添加返厂依据

applications/dee-mes/src/privateComponents/components/InStorageRecallItemCom/component/storageDetailsCreateCom.vue

@@ -1837,12 +1837,12 @@ export default {
                 'fieldName': 'targetId',
                 'operator': 'EQ',
                 'value': this.basicData.materialTypeId || ''
-              },
-              {
-                'fieldName': 'source.extDxProductAreaId',
-                'operator': 'EQ',
-                'value': this.basicData.extDxProductAreaId || ''
               }
+              // {
+              //   'fieldName': 'source.extDxProductAreaId',
+              //   'operator': 'EQ',
+              //   'value': this.basicData.extDxProductAreaId || ''
+              // }
               ],
               'operator': 'AND'
             }
@@ -1858,6 +1858,7 @@ export default {
           const STORAGE = this.formFileds[0].data.find(
             (item) => item.key === 'storageZone'
           )
+          res.items.content = res.items.content.filter(item => { return item.source })
           STORAGE.component.options = res.items.content.map((item) => {
             return {
               label: item.source && item.source.extname,

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

@@ -176,7 +176,8 @@ export default {
           title: '创建时间', key: 'createTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
             return row.createTime && row.createTime.split(' ')[0]
           }
-        }
+        },
+        { title: '返厂依据', key: 'callBackBill', align: 'center', headerAlign: 'center' }
       ],
       optionsTree: {
         rowKey: 'id',

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

@@ -289,7 +289,8 @@ export default {
           title: '创建时间', key: 'createTime', align: 'center', headerAlign: 'center', width: '120', formatter: (row, column, cellValue, index) => {
             return row.createTime && row.createTime.split(' ')[0]
           }
-        }
+        },
+        { title: '返厂依据', key: 'callBackBill', align: 'center', headerAlign: 'center' }
       ]
       if ((this.basicData.subTypeName === 'InStoragePurchaseItem' || this.basicData.subTypeName === 'InStorageRecallItem' || this.basicData.subTypeName === 'InStorageExpireItem') && this.basicData.state === 'In_Confirm') {
         return tableConlumn