feat:用友订单读入新增订单号,凭证号排序

src/views/order/orderReading.vue

@@ -6,7 +6,7 @@
       <el-button plain size="small" type="primary" @click="saveInvoiceBtn()" class="btnleft">保存</el-button>
       <el-button plain size="small" type="primary" @click="SAPReadingBeforeFn" class="btnleft">订单读入</el-button>
     </el-row>
-    <custom-table :columns="tableColumn" :data="tableList" :default-sort="{prop: 'ddcjsj', order: 'descending'}" @selection-change="handleSelectChange" ref='CustomTable' :height='tableHeight'></custom-table>
+    <custom-table         @sort-change="handleSort" :columns="tableColumn" :data="tableList" :default-sort="{prop: 'ddcjsj', order: 'descending'}" @selection-change="handleSelectChange" ref='CustomTable' :height='tableHeight'></custom-table>
     <Pagination :total="page.totalCount" :page="page.page" :limit="page.limit" @pagination="pageChange"></Pagination>
     <el-dialog title="订单读入" :visible.sync="SAPReadingShow" class="SAPdialog" center width="750px">
       <el-form ref='SAPReadingFormData' :model="ReadingData" label-width="110px" label-position="right">
@@ -208,6 +208,7 @@ export default {
           },
         },
       ],
+      orderBy:'',
       formInline: {
         time: [],
         time1: [],
@@ -245,12 +246,14 @@ export default {
         {
           prop: 'cpznum',
           label: "凭证号",
-          width: "120"
+          width: "120",
+          sortable: "custom",
         },
         {
           prop: 'cdlcode',
           label: "订单号",
-          width: "120"
+          width: "120",
+          sortable: "custom",
         },
         {
           prop: 'ccusname',
@@ -362,6 +365,17 @@ export default {
     }
   },
   methods: {
+    handleSort(column, prop, order) {
+      console.log(column);
+      if(column.prop == "ddh"){
+        column.order == 'ascending' ?  this.orderBy = 'ddhAsc' : this.orderBy = 'ddhDesc';
+
+      }
+      if(column.prop == "pzh"){
+        column.order == 'ascending' ?  this.orderBy = 'pzhAsc' : this.orderBy = 'pzhDesc';
+      }
+      this.orderList();
+    },
     pageChange (cur) {
       this.page.page = cur.page;
       this.page.limit = cur.limit;
@@ -375,6 +389,7 @@ export default {
     //table列表展示数据
     orderList () {
       let invoiceData = {
+        orderBy:this.orderBy,
         ghfNsrsbh: "",
         startTime: this.formInline.time[0] + ' ' + '00:00:00',
         endTime: this.formInline.time[1] + ' ' + '23:59:59',
@@ -446,8 +461,8 @@ export default {
         if (valid) {
           showLoading()
           readIn({
-            readTimeStart: this.ReadingData.date1 + ' ' + '00:00:00',
-            readTimeEnd: this.ReadingData.date2 + ' ' + '23:59:59',
+            startTime: this.ReadingData.date1 + ' ' + '00:00:00',
+            endTime: this.ReadingData.date2 + ' ' + '23:59:59',
             pzh: this.ReadingData.pzh,
             ddh: this.ReadingData.ddh,
             orgId: this.$store.state.system.userInfo.dept.enterpriseNumbers,

src/views/order/orderReadingSK.vue

@@ -428,8 +428,8 @@ export default {
         if (valid) {
           showLoading()
           readIn({
-            readTimeStart: this.ReadingData.date1 + ' ' + '00:00:00',
-            readTimeEnd: this.ReadingData.date2 + ' ' + '23:59:59',
+            startTime: this.ReadingData.date1 + ' ' + '00:00:00',
+            endTime: this.ReadingData.date2 + ' ' + '23:59:59',
             ddh: this.ReadingData.ddh,
             orgId: this.$store.state.system.userInfo.dept.enterpriseNumbers,
             entId: this.$store.state.system.userInfo.currentDeptId,

vue.config.js

@@ -71,7 +71,7 @@ module.exports = {
       '/sims-api': {
         // target: 'http://10.1.31.166:18107/sims-api', // 张双超
         // target: 'http://10.1.30.104:18108/sims-api', // 姚旭光
-        target: 'http://10.18.90.125:10000/sims-api', // 测试环境
+        target: 'http://10.18.90.124:10000/sims-api', // 测试环境
         changeOrigin: false,
         // target: 'http://10.1.3.216:10000/sims-api', //乐企通
         pathRewrite: {
@@ -79,7 +79,7 @@ module.exports = {
         },
       },
       '/management': {
-        target: 'http://10.18.90.125:10000/management', // 新测试环境
+        target: 'http://10.18.90.124:10000/management', // 新测试环境
         // target: 'http://10.1.3.216:10000/management', //乐企通
         changeOrigin: false,
         pathRewrite: {