Merge remote-tracking branch 'origin/dev' into dev

src/views/material/basicFile/details.vue

@@ -735,7 +735,7 @@ export default {
         pageNum: 1,
         total: 0,
         pageSize: 10,
-      }
+      },
     }
   },
 
@@ -761,13 +761,14 @@ export default {
 
         return !(this.updateButtonGroup && attribute.edit && this.basicData.value['isInventoryStatus'] == '0');
       }
+      // 效期管理（expiryDateManagerment）：控制一下几个是否可编辑
+      // expiryUnitId 效期单位  usefulLife 有效期 usefulLifeUnitId 有效期至单位  "recentWarningPeriod" 近效期预警天数
+
       else if (attribute.prop == 'expiryUnitId'
         || attribute.prop == 'usefulLife'
         || attribute.prop == 'usefulLifeUnitId'
         || attribute.prop == 'recentWarningPeriod'
       ) {
-        // 效期管理（expiryDateManagerment）：控制一下几个是否可编辑
-        // expiryUnitId 效期单位  usefulLife 有效期 usefulLifeUnitId 有效期至单位  "recentWarningPeriod" 近效期预警天数
         if (this.basicData.value['expiryDateManagerment'] == '2') {
 
           this.basicData.value['expiryUnitId'] = '';
@@ -777,7 +778,13 @@ export default {
         }
 
         return !(this.updateButtonGroup && attribute.edit && this.basicData.value['expiryDateManagerment'] == '0');
-      } else {
+      }
+      // 默认采购组织:purchasingOrganization  业务部门:businessDepartment
+      else if (attribute.prop == 'businessDepartment') {
+        console.log(!this.basicData.value['purchasingOrganization'], '////////////');
+        return !(this.updateButtonGroup && attribute.edit && this.basicData.value['purchasingOrganization']);
+      }
+      else {
         // 其他属性是否可编辑
         return !(this.updateButtonGroup && attribute.edit);
       }
@@ -934,13 +941,21 @@ export default {
       this.handleQueryMore(this.MoreDataDialog.msg, this.MoreDataDialog.key, this.MoreDataDialog.target);
     },
     // 根据apiUrl获取对应参照的值
-    getExecuteMethods(methodName, params, cb) {
+    getExecuteMethods(methodName, param, cb) {
 
       let page = {
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
       }
 
+      let params = { ...param };
+      // 业务部门需要  依据默认采购组组织查询
+      if (methodName == "queryOperatingDepptTree") {
+
+        params['puOrgId'] = this.basicData.value['purchasingOrganization']
+
+      }
+
       materialApi.executeMethods(methodName, params, page).then(res => {
         this.MoreDataDialog.loading = false;
         if (res.code == 200) {
@@ -1784,24 +1799,25 @@ export default {
         //  基本信息
         this.basicData.value[this.MoreDataDialog.target.prop] = this.MoreDataDialog.value.id;
 
-        // this.basicData.value[`${this.MoreDataDialog.target.prop}Label`] = this.MoreDataDialog.value.name;
         this.basicData.value[`${this.MoreDataDialog.target.prop}Name`] = this.MoreDataDialog.value.name;
 
         console.log(this.MoreDataDialog.target.prop, 'props-----------------', this.MoreDataDialog.value);
 
         console.log(this.basicData.value[`${this.MoreDataDialog.target.prop}`], '值', this.basicData.value[`${this.MoreDataDialog.target.prop}Name`], '//////////基本信息///////////');
+        // 默认采购组织:purchasingOrganization  业务部门:businessDepartment
+        if (this.MoreDataDialog.target.prop == 'purchasingOrganization') {
+
+          this.basicData.value['businessDepartment'] = '';
+          this.basicData.value['businessDepartmentName'] = '';
+
+        }
+
 
       } else if (this.MoreDataDialog.target.name == 'medcineData') {
-        // console.log('this.MoreDataDialog.value', this.MoreDataDialog.value, this.MoreDataDialog.target.prop, this.medcineData);
-        // if (this.MoreDataDialog.target.prop === 'dosageFrom')
-        //   this.medcineData.form = this.medcineData.form.map((item) => {
-        //     if (item.prop === "dosageFrom") item.dictValue = [{ dictLabel: this.MoreDataDialog.value.name, dictValue: this.MoreDataDialog.value.id }]
-        //     return item
-        //   })
+
         //  医药信息
         this.medcineData.value[this.MoreDataDialog.target.prop] = this.MoreDataDialog.value.id;
 
-        // this.medcineData.value[`${this.MoreDataDialog.target.prop}Label`] = this.MoreDataDialog.value.name;
         this.medcineData.value[`${this.MoreDataDialog.target.prop}Name`] = this.MoreDataDialog.value.name;
 
         console.log(this.MoreDataDialog.target.prop, 'props-----------------', this.MoreDataDialog.value);
@@ -1813,7 +1829,6 @@ export default {
         //  其他页签
         this.otherDeatils.value[this.MoreDataDialog.target.prop] = this.MoreDataDialog.value.id;
 
-        // this.otherDeatils.value[`${this.MoreDataDialog.target.prop}Label`] = this.MoreDataDialog.value.name;
         this.otherDeatils.value[`${this.MoreDataDialog.target.prop}Name`] = this.MoreDataDialog.value.name;
 
         console.log(this.otherDeatils.value[`${this.MoreDataDialog.target.prop}Name`], '/////////其他页签///////');
@@ -1848,10 +1863,10 @@ export default {
       }
 
       if (confirm) {
-
         this.count++;
         this.MoreDataDialog.show = false;
         this.MoreDataDialog.key = '';
+        this.MoreDataDialog.value = {};
       }
     },
     // 取消-关闭参照弹窗

src/views/material/config/detailsTabs.js

@@ -6,7 +6,7 @@ const detailsTabs = [
     isShow: true,
   },
   {
-    label: '财物信息',
+    label: '财务信息',
     code: 'material_finance',
     isShow: true,
   },

src/views/material/requisition/add.vue

@@ -995,8 +995,8 @@ export default {
       if (this.row.mediumPackageUnitId) {
         this.getMidPackDetails(this.row.mediumPackageUnitId)
       }
-      // 内包装单位回显
-      if (this.row.innerPackingUnit) {
+       // 内包装单位回显
+       if (this.row.innerPackingUnit) {
         this.getInnerPackingUnitDetails(this.row.innerPackingUnit)
       }
     } else if (this.pageStu == 'add') {