Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!210

src/views/purchase/PurchaseDemandList/index.vue

@@ -71,7 +71,7 @@
           <el-row :gutter="10">
             <el-col :span="1.5">
               <el-form-item label="需求部门">
-                <el-select clearable v-model="queryParams.demandDept" size="mini" :disabled="disable" @focus="chooseOrg('DEPT_PARAM', true, '需求部门')" style="width: 200px">
+                <el-select clearable v-model="queryParams.demandDept" size="mini" @focus="chooseOrg('DEPT_PARAM', true, '需求部门')" style="width: 200px">
                   <el-option
                     v-for="item in deptOptions"
                     :key="item.id"

src/views/purchase/purchase-order/add/index.vue

@@ -339,13 +339,8 @@ export default {
         let detailList = this.params['puOrderItemList'].filter(item => (
           item.material && item.material != '' 
         ))
-        // && item.qty && item.qty != ''
-        
-        if(detailList.length){
-
-          this.handleGetPrice();
 
-        }
+        detailList.length && this.handleGetPrice();
         
       }
 

src/views/purchase/purchase-order/edit/index.vue

@@ -256,7 +256,7 @@ export default {
           }
         ]
 
-      await  relevanceRefer.forEach(async (refer) =>{
+        await relevanceRefer.forEach(async (refer) =>{
 
           try {
 
@@ -278,6 +278,15 @@ export default {
           } catch (error) {}
           
         })
+
+        // 明细不为空的情况下进行询价
+        let detailList = this.params['puOrderItemList'].filter(item => (
+          item.material && item.material != '' 
+        ))
+
+        detailList.length && this.handleGetPrice();
+
+
         
       }
     },