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

src/views/book/addBookDrawer.vue

@@ -566,7 +566,13 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
-
+        // {
+        //   title: '净价总金额',
+        //   dataIndex: 'totalNetPrice',
+        //   width: 120,
+        //    ellipsis: true,
+        //   className: 'replacecolor'
+        // },
          {
           title: '制单人',
           dataIndex: 'createBy',

src/views/book/book-list.vue

@@ -285,6 +285,13 @@ export default {
            ellipsis: true,
           className: 'replacecolor'
         },
+        // {
+        //   title: '净价总金额',
+        //   dataIndex: 'totalNetPrice',
+        //   width: 120,
+        //    ellipsis: true,
+        //   className: 'replacecolor'
+        // },
         { title: '外销发票号码', dataIndex: 'exportInvoiceNo', width: 120, className: 'replacecolor', ellipsis: true, },
         {
           title: '发票推送状态',
@@ -457,12 +464,12 @@ export default {
      
      if(record.isAhaa == '国内'){
        if(record.readyFabric=='成衣'){
-         var exinvoiceArr = ["-报关资料","-结汇发票"]
+         var exinvoiceArr = ["-报关资料","-结汇资料"]
        }else{
          var exinvoiceArr = ["-报关资料"]
        }
     }else{//
-      var exinvoiceArr = ["国外-报关信息-装箱单","国外-报关信息-发票","国外-报关信息-托书","-结汇发票"]
+      var exinvoiceArr = ["国外-报关信息-装箱单","国外-报关信息-发票","国外-报关信息-托书","-结汇资料"]
     }
        
        exinvoiceArr.map(item =>{

src/views/book/detailsBookDrawer.vue

@@ -391,7 +391,13 @@ export default {
           ellipsis: true,
           className: 'replacecolor'
         },
-
+        // {
+        //   title: '净价总金额',
+        //   dataIndex: 'totalNetPrice',
+        //   width: 120,
+        //    ellipsis: true,
+        //   className: 'replacecolor'
+        // },
          {
           title: '制单人',
           dataIndex: 'createBy',

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

@@ -272,6 +272,7 @@ export default {
         // index: '',
         // planNum: '',
         // customerShortame: '',
+        pageSize:50,
         pageNo: '' // 点击的页数
       },
       dateFormat: 'YYYY-MM-DD',
@@ -296,7 +297,8 @@ export default {
             this.ipagination = {
               total: res.result.total,
               current: res.result.current,
-              pageSize: res.result.size
+              pageSize: res.result.size,
+              pageSizeOptions: ["50","100","150", "500"],
             }
           }
         })
@@ -345,7 +347,9 @@ export default {
     },
     searchReset() {
       this.queryParam.pageNo = ''
-      this.queryParam = {}
+      this.queryParam = {
+        pageSize:50,
+      }
       this.getCostList()
     },
     onChange(){

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

@@ -247,7 +247,7 @@ export default {
       dateFormat: 'YYYY-MM-DD',
       // 查询条件
       queryParam: {
-        
+        pageSize:50,
       },
       apply:"",
       dateFormat: 'YYYY-MM-DD',
@@ -274,7 +274,8 @@ export default {
             this.ipagination = {
               total: res.result.total,
               current: res.result.current,
-              pageSize: res.result.size
+              pageSize: res.result.size,
+              pageSizeOptions: ["50","100","150", "500"],
             }
           }else{
             this.$message.error(res.message);
@@ -431,7 +432,9 @@ export default {
     },
     searchReset() {
       this.queryParam.pageNo = ''
-      this.queryParam = {}
+      this.queryParam = {
+        pageSize:50,
+      }
       this.getCostList()
     },
     handleChange(value){