修改出入记录显示

src/views/accessrecords/ProcessMaterialWarehousingRecord.vue

@@ -225,7 +225,7 @@
             title:'流程发起部门',
             align:"center",
             scopedSlots: { customRender: 'sysOrgCode_dictText' },
-            dataIndex: 'sysOrgCode_dictText',
+            dataIndex: 'departId_dictText',
           },
           {
             title:'流程发起人',

src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue

@@ -262,7 +262,7 @@
             title:'流程发起部门',
             align:"center",
             scopedSlots: { customRender: 'sysOrgCode_dictText' },
-            dataIndex: 'sysOrgCode_dictText',
+            dataIndex: 'departId_dictText',
           },
           {
             title:'流程发起人',
@@ -290,9 +290,9 @@
             title:'出库时间',
             align:"center",
             dataIndex: 'deliveryTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            // customRender:function (text) {
+            //   return !text?"":(text.length>10?text.substr(0,10):text)
+            // }
           },
           // {
           //   title:'文件id',
@@ -361,7 +361,7 @@
           path:'/access_records/deplan',
           query:{
             item: records.id,
-            merchandiseName: " - "+records.materialType_dictText,
+            merchandiseName: " - "+records.describes.substring(0,10),
           }
         })
       },

src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue

@@ -213,7 +213,7 @@
           {
             title:'物料组',
             align:"center",
-            dataIndex: 'materialGroup',
+            dataIndex: 'materialClassify',
           },
           {
             title:'物料号',
@@ -226,22 +226,22 @@
             scopedSlots: { customRender: 'materialDescription' },
             dataIndex: 'materialDescription'
           },
-          {
-            title:'规格',
-            align:"center",
-            scopedSlots: { customRender: 'specification' },
-            dataIndex: 'specification'
-          },
-          {
-            title:'型号',
-            align:"center",
-            scopedSlots: { customRender: 'type' },
-            dataIndex: 'type'
-          },
+          // {
+          //   title:'规格',
+          //   align:"center",
+          //   scopedSlots: { customRender: 'specification' },
+          //   dataIndex: 'specification'
+          // },
+          // {
+          //   title:'型号',
+          //   align:"center",
+          //   scopedSlots: { customRender: 'type' },
+          //   dataIndex: 'type'
+          // },
           {
             title:'仓储地点',
             align:"center",
-            dataIndex: 'unitWasteWarehouseCodeId',
+            dataIndex: 'warehouseId_dictText',
           },
           // {
           //   title:'生产时间',

src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue

@@ -182,7 +182,7 @@ export default {
         {
           title:'物料组',
           align:"center",
-          dataIndex: 'materialGroup',
+          dataIndex: 'materialClassify',
         },
         {
           title:'物料号',
@@ -195,18 +195,18 @@ export default {
           scopedSlots: { customRender: 'materialName' },
           dataIndex: 'materialName',
         },
-        {
-          title:'规格',
-          align:"center",
-          scopedSlots: { customRender: 'specification' },
-          dataIndex: 'specification',
-        },
-        {
-          title:'型号',
-          align:"center",
-          scopedSlots: { customRender: 'type' },
-          dataIndex: 'type',
-        },
+        // {
+        //   title:'规格',
+        //   align:"center",
+        //   scopedSlots: { customRender: 'specification' },
+        //   dataIndex: 'specification',
+        // },
+        // {
+        //   title:'型号',
+        //   align:"center",
+        //   scopedSlots: { customRender: 'type' },
+        //   dataIndex: 'type',
+        // },
         {
           title:'单位',
           align:"center",
@@ -247,9 +247,10 @@ export default {
             title:'出库时间',
             align:"center",
             dataIndex: 'createTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            width:150,
+            // customRender:function (text) {
+            //   return !text?"":(text.length>10?text.substr(0,10):text)
+            // }
           },
         // {
         //   title: '操作',

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -431,7 +431,7 @@
     },
     methods: {
       jumpLink(text,record){
-        console.log("跳转了",text,record)
+        // console.log("跳转了",text,record)
         let params = {
           tableId: record.processMaterialWarehousingId,
           logType:1
@@ -446,6 +446,8 @@
             this.$message.warning(res.message)
           }
           this.loading = false;
+        }).finally(()=>{
+          this.loading = false;
         })
 
       },
@@ -457,7 +459,7 @@
         //   return;
         // }
         // console.log("isView>>>>>>>>>>>>",isView)
-        console.log("r>>>>>>>>>>>>",r)
+        // console.log("r>>>>>>>>>>>>",r)
         isView = isView||false;
         this.lcModa.disabled = isView;
         this.lcModa.hieg = isView;