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

src/views/advance-packingList/addAdpackingDrawer.vue

@@ -1085,6 +1085,9 @@ export default {
       if (record.unitPrice != undefined && record.unitPrice != ""){
         record.totalPrice = (record.unitPrice*record.total).toFixed(2);
       }      
+      if (record.netWeight != undefined && record.netWeight != ""&&record.boxNumber!==undefined&&record.boxNumber!==''){
+        record.totalNetWeight = (record.netWeight*record.boxNumber).toFixed(2);
+      } 
       if (record.grossWeight != "" && record.grossWeight != undefined){
         record.totalGrossWeight = (record.grossWeight * record.boxNumber).toFixed(2);
       }
@@ -1110,7 +1113,7 @@ export default {
     setHeadCalField(){
       var headData = JSON.parse(JSON.stringify(this.addAdpacking));
       var totalBoxes = 0;
-      var totalNetWeight = 0;
+      var totalNetWeight1 = 0;
       var totalGrossWeight = 0;
       var totalVolume = 0;
       var totalPrice = 0;
@@ -1119,8 +1122,8 @@ export default {
       for (var i=0; i<headData.syPreAssembledPackingListItemList.length; i++){
         var rowData = headData.syPreAssembledPackingListItemList[i];
         totalBoxes += rowData.boxNumber;
-        if (rowData.totalNetWeight != undefined && rowData.totalNetWeight != ""){
-          totalNetWeight += rowData.totalNetWeight*1;
+        if (rowData.totalNetWeight != undefined && rowData.totalNetWeight != ""&&rowData.totalNetWeight != null){
+          totalNetWeight1 += rowData.totalNetWeight*1;
         }
         if (rowData.totalGrossWeight != undefined && rowData.totalGrossWeight != ""){
           totalGrossWeight += rowData.totalGrossWeight*1;
@@ -1137,7 +1140,7 @@ export default {
       }
       
       headData.totalBoxes =Number(totalBoxes).toFixed(0);
-      headData.totalNetWeight = Number(totalNetWeight).toFixed(2);
+      headData.totalNetWeight = Number(totalNetWeight1).toFixed(2);
       headData.totalGrossWeight = Number(totalGrossWeight).toFixed(2);
       headData.totalVolume = totalVolume.toFixed(3);
       headData.totalPrice = totalPrice.toFixed(2); 

src/views/book/addBookDrawer.vue

@@ -802,8 +802,6 @@ export default {
             }
            })
            this.addBook.dutyParagraph = duty
-         }else{
-          this.resetColumns()
          }
         this.setHeadCalField()
         this.getFreightForwarder(this.addBookData[0].acSetNo)
@@ -846,6 +844,7 @@ export default {
         moneytotal += item.totalPrice;
        })
        this.addBook.money = moneytotal.toFixed(2);
+       this.resetColumns()
        }
       })
 

src/views/book/book-list.vue

