Merge branch 'dev' into 'master'

Dev

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

src/components/popover-select-v2/index.vue

@@ -170,7 +170,7 @@ export default {
     // auto
     async useAutocomplete(prop, cb) {
       if (prop) {
-        this.page.pageSize = 1000000;
+        this.page.pageSize = 10;
         this.model.search = prop;
         await this.fetchList(this.model, this.page);
         await cb(this.data);

src/views/purchase/purchase-order/add/column.js

@@ -375,7 +375,7 @@ const PurchaseTabColumns =[
         },
       },
       { 
-        key: "rowno", 
+        key: "rowNo", 
         title: "行号", 
         inputType: "Input", 
         disabled:true,

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

@@ -555,7 +555,7 @@ export default {
     // 子表inputNumber
     handleInputChange(row, type) {
       // 物料数量变化----询价
-      if ((type == "qty" || type == "taxPrice" )&& row.material) {
+      if ((type == "qty" || type == "taxPrice" || type == 'taxDeductMoneya')&& row.material) {
 
         // row['whetherCompleteInquiry'] = false;
 

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

@@ -505,7 +505,7 @@ export default {
 
 
       // 物料数量变化----询价
-      if ((type == "qty" || type == "taxPrice" ) && row.material ) {
+      if ((type == "qty" || type == "taxPrice"  || type == 'taxDeductMoneya') && row.material ) {
 
         if(this.params.status === '2'){
 

src/views/purchase/transferOrder/add.vue

@@ -1633,7 +1633,7 @@ export default {
       if (this.basicForm.materialInfo.length !== 0) {
         this.basicForm.materialInfo.forEach((item) => {
           if (item.allotDate) {
-            item.allotDate = null;
+            item.allotDate = new Date();
           }
           if (item.deliveryCode) {
             item.deliveryCode = "";
@@ -1892,7 +1892,7 @@ export default {
         producBatch: null,
         manufactureDate: null,
         periodEndDate: null,
-        allotDate: null,
+        allotDate: new Date(),
         ratifyCode: null,
         registration: null,
         productCode: null,

src/views/purchase/workSpace/index.vue

@@ -323,11 +323,13 @@ export default {
             this.$modal.closeLoading();
             this.$modal.notifySuccess("审批成功");
             this.searchList()
+            this.sonTableList = []
           }
         })
         }).catch(() => {
           this.$modal.closeLoading();
           this.searchList()
+          this.sonTableList = []
         })
       } 
     },
@@ -342,10 +344,12 @@ export default {
           this.$modal.closeLoading();
           this.$modal.notifySuccess("审批成功");
           this.searchList()
+          this.sonTableList = []
         }
       }).catch(() => {
         this.$modal.closeLoading();
         this.searchList()
+        this.sonTableList = []
       })
     },
     handleSizeChange(val) {