国内贸易修改

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -1112,6 +1112,7 @@ export default {
               this.form.corpsTypeId = this.form.corpsTypeId.join(",")
             }
             this.pageLoading = true
+            this.saveActives = ''
             sendOutGoods(this.form).then(res => {
               this.$message.success('发货成功')
               this.queryData(res.data.data.id)
@@ -1126,6 +1127,7 @@ export default {
             this.form.deliveryItemsList = this.goodsShowData.concat(this.giftData)
           }
           this.pageLoading = true
+          this.saveActives = ''
           confirmArrival(this.form).then(res => {
             this.$message.success('已确认到货')
             this.queryData(this.form.id)

src/views/businessManagement/deliveryNotice/index.vue

@@ -188,6 +188,7 @@ export default {
     })
   },
   activated() {
+    this.isShow = true;
     setTimeout(() => {
       if (this.$route.query.form) {
         this.detailData = {
@@ -240,7 +241,6 @@ export default {
     //查询全部
     initData() {
       customerList().then(res => {
-        console.log(this.form);
         const column = this.findObject(this.option.column, "parentId");
         column.dicData = res.data.data.records;
       });
@@ -319,11 +319,9 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
-      this.gobackSearch(this.search)
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
-      this.gobackSearch(this.search)
     },
     refreshChange() {
       this.page.currentPage = 1;
@@ -338,7 +336,8 @@ export default {
         }
         this.$delete(params,'businessDate')
       }
-      let queryParams = Object.assign({}, params, {
+      let data = this.gobackSearch(params)
+      let queryParams = Object.assign({}, data, {
         size: page.pageSize,
         current: page.currentPage,
         billType:"FH"
@@ -368,17 +367,21 @@ export default {
       }
       this.isShow = true;
       this.$store.commit("IN_OUT_DETAIL");
-      this.gobackSearch(this.search)
+      this.onLoad(this.page, this.search)
     },
     gobackSearch(params) {
-      let data = {};
-      data = Object.assign({}, params)
-      if (data.createTime && data.createTime != '') {
-        data.createTimeStart = data.createTime[0]+ " " + "00:00:00"
-        data.createTimeEnd = data.createTime[1]+ " " + "23:59:59"
-        this.$delete(data,'createTime')
+      params = Object.assign({}, this.search)
+      if (params.businessDate && params.businessDate != '') {
+        params.businessStartDate = params.businessDate[0]+ " " + "00:00:00"
+        params.businessEndDate = params.businessDate[1]+ " " + "23:59:59"
+        this.$delete(params,'businessDate')
+      }
+      if (params.createTime && params.createTime != '') {
+        params.createTimeStart = params.createTime[0]+ " " + "00:00:00"
+        params.createTimeEnd = params.createTime[1]+ " " + "23:59:59"
+        this.$delete(params,'createTime')
       }
-      this.onLoad(this.page, data);
+      return params
     },
     //列保存触发
     async saveColumn() {

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -42,11 +42,11 @@
             >
               申请货款
             </el-dropdown-item>
-            <el-dropdown-item
-              @click.stop.native="applyPayment('收费')"
-              :disabled="!this.form.id"
-            >申请退款
-            </el-dropdown-item>
+<!--            <el-dropdown-item-->
+<!--              @click.stop.native="applyPayment('收费')"-->
+<!--              :disabled="!this.form.id"-->
+<!--            >申请退款-->
+<!--            </el-dropdown-item>-->
             <el-dropdown-item
                @click.native="openApplicationDialog"
                :disabled="!form.id"

src/views/businessManagement/purchaseOrder/index.vue

@@ -37,6 +37,9 @@
         <template slot-scope="scope" slot="corpId">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.strCorpName }}</span>
         </template>
+        <template slot-scope="scope" slot="orderNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row,scope.index)">{{ scope.row.orderNo }}</span>
+        </template>
         <template slot-scope="scope" slot="createUser">
           {{ scope.row.createUserName }}
         </template>
@@ -293,26 +296,17 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
-      this.gobackSearch(this.search)
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
-      this.gobackSearch(this.search)
     },
     refreshChange() {
       this.page.currentPage = 1;
       this.onLoad(this.page,this.search);
     },
     onLoad(page, params) {
-      if (this.search.requiredArrivalDate.length > 0) {
-        params = {
-          ...params,
-          requiredArrivalStartDate: this.search.requiredArrivalDate[0]+ " " + "00:00:00",
-          requiredArrivalEndDate: this.search.requiredArrivalDate[1]+ " " + "23:59:59",
-        }
-        this.$delete(params,'requiredArrivalDate')
-      }
-      let queryParams = Object.assign({tradeType: 'GN'}, params, {
+      let data = this.gobackSearch(params)
+      let queryParams = Object.assign({tradeType: 'GN'}, data, {
         size: page.pageSize,
         current: page.currentPage,
         // billType:'CG',
@@ -340,17 +334,21 @@ export default {
       this.multiple = true
       this.detailData=this.$options.data().detailData
       this.isShow = true;
-      this.gobackSearch(this.search)
+      this.onLoad(this.page, this.search);
     },
     gobackSearch(params) {
-      let data = {};
-      data = Object.assign({}, params)
-      if (data.createTime && data.createTime != '') {
-        data.createStartTime = data.createTime[0]+ " " + "00:00:00"
-        data.createEndTime = data.createTime[1]+ " " + "23:59:59"
-        this.$delete(data,'createTime')
+      params = Object.assign({}, this.search)
+      if (params.requiredArrivalDate && params.requiredArrivalDate != '') {
+        params.requiredArrivalStartDate = params.requiredArrivalDate[0]+ " " + "00:00:00"
+        params.requiredArrivalEndDate = params.requiredArrivalDate[1]+ " " + "23:59:59"
+        this.$delete(params,'requiredArrivalDate')
+      }
+      if (params.createTime && params.createTime != '') {
+        params.createStartTime = params.createTime[0]+ " " + "00:00:00"
+        params.createEndTime = params.createTime[1]+ " " + "23:59:59"
+        this.$delete(params,'createTime')
       }
-      this.onLoad(this.page, data);
+      return params
     },
     //列保存触发
     async saveColumn() {

src/views/businessManagement/receipt/index.vue

@@ -190,6 +190,7 @@ export default {
     })
   },
   activated() {
+    this.isShow = true;
     setTimeout(() => {
       if (this.$route.query.form) {
         this.detailData = {
@@ -322,28 +323,17 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
-      this.gobackSearch(this.search)
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
-      this.gobackSearch(this.search)
     },
     refreshChange() {
       this.page.currentPage = 1;
       this.onLoad(this.page,this.search);
     },
     onLoad(page, params) {
-      if (this.search.businessDate.length > 0) {
-        params = {
-          ...params,
-          businessStartDate: this.search.businessDate[0]+ " " + "00:00:00",
-          businessEndDate: this.search.businessDate[1]+ " " + "23:59:59",
-        }
-        this.$delete(params,'businessDate')
-      }
-      if (params) {
-      }
-      let queryParams = Object.assign({}, params, {
+      let data = this.gobackSearch(params)
+      let queryParams = Object.assign({}, data, {
         size: page.pageSize,
         current: page.currentPage,
         billType:'SH',
@@ -374,17 +364,21 @@ export default {
       }
       this.isShow = true;
       this.$store.commit("DOM_OUT_DETAIL");
-      this.gobackSearch(this.search)
+      this.onLoad(this.page, this.search)
     },
     gobackSearch(params) {
-      let data = {};
-      data = Object.assign({}, params)
-      if (data.createTime && data.createTime != '') {
-        this.$set(data, 'createStartTime', data.createTime[0]+ " " + "00:00:00")
-        this.$set(data, 'createEndTime', data.createTime[1]+ " " + "23:59:59")
-        this.$delete(data,'createTime')
+      params = Object.assign({}, this.search)
+      if (params.businessDate && params.businessDate != '') {
+        this.$set(params, 'businessStartDate', params.businessDate[0]+ " " + "00:00:00")
+        this.$set(params, 'businessEndDate', params.businessDate[1]+ " " + "23:59:59")
+        this.$delete(params,'businessDate')
+      }
+      if (params.createTime && params.createTime != '') {
+        this.$set(params, 'createStartTime', params.createTime[0]+ " " + "00:00:00")
+        this.$set(params, 'createEndTime', params.createTime[1]+ " " + "23:59:59")
+        this.$delete(params,'createTime')
       }
-      this.onLoad(this.page, data);
+      return params
     },
     //列保存触发
     async saveColumn() {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -40,10 +40,10 @@
               :disabled="detailData.seeDisabled"
               @click.native="applySettlement('收费')">生成账单
             </el-dropdown-item>
-            <el-dropdown-item
-              :disabled="detailData.seeDisabled"
-              @click.native="applySettlement('申请')"
-            >申请退款</el-dropdown-item>
+<!--            <el-dropdown-item-->
+<!--              :disabled="detailData.seeDisabled"-->
+<!--              @click.native="applySettlement('申请')"-->
+<!--            >申请退款</el-dropdown-item>-->
             <el-dropdown-item
               @click.native="openApplicationDialog"
               :disabled="!form.id"

src/views/businessManagement/salesOrder/index.vue

@@ -335,11 +335,9 @@ export default {
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
-      // this.gobackSearch(this.search)
     },
     sizeChange(pageSize) {
       this.page.pageSize = pageSize;
-      this.gobackSearch(this.search)
     },
     //列表刷新触发
     refreshChange() {
@@ -359,16 +357,17 @@ export default {
       }
     },
     onLoad(page, params) {
-      if (this.search.businesDate && this.search.businesDate.length > 0) {
-        params = {
-          ...params,
-          orderStartDate: this.search.businesDate[0]+ " " + "00:00:00",
-          orderEndDate: this.search.businesDate[1]+ " " + "23:59:59",
-        }
-        delete params.businesDate;
-      }
+      // if (this.search.businesDate && this.search.businesDate.length > 0) {
+      //   params = {
+      //     ...params,
+      //     orderStartDate: this.search.businesDate[0]+ " " + "00:00:00",
+      //     orderEndDate: this.search.businesDate[1]+ " " + "23:59:59",
+      //   }
+      //   delete params.businesDate;
+      // }
+      let data = this.gobackSearch(params)
 
-      let queryParams = Object.assign({}, params, {
+      let queryParams = Object.assign({}, data, {
         size: page.pageSize,
         current: page.currentPage,
         billType:'XS',
@@ -399,32 +398,36 @@ export default {
         this.$refs.crud.toggleRowExpansion(item, false)
       })
       this.isShow = true;
-      this.gobackSearch(this.search)
+      this.onLoad(this.page, this.search);
     },
     gobackSearch(params) {
-      let data = {};
-      data = Object.assign({}, params)
-      if (data.requiredDeliveryDate && data.requiredDeliveryDate != '') {
-        data.deliveryStartDate = data.requiredDeliveryDate[0]+ " " + "00:00:00"
-        data.deliveryEndDate = data.requiredDeliveryDate[1]+ " " + "23:59:59"
-        this.$delete(data,'requiredDeliveryDate')
+      params = Object.assign({}, this.search)
+      if (params.businesDate && params.businesDate != '') {
+        params.orderStartDate = params.businesDate[0]+ " " + "00:00:00"
+        params.orderEndDate = params.businesDate[1]+ " " + "23:59:59"
+        this.$delete(params,'businesDate')
+      }
+      if (params.requiredDeliveryDate && params.requiredDeliveryDate != '') {
+        params.deliveryStartDate = params.requiredDeliveryDate[0]+ " " + "00:00:00"
+        params.deliveryEndDate = params.requiredDeliveryDate[1]+ " " + "23:59:59"
+        this.$delete(params,'requiredDeliveryDate')
       }
-      if (data.requiredArrivalDate && data.requiredArrivalDate != '') {
-        data.arrivalDateStart = data.requiredArrivalDate[0]+ " " + "00:00:00"
-        data.arrivalDateEnd = data.requiredArrivalDate[1]+ " " + "23:59:59"
-        this.$delete(data,'requiredArrivalDate')
+      if (params.requiredArrivalDate && params.requiredArrivalDate != '') {
+        params.arrivalDateStart = params.requiredArrivalDate[0]+ " " + "00:00:00"
+        params.arrivalDateEnd = params.requiredArrivalDate[1]+ " " + "23:59:59"
+        this.$delete(params,'requiredArrivalDate')
       }
-      if (data.actualDeliveryDate && data.actualDeliveryDate != '') {
-        data.actualDeliveryDateStart = data.actualDeliveryDate[0]+ " " + "00:00:00"
-        data.actualDeliveryDateEnd = data.actualDeliveryDate[1]+ " " + "23:59:59"
-        this.$delete(data,'actualDeliveryDate')
+      if (params.actualDeliveryDate && params.actualDeliveryDate != '') {
+        params.actualDeliveryDateStart = params.actualDeliveryDate[0]+ " " + "00:00:00"
+        params.actualDeliveryDateEnd = params.actualDeliveryDate[1]+ " " + "23:59:59"
+        this.$delete(params,'actualDeliveryDate')
       }
-      if (data.createTime && data.createTime != '') {
-        data.createTimeStart = data.createTime[0]+ " " + "00:00:00"
-        data.createTimeEnd = data.createTime[1]+ " " + "23:59:59"
-        this.$delete(data,'createTime')
+      if (params.createTime && params.createTime != '') {
+        params.createTimeStart = params.createTime[0]+ " " + "00:00:00"
+        params.createTimeEnd = params.createTime[1]+ " " + "23:59:59"
+        this.$delete(params,'createTime')
       }
-      this.onLoad(this.page, data);
+      return params
     },
     //列保存触发
     async saveColumn() {