Merge branch 'purchaseDev' into 'dev'

Purchase dev

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

src/views/purchase/PurchaseDemandList/add.vue

@@ -41,7 +41,7 @@
           </el-col>
 
          <el-col :span="1.5">
-            <el-form-item label="需求客户" prop="customer" :rules="{ required: true, message: '请选择需求客户', trigger: 'blur' }">
+            <el-form-item label="需求客户">
               <el-select clearable size="small" v-model="basicForm.customer" :disabled="sonDisable" @clear="cleanCustomer" @focus="chooseOrg('CUSTOMER_PARAM', true, '选择客户')" style="width: 200px">
                 <el-option v-for="item in customerOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
@@ -985,6 +985,8 @@ export default {
       // 物料存储条件和运输条件
       this.basicForm.puDemandItemList[this.tableIndex].transportationCondition = selection[0].transportationCondition
       this.basicForm.puDemandItemList[this.tableIndex].storageCondition = selection[0].storageCondition
+      // 选中骨科耗材时候的物料，需求客户不必填
+      
     },
     // 明细行选择业务部门参照带出业务部门数据
     chooseDept(index, type, isPage, title) {

src/views/purchase/transferOrder/add.vue

@@ -36,6 +36,7 @@
                 :disabled="sonDisable"
                 type="date"
                 clearable
+                @change="changeBillDate"
                 value-format="yyyy-MM-dd"
                 style="width: 200px">
               </el-date-picker>
@@ -719,6 +720,12 @@ export default {
     }
   },
   methods: {
+    // 改变单据日期时清空子表的调拨日期
+    changeBillDate() {
+      this.materialInfo.forEach(item => {
+        item.allotDate = null
+      })
+    },
     // 控制先选调出库存组织和调入库存组织再选调出部门和调入调出仓库
     controlCk() {
       console.log('进了吗')