@@ -375,7 +375,7 @@ export default {
          var exinvoiceArr = ["-报关资料"]
        }
     }else{//
-      var exinvoiceArr = ["国外-报关信息-装箱单","国外-报关信息-发票","国外-报关信息-托书"]
+      var exinvoiceArr = ["国外-报关信息-装箱单","国外-报关信息-发票","国外-报关信息-托书","-结汇发票"]
     }
        
        exinvoiceArr.map(item =>{

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

@@ -755,7 +755,7 @@ export default {
         if (res.success) {
             this.getSpltList()
             this.selectedRowKeys = []
-            this.$message.success('推送成功');
+            this.$message.success(res.message);
           }else{
             this.getSpltList()
             this.$message.error(res.message);

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

@@ -726,7 +726,7 @@ export default {
         if (res.success) {
             this.getFabricList()
             this.selectedRowKeys = []
-            this.$message.success('推送成功');
+            this.$message.success(res.message);
           }else{
             this.getFabricList()
             this.$message.error(res.message);

src/views/pre-book/addPreBookDrawer.vue

@@ -8,6 +8,7 @@
       :closable="true"
       :visible="visible"
       @close="handleCancel"
+      destroyOnClose
     >
       <!-- 主表信息 -->
       <a-card :bordered="true">
@@ -601,6 +602,7 @@ export default {
       this.visible = false
       this.defultMethod = 'add'
       this.$refs.form.resetFields()
+      this.addPreBook={}
     },
 
     // ------------------------------------------

src/views/pre-book/advancePackingListModal.vue

@@ -7,6 +7,7 @@
     @cancel="handleCancel"
     width="86%"
     style="top:330px;left:100px;"
+    destroyOnClose
   >
     <!-- tabel 加载 -->
     <a-spin :spinning="confirmLoading">
@@ -389,7 +390,8 @@ export default {
       this.error = []
       this.errorFather = []
       this.preDeliveryDate = []
-      this.defulatSelect()
+      this.defulatSelect(),
+      this.fatherData=[]
     },
     handleCancel() {
       this.close()

src/views/pre-book/detailsPreBookDrawer.vue

@@ -75,7 +75,7 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="通知方" prop="notifyParty">
-                  {{ preBookDetails.notifyParty }}
+                  {{ preBookDetails.notifyParty | ellipsis }}
                 </a-form-model-item>
               </a-col>
 

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

@@ -106,6 +106,11 @@
                 {{ detailsPlanNum.rmbProcesscost }}
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="加工费(美元)" prop="usdProcesscost">
+                {{ detailsPlanNum.usdProcesscost }}
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="8">
               <a-form-model-item label="短出数" prop="shortseveral" >
                 {{ detailsPlanNum.shortseveral }}
@@ -131,11 +136,21 @@
                 {{ detailsPlanNum.fabriccostIncludestax }}
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="面料含税成本(美元)" prop="UsdfabriccostIncludestax" >
+                {{ detailsPlanNum.fabriccostIncludestaxUsd }}
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="8">
               <a-form-model-item label="辅料含税成本" prop="excipiencostIncludestax">
                 {{ detailsPlanNum.excipiencostIncludestax }}
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="辅料含税成本(美元)" prop="UsdexcipiencostIncludestax">
+                {{ detailsPlanNum.excipiencostIncludestaxUsd }}
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="8">
               <a-form-model-item label="销售订单本币总额" prop="salesordersLocaltotal">
                 {{ detailsPlanNum.salesordersLocaltotal }}
@@ -151,11 +166,21 @@
                 {{ detailsPlanNum.fabriccostNotincludestax }}
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="面料不含税成本(美元)" prop="UsdfabriccostNotincludestax" >
+                {{ detailsPlanNum.fabriccostNotincludestaxUsd }}
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="8">
               <a-form-model-item label="辅料不含税成本" prop="excipiencostNotincludestax">
                 {{ detailsPlanNum.excipiencostNotincludestax }}
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-model-item label="辅料不含税成本(美元)" prop="UsdexcipiencostNotincludestax">
+                {{ detailsPlanNum.excipiencostNotincludestaxUsd }}
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="8">
               <a-form-model-item label="销售订单原币总额" prop="salesrrdersOriginaltotal">
                 {{ detailsPlanNum.salesrrdersOriginaltotal }}
@@ -560,10 +585,13 @@ export default {
           processCost:processCostAll.toFixed(3)
         }
         //发运明细-合计行
-        if(this.$refs.unitTabs.shipData[this.$refs.unitTabs.shipData.length-1].outdata=='合计'){
-          this.$refs.unitTabs.shipData.pop()
+       
+        if(this.$refs.unitTabs.shipData.length!==0 ){
+          if(this.$refs.unitTabs.shipData[this.$refs.unitTabs.shipData.length-1].outdata=='合计'){
+            this.$refs.unitTabs.shipData.pop()
+           }
+          this.$refs.unitTabs.shipData.push(allObj)
         }
-        if(this.$refs.unitTabs.shipData.length!==0 ){this.$refs.unitTabs.shipData.push(allObj)}
         this.$refs.unitTabs.shipData.map(item=>{
           item.shipQuantity = Number(item.shipQuantity)
           item.exportUnitPrice = Number(item.exportUnitPrice)
@@ -612,9 +640,11 @@ export default {
           usdAmount:usdAmountAll,
           priceExcludingtax:priceExcludingtaxAll,
           dosage:dosageAll
-        }
-     if(this.$refs.unitTabs.ingData[this.$refs.unitTabs.ingData.length-1].goodsName=='合计'){this.$refs.unitTabs.ingData.pop()}
-        if(this.$refs.unitTabs.ingData.length!==0 ){  this.$refs.unitTabs.ingData.push(allObj)}
+        }  
+        if(this.$refs.unitTabs.ingData.length!==0 ){
+          if(this.$refs.unitTabs.ingData[this.$refs.unitTabs.ingData.length-1].goodsName=='合计'){this.$refs.unitTabs.ingData.pop()}
+            this.$refs.unitTabs.ingData.push(allObj)
+          }
     },
     //事故单合计行
     addAccident(val){
@@ -631,8 +661,10 @@ export default {
       amount:amountAll,
       amountrmb:amountrmbAll
      }
-     if(this.accidentListData[this.accidentListData.length-1].goodsName=='合计'){this.accidentListData.pop()}
-        if(this.accidentListData.length!==0 ){  this.accidentListData.push(allObj)}
+        if(this.accidentListData.length!==0 ){ 
+          if(this.accidentListData[this.accidentListData.length-1].accidentUndertaker=='合计'){this.accidentListData.pop()}
+           this.accidentListData.push(allObj)
+          }
     },
     //费用支出合计行
     addAmountCostPay(val){
@@ -653,9 +685,10 @@ export default {
       shuiemoney:shuiemoneyAll.toFixed(3),
       totalTaxIncrease:(disbursedLocalmoneyALL+shuiemoneyAll)
      }
-     console.log(this.costPayData[this.costPayData.length-1])
-     if(this.costPayData[this.costPayData.length-1].setNo=='合计'){this.costPayData.pop()}
-     if(this.costPayData.length!==0){ this.costPayData.push(obj)}
+     if(this.costPayData.length!==0){
+      if(this.costPayData[this.costPayData.length-1].setNo=='合计'){this.costPayData.pop()}
+       this.costPayData.push(obj)
+      }
     },
     daYin(){
          this.showSelect = 1

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

@@ -103,6 +103,9 @@
               <a-button type="primary" @click="openEnclosure">附件</a-button>
             </a-col>
             <a-col :md="6" :sm="8" class="noprint">
+              <!-- <a-upload    :file-list="fileList" :multiple="true"  :action="importExcelUrl" :data="{code:this.planNO}" :customRequest="uploadFlie">
+                <a-button type="primary" >附件上传</a-button>
+              </a-upload> -->
               <j-upload   v-model="fabricLoss.attachs"  ></j-upload>
               <!-- <a-upload  name="file" action="https://www.mocky.io/v2/5cc8019d300000980a055e76"    :multiple="true"    :default-file-list="fileList">
                 <a-button type="primary" >附件上传</a-button>
@@ -505,24 +508,6 @@ export default {
         planNum: [{ required: true, message: '请输入计划单号进行搜索', trigger: 'blur' }]
       },
       fileList: [
-        {
-          uid: '-1',
-          name: 'xxx.png',
-          status: 'done',
-          url: 'http://www.baidu.com/xxx.png',
-        },
-        {
-          uid: '-1',
-          name: 'xxx.png',
-          status: 'done',
-          url: 'http://www.baidu.com/xxx.png',
-        },
-        {
-          uid: '-1',
-          name: 'xxx.png',
-          status: 'done',
-          url: 'http://www.baidu.com/xxx.png',
-        },
       ],
       edit:'0',
       planNO:'',//计划单号
@@ -596,7 +581,7 @@ export default {
       // 委外订单国内 表头
       outsourceOrderColumns: [
         { title: '制造工艺', width: '10%', dataIndex: 'cvcname', className: 'replacecolor' },
-        { title: '工厂', width: 80, dataIndex: 'cvenAbbName', className: 'replacecolor' },
+        { title: '工厂', width: 80, dataIndex: 'cvenAbbName', className: 'replacecolor specleWidth' },
         {
           title: '材料出库数量',
           dataIndex: 'iquantityOut',
@@ -811,13 +796,22 @@ export default {
         { title: '金额', dataIndex: 'ioriSum', width: 120, className: 'replacecolor' }
       ],
       accidentListData: [{ accidentNum: '1100011' }, { accidentNum: '3540011' }],
-
+      url: {
+        list: '/sys/user/list',
+        importExcelUrl: 'report/FabricLoss/addFile' ,// 导入
+      },
       noteOne: '', // 备注 1
       noteTwo: '' // 备注 2
     }
   },
 
   methods: {
+    uploadFlie(file) {
+      const formData = new FormData()
+      formData.append('file', file.file)
+      console.log(file.file.name)
+      debugger
+      },
     daYin(){
          this.showSelect = 1
          this.$nextTick(() => {
@@ -825,7 +819,7 @@ export default {
          const win = window.open();
          const style = '<style>\n'
          +'.noprint{display:none}'
-         +'.specleWidth{width:10% !important}'
+         +'.specleWidth{width:15% !important}'
          +'.ant-table-body{overflow-x: hidden !important }' //去除滚动条
          +'.kk{display:flex;flex-wrap: wrap}' //主要信息并排
          +'.ant-col-sm-8{width:40%;margin-bottom: 6px;}'
@@ -851,9 +845,19 @@ export default {
          + '</style>';
          win.document.write(style+html);
          win.focus();
-         win.print();
-         win.close();
-		     this.showSelect = 0
+         setTimeout(function(){
+          let textArea = win.document.getElementsByTagName('textarea')
+          for (let i = 0; i < textArea.length; i++) {
+             textArea[i].style.height = 'auto' // 先设置成auto，再设置高度，删除文字的时候高度才会改变
+             textArea[i].style.height = textArea[i].scrollHeight+30 + 'px'
+          }
+            win.print();
+            win.close();
+            this.showSelect = 0
+         },500)
+        //  win.print();
+        //  win.close();
+		    //  this.showSelect = 0
         })
         
     },
@@ -869,6 +873,16 @@ export default {
             if (res.success) {
               this.PrintButton = false
               this.fabricLoss = res.result;
+              var fileList = this.fabricLoss.attachs.split(",")
+              this.fileList = []
+              fileList.map(item=>{
+                  this.fileList.push({
+                    uid: '-1',
+                    name: item,
+                    status: 'done',
+                    url:'http://www.myfitt.cn:18001/jeecg-boot/sys/common/static' +'/'+item
+                  })
+              })
               this.edit = this.fabricLoss.edit
               // 开票成本成衣：获取原币和本币金额是否完全相同，完全相同隐藏美元列
               var findList = this.fabricLoss.fabricCostClothesList.filter(e=>e.ioriSum!=e.isum);
@@ -1150,49 +1164,7 @@ export default {
       }
     },
 
-    //成本发票 -----合计行
-    // costFooterShow(data){
-    //    return (
-    //     <a-table
-    //       rowKey={Math.random}
-    //       bordered={false}
-    //       pagination={false}
-    //       columns={this.costInvoiceColumns}
-    //       dataSource={this.costFooterDataSource || []}
-    //       showHeader={false}
-    //     ></a-table>
-    //   )
-    // },
-    
-
-
-    // 开票成本-成衣 ----合计行
-    // clothesFooterShow(data) {
-    //   return (
-    //     <a-table
-    //       rowKey={Math.random}
-    //       bordered={false}
-    //       pagination={false}
-    //       columns={this.costInvoiceClothesColumns}
-    //       dataSource={this.clothesFooterDataSource || []}
-    //       showHeader={false}
-    //     ></a-table>
-    //   )
-    // },
 
-    // 开票成本-辅料 ----合计行
-    // assistFooterShow(data) {
-    //   return (
-    //     <a-table
-    //       rowKey={Math.random}
-    //       bordered={false}
-    //       pagination={false}
-    //       columns={this.costInvoiceIngredientColumns}
-    //       dataSource={this.assistFooterDataSource || []}
-    //       showHeader={false}
-    //     ></a-table>
-    //   )
-    // },
     //费用支出 ----合计行
     costPayFooterShow(){
        return (
@@ -1316,6 +1288,7 @@ export default {
         });
       this.$refs.attachmentDisplay.AttachmentModVis = true
       this.$refs.attachmentDisplay.attachmentData =  attachList;
+     
     },
     //供应商，颜色，批号
     bulkPrice(supplier,colour,lotNumber,editPricre){
@@ -1375,6 +1348,9 @@ export default {
   // },
   // 构建合计数据 --合计
   computed: {
+    importExcelUrl: function() {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    },
     // costFooterDataSource(){
     //    //成本发票 合计
     //    var item = {

src/views/reportForms/pro-progress-report/salesOrderDetailsDrawer.vue

@@ -7,6 +7,17 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline">
             <a-row :gutter="24">
+              <a-col :md="6" :sm="8">
+                <a-form-item label="销售订单号">
+                  {{ salesOrderMain.csocode }}
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="8">
+                <a-form-item label="款号">
+                  {{ salesOrderMain.itemNumber }}
+                </a-form-item>
+              </a-col>
+
               <a-col :md="6" :sm="8">
                 <a-form-item label="部门">
                   {{ salesOrderMain.cdepName }}
@@ -24,92 +35,97 @@
                   {{ salesOrderMain.ccusName }}
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="8">
-                <a-form-item label="物料编码">
+              <!-- <a-col :md="6" :sm="8">
+                <a-form-item label="物料">
                   {{ salesOrderMain.cinvCode }}
                 </a-form-item>
-              </a-col>
+              </a-col> -->
 
-              <a-col :md="12" :sm="12">
+              <a-col :md="6" :sm="8">
                 <a-form-item label="物料名称">
                   {{ salesOrderMain.cinvName }}
                 </a-form-item>
               </a-col>
-
               <a-col :md="6" :sm="8">
-                <a-form-item label="款号">
-                  {{ salesOrderMain.itemNumber }}
+                <a-form-item label="订单数量">
+                  {{ salesOrderMain.iquantity }}
                 </a-form-item>
               </a-col>
-
               <a-col :md="6" :sm="8">
-                <a-form-item label="颜色">
-                  {{ salesOrderMain.color }}
+                <a-form-item label="出库数量">
+                  {{ salesOrderMain.foutquantity }}
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
-                <a-form-item label="交期">
-                  {{ salesOrderMain.dpreDateBT }}
+                <a-form-item label="单价">
+                  {{ salesOrderMain.itaxUnitPriceD }}
                 </a-form-item>
               </a-col>
-
               <a-col :md="6" :sm="8">
-                <a-form-item label="订单数量">
-                  {{ salesOrderMain.iquantity }}
+                <a-form-item label="总额">
+                  {{ salesOrderMain.totalSum }}
                 </a-form-item>
               </a-col>
 
+              <!-- <a-col :md="6" :sm="8">
+                <a-form-item label="总额">
+                  {{ salesOrderMain.inatSum }}
+                </a-form-item>
+              </a-col> -->
+
               <a-col :md="6" :sm="8">
-                <a-form-item label="单价(原币)">
-                  {{ salesOrderMain.itaxUnitPrice }}
+                <a-form-item label="单价(采购)">
+                  {{ salesOrderMain.poPrice }}
                 </a-form-item>
               </a-col>
-
               <a-col :md="6" :sm="8">
-                <a-form-item label="总额(原币)">
-                  {{ salesOrderMain.totalSum }}
+                <a-form-item label="单价(委外)">
+                  {{ salesOrderMain.moPrice }}
                 </a-form-item>
               </a-col>
 
+
+              <!-- <a-col :md="6" :sm="8">
+                <a-form-item label="颜色">
+                  {{ salesOrderMain.color }}
+                </a-form-item>
+              </a-col> -->
               <a-col :md="6" :sm="8">
-                <a-form-item label="单价(本币)">
-                  {{ salesOrderMain.bbPrice }}
+                <a-form-item label="交期">
+                  {{ salesOrderMain.dpreDateBT }}
                 </a-form-item>
               </a-col>
+
               <a-col :md="6" :sm="8">
-                <a-form-item label="总额(本币)">
-                  {{ salesOrderMain.inatSum }}
+                <a-form-item label="计划单号">
+                  {{ salesOrderMain.planCode }}
                 </a-form-item>
               </a-col>
 
+            
+
+    
+<!--              
               <a-col :md="6" :sm="8">
                 <a-form-item label="单件成本(本币)">
                   {{ salesOrderMain.todo2 }}
                 </a-form-item>
               </a-col>
 
-              <a-col :md="6" :sm="8">
-                <a-form-item label="已出库数量">
-                  {{ salesOrderMain.foutquantity }}
-                </a-form-item>
-              </a-col>
+             
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="累计开票数量">
                   {{ salesOrderMain.ikpquantity }}
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="8">
-                <a-form-item label="计划单号">
-                  {{ salesOrderMain.planCode }}
-                </a-form-item>
-              </a-col>
+             
 
               <a-col :md="6" :sm="8">
                 <a-form-item label="业务填写">
                   {{ salesOrderMain.todo3 }}
                 </a-form-item>
-              </a-col>
+              </a-col> -->
             </a-row>
           </a-form>
         </div>
@@ -118,7 +134,7 @@
       <!--采购 -->
       <a-card :bordered="true" style="margin:10px 0;">
         <div style="marginTop:30px;">
-          <h6 class="table-title">采购</h6>
+          <h6 class="table-title">采购/委外</h6>
           <a-table
             bordered
             rowKey="id"
@@ -136,7 +152,7 @@
         </div>
 
         <!-- 委外 -->
-        <div style="margin:60px 0;">
+        <!-- <div style="margin:60px 0;">
           <h6 class="table-title">委外</h6>
           <a-table
             bordered
@@ -147,12 +163,12 @@
             :data-source="weiwaiData"
             :scroll="{ x: 1500, y: 300 }"
           >
-            <!-- 物料编码 弹框-->
+           
             <span slot="cinvCode" slot-scope="text">
               <a>{{ text }}</a>
             </span>
           </a-table>
-        </div>
+        </div> -->
 
         <!-- 物料卡开始 -->
         <div>
@@ -255,34 +271,34 @@ export default {
 
       // 采购 表头
       CaiGouColumns: [
-        { title: '账套信息', width: 120, dataIndex: 'accId', fixed: 'left', className: 'replacecolor' },
+        { title: '账套信息', width: 120, dataIndex: 'account', fixed: 'left', className: 'replacecolor' },
         {
-          title: '采购订单号',
+          title: '订单号',
           width: 160,
-          dataIndex: 'cpoid',
+          dataIndex: 'poOrom',
           fixed: 'left',
           className: 'replacecolor'
         },
         {
-          title: '物料编码',
+          title: '物料名称',
           width: 120,
-          dataIndex: 'cinvCode',
-          className: 'replacecolor',
+          dataIndex: 'cInvName',
           fixed: 'left',
+          className: 'replacecolor',
           customCell: this.cinvCodeCustomCell,
           scopedSlots: { customRender: 'cinvCode' }
         },
-        { title: '供应商', width: 240, dataIndex: 'cvenName', align: 'left', className: 'replacecolor' },
-        { title: '单价(本币)', width: 140, dataIndex: 'inatUnitPrice', className: 'replacecolor' },
-        { title: '物料名称', width: 260, dataIndex: 'cinvName', align: 'left', className: 'replacecolor' },
-        { title: '计划数量(LRP)', width: 120, dataIndex: 'iquantityLrp', className: 'replacecolor' },
-        { title: '订单数量', width: 120, dataIndex: 'iquantity', className: 'replacecolor' },
-        { title: '累计入库数量', width: 120, dataIndex: 'ireceivedQTY', className: 'replacecolor' },
-        { title: '累计开票数量', width: 120, dataIndex: 'iinvQTY', className: 'replacecolor' },
-        { title: '累计开票金额', width: 120, dataIndex: 'iinvMoney', className: 'replacecolor' },
-        { title: '下游订单', width: 160, dataIndex: 'csocode', className: 'replacecolor' },
-        { title: '使用数量', width: 120, dataIndex: 'useQTY', className: 'replacecolor' },
-        { title: '余料', width: 100, dataIndex: 'surplusQty', fixed: 'right', className: 'replacecolor' }
+        //{ title: '物料名称', width: 260,fixed: 'left', dataIndex: 'cInvName', className: 'replacecolor' },
+        { title: '颜色', width: 260, dataIndex: 'color',  className: 'replacecolor' },
+        { title: '计划数量(LRP)', width: 120, dataIndex: 'iQuantityLrp', className: 'replacecolor' },
+        { title: '订单数量', width: 120, dataIndex: 'iQuantity', className: 'replacecolor' },
+        { title: '累计入库数量', width: 120, dataIndex: 'finquantity', className: 'replacecolor' },
+        { title: '使用数量', width: 120, dataIndex: 'iReceivedQTY', className: 'replacecolor' },
+        { title: '单价', width: 140, dataIndex: 'iNatUnitPrice', className: 'replacecolor' },
+        { title: '余料', width: 100, dataIndex: 'clout',  className: 'replacecolor' },
+        { title: '下游订单号', width: 160, dataIndex: 'downCode', className: 'replacecolor' },
+        { title: '供应商', width: 240, dataIndex: 'cVenName', className: 'replacecolor' },
+        { title: '订单类型', width: 240, dataIndex: 'poOromType',  className: 'replacecolor' }
       ],
       CaiGouData: [],
 
@@ -377,8 +393,7 @@ export default {
       this.$nextTick(() => {
         salesOrderDetails({
           color: this.record.color,
-          itemNumber: this.record.itemNumber,
-          marCode: this.record.cinvCode,
+          cInvCode: this.record.cinvCode,
           planCode: this.record.planCode,
           soCode: this.record.csocode
         }).then(res => {
@@ -386,7 +401,7 @@ export default {
             console.log('销售订单详情所有数据', res.result)
             this.salesOrderMain = res.result //主表信息
             this.CaiGouData = res.result.productionScheduleCaiGou //采购
-            this.weiwaiData = res.result.productionScheduleWeiWai //委外
+            //this.weiwaiData = res.result.productionScheduleWeiWai //委外
             // this.cardData = res.result.productionScheduleWeiWai //物料卡
           }
         })

src/views/shipment-details/shipmentList.vue

@@ -372,10 +372,11 @@ export default {
         {
           title: '账套',
           dataIndex: 'account',
-          width: 70,
+          width: 85,
            fixed: 'left',
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.account - b.account,
         },
         {
           title: '销售订单号',
@@ -384,35 +385,44 @@ export default {
           // customRender: t => ellipsis(t,17),
           width: 180,
            ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.orderNumber - b.orderNumber,
+
         },
         {
           title: '款号',
           dataIndex: 'itemNumber',
           width: 130,
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.itemNumber - b.itemNumber,
+
         },
         {
           title: '业务员',
           dataIndex: 'salesman',
           width: 100,
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.salesman - b.salesman,
+          
         },
         {
           title: '分销点',
           dataIndex: 'distributionPoint',
           width: 110,
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.distributionPoint - b.distributionPoint,
+
         },
         {
           title: '小po',
           dataIndex: 'smallPo',
           width: 110,
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.smallPo - b.smallPo,
         },
 
         {
@@ -421,6 +431,7 @@ export default {
           width: 220,
           className: 'replacecolor',
           ellipsis: true,
+          sorter:(a, b) => a.inventoryName - b.inventoryName,
         },
         {
           title: '报关品名',
@@ -428,11 +439,12 @@ export default {
           width: 110,
           className: 'replacecolor',
            ellipsis: true,
+          sorter:(a, b) => a.declarationName - b.declarationName,
         },
         {
           title: '是否TC',
           dataIndex: 'isTc',
-          width: 90,
+          width: 110,
           customRender: function(text) {
             if (text === '0') {
               return '否'
@@ -441,7 +453,9 @@ export default {
               return '是'
             }
           },
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.isTc - b.isTc,
+
         },
         {
           title: '预发货日期',
@@ -453,14 +467,18 @@ export default {
             return moment(text).format('YYYY-MM-DD')
           },
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.preDeliveryDate - b.preDeliveryDate,
+
         },
         {
           title: '数量',
           dataIndex: 'shipmentQuantity',
           width: 80,
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.shipmentQuantity - b.shipmentQuantity,
+
         },
         {
           title: '报关单价',
@@ -468,6 +486,8 @@ export default {
           width: 80,
           className: 'replacecolor',
            ellipsis: true,
+          sorter:(a, b) => a.customsDeclarationUnitPrice - b.customsDeclarationUnitPrice,
+
         },
         {
           title: '成衣工厂',
@@ -475,6 +495,8 @@ export default {
           width: 100,
           className: 'replacecolor',
           ellipsis: true,
+          sorter:(a, b) => a.garmentFactory - b.garmentFactory,
+
         },
         {
           title: 'HScode',
@@ -482,6 +504,8 @@ export default {
           width: 120,
           className: 'replacecolor',
            ellipsis: true,
+          sorter:(a, b) => a.hsCode - b.hsCode,
+
         },
         {
           title: '英文品名',
@@ -490,6 +514,8 @@ export default {
           className: 'replacecolor',
           // customRender: t => ellipsis(t),
            ellipsis: true,
+          sorter:(a, b) => a.englishProductName - b.englishProductName,
+
         },
         {
           title: '物料成分',
@@ -498,6 +524,8 @@ export default {
           ellipsis: true,
           className: 'replacecolor',
           ellipsis: true,
+          sorter:(a, b) => a.materialComposition - b.materialComposition,
+
         },
         {
           title: '采购/委外订单号',
@@ -505,6 +533,8 @@ export default {
           width: 140,
           className: 'replacecolor',
           ellipsis: true,
+          sorter:(a, b) => a.purOrSubOrder - b.purOrSubOrder,
+
         },
         {
           // （存货自定义项）
@@ -513,13 +543,17 @@ export default {
           width: 90,
           className: 'replacecolor',
            ellipsis: true,
+          sorter:(a, b) => a.numberOfSets - b.numberOfSets,
+
         },
         {
           title: 'pack id',
           dataIndex: 'packId',
           width: 110,
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.packId - b.packId,
+
         },
         {
           title: '客户简称',
@@ -527,14 +561,18 @@ export default {
           width: 100,
           align: 'left',
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.customerAbbreviation - b.customerAbbreviation,
+
         },
         {
           title: '部门',
           dataIndex: 'salesDepartment',
           width: 100,
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.salesDepartment - b.salesDepartment,
+
         },
 
         {
@@ -544,7 +582,9 @@ export default {
           align: 'left',
           width: 140,
           ellipsis: true,
-          className: 'replacecolor'
+          className: 'replacecolor',
+          sorter:(a, b) => a.documentNo - b.documentNo,
+
         },
   
         {
@@ -552,16 +592,20 @@ export default {
           dataIndex: 'pushState',
           scopedSlots: { customRender: 'pushState' },
           fixed: 'right',
-          width: 90,
+          width: 110,
           className: 'replacecolor',
+          sorter:(a, b) => a.pushState - b.pushState,
+
         },
         {
           title: '单据状态',
           dataIndex: 'submitStatus',
           scopedSlots: { customRender: 'state' },
           fixed: 'right',
-          width: 90,
+          width: 110,
           className: 'replacecolor',
+          sorter:(a, b) => a.submitStatus - b.submitStatus,
+
         },
         {
           title: '操作',