验收入库申请流程详情

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

@@ -32,6 +32,7 @@ export default {
     return {
       tableData: [],
       columns: [
+        { title: '单据编号', key: 'inventoryReq.reqNo', width: '120', headerAlign: 'center' },
         { title: '所属设备', key: 'subEquipment', headerAlign: 'center' },
         {
           title: '物料类型', key: 'typeName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
@@ -40,7 +41,7 @@ export default {
           }
         },
         {
-          title: '编码', key: 'typeCode', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+          title: '编码', key: 'typeCode', headerAlign: 'center', width: '100', formatter: (row, column, cellValue, index) => {
             const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : ''
             return value
           }
@@ -62,10 +63,14 @@ export default {
         },
         // { title: '是否合格供应商', key: 'extDxSipplier.isValid', headerAlign: 'center' },
         { title: '制造商', key: 'manufacturer', headerAlign: 'center' },
-        { title: '到货日期', key: 'arrivalDate', headerAlign: 'center' },
-        { title: '生产日期', key: 'producedTime', headerAlign: 'center' },
+        { title: '到货日期', key: 'arrivalDate', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
+          return row.arrivalDate.split(' ')[0]
+        } },
+        { title: '生产日期', key: 'producedTime', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
+          return row.arrivalDate.split(' ')[0]
+        } },
         {
-          title: '随产品资料', key: 'withProductMaterial', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+          title: '随产品资料', key: 'withProductMaterial', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
             return Array.isArray(row.withProductMaterial) ? row.withProductMaterial.join(';') : row.withProductMaterial
           }
         },
@@ -85,7 +90,9 @@ export default {
         { title: '合同号', key: 'contractNo', headerAlign: 'center' },
         { title: '备注', key: 'remark', headerAlign: 'center' },
         { title: '状态', key: 'state', headerAlign: 'center' },
-        { title: '创建时间', key: 'createTime', headerAlign: 'center' }
+        { title: '创建时间', key: 'createTime', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
+          return row.arrivalDate.split(' ')[0]
+        } }
       ],
       optionsTree: {
         rowKey: 'id',
@@ -138,7 +145,7 @@ export default {
 
             ]
           },
-          'openProps': [{ 'name': 'extMaterial', 'openProps': [{ 'name': 'resType2' }, { 'name': 'extUnit' }] }, { 'name': 'extDxSipplier' }, { 'name': 'storageZone' }],
+          'openProps': [{ 'name': 'extMaterial', 'openProps': [{ 'name': 'resType2' }, { 'name': 'extUnit' }] }, { 'name': 'extDxSipplier' }, { 'name': 'storageZone' }, { 'name': 'inventoryReq' }],
           'sortItem': [
             {
               'fieldName': 'modifyTime',
@@ -166,7 +173,8 @@ export default {
               ]
             },
             { 'name': 'extDxSipplier' },
-            { 'name': 'storageZone' }
+            { 'name': 'storageZone' },
+            { 'name': 'inventoryReq' }
           ],
           'sortItem': [
             {