Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/views/main/BookingLedger/detail/components/sedOrder.vue

@@ -191,7 +191,7 @@ export default {
         // issueplace: [ { required: false, message: '请选择签单地点', trigger: 'change' } ],
         issueplaceid: [ { required: false, message: '请输入签单地代码', trigger: 'change' } ],
         nobill: [ { required: false, message: '请选择提单份数', trigger: 'change' } ],
-        copynobilll: [ { required: false, message: '请选择副本份数', trigger: 'change' } ],
+        copynobill: [ { required: false, message: '请选择副本份数', trigger: 'change' } ],
         prepardat: [ { required: false, message: '请选择预付地点', trigger: 'change' } ],
         payableat: [ { required: false, message: '请选择到付地点', trigger: 'change' } ],
         blfrt: [ { required: false, message: '请选择付费方式', trigger: 'change' } ],

src/views/main/BookingLedger/detail/index.vue

@@ -183,7 +183,7 @@ const initDetail = {
   issueplace: '',
   issueplaceid: '',
   nobill: 'THREE',
-  copynobilll: 'THREE',
+  copynobill: 'THREE',
   prepardat: '',
   payableat: '',
   blfrt: '',
@@ -322,7 +322,7 @@ export default {
         // issueplace: [ { required: false, message: '请选择签单地点', trigger: 'change' } ],
         issueplaceid: [ { required: false, message: '请输入签单地代码', trigger: 'change' } ],
         nobill: [ { required: false, message: '请选择提单份数', trigger: 'change' } ],
-        copynobilll: [ { required: false, message: '请选择副本份数', trigger: 'change' } ],
+        copynobill: [ { required: false, message: '请选择副本份数', trigger: 'change' } ],
         prepardat: [ { required: false, message: '请选择预付地点', trigger: 'change' } ],
         payableat: [ { required: false, message: '请选择到付地点', trigger: 'change' } ],
         blfrt: [ { required: false, message: '请选择付费方式', trigger: 'change' } ],

src/views/main/BookingLedger/detail/modules/billInfo.vue

@@ -114,9 +114,9 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 has-feedback
-                prop="copynobilll"
+                prop="copynobill"
               >
-                <a-select :default-value="details.copynobilll || 'THREE'" v-model="details.copynobilll" @change="handleCopyNoChange">
+                <a-select :default-value="details.copynobill || 'THREE'" v-model="details.copynobill" @change="handleCopyNoChange">
                   <a-select-option value="ONE"> ONE </a-select-option>
                   <a-select-option value="TWO"> TWO </a-select-option>
                   <a-select-option value="THREE"> THREE </a-select-option>
@@ -697,8 +697,8 @@ export default {
 
     // ===== 旧数据 ====
     handleCopyNoChange(value) {
-      this.details.copynobilll = value
-      console.log(this.details.copynobilll)
+      this.details.copynobill = value
+      console.log(this.details.copynobill)
     },
     handleNoChange(value) {
       this.details.nobill = value

src/views/main/BookingLedger/detail/modules/mailingInfo.vue

@@ -273,7 +273,7 @@
                     <a-date-picker
                       style="min-width:100px"
                       show-time
-                      format="YYYY-MM-DD HH:mm"
+                      format="YYYY-MM-DD HH"
                       v-model="details.closingdate"
                       @change="closingdateChange"
                     >
@@ -293,7 +293,7 @@
                     <a-date-picker
                       style="min-width:100px"
                       show-time
-                      format="YYYY-MM-DD HH:mm"
+                      format="YYYY-MM-DD HH"
                       v-model="details.closedocdate"
                       @change="closedocdateChange"
                     >
@@ -313,7 +313,7 @@
                     <a-date-picker
                       style="min-width:100px"
                       show-time
-                      format="YYYY-MM-DD HH:mm"
+                      format="YYYY-MM-DD HH"
                       v-model="details.closevgmdate"
                       @change="closevgmdateChange"
                     >
@@ -776,6 +776,9 @@ export default {
         this.showShipper = ''
         this.showConsignee = ''
         this.showNotifier = ''
+        this.shippername = ''
+        this.consigneename = ''
+        this.notifypartyname = ''
       }
     }
   },

src/views/main/BookingLedger/list/index.vue

@@ -563,9 +563,9 @@ export default {
     this.showColumns = JSON.parse(JSON.stringify(initData.columns))
     this.formAllData = JSON.parse(JSON.stringify(initData.condAllData))
     this.fromTableAllData = JSON.parse(JSON.stringify(initData.columnsAllData))
-    this.getList()
     this.getFormData()
     this.getTableList()
+    this.getPageSize()
   },
   mounted() {
     window.onresize = () => {
@@ -765,11 +765,38 @@ export default {
       })
     },
     handlePageChange({ currentPage, pageSize }) {
+      if (this.gridOptions.pagerConfig.pageSize !== pageSize) {
+        console.log('pagesize变化：', pageSize)
+        this.editPageSizeSave(pageSize)
+      }
       this.gridOptions.pagerConfig.currentPage = currentPage
       this.gridOptions.pagerConfig.pageSize = pageSize
       this.getList(this.formRes)
     },
 
+    editPageSizeSave (pageSize = 10) {
+      const data = {
+        pageSize: pageSize
+      }
+      DjyUserConfigAdd({
+        type: 'booking_list_page',
+        configJson: JSON.stringify(data)
+      }).then(res => {
+        console.log('页码设置成功')
+      })
+    },
+
+    getPageSize () {
+      DjyUserConfigGet({ type: 'booking_list_page' }).then(res => {
+        if (res.data && JSON.parse(res.data.configJson)) {
+          this.gridOptions.pagerConfig.pageSize = JSON.parse(res.data.configJson).pageSize
+          console.log('获取到pageSize ： ', this.gridOptions.pagerConfig.pageSize)
+          this.getList()
+          this.$forceUpdate()
+        }
+      })
+    },
+
     // form
     toggleAdvanced() {
       this.advanced = !this.advanced