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

src/views/book/book-list.vue

@@ -137,6 +137,8 @@
         <a-button type="primary" @click="addBookDrawer" icon="plus">新增</a-button>
         <a-button type="primary" @click="batchSubmit()"  icon="plus">批量提交</a-button>
         <a-button type="primary" @click="batchCanaleSubmit()" icon="plus">批量取消提交</a-button>
+        <a-button type="primary" @click="batchPushU8()" icon="plus">批量推送U8</a-button>
+        <a-button type="primary" @click="batchPushInvoice()" icon="plus">批量推送装箱单发票  </a-button>
       </div>
 
       <!-- 子表 -->
@@ -229,7 +231,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 
-import { downFile } from '@/api/manage'
+import { downFile ,getAction,deleteAction,postActio} from '@/api/manage'
 
 import addBookDrawer from '@views/book/addBookDrawer.vue'
 import detailsBookDrawer from '@views/book/detailsBookDrawer.vue'
@@ -545,7 +547,34 @@ export default {
         })
       })
     },
-
+    //批量推送U8
+    batchPushU8(){
+      if(this.selectedRowKeys.length==0){
+        this.$message.success('请勾选数据')
+      }else{
+        getAction('/syShippingOrder/syShippingOrder/expensesU8Batch',{ids:this.selectedRowKeys.join(',')}).then((res) => {
+          if (res.success) {
+            this.getBookList('await')
+          }else{
+            this.$message.warning(res.message);
+          }
+        })
+      }
+    },
+    //批量推送装箱单发票 
+    batchPushInvoice(){
+      if(this.selectedRowKeys.length==0){
+        this.$message.success('请勾选数据')
+      }else{
+        getAction('/syShippingOrder/syShippingOrder/updateTimeStutaBatch',{ids:this.selectedRowKeys.join(',')}).then((res) => {
+          if (res.success) {
+            this.getBookList('await')
+          }else{
+            this.$message.warning(res.message);
+          }
+        })
+      }
+    },
     //推送U8
     pushU8(record){
       pushU8({ id: record.id}).then(res => {

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

@@ -652,6 +652,7 @@ export default {
       this.detailsPlanNum.salesrrdersOriginaltotal=( this.detailsPlanNum.salesrrdersOriginaltotal==''|| !this.detailsPlanNum.salesrrdersOriginaltotal)?0:Number( this.detailsPlanNum.salesrrdersOriginaltotal).toFixed(2)//销售订单原币金额  
       this.detailsPlanNum.excipiencostIncludestaxUsd=( this.detailsPlanNum.excipiencostIncludestaxUsd==''|| !this.detailsPlanNum.excipiencostIncludestaxUsd)?0: this.detailsPlanNum.excipiencostIncludestaxUsd//辅料成本（$）
       this.detailsPlanNum.shuiemoney=( this.detailsPlanNum.shuiemoney==''|| !this.detailsPlanNum.shuiemoney)?0: this.detailsPlanNum.shuiemoney//运费税额
+      this.detailsPlanNum.shortvalue=( this.detailsPlanNum.shortvalue==''|| !this.detailsPlanNum.shortvalue)?'': (this.detailsPlanNum.shortvalue).toFixed(2)//短出货值
       this.color1 = Number(this.detailsPlanNum.rmbExportamount)-Number(this.detailsPlanNum.fabriccostNotincludestax)-Number(this.detailsPlanNum.excipiencostNotincludestax)-Number(this.detailsPlanNum.rmbProcesscost)-Number(this.detailsPlanNum.rmbExpense)
       this.color2 = this.color1/Number(this.detailsPlanNum.usdTotalexportprice)
       this.color2 = this.color2>0?this.color2:-this.color2

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

@@ -350,8 +350,9 @@ export default {
       var A =rmbExportamoun-fabriccostNotincludestax-excipiencostNotincludestax-rmbProcesscost-rmbExpense
       var B = A/usdTotalexportprice
       B= B>0?B:-B
-      item.signA = A<0?'red':'black'
-      item.signB = B<0.8?'blue':'black'
+      item.signA = A<0?'red':''
+      item.signB = B<0.8?'blue':''
+      this.$forceUpdate()
     },
     cancelSumit(record){
       var syApprovalHistory={

src/views/cost-allocation-total/modal/mainTableExpenseCNYModal.vue

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

src/views/cost-allocation-total/modal/mainTableExpenseUSDModal.vue

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

src/views/cost-allocation-total/modal/pilosityFewerModal.vue

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

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

@@ -728,6 +728,7 @@ export default {
       this.detailsPlanNum.salesrrdersOriginaltotal=( this.detailsPlanNum.salesrrdersOriginaltotal==''|| !this.detailsPlanNum.salesrrdersOriginaltotal)?0:Number( this.detailsPlanNum.salesrrdersOriginaltotal).toFixed(2)//销售订单原币金额  
       this.detailsPlanNum.excipiencostIncludestaxUsd=( this.detailsPlanNum.excipiencostIncludestaxUsd==''|| !this.detailsPlanNum.excipiencostIncludestaxUsd)?0: this.detailsPlanNum.excipiencostIncludestaxUsd//辅料成本（$）
       this.detailsPlanNum.shuiemoney=( this.detailsPlanNum.shuiemoney==''|| !this.detailsPlanNum.shuiemoney)?0: this.detailsPlanNum.shuiemoney//运费税额
+      this.detailsPlanNum.shortvalue=( this.detailsPlanNum.shortvalue==''|| !this.detailsPlanNum.shortvalue)?'': (this.detailsPlanNum.shortvalue).toFixed(2)//短出货值
       this.color1 = Number(this.detailsPlanNum.rmbExportamount)-Number(this.detailsPlanNum.fabriccostNotincludestax)-Number(this.detailsPlanNum.excipiencostNotincludestax)-Number(this.detailsPlanNum.rmbProcesscost)-Number(this.detailsPlanNum.rmbExpense)
       this.color2 = this.color1/Number(this.detailsPlanNum.usdTotalexportprice)
       this.color2 = this.color2>0?this.color2:-this.color2

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

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

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

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

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

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

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

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

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

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

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

@@ -292,4 +292,7 @@ export default {
   height: auto !important;
     overflow-y: scroll;
 }
+/deep/.ant-table-fixed-header .ant-table-scroll .ant-table-header{
+            width: calc(100% + 9px);//减去滚动条的宽度
+}
 </style>

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

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

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

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

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

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