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

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

@@ -151,9 +151,9 @@
     <a-card :bordered="false" style="margin:10px 0">
       <div class="table-operator">
         <a-button type="primary" @click="addAdpacking" icon="plus">新增</a-button>
-        <a-button type="primary" icon="download" @click="handleExportXls1('预装箱单-成衣','0')">预装箱单成衣导出</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls1('预装箱单-成衣','0')">预装箱单列表导出</a-button>
         <a-button type="primary" icon="download" @click="handleExportXls('预装箱单-成衣','1')">预装箱单成衣导出-装箱单</a-button>
-        <a-button type="primary" icon="download" @click="handleExportXls2('预装箱单列表')">预装箱单列表导出</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls2('预装箱单列表')">预装箱单成衣导出</a-button>
         <a-upload productName="file" :showUploadList="false"  :multiple="false"  :headers="tokenHeader"  :action="importExcelUrl"   @change="handleImportExcel" :customRequest="uploadFlie">
           <a-button type="primary" icon="import">导入-来源出运明细</a-button>
         </a-upload>

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

@@ -537,7 +537,7 @@ export default {
               }
             })
             this.fabricCost = this.detailsPlanNum.fabriccostIncludestax
-            this.detailsPlanNum.fabriccostIncludestax = (all+Number(this.detailsPlanNum.fabriccostIncludestax)-allYu).toFixed(2) // 表头面料成本（￥）
+            // this.detailsPlanNum.fabriccostIncludestax = (all+Number(this.detailsPlanNum.fabriccostIncludestax)-allYu).toFixed(2) // 表头面料成本（￥）
             this.detailsPlanNum.fabriccostIncludestaxUsd = (Number(this.detailsPlanNum.fabriccostIncludestax)/1.13/this.detailsPlanNum.exchangeRate).toFixed(2)//表头面料成本（$）
             this.detailsPlanNum.fabriccostNotincludestax = (Number(this.detailsPlanNum.fabriccostIncludestax)/(1+(Number(this.detailsPlanNum.taxrate)/100))).toFixed(2)//表头-面料不含税成本（￥）
             this.$refs.unitTabs.ingData = oneData.syCostAllocationIngredientList //辅料sheet数据源
@@ -670,12 +670,30 @@ export default {
         if(data.fileList.length>this.fileList.length&&data.file.status=='uploading'){ 
           var that =this
           setTimeout(()=>{
-            that.onSearch('query')
+            that.getFileLIst()
         },1000)
           
         }
         
         
+      },
+      getFileLIst(){
+        seachPlanNum({ plannum: this.detailsPlanNum.planNum, type: 'query' }).then(res => {
+          if (res.success) {
+              var fileList =  (res.result.attachs!==''&&res.result.attachs)?res.result.attachs.split(","):[]
+              this.fileList = []
+              if(fileList.length!==0){
+                fileList.map(item=>{
+                  this.fileList.push({
+                    uid: '-1',
+                    name: item,
+                    status: 'done',
+                    url:'http://www.myfitt.cn:18001/jeecg-boot/sys/common/static' +'/'+item
+                  })
+              })
+              }
+          }
+        })
       },
       removeFile(data){
         deleteFileDetail({code:this.detailsPlanNum.planNum,name:data.name}).then(res => {

src/views/shipment-details/referOrderDataModal.vue

@@ -539,6 +539,10 @@ export default {
     onSubmit() {
       this.dataSet( this.selectedRows)
       var vv = this.selectedRows[0]
+      var mes = '1'
+      this.selectedRows.map(item=>{
+        if(item.surplusNum==0){mes='0'}
+      })
       // if(this.fatherData.length !== 0){
       //   this.fatherDataSet(this.fatherData,vv)
       // }
@@ -551,7 +555,11 @@ export default {
           this.$message.error('含有成衣工厂为空的数据，请重新选择！');
       }else if(this.queryParam.account == '103' && !((this.customerArr.length==1 && this.customerArr[0] == '香港森语') || (this.customerArr.length==1 && this.customerArr[0] == 'International Apparel Group'))){
           this.$message.error('含有客户简称不为香港森语的数据，请重新选择！');
+      }else if(this.queryParam.refer=='1'&&mes=='0'){
+        debugger
+        this.$message.error('订单剩余数量不可为0!');
       }else{
+        debugger
         var garment = ''
         if(this.queryParam.flourOrGarment == 1){
           garment = '成衣'
@@ -589,7 +597,8 @@ export default {
        colourTest = [],
        sizeTest = [],
        custorTest = [],
-       distributionPointTest = []
+       distributionPointTest = [],
+       mes ='0'
        this.selectedRows.map(item=>{
          this.confimList.push(item.syOrderDataItemId);
          orderTest.push(item.orderNumber)