Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

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

@@ -111,9 +111,9 @@ export default {
       const dicData = await this.$utils.getDicListByCode('UseRequestType')
       // 当前登陆人为孙瑶雪 和dexadmin的时候下拉可以看到试验领用，其他人看不到
       if (user === '孙瑶雪' || user === 'dexadmin') {
-        this.options = dicData
+        this.options = dicData.filter(item => item.label !== '无指令领用')
       } else {
-        this.options = dicData.filter(item => item.label !== '试验领用')
+        this.options = dicData.filter(item => item.label !== '试验领用' && item.label !== '无指令领用')
       }
     },
     dataChangeHandler(val) {

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

@@ -871,7 +871,10 @@ export default {
         'extDxProductAreaId': this.form.extDxProductAreaId,
         'extDxSipplierId': this.form.extDxSipplierId,
         'materialTypeId': this.form.materialTypeId,
-        'inStorageRequestItems': tableData
+        'inStorageRequestItems': tableData && tableData.map(r => {
+          delete r.objOrg
+          return r
+        }) || []
       }
       if (paramOperator === 'MODIFY') {
         param.id = this.newDataImportResId || this.form.id

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

@@ -951,7 +951,10 @@ export default {
           'extDxProductAreaId': this.form.extDxProductAreaId,
           'extDxSipplierId': this.form.extDxSipplierId,
           'materialTypeId': this.form.materialTypeId,
-          'inStorageRequestItems': tableData
+          'inStorageRequestItems': tableData && tableData.map(r => {
+            delete r.objOrg
+            return r
+          }) || []
         }
         if (paramOperator === 'MODIFY') {
           param.id = this.newDataImportResId || this.form.id