Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/advance-packingList/adPaList-clothes.vue

@@ -169,7 +169,7 @@
         :columns="adPaListClothesColumns"
         :data-source="adPaListClothesData"
         :loading="loading"
-        :pagination="pagination"
+        :pagination="ipagination"
         :row-key="record => record.id"
         :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,fixed:true }"
         @change="handleTableChange"
@@ -558,14 +558,7 @@ export default {
         // itemNumber: '',
         // productName: '' // 品名
       },
-      pagination: {
-        pageSizeOptions: ["50", "100", "150"],
-        showSizeChanger: true,
-        pageSize:50
-        // total: '',
-        // current: 0,
-        // pageSize: 0
-      },
+
       selectedRowKeys: [], // 勾选航
       dateFormat: 'YYYY-MM-DD',
       url: {
@@ -596,7 +589,7 @@ export default {
               this.adPaListClothesData = res.result.records;
             }
             this.selectedRowKeys = []
-            this.pagination = {
+            this.ipagination = {
               total: res.result.total,
               current: res.result.current,
               pageSize: res.result.size,
@@ -694,7 +687,7 @@ export default {
       // const data = this.queryParam
       // data['status'] = sta
       var obj ={}
-      if(this.selectedRowKeys.length == this.pagination.pageSize || this.selectedRowKeys.length==this.adPaListClothesData.length){
+      if(this.selectedRowKeys.length == this.ipagination.pageSize || this.selectedRowKeys.length==this.adPaListClothesData.length){
           obj=this.queryParam
           obj.selectAll = '1'
       }else{
@@ -734,7 +727,7 @@ export default {
     handleExportXls1(fileName,sta) {
       // const data = this.queryParam
       var obj ={}
-      if(this.selectedRowKeys.length == this.pagination.pageSize || this.selectedRowKeys.length==this.adPaListClothesData.length){
+      if(this.selectedRowKeys.length == this.ipagination.pageSize || this.selectedRowKeys.length==this.adPaListClothesData.length){
           obj=this.queryParam
           obj.selectAll = '1'
       }else{
@@ -772,7 +765,7 @@ export default {
     handleExportXls2(fileName) {
       // const data = this.queryParam
       var obj ={}
-      if(this.selectedRowKeys.length == this.pagination.pageSize || this.selectedRowKeys.length==this.adPaListClothesData.length){
+      if(this.selectedRowKeys.length == this.ipagination.pageSize || this.selectedRowKeys.length==this.adPaListClothesData.length){
           obj=this.queryParam
           obj.selectAll = '1'
       }else{

src/views/cost-allocation-total/fabricLossesSummary.vue

@@ -116,8 +116,8 @@
         :columns="fabricLossesColumns"
         :data-source="fabricLossesData"
         :loading="loading"
-        :pagination="pagination"
-        :scroll="{ x: 1200 }"
+        :pagination="ipagination"
+        :scroll="{ x: 1200 ,y:450}"
         @change="handleTableChange"
       >
       <span slot="action" slot-scope="text, record">
@@ -274,9 +274,6 @@ export default {
         // customerShortame: '',
         pageNo: '' // 点击的页数
       },
-      // 分页
-      pagination: {
-      },
       dateFormat: 'YYYY-MM-DD',
       loading: false, // 表格加载
       apply:"",
@@ -291,10 +288,12 @@ export default {
    // 分页查询
    getCostList() {
       this.$nextTick(() => {
+        this.loading = true
         checkList(this.queryParam).then(res => {
+          this.loading = false
           if (res.success) {
             this.fabricLossesData = res.result.records
-            this.pagination = {
+            this.ipagination = {
               total: res.result.total,
               current: res.result.current,
               pageSize: res.result.size
@@ -356,6 +355,7 @@ export default {
 
     handleTableChange(pagination, filters, sorter) {
       this.queryParam.pageNo = pagination.current
+      this.queryParam.pageSize = pagination.pageSize
       this.getCostList()
     },
     changeCreateTime(data){

src/views/cost-allocation-total/inancialReconciliation.vue

@@ -136,7 +136,7 @@
         :data-source="costAllocationData"
         :loading="loading"
         :customRow="rowClick"
-        :pagination="pagination"
+        :pagination="ipagination"
         :scroll="{ x: 1500,y:450 }"
         @change="handleTableChange"
       >
@@ -417,12 +417,12 @@ export default {
         pageSize:50,
         pageNo: '' // 点击的页数
       },
-      // 分页
-      pagination: {
-        pageSizeOptions: ["50","100","150", "500"],
-        showSizeChanger: true,
-        pageSize:50
-      },
+      // // 分页
+      // pagination: {
+      //   pageSizeOptions: ["50","100","150", "500"],
+      //   showSizeChanger: true,
+      //   pageSize:50
+      // },
       dateFormat: 'YYYY-MM-DD',
       loading: false // 表格加载
     }
@@ -446,7 +446,7 @@ export default {
               item.ffinalApproveDate = item.ffinalApproveDate!==''&&item.ffinalApproveDate ? moment(item.ffinalApproveDate).format('YYYY-MM-DD'):''
               item.readyEndDate = item.readyEndDate!==''&&item.readyEndDate ? moment(item.readyEndDate).format('YYYY-MM-DD'):''
             })
-            this.pagination = {
+            this.ipagination = {
               total: res.result.total,
               current: res.result.current,
               pageSize: res.result.size,

src/views/cost-allocation-total/list.vue

@@ -126,8 +126,8 @@
         :columns="costAllocationColumns"
         :data-source="costAllocationData"
         :loading="loading"
-        :pagination="pagination"
-        :scroll="{ x: 1000 }"
+        :pagination="ipagination"
+        :scroll="{ x: 1000 ,y:450}"
         @change="handleTableChange"
       >
         <!-- 操作 -->
@@ -248,12 +248,6 @@ export default {
       // 查询条件
       queryParam: {
         
-      },
-      // 分页
-      pagination: {
-        // total: '',
-        // current: 0,
-        // pageSize: 0
       },
       apply:"",
       dateFormat: 'YYYY-MM-DD',
@@ -277,7 +271,7 @@ export default {
             this.costAllocationData.map((item,index)=>{
               this.getSign(item,index)
             })
-            this.pagination = {
+            this.ipagination = {
               total: res.result.total,
               current: res.result.current,
               pageSize: res.result.size
@@ -479,6 +473,7 @@ export default {
 
     handleTableChange(pagination, filters, sorter) {
       this.queryParam.pageNo = pagination.current
+      this.queryParam.pageSize = pagination.pageSize
       this.getCostList()
     },
     // father 抽屉方法

src/views/order/orderList.vue

@@ -131,7 +131,7 @@ c<template>
           :columns="orderLIstColumns"
           :data-source="orderListData"
           :loading="loading"
-          :pagination="pagination"
+          :pagination="ipagination"
           :scroll="{ x: 1500,y:600 }"
           @change="handleTableChange"
         >
@@ -278,17 +278,18 @@ export default {
         isProduct: '', // 客户需求新增
         salesDepartment: '',//部门
         salesman:'',//业务员
-        pageNo: '' // 初始页
+        pageNo: '', // 初始页
+        pageSize:'50'
       },
       dingDan:'',//单条同步订单号
 
-      pagination: {
-         pageSizeOptions: ["50", "100", "150"],
-        showSizeChanger: true,
-        // total: '',
-        // current: 0,
-        // pageSize: 0
-      },
+      // pagination: {
+      //    pageSizeOptions: ["50", "100", "150"],
+      //   showSizeChanger: true,
+      //   // total: '',
+      //   // current: 0,
+      //   // pageSize: 0
+      // },
       account:'',//单条同步条件
       dateRange:[],
       dataRangeMode:['date','date'],
@@ -307,16 +308,17 @@ export default {
       // that.spinIsShow = true;
       this.loading = true
       this.$nextTick(() => {
-        this.queryParam.pageSize = 50
+        // this.queryParam.pageSize = 50
         orderList(this.queryParam).then(res => {
           // that.spinIsShow = false;
           this.loading = false
           if (res.success) {
             that.orderListData = res.result.records;
-            that.pagination = {
+            that.ipagination = {
               total: res.result.total,
               current: res.result.current,
-              pageSize: res.result.size
+              pageSize: res.result.size,
+              pageSizeOptions: ["50", "100", "150"],
             }
           }else{
               that.$message.error(res.message);
@@ -417,6 +419,7 @@ export default {
 
     handleTableChange(pagination, filters, sorter) {
       this.queryParam.pageNo = pagination.current
+      this.queryParam.pageSize = pagination.pageSize
       this.getOrderList()
     },
 

src/views/packing-list/clothes-list.vue

@@ -157,7 +157,7 @@
         :columns="clothesListColumns"
         :data-source="clothesListData"
         :loading="loading"
-        :pagination="pagination"
+        :pagination="ipagination"
         :row-key="record => record.id"
         :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         @change="handleTableChange"
@@ -590,14 +590,6 @@ export default {
       },
       preDeliveryDate:[],
       handleOkButton:false,
-      pagination: {
-        pageSizeOptions: ["50", "100", "150"],
-        showSizeChanger: true,
-        pageSize:50
-        // total: '',
-        // current: 0,
-        // pageSize: 0
-      },
       url: {
         // syncUser: '/act/process/extActProcess/doSyncUser',
         list: '/sys/user/list',
@@ -634,10 +626,11 @@ export default {
               item.hod = n[0]
         })
         this.selectedRowKeys = []
-            that.pagination = {
+            that.ipagination = {
               total: res.result.total,
               current: res.result.current,
-              // pageSize: res.result.size
+              pageSizeOptions: ["50", "100", "150"],
+              pageSize: res.result.size
             }
           }else{
               that.$message.error(res.message);
@@ -823,7 +816,7 @@ export default {
     // 列表导出
     handleExportXls(fileName) {
       var obj ={}
-      if(this.selectedRowKeys.length == this.pagination.pageSize || this.selectedRowKeys.length==this.clothesListData.length){
+      if(this.selectedRowKeys.length == this.ipagination.pageSize || this.selectedRowKeys.length==this.clothesListData.length){
           obj=this.queryParam
           obj.selectAll = '1'
       }else{

src/views/packing-list/fabric-list.vue

@@ -130,7 +130,7 @@
         :data-source="fabricListData"
         :loading="loading"
         :scroll="{ x: 1500 , y: 600 }"
-        :pagination="pagination"
+        :pagination="ipagination"
         :row-key="record => record.id"
         :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         @change="handleTableChange"
@@ -392,10 +392,6 @@ export default {
         pageSize:'50',
         pushState:''
       },
-      pagination:{
-        pageSizeOptions: ["50", "100", "150"],
-        showSizeChanger: true,
-      },
       selectedNumber:0,//已选择条数
       url: {
         // syncUser: '/act/process/extActProcess/doSyncUser',
@@ -467,10 +463,11 @@ export default {
             this.fabricListData = res.result.records;
             this.loading = false
             this.selectedRowKeys = []
-            this.pagination = {
+            this.ipagination = {
               total: res.result.total,
               current: res.result.current,
-              pageSize: res.result.size
+              pageSize: res.result.size,
+              pageSizeOptions: ["50", "100", "150"],
             }
             this.$forceUpdate()
           }else{
@@ -490,10 +487,9 @@ export default {
     searchReset() {
       this.queryParam = {
         isReference:'0',
-        pageSize:this.pagination.pageSize
+        pageSize:this.ipagination.pageSize
       }
       this.pushState=[]
-      debugger
       this.getFabricList()
     },
     // ------------------------------------
@@ -511,7 +507,7 @@ export default {
      // 列表导出
     handleExportXls(fileName) {
       var obj ={}
-      if(this.selectedRowKeys.length == this.pagination.pageSize || this.selectedRowKeys.length==this.fabricListData.length){
+      if(this.selectedRowKeys.length == this.ipagination.pageSize || this.selectedRowKeys.length==this.fabricListData.length){
           obj=this.queryParam
           obj.selectAll = '1'
       }else{
@@ -902,4 +898,7 @@ padding-bottom: 0px !important;
 /deep/ .ant-table-fixed-left table,.ant-table-fixed-right table{
    width: min-content;
 }
+/deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
+            width: calc(100% + 9px);//减去滚动条的宽度
+    }
 </style>

src/views/pre-book/preBookList.vue

@@ -94,7 +94,7 @@
         :columns="preBookListColumns"
         :data-source="preBookListData"
         :loading="loading"
-        :pagination="pagination"
+        :pagination="ipagination"
         @change="handleTableChange"
         :scroll="{ x: 1500,y: 600 }"
       >
@@ -287,14 +287,6 @@ export default {
         pageSize:'50',
         pageNo: '' // 点击的页数
       },
-      pagination: {
-        pageSizeOptions: ["50", "100", "150"],
-        showSizeChanger: true,
-        pageSize:'50'
-        // total: '',
-        // current: 0,
-        // pageSize: 0
-      },
       dateFormat: 'YYYY-MM-DD',
       
     }
@@ -313,10 +305,11 @@ export default {
           this.loading = false
           if (res.success) {
             this.preBookListData = res.result.records;
-            this.pagination = {
+            this.ipagination = {
               total: res.result.total,
               current: res.result.current,
-              pageSize: res.result.size
+              pageSize: res.result.size,
+              pageSizeOptions: ["50", "100", "150"],
             }
           }else{
             this.$message.error(res.message)
@@ -535,4 +528,7 @@ padding-bottom: 0px !important;
 /deep/ .ant-table-thead > tr > th, .ant-table-tbody > tr > td{
   padding: 9px 16px
 }
+/deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
+            width: calc(100% + 9px);//减去滚动条的宽度
+    }
 </style>

src/views/reportForms/cost-allocation-table.vue

@@ -956,6 +956,8 @@ export default {
          var json = Object.assign({},this.detailsPlanNum)
          json.fabriccostIncludestax = this.fabricCost
          json.outdata=moment(json.outdata).format('YYYY-MM-DD hh:mm:ss')
+         json.signNumA = this.color1
+         json.signNumB = this.color2
          this.loading=true
         addHalfInfo(json).then(res => {
           this.isDisabled = false  

src/views/reportForms/fabric-loss-table/invoiceNumModal.vue

@@ -247,6 +247,9 @@ export default {
 /deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
             width: calc(100% + 9px);//减去滚动条的宽度
 }
+/deep/.ant-table-footer {
+            width: calc(100% - 9px);//减去滚动条的宽度
+}
 
 // /deep/ th.replacecolor {
 //   background-color: #ccc;