物料对照表保存参数修改

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

@@ -273,11 +273,12 @@ export default {
       // 带出物料相关默认值
       const SELECT_MATERIAL = this.optionsA.find((item) => item.resCode === v)
       if (SELECT_MATERIAL) {
-        this.sourceForm.modelNo = SELECT_MATERIAL.modelNo || ''
-        this.sourceForm.techSpec = SELECT_MATERIAL.techSpec || ''
-        this.sourceForm.spec = SELECT_MATERIAL.spec || ''
-        this.sourceForm.supplyStatus = SELECT_MATERIAL.supplyStatus || ''
-        this.sourceForm.resName = SELECT_MATERIAL.resName || ''
+        this.sourceForm = SELECT_MATERIAL
+        // this.sourceForm.modelNo = SELECT_MATERIAL.modelNo || ''
+        // this.sourceForm.techSpec = SELECT_MATERIAL.techSpec || ''
+        // this.sourceForm.spec = SELECT_MATERIAL.spec || ''
+        // this.sourceForm.supplyStatus = SELECT_MATERIAL.supplyStatus || ''
+        // this.sourceForm.resName = SELECT_MATERIAL.resName || ''
       }
     },
     // 切换物料下拉
@@ -285,11 +286,12 @@ export default {
       // 带出物料相关默认值
       const SELECT_MATERIAL = this.optionsB.find((item) => item.resCode === v)
       if (SELECT_MATERIAL) {
-        this.targetForm.modelNo = SELECT_MATERIAL.modelNo || ''
-        this.targetForm.techSpec = SELECT_MATERIAL.techSpec || ''
-        this.targetForm.spec = SELECT_MATERIAL.spec || ''
-        this.targetForm.supplyStatus = SELECT_MATERIAL.supplyStatus || ''
-        this.targetForm.resName = SELECT_MATERIAL.resName || ''
+        this.targetForm = SELECT_MATERIAL
+        // this.targetForm.modelNo = SELECT_MATERIAL.modelNo || ''
+        // this.targetForm.techSpec = SELECT_MATERIAL.techSpec || ''
+        // this.targetForm.spec = SELECT_MATERIAL.spec || ''
+        // this.targetForm.supplyStatus = SELECT_MATERIAL.supplyStatus || ''
+        // this.targetForm.resName = SELECT_MATERIAL.resName || ''
       }
     },
     submitEvent() {

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

@@ -75,7 +75,7 @@ export default {
         }, width: 100 },
         {
           title: '物料A', children: [
-            { title: '物料', key: 'source.resType2.typeName', align: 'center' },
+            { title: '物料类型', key: 'source.resType2.typeName', align: 'center' },
             { title: '物料编码', key: 'source.resCode', align: 'center' },
             { title: '物料名称', key: 'source.resName', align: 'center' },
             { title: '牌号/型号/件号', width: '120', key: 'source.modelNo', align: 'center' },
@@ -86,7 +86,7 @@ export default {
         },
         {
           title: '物料B', children: [
-            { title: '物料', key: 'target.resType2.typeName', align: 'center' },
+            { title: '物料类型', key: 'target.resType2.typeName', align: 'center' },
             { title: '物料编码', key: 'target.resCode', align: 'center' },
             { title: '物料名称', key: 'target.resName', align: 'center' },
             { title: '牌号/型号/件号', width: '120', key: 'target.modelNo', align: 'center' },
@@ -182,12 +182,20 @@ export default {
       const params = {
         'pageFrom': this.pagination.currentPage,
         'pageSize': this.pagination.pageSize,
-        'searchItems': { }
+        'searchItems': { },
+        'sortItem': [
+          {
+            'fieldName': 'modifyTime',
+            'sortOrder': 'desc'
+          }
+        ]
       }
       if (searchForm) {
         params.searchItems = searchForm
       }
-      params.openProps = [{ name: 'target' }, { name: 'source' }]
+      params.openProps = [
+        { name: 'target', 'openProps': [{ name: 'resType2' }] },
+        { name: 'source', 'openProps': [{ name: 'resType2' }] }]
       this.$api.searchApi('MaterialReferenceLink', params).then(res => {
         if (res.items && res.items.content) {
           this.tableData = res.items.content