Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/privateComponents/components/GenerateCreateOrproductionButton/index.vue

@@ -67,7 +67,6 @@ export default {
         }).catch((err) => {
           console.log(err)
         })
-        this.$emit('cancel')
       }).catch((err) => {
         console.log(err)
       })

applications/dee-mes/src/privateComponents/components/InStorageMoveWarehouseSelect/index.vue

@@ -122,6 +122,13 @@ export default {
       this.options = []
     })
   },
+  beforeDestroy() {
+  // 在组件销毁之前做一些清理工作
+  // 清除定时器、取消订阅等
+    sessionStorage.setItem('InStorageMoveform-InStorageMoveTable', '')
+    this.selVal = null
+    this.options = []
+  },
   methods: {
     changeVal() {
       this.$emit('input', this.selVal)

applications/dee-mes/src/privateComponents/components/MaterialReferenceLinkTable/components/addForm.vue

@@ -306,6 +306,7 @@ export default {
       this.$api.recursion('MaterialReferenceLink', form).then(res => {
         this.cancelEvent()
         this.$utils.showMessageSuccess('保存成功')
+        this.$emit('success')
       })
     },
     cancelEvent() {

applications/dee-mes/src/privateComponents/components/MaterialReferenceLinkTable/index.vue

@@ -19,7 +19,12 @@
       :form-btn-position="'center'"
       @on-submit="initData(searchForm)"
     /> -->
+    <!-- :show-fresh="true"
+      :show-query-form="true"
+      :show-table-config="true"
+      :show-table-query="true" -->
     <dee-up-table
+      ref="upTable"
       :columns="tableColumns"
       :data="tableData"
       :index-row="{ title: '序号', width: '60', align: 'center', fixed: true }"
@@ -32,7 +37,7 @@
       <dee-tools slot="header" :tools="tools" mode="normal" :collapse="false" />
     </dee-up-table>
     <dee-dialog width="70%" title="新增" :visible.sync="addDialogVisible" @on-cancel="addCancel">
-      <add-form ref="addForm" @cancel="addCancel" />
+      <add-form ref="addForm" @cancel="addCancel" @success="successFun" />
     </dee-dialog>
   </div>
 </template>
@@ -173,7 +178,6 @@ export default {
   },
   methods: {
     initData(searchForm) {
-      console.log(searchForm)
       // 初始化数据
       const params = {
         'pageFrom': this.pagination.currentPage,
@@ -205,6 +209,9 @@ export default {
     },
     addCancel(pageNum) {
       this.addDialogVisible = false
+    },
+    successFun() {
+      this.initData()
     }
   }
 }