采购入库明细增加字段

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

@@ -429,6 +429,19 @@ export default {
             return value
           }
         },
+        {
+          title: '规格', width: '150', key: 'spec', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.spec : ''
+            return value
+          }
+        },
+        {
+          title: '供应状态', width: '150', key: 'supplyStatus', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.supplyStatus : ''
+            return value
+          }
+        },
+        { title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
         { title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
         { title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
         { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
@@ -451,6 +464,7 @@ export default {
         { title: '制造商', key: 'manufacturer', headerAlign: 'center' },
         { title: '到货日期', key: 'arrivalDate', headerAlign: 'center' },
         { title: '生产日期', key: 'producedTime', headerAlign: 'center' },
+        { title: '贮存条件', key: 'storageCondition', headerAlign: 'center' },
         {
           title: '随产品资料', key: 'withProductMaterial', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
             return Array.isArray(row.withProductMaterial) ? row.withProductMaterial.join(';') : row.withProductMaterial

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

@@ -83,6 +83,19 @@ export default {
             return value
           }
         },
+        {
+          title: '规格', width: '150', key: 'spec', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.spec : ''
+            return value
+          }
+        },
+        {
+          title: '供应状态', width: '150', key: 'supplyStatus', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.supplyStatus : ''
+            return value
+          }
+        },
+        { title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
         { title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
         { title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
         { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
@@ -113,6 +126,7 @@ export default {
             return row.producedTime && row.producedTime.split(' ')[0]
           }
         },
+        { title: '贮存条件', key: 'storageCondition', headerAlign: 'center' },
         {
           title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
             return Array.isArray(row.withProductMaterial) ? row.withProductMaterial.join(';') : row.withProductMaterial

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

@@ -194,6 +194,19 @@ export default {
             return value
           }
         },
+        {
+          title: '规格', width: '150', key: 'spec', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.spec : ''
+            return value
+          }
+        },
+        {
+          title: '供应状态', width: '150', key: 'supplyStatus', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.supplyStatus : ''
+            return value
+          }
+        },
+        { title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
         { title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
         { title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
         { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
@@ -224,6 +237,7 @@ export default {
             return row.producedTime && row.producedTime.split(' ')[0]
           }
         },
+        { title: '贮存条件', key: 'storageCondition', headerAlign: 'center' },
         {
           title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
             return Array.isArray(row.withProductMaterial) ? row.withProductMaterial.join(';') : row.withProductMaterial

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

@@ -63,6 +63,19 @@ export default {
             return value
           }
         },
+        {
+          title: '规格', width: '150', key: 'spec', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.spec : ''
+            return value
+          }
+        },
+        {
+          title: '供应状态', width: '150', key: 'supplyStatus', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.supplyStatus : ''
+            return value
+          }
+        },
+        { title: '炉/批号', key: 'lotNo', width: '150', headerAlign: 'center' },
         { title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
         { title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
         { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
@@ -93,6 +106,7 @@ export default {
             return row.producedTime && row.producedTime.split(' ')[0]
           }
         },
+        { title: '贮存条件', key: 'storageCondition', headerAlign: 'center' },
         {
           title: '随产品资料', key: 'withProductMaterial', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
             return Array.isArray(row.withProductMaterial) ? row.withProductMaterial.join(';') : row.withProductMaterial