验收入库明细增加字段，验收单类型增加过滤

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

@@ -422,6 +422,14 @@ export default {
             return value
           }
         },
+        {
+          title: '技术条件', width: '150', key: 'modelNo', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.techSpec : ''
+            return value
+          }
+        },
+        { title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
+        { title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
         { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
         { title: '机型', key: 'airModel', headerAlign: 'center' },
         { title: '架次', key: 'sorties', headerAlign: 'center' },

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

@@ -423,6 +423,14 @@ export default {
             return value
           }
         },
+        {
+          title: '技术条件', width: '150', key: 'modelNo', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.techSpec : ''
+            return value
+          }
+        },
+        { title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
+        { title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
         { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
         { title: '机型', key: 'airModel', headerAlign: 'center' },
         { title: '架次', key: 'sorties', headerAlign: 'center' },
@@ -624,7 +632,17 @@ export default {
       const param = { 'pageFrom': 1, 'pageSize': 9999, 'searchItems': { 'items': [{ 'fieldName': 'dictState', 'operator': 'EQ', 'value': 'ENABLE' }, { 'fieldName': 'dictCode', 'operator': 'EQ', 'value': 'BillType' }] }, 'sortItem': [{ 'fieldName': 'dictSeq', 'sortOrder': 'asc' }] }
       post('DictData/search', param).then(res => {
         this.formData[0].data.forEach(item => {
-          item.key === 'billType' && (item.component.options = res.items.content.map(row => { return { value: row.dictKey, label: row.dictValue } }))
+          if (item.key === 'billType') {
+            item.component.options = []
+            res.items.content.map(row => {
+              if (row.dictValue !== '领用出库' && row.dictValue !== '供外出库') {
+                item.component.options.push(
+                  { value: row.dictKey, label: row.dictValue }
+                )
+              }
+            }
+            )
+          }
         })
       }).catch((err) => {
         console.log(err)

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

@@ -77,6 +77,14 @@ export default {
             return value
           }
         },
+        {
+          title: '技术条件', width: '150', key: 'modelNo', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.techSpec : ''
+            return value
+          }
+        },
+        { title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
+        { title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
         { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
         { title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' },
         { title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' },

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

@@ -188,6 +188,14 @@ export default {
             return value
           }
         },
+        {
+          title: '技术条件', width: '150', key: 'modelNo', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.techSpec : ''
+            return value
+          }
+        },
+        { title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
+        { title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
         { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
         { title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' },
         { title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' },

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

@@ -45,6 +45,27 @@ export default {
             return value
           }
         },
+        {
+          title: '名称', key: 'resName', width: '120', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.resName ? row.resName : row.extMaterial ? row.extMaterial.resName : ''
+            return value
+          }
+        },
+        {
+          title: '牌号/型号/件号', width: '150', key: 'modelNo', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.modelNo : ''
+            return value
+          }
+        },
+        {
+          title: '技术条件', width: '150', key: 'modelNo', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
+            const value = row.extMaterial ? row.extMaterial.techSpec : ''
+            return value
+          }
+        },
+        { title: '到货标准/图号', key: 'arrivedDrawNo', width: '150', headerAlign: 'center' },
+        { title: '到货版次', key: 'arrivalVer', width: '150', headerAlign: 'center' },
+        { title: '系列号/序列号', key: 'serialNo', width: '150', headerAlign: 'center' },
         { title: '机型', key: 'airModel', align: 'center', headerAlign: 'center' },
         { title: '架次', key: 'sorties', align: 'center', headerAlign: 'center' },
         {