Merge branch 'dev' into 'purchaseDev'

Dev

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

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/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) {