Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

# Conflicts:
#	src/views/houseSelfCollect/paymentManagement.vue

.gitignore

@@ -163,3 +163,4 @@ deployment.yaml
 # Docker
 ######################
 Dockerfile
+/vue.config.js

src/views/houseSelfCollect/paymentManagement.vue

@@ -72,8 +72,7 @@
       <el-table-column class="table_td" prop="paymentNo" width="100" label="编号" sortable></el-table-column>
       <el-table-column class="table_td" prop="customerName" label="客户" sortable>
         <template slot-scope="scope">
-          <div @click.stop="customer(scope.row)"><span
-              :class="{ text_css: scope.row.textcss }">{{scope.row.customerName}}</span></div>
+          <div @click.stop="customer(scope.row)"><span class="text_css">{{scope.row.customerName}}</span></div>
         </template>
       </el-table-column>
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
@@ -251,6 +250,8 @@
   import {
     downloadFile
   } from '@/utils/batchDown'
+  import JSZip from 'jszip'
+  import FileSaver from 'file-saver'
   import {
     getpayment,
     selectWarehouseSelf,
@@ -270,6 +271,7 @@
   import {
     getHp
   } from '@/utils/getHasPermission'
+import download from '../../components/WsDownload/download'
   export default {
     components: {
       paymentPrint
@@ -372,6 +374,53 @@
         })
 
       },
+        /**文件打包
+  * arrImages:文件list:[{fileUrl:文件url,renameFileName:文件名}]
+  * filename 压缩包名
+  * */
+  filesToRar(arrImages, filename) {
+  let _this = this;
+  let zip = new JSZip();
+  let cache = {};
+  let promises = [];
+  _this.title = '正在加载压缩文件';
+  for (let item of arrImages) {
+   const promise= _this.getImgArrayBuffer(item.fileUrl).then(data => {
+   // 下载文件, 并存成ArrayBuffer对象(blob)
+   zip.file(item.renameFileName, data, { binary: true }); // 逐个添加文件
+   cache[item.renameFileName] = data;
+   });
+   promises.push(promise);
+  }
+  Promise.all(promises).then(() => {
+   zip.generateAsync({ type: "blob" }).then(content => {
+   _this.title = '正在压缩';
+   // 生成二进制流
+   FileSaver.saveAs(content, filename); // 利用file-saver保存文件 自定义文件名
+   _this.title = '压缩完成';
+   });
+  }).catch(res=>{
+   _this.$message.error('文件压缩失败');
+  });
+  },
+ //获取文件blob
+  getImgArrayBuffer(url){
+  let _this=this;
+  return new Promise((resolve, reject) => {
+   //通过请求获取文件blob格式
+   let xmlhttp = new XMLHttpRequest();
+   xmlhttp.open("GET", url, true);
+   xmlhttp.responseType = "blob";
+   xmlhttp.onload = function () {
+   if (this.status == 200) {
+    resolve(this.response);
+   }else{
+    reject(this.status);
+   }
+   }
+   xmlhttp.send();
+  });
+  },
       invoicingClick() {
         // let data = JSON.stringify({
         //   paymentManagementList : this.modification
@@ -392,16 +441,28 @@
           .then(response => {
             console.log(response)
             if (response.length > 0) {
+              
+              var arr=[]
               for (let i = 0; i < response.length; i++) {
-                // 创建标签下载文件
-                let a = document.createElement('a');
-                a.setAttribute('download', response[i]);
-                a.setAttribute('target', 'blank');
-                a.setAttribute('href', response[i]);
-                a.click();
-                a.remove();
-
+                arr.push({fileUrl:response[i],renameFileName:'发票'+i})
+                //创建标签下载文件
+                // window.open(response[i],)
+                // let a = document.createElement('a');
+                // // a.href = response[i];
+                // a.setAttribute('target', 'blank');
+                // a.setAttribute('download', response[i]);
+                // a.setAttribute('href', response[i]);
+                // a.click();
+                // a.remove();
+                // let b = document.createElement('a');
+                // // b.href = response[i];
+                // b.setAttribute('target', 'blank');
+                // b.setAttribute('download', response[i]);
+                // b.setAttribute('href', response[i]);
+                // b.click();
+                // b.remove();
               }
+              this.filesToRar(arr, 'download')
             }
             //未完成，接口调通后替换假数据
             // response = {
@@ -435,20 +496,11 @@
           .catch(() => {})
       },
       customer(row) {
-        for (let i = 0; i < this.paymentList.length; i++) {
-          if (row.id == this.paymentList[i].id) {
-            row.textcss = true
-          } else {
-            this.paymentList[i].textcss = false
-          }
-        }
-        row.textcss = true
-        this.customerInfo = true
+        this. customerInfo = true
         this.customerlist = row.identityAuthenticationInfo
         this.customerlist.cardAddressUrl1 = this.customerlist.cardAddressUrl.split(',')[0]
         this.customerlist.cardAddressUrl2 = this.customerlist.cardAddressUrl.split(',')[1]
         this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(',')
-        this.$forceUpdate();
       },
       customerclose(e) {
         console.log(e)
@@ -694,34 +746,30 @@
         if (this.searchType != -1) {
           searchParam = this.searchType
         }
-        getpayment({
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchKeyWord: this.searchKeyWord,
-            searchType: searchParam,
-            warehouseName: this.warehouseName,
-            managementType: 1,
-            compId: sessionStorage.getItem('ws-pf_compId')
-          })
-          .toPromise()
-          .then(response => {
-            this.paymentList = response.records
-            for (let i = 0; i < this.paymentList.length; i++) {
-              this.paymentList.textcss = false
-            }
-            this.deptBudgetTotal = response.total
-          })
-        // getJurisdiction({
-        //   managementType: 1,
-        //   warehouseName: this.warehouseName,
-        //   compId: sessionStorage.getItem('ws-pf_compId')
-        // })
-        //   .toPromise()
-        //   .then(response => {
-        //     this.isShowAdopt = response
-        //   })
-
 
+      getpayment({
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+        searchType: searchParam,
+        warehouseName: this.warehouseName,
+        managementType: 1,
+        compId: sessionStorage.getItem('ws-pf_compId')
+      })
+        .toPromise()
+        .then(response => {
+          this.paymentList = response.records
+          this.deptBudgetTotal = response.total
+        })
+      // getJurisdiction({
+      //   managementType: 1,
+      //   warehouseName: this.warehouseName,
+      //   compId: sessionStorage.getItem('ws-pf_compId')
+      // })
+      //   .toPromise()
+      //   .then(response => {
+      //     this.isShowAdopt = response
+      //   })
       },
       del(row) {
         this.$confirm(
@@ -1196,6 +1244,6 @@
   }
 
   .text_css {
-    color: #2c29e7;
+    color: #5878e8;
   }
 </style>

src/views/statisticalReport/autoSettlementList.vue

@@ -371,7 +371,7 @@
             </div>
           </template></el-table-column
         >
-        <el-table-column label="状态" prop="status">
+        <el-table-column label="状态" prop="status" width="100px">
           <template slot-scope="scope">
             <span v-if="scope.row.approveStatus != null">{{
               scope.row.approveStatus

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -4,9 +4,9 @@
     <el-scrollbar style="height: 100%">
       <el-row>
         <el-col style="padding-left: 15px" :span="16">
-          <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.view`" @click="adopt()">备注
+          <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.carry`" @click="adopt()">备注
           </ws-button>
-          <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.view`" @click="depositbutton()">定金
+          <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.draw`" @click="depositbutton()">定金
           </ws-button>
           <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.payment`" @click="handlecollect()">收款
           </ws-button>
@@ -21,10 +21,12 @@
           </el-select>
         </el-col>
       </el-row>
-      <el-row class='row2' v-if='orderList.deliverType==1'>
+      <el-row v-if='orderList.deliverType==1'>
         <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane v-for='(item,index) in orderList.tranTaskInfoList' :key='index'
-            :label="item.taskNo+'+('+item.tranProcessInfo.tranType +')'" :name="item.tranProcessInfo.processNo"></el-tab-pane>
+          <el-tab-pane v-for='(item,index) in tranProcessInfo' :key='index'
+            :label="item.label" :name="item.name"></el-tab-pane>
+            <el-tab-pane 
+            label="退库" name="退库"></el-tab-pane>
         </el-tabs>
       </el-row>
       <div v-if="contractNo != ''">
@@ -56,15 +58,18 @@
         <span v-else>定金: 0 元</span>
       </div>
       <!-- 自运 -->
-      {{this.tranType}}
-      <el-table class="wenzi" :data="saleList.records" style="width: 100%; margin-top: 20px" ref="saleList" border
+      <el-table class="wenzi" :data="saleList.records" :row-class-name="tableRowClassName" style="width: 100%; margin-top: 20px" ref="saleList" border
         :summary-method="getSummaries" show-summary @selection-change="handleSelectionChange"
         @row-click="handleRowClick" v-if="orderList.deliverType==1">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务阶段编号"></el-table-column>
+        <el-table-column  v-if="this.tranType!='退库'" class="table_td" prop="processNo" label="运输任务阶段编号"></el-table-column>
         <el-table-column class="table_td" prop="warehouseName" label="仓库" v-if="this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="carNo" label="车牌号" v-if="this.tranType=='汽运'||this.tranType=='退库'"></el-table-column>
+        <el-table-column class="table_td" prop="carNo" label="车牌号" v-if="this.tranType=='汽运'||this.tranType=='退库'">
+          <template slot-scope="scope">
+            <span >{{scope.row.carNo }}({{scope.row.tranCarNo}})</span>
+          </template>
+        </el-table-column>
         <el-table-column class="table_td" prop="binNumber" label="仓位号" v-if="this.tranType=='散船'"></el-table-column>
         <el-table-column class="table_td" prop="boxNo" label="车厢号" v-if="this.tranType=='火运'"></el-table-column>
         <el-table-column class="table_td" prop="caseNo" label="箱号" v-if="this.tranType=='汽运'||this.tranType=='箱船'||this.tranType=='退库'"></el-table-column>
@@ -76,7 +81,11 @@
         <el-table-column class="table_td" prop="feedbackPerson" label="卸船反馈人" v-if="this.tranType=='散船'||this.tranType=='箱船'"></el-table-column>
         <el-table-column class="table_td" prop="grossWeight" label="毛重（吨）" v-if="this.tranType=='退库'"></el-table-column>
         <el-table-column class="table_td" prop="tare" label="皮重（吨）" v-if="this.tranType=='退库'"></el-table-column>
-        <el-table-column class="table_td" prop="netWeight" label="净重（吨）" v-if="this.tranType=='退库'"></el-table-column>
+        <el-table-column class="table_td" prop="netWeight" label="净重（吨）" v-if="tranType=='退库'">
+          <template slot-scope="scope">
+            <span >{{-scope.row.netWeight }}</span>
+          </template>
+        </el-table-column>
 
         <!-- <el-table-column class="table_td" prop="deliveryDate" label="出库日期">
           <template slot-scope="scope">
@@ -85,7 +94,7 @@
           </template>
         </el-table-column> -->
         <el-table-column class="table_td" prop="unloadingWeight" label="卸车净重（吨）" v-if="this.tranType=='汽运'||this.tranType=='火运'"></el-table-column>
-        <el-table-column class="table_td" prop="unloadingWeight" label="卸船净重（吨）" v-if="this.tranType=='散船'||this.tranType=='箱船'"></el-table-column>
+        <el-table-column v-else-if="this.tranType=='散船'||this.tranType=='箱船'" class="table_td" prop="unloadingWeight" label="卸船净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="settlementWeight" label="结算重量（吨）"></el-table-column>
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额（元）"></el-table-column>
         <el-table-column class="table_td" prop="amountEdReceivable" label="已收金额（元）">
@@ -125,7 +134,7 @@
       </el-table>
 
       <!-- 他运 -->
-      <el-table v-else class="wenzi" :data="saleList.records" style="width: 100%; margin-top: 20px" ref="saleList1"
+      <el-table v-else class="wenzi" :data="saleList.records" :row-class-name="tableRowClassName" style="width: 100%; margin-top: 20px" ref="saleList1"
         border :summary-method="getSummaries" show-summary @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
@@ -363,6 +372,7 @@
         collectionScreenshot: '',
         amountEdCollectionable: '',
         actualCollectionment: '',
+        tranProcessInfo:[],
         // collectDate: '',
         calculationCollectable: '',
         searchType: '',
@@ -394,10 +404,31 @@
       this.showType = this.isShow
     },
     methods: {
+      tableRowClassName({row, rowIndex}) {
+        console.log(row)
+        if (row.returnFlag==1) {
+          return 'warning-row';
+        } else {
+          return '';
+        }
+      },
       handleRowClick(){},
       handleClick(tab, event) {
-        console.log(tab,event);
-
+        console.log(tab);
+        this.activeName=tab.name
+        if(this.activeName=='退库'){
+          this.tranType = '退库'
+        }else{
+          for (let i = 0; i < this.tranProcessInfo.length; i++) {
+            if(this.tranProcessInfo[i].name==this.activeName){
+              this.tranType = this.tranProcessInfo[i].tranType
+            }
+          }
+        }
+        
+        // console.log(this.tranType)
+        // this.
+        this.getList(this.orderList.deliverType)
       },
       //表头
       contractchange(e) {
@@ -405,8 +436,18 @@
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             this.orderList = this.contractNoList[i]
-            this.activeName = this.orderList.tranTaskInfoList[0].tranProcessInfo.processNo
-            this.tranType = this.orderList.tranTaskInfoList[0].tranProcessInfo.tranType
+            for (let i = 0; i < this.orderList.tranTaskInfoList.length; i++) {
+              if(this.orderList.tranTaskInfoList[i].tranProcessInfo){
+                  this.tranProcessInfo.push({
+                    label:this.orderList.tranTaskInfoList[i].taskNo+'+('+this.orderList.tranTaskInfoList[i].tranProcessInfo.tranType+')',
+                    name:this.orderList.tranTaskInfoList[i].tranProcessInfo.processNo,
+                    tranType:this.orderList.tranTaskInfoList[i].tranProcessInfo.tranType
+                    })
+              }
+            }
+            console.log(this.orderList.tranTaskInfoList)
+            this.activeName = this.tranProcessInfo[0].name
+            this.tranType = this.tranProcessInfo[0].tranType
             if (this.contractNoList[i].depositUrl) {
               this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
             } else {
@@ -476,7 +517,7 @@
                   title: '成功',
                   message: '结算重量修改成功',
                 })
-                this.getList()
+                this.getList(this.orderList.deliverType)
               })
               .catch(() => {
                 return false
@@ -538,31 +579,114 @@
         } = param
         const sums = []
         columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计'
-          } else if (
-            index === 7 ||
-            index === 8
-          ) {
-            const values = data.map((item) => Number(item[column.property]))
-            if (!values.every((value) => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr)
-                if (!isNaN(value)) {
-                  return prev + curr
+          if(this.orderList.deliverType!=1){
+            if (index === 0) {
+              sums[index] = '合计'
+            } else if (
+              index === 8 ||
+              index === 9||
+              index === 10||
+              index === 11
+            ) {
+              const values = data.map((item) => Number(item[column.property]))
+              if (!values.every((value) => isNaN(value))) {
+                sums[index] = values.reduce((prev, curr) => {
+                  const value = Number(curr)
+                  if (!isNaN(value)) {
+                    return prev + curr
+                  } else {
+                    return prev
+                  }
+                }, 0)
+              } else {
+                sums[index] = '元'
+              }
+            } else {
+              sums[index] = '--'
+            }
+          }else{
+            if(this.tranType=='火运'||this.tranType=='散船'){
+              if (index === 0) {
+                sums[index] = '合计'
+              } else if (
+                index === 8 ||
+                index === 9||
+                index === 10||
+                index === 7
+              ) {
+                const values = data.map((item) => Number(item[column.property]))
+                if (!values.every((value) => isNaN(value))) {
+                  sums[index] = values.reduce((prev, curr) => {
+                    const value = Number(curr)
+                    if (!isNaN(value)) {
+                      return prev + curr
+                    } else {
+                      return prev
+                    }
+                  }, 0)
                 } else {
-                  return prev
+                  sums[index] = '元'
                 }
-              }, 0)
-            } else {
-              sums[index] = '元'
+              } else {
+                sums[index] = '--'
+              }
+            }else if(this.tranType=='汽运'){
+              if (index === 0) {
+                sums[index] = '合计'
+              } else if (
+                index === 11 ||
+                index === 9||
+                index === 10||
+                index === 12
+              ) {
+                const values = data.map((item) => Number(item[column.property]))
+                if (!values.every((value) => isNaN(value))) {
+                  sums[index] = values.reduce((prev, curr) => {
+                    const value = Number(curr)
+                    if (!isNaN(value)) {
+                      return prev + curr
+                    } else {
+                      return prev
+                    }
+                  }, 0)
+                } else {
+                  sums[index] = '元'
+                }
+              } else {
+                sums[index] = '--'
+              }
+            }else if(this.tranType=='箱船'){
+              if (index === 0) {
+                sums[index] = '合计'
+              } else if (
+                index === 11 ||
+                index === 9||
+                index === 10||
+                index === 8
+              ) {
+                const values = data.map((item) => Number(item[column.property]))
+                if (!values.every((value) => isNaN(value))) {
+                  sums[index] = values.reduce((prev, curr) => {
+                    const value = Number(curr)
+                    if (!isNaN(value)) {
+                      return prev + curr
+                    } else {
+                      return prev
+                    }
+                  }, 0)
+                } else {
+                  sums[index] = '元'
+                }
+              } else {
+                sums[index] = '--'
+              }
             }
-          } else {
-            sums[index] = '--'
           }
+         
         })
-        sums[sums.length - 1] = sums[sums.length - 1].toFixed(2)
-        sums[sums.length - 2] = sums[sums.length - 2].toFixed(2)
+        console.log(sums[sums.length - 1],sums[sums.length - 2])
+          // sums[sums.length - 1] = sums[sums.length - 1].toFixed(2)
+          // sums[sums.length - 2] = sums[sums.length - 2].toFixed(2)
         return sums
       },
       //定金
@@ -801,16 +925,6 @@
   }
 </script>
 <style lang="scss" scoped>
-  .connert {
-    width: 90%;
-    margin: 0 auto;
-  }
-
-  .vertical-text-left {
-    width: 62px;
-    text-align: right;
-  }
-
   //分页
   .el-pagination {
     padding: 10px 15px;
@@ -869,26 +983,6 @@
   /deep/.el-table tr th.is-leaf:first-child {
     border-left: 1px solid #e9ecf7;
   }
-
-  .record,
-  .adjustment {
-    display: inline-block;
-    color: #5878e8;
-    padding: 0 4px !important;
-    position: relative;
-  }
-
-  .record:after {
-    position: absolute;
-    content: '';
-    display: block;
-    top: 5px;
-    right: -2px;
-    width: 1px;
-    height: 12px;
-    background: #e9ecf7;
-  }
-
   // .el-row{
   //     height: 150px;
   // }
@@ -904,46 +998,10 @@
     height: 32px;
     margin-left: -20%;
   }
-
-  //执行样式
-  .executory,
-  .inExecution,
-  .done {
-    width: 6px;
-    height: 6px;
-    display: inline-block;
-    border-radius: 50%;
-    position: relative;
-    top: -1px;
-    font-size: 14px;
-  }
-
-  .executory {
-    background: #ff9f24;
-  }
-
-  .inExecution {
-    background: #5878e8;
-  }
-
-  .done {
-    background: #50cad4;
-  }
-
-  .record,
-  .adjustment {
-    display: inline-block;
-    color: #5878e8;
-    padding: 0 4px !important;
-    position: relative;
-    font-size: 14px;
-  }
-
   .container {
     overflow: scroll;
     height: 93vh;
   }
-
   .button-container {
     display: flex;
     flex-wrap: nowrap;
@@ -979,25 +1037,6 @@
       }
     }
   }
-
-  .bg-left {
-    padding-left: 30px;
-  }
-
-  .title {
-    position: relative;
-  }
-
-  .title::before {
-    content: '';
-    display: inline-block;
-    width: 5px;
-    height: 30px;
-    background: #5473e8;
-    position: absolute;
-    left: 0;
-  }
-
   .el-button--primary {
     background-color: #5878e8;
     border-color: #5878e8;
@@ -1019,26 +1058,11 @@
     width: 385px;
     margin-top: 10px;
   }
-
-  .bg-bottom {
-    margin-left: 85%;
-  }
-
-  .but {
-    margin-left: 30%;
-    /* margin-top: -32px; */
-    overflow: auto;
-    /* float: left; */
-    /* margin-left: 1px; */
-    margin-left: -10px;
-  }
-
   .el-input--small {
     font-size: 13px;
     width: 390px;
     margin-left: 74%;
   }
-
   /deep/.el-table .el-table__header .cell,
   .el-table .el-table__body .cell {
     text-align: center;
@@ -1065,20 +1089,6 @@
     padding: 0 12%;
   }
 
-  /deep/.el-form-item--small .el-form-item__label,
-  .el-form-item--small .el-form-item__content {
-    text-align: center;
-  }
-
-  hr {
-    width: 91%;
-  }
-
-  /deep/.deaal {
-    width: 66%;
-    margin-left: 9%;
-  }
-
   .el-date-editor.el-input,
   .el-date-editor.el-input__inner,
   .el-input-number--small {}
@@ -1107,4 +1117,29 @@
     display: inline-flex;
     margin-left: -80%;
   }
+  /deep/.el-tabs__active-bar{
+    background:transparent;
+  }
+  /deep/.el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2),
+  /deep/.el-tabs--bottom .el-tabs__item.is-top:nth-child(2),
+  /deep/.el-tabs--top .el-tabs__item.is-bottom:nth-child(2),
+  /deep/.el-tabs--top .el-tabs__item.is-top:nth-child(2){
+    padding-left:20px;
+  }
+  /deep/.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+  /deep/.el-tabs--bottom .el-tabs__item.is-top:last-child,
+  /deep/.el-tabs--top .el-tabs__item.is-bottom:last-child,
+  /deep/.el-tabs--top .el-tabs__item.is-top:last-child{
+    padding-right:20px;
+  }
+  /deep/.el-tabs{
+    border-top:1px solid #ccc;
+  }
+  /deep/.el-table .warning-row{
+    background:#FFEDEF;
+    // border:1px solid #E05D6B !important;
+  }
+  /deep/.el-table .warning-row td {
+    border-bottom:1px solid #E05D6B !important;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -794,7 +794,7 @@
 						return
 					}
 					if (
-						this.dataList.bulkDensity < 500 ||
+						this.dataList.bulkDensity < 0 ||
 						this.dataList.bulkDensity > 1000
 					) {
 						this.$message({

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -994,7 +994,7 @@ export default {
           return
         }
         if (
-          this.dataList.bulkDensity < 500 ||
+          this.dataList.bulkDensity < 0 ||
           this.dataList.bulkDensity > 1000
         ) {
           this.$message({
@@ -1130,7 +1130,7 @@ export default {
           return
         }
         if (
-          this.dataList1.bulkDensity < 500 ||
+          this.dataList1.bulkDensity < 0 ||
           this.dataList1.bulkDensity > 1000
         ) {
           this.$message({
@@ -1280,7 +1280,7 @@ export default {
           return
         }
         if (
-          this.dataList1.bulkDensity < 500 ||
+          this.dataList1.bulkDensity < 0 ||
           this.dataList1.bulkDensity > 1000
         ) {
           this.$message({

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -95,7 +95,7 @@
         <div style="width: 100%" class="flex position" v-for="(item, index) in freightspace" :key="index">
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">车厢号-{{ index + 1 }}</div>
+            <div class="catNos">车厢-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>
@@ -683,10 +683,11 @@
         let that = this;
         that.$forceUpdate();
         that.freightspace[that.index].imgCount++
-        console.log(that.freightspace[that.index].imgCount)
-        that.freightspace[that.index].loadPoundImg += e.url + ","
-        console.log(that.freightspace[that.index].loadPoundImg)
-
+        if(that.freightspace[that.index].loadPoundImg){
+             that.freightspace[that.index].loadPoundImg += "," + e.url  
+        }else{
+             that.freightspace[that.index].loadPoundImg += e.url 
+        }
       }
     }
   }

src/views/tranManagement/tranManagementFireFeedbackLook.vue

@@ -125,7 +125,7 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">车厢号-{{ index + 1 }}</div>
+            <div class="catNos">车厢-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -149,7 +149,7 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">车厢号-{{ index + 1 }}</div>
+            <div class="catNos">车厢-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>
@@ -759,7 +759,12 @@ export default {
         that.$forceUpdate();
         that.freightspace[that.index].imgCount++
         console.log(that.freightspace[that.index].imgCount)
-        that.freightspace[that.index].unloadPoundImg += e.url + ','
+        debugger
+        if( that.freightspace[that.index].unloadPoundImg){
+           that.freightspace[that.index].unloadPoundImg += ',' + e.url
+        }else{
+          that.freightspace[that.index].unloadPoundImg += e.url
+        }
     },
   },
 }

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -130,7 +130,7 @@
         >
           <ws-info-table>
             <!--车厢号-->
-            <div class="catNos">车厢号-{{ index + 1 }}</div>
+            <div class="catNos">车厢-{{ index + 1 }}</div>
             <ws-form-item label="车厢号:" span="1" prop="boxNo">
               <span>{{ item.boxNo }}</span>
             </ws-form-item>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -84,7 +84,7 @@
             >
             <!--最晚发货日期-->
             <ws-form-item
-              label="最晚发货日期"
+              label="最晚到货日期"
               span="1"
               prop="inOutDate"
               class="deliverydate"

src/views/tranManagement/tranManagementShippingLook.vue

@@ -49,7 +49,7 @@
               </ws-form-item>
 
               <!--发船日期-->
-              <ws-form-item label="发船日期" span="1" prop="deliveryDateStart">{{ deptBudgetList.deliveryDateStart }}
+              <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">{{ deptBudgetList.deliveryDateStart }}
               </ws-form-item>
 
               <!--最晚发货日期-->

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -71,7 +71,7 @@
               {{ deptBudgetList.deliveryDateStart }}
             </ws-form-item>
             <ws-form-item
-              label="最晚发货日期"
+              label="最晚到货日期"
               span="1"
               prop="inOutDate"
               class="deliverydate"
@@ -115,7 +115,7 @@
               <div v-if="deptBudgetList.priceStatus=='审核中'">
                 <el-button
               type="primary"
-              v-hasPermission="`tranManager.vehicleDispatching.price`"
+              v-hasPermission="`tranManager.vehicleDispatching.reprice`"
               size="small"
               @click="examine()"
               >审核中</el-button

src/views/warehouse/warehouseManagementGross.vue

@@ -63,11 +63,10 @@
             <el-select
               filterable
               clearable
-              :filter-method="dataFilter1"
               v-model="deptBudgetList.contractNo"
               placeholder="请选择合同编号或移库任务编号"
               class="typeselect"
-              @change="contractNoChange"
+              @change="contractNoChange1"
             >
               <el-option
                 v-for="item in options1"
@@ -1996,14 +1995,55 @@ export default {
       }
     },
     contractNoChange(e) {
+      console.log(e)
       for(let i = 0 ; i < this.deptBudgetList1.length ; i++){
         if(this.deptBudgetList1[i].inOutTaskNo == e){
          this.deptBudgetList.contractNo =  this.deptBudgetList1[i].contractNo
          return
         }
       }
+      for (var i = 0; i < this.outContractNo.length; i++) {
+        if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
+          if (this.outContractNo[i].inOutType == '采购入库') {
+              this.deptBudgetList.inOutTypeKey = 1
+            } else if (this.outContractNo[i].inOutType == '移库入库') {
+              this.deptBudgetList.inOutTypeKey = 3
+            } else if (this.outContractNo[i].inOutType == '暂存入库') {
+              this.deptBudgetList.inOutTypeKey = 4
+            } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
+              this.deptBudgetList.inOutTypeKey = 5
+            } else if (this.outContractNo[i].inOutType == '退库') { 
+              this.deptBudgetList.inOutTypeKey = 6
+            }
+          this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
+          this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+          // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
+          this.cost = this.outContractNo[i].contractPrice
+          if(this.cost){
+            this.isGetCost = true
+              this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
+          }else{
+             this.isGetCost = false
+             this.deptBudgetList.cost = this.deptBudgetList.cost
+          }
+          this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
+          if(this.outContractNo[i].inOutType=='移库入库'){
+            this.isSelectType = false
+          }else{
+            this.isSelectType = true
+          }
+          if (this.outContractNo[i].tranCarInfoList) {
+            this.options2 = this.outContractNo[i].tranCarInfoList
+            this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
+            this.carstatus = true
+          }
+        }
+      }
+    },
+    contractNoChange1(e) {
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
+          console.log(this.outContractNo[i])
           if (this.outContractNo[i].inOutType == '采购入库') {
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
@@ -2012,7 +2052,7 @@ export default {
               this.deptBudgetList.inOutTypeKey = 4
             } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
               this.deptBudgetList.inOutTypeKey = 5
-            } else if (this.detailData.inOutType == '退库') {
+            } else if (this.outContractNo[i].inOutType == '退库') {
               this.deptBudgetList.inOutTypeKey = 6
             }
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
@@ -2132,18 +2172,13 @@ export default {
           })
       }
       //合同编号
-      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'), flag: 6 })
+      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'), flag: 7 })
         .toPromise()
         .then((response) => {
           this.options1 = response
           this.outContractNo = response
         })
-      //合同编号2
-      xialaNo({ compId: sessionStorage.getItem('ws-pf_compId'), flag: 7 })
-        .toPromise()
-        .then((response) => {
-          this.outContractNo1 = response
-        })
+
       //经办人
       getstaff({
         compId: sessionStorage.getItem('ws-pf_compId'),

src/views/warehouse/warehouseManagementRecord.vue

@@ -87,7 +87,9 @@
 					</el-table-column>
 					<el-table-column prop="goodsName" label="货名" width="60px"> </el-table-column>
 					<el-table-column prop="type" label="类型" width="60px"> </el-table-column>
-					<el-table-column prop="grossWeight" label="毛重（吨）" ></el-table-column>
+					<el-table-column prop="grossWeight" label="毛重（吨）" >
+						
+					</el-table-column>
 					<el-table-column prop="tare" label="皮重（吨）"> </el-table-column>
 					<el-table-column prop="deductionWeight" label="扣重（吨）"> </el-table-column>
 					<el-table-column prop="netWeight" label="净重（吨）"></el-table-column>

vue.config.js

@@ -1,273 +0,0 @@
-const path = require('path')
-
-function resolve(dir) {
-  return path.join(__dirname, dir)
-}
-/**
- * cdn 引入资源
- */
-const cdn = {
-  externals: {
-    vue: 'Vue',
-    'vue-router': 'VueRouter',
-    vuex: 'Vuex',
-    axios: 'axios',
-    'element-ui': 'ELEMENT',
-    'echarts': 'echarts',
-    winseaview: 'winseaview',
-    // 'base-template-lib': 'base-template-lib',
-    // 'ali-oss': 'ali-oss',
-    // 'lodash': 'lodash'
-  },
-  js: {
-    dev: [
-      "//cdn.bootcdn.net/ajax/libs/sockjs-client/1.5.0/sockjs.min.js",
-      "//cdn.bootcdn.net/ajax/libs/stomp.js/2.3.3/stomp.min.js",
-      "//cdn.bootcdn.net/ajax/libs/Sortable/1.9.0/Sortable.min.js"
-    ],
-    ship: [
-      `./static/libs/sock.min.js`,
-      `./static/libs/stomp.min.js`,
-      `./cdn/Sortable/1.9.0/Sortable.min.js`,
-      `./cdn/vue/2.6.10/vue.min.js`,
-      `./cdn/vuex/3.1.1/vuex.min.js`,
-      `./cdn/vue-router/3.0.1/vue-router.min.js`,
-      `./cdn/axios/1.0.0/axios.min.js`,
-      `./cdn/element-ui/2.12.0/index.js`,
-      `./cdn/echarts/echarts.min.js`,
-      `./cdn/lodash/4.17.20/lodash.min.js`,
-      // `${process.env.BASE_URL}cdn/base-template-lib/base-template-lib.umd.min.js`,
-      // `${process.env.BASE_URL}cdn/winseaview/winseaview.min.js`
-    ],
-    product: [
-      "//cdn.bootcdn.net/ajax/libs/sockjs-client/1.5.0/sockjs.min.js",
-      "//cdn.bootcdn.net/ajax/libs/stomp.js/2.3.3/stomp.min.js",
-      "//cdn.bootcdn.net/ajax/libs/Sortable/1.9.0/Sortable.min.js",
-      "//cdn.bootcdn.net/ajax/libs/vue/2.6.10/vue.min.js",
-      "//cdn.bootcdn.net/ajax/libs/vuex/3.1.1/vuex.min.js",
-      "//cdn.bootcdn.net/ajax/libs/vue-router/3.0.1/vue-router.min.js",
-      "//cdn.bootcdn.net/ajax/libs/axios/0.21.0/axios.min.js",
-      "//cdn.bootcdn.net/ajax/libs/element-ui/2.12.0/index.js",
-      "//cdn.bootcdn.net/ajax/libs/echarts/4.8.0/echarts.min.js",
-      // "//cdn.bootcdn.net/ajax/libs/lodash.js/4.17.20/lodash.min.js",
-      // "//cdn.bootcdn.net/ajax/libs/ali-oss/6.11.2/aliyun-oss-sdk.min.js",
-      // `/cdn/base-template-lib/base-template-lib.umd.min.js`,
-      `/cdn/winseaview/winseaview.min.js`
-    ]
-  },
-  css: {
-    dev: [
-      "/cdn/element-ui/2.13.2/theme-chalk/index.css",
-      `./static/iconfont/iconfont.css`
-    ],
-    ship: [
-      "/cdn/element-ui/2.13.2/theme-chalk/index.css",
-      `./static/iconfont/iconfont.css`
-    ],
-    product: [
-      `/cdn/winseaview/index.css`,
-      "/cdn/element-ui/2.13.2/theme-chalk/index.css",
-      `./static/iconfont/iconfont.css`
-    ]
-  }
-}
-
-const port = 9527 // dev port
-const ignoreFile = ['production']
-module.exports = {
-  assetsDir: 'static',
-  lintOnSave: true,
-  publicPath: process.env.VUE_APP_PACKAGE_ENV === 'ship' ? '/' : './',
-  productionSourceMap: false, //去掉 .map 文件
-  // runtimeCompiler: true,
-  // cssSourceMap: true,
-  devServer: {
-    port: port,
-    disableHostCheck: true,
-    open: false,
-    overlay: {
-      warnings: false,
-      errors: true
-    },
-    proxy: {
-      '/pb/bijiadan': {
-        // target: 'http://127.0.0.1:4523/mock/349485',//目标地址
-        target: 'http://192.168.24.5:8045',//目标地址
-        // target: 'http://192.168.24.24:8089',//目标地址
-        changeOrigin: true, //开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
-        pathRewrite: {
-          '^/pb/bijiadan': '/'
-        }, //这里重写路径
-        logLevel: 'debug',
-      },
-      '/pb/hs': {
-        // target: 'http://127.0.0.1:4523/mock/349485',//目标地址
-        target: 'http://192.168.24.24:8045',// 刘宪春本地目标地址
-        // target: 'http://192.168.22.6:8020',//目标地址
-        // target: 'http://192.168.24.24:8089',//目标地址
-        changeOrigin: true, //开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
-        pathRewrite: {
-          '^/pb/hs': '/'
-        }, //这里重写路径
-        logLevel: 'debug',
-      },
-      '/pb/mock': {
-        target: 'http://127.0.0.1:4523/mock/349485',//目标地址
-        changeOrigin: true, //开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
-        pathRewrite: {
-          '^/pb/mock': '/'
-        }, //这里重写路径
-        logLevel: 'debug',
-      },
-      '/pb/apiFinance': {
-        target: 'http://192.168.24.5:8098',//目标地址
-        changeOrigin: true, //开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
-        pathRewrite: {
-          '^/pb/apiFinance': '/'
-        }, //这里重写路径
-        logLevel: 'debug',
-      },
-      '/pb/api': {
-        // target: 'http://127.0.0.1:4523/mock/349485',//目标地址
-        target: 'http://192.168.24.5:8098',//目标地址
-        // target: 'http://192.168.24.24:8089',//目标地址
-        changeOrigin: true, //开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
-        pathRewrite: {
-          '^/pb/api': '/'
-        }, //这里重写路径
-        logLevel: 'debug',
-      },
-      '/pb': {
-        // target: 'https://product-server.winsea.com/', //目标地址
-        // target: 'http://standard-dev.winsea.com/', //目标地址
-        // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.122:9100/',
-        // target: 'http://192.168.24.5:8098',//目标地址
-        // target: 'http://product-server.winsea.com/',
-        // target: 'http://192.168.24.5:8098',//目标地址
-        changeOrigin: true, //开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
-        pathRewrite: { '^/pb': '/' }, //这里重写路径
-        secure: false,
-        logLevel: 'debug',
-        // headers: {
-        //   Referer: 'http://192.168.23.9:9527/',//'https://product-server.winsea.com/'
-        // }
-      },
-    }
-  },
-  configureWebpack: (config) => {
-    // provide the app's title in webpack's name field, so that
-    // it can be accessed in index.html to inject the correct title.
-    // if (debug) { // 开发环境配置
-    //   config.devtool = 'source-map'
-    // }
-    //直接修改配置
-    config.resolve.alias['@'] = resolve('src')
-    config.resolve.alias['@/assets'] = resolve('src/assets')
-    // if (ignoreFile.includes(process.env.NODE_ENV)) {
-    //   config.optimization.minimizer[0].options.terserOptions.compress.warnings = false
-    //   config.optimization.minimizer[0].options.terserOptions.compress.drop_console = false
-    //   config.optimization.minimizer[0].options.terserOptions.compress.drop_debugger = true
-    //   config.optimization.minimizer[0].options.terserOptions.compress.pure_funcs = ['console.log', 'console.info']
-    // }
-  },
-  chainWebpack(config) {
-    config.plugins.delete('preload')
-    config.plugins.delete('prefetch')
-    config.output.chunkFilename('static/js/[name].[chunkhash].js').end()
-
-    const entry = config.entry('app')
-    entry.add('babel-polyfill').end()
-    entry.add('classlist-polyfill').end()
-    /* 添加分析工具 */
-    if (process.env.NODE_ENV === 'production') {
-      // config
-      //   .plugin('webpack-bundle-analyzer')
-      //   .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin)
-      //   .end()
-    }
-
-    // entry.add('@/mock').end()
-    //忽略的打包文件
-    if (ignoreFile.includes(process.env.NODE_ENV)) {
-      //忽略的打包文件
-      config.externals(cdn.externals)
-      //开启Gzip压缩
-      config
-        .plugin('gzip-plugin')
-        .use('compression-webpack-plugin', [{
-          filename: '[path].gz[query]',
-          algorithm: 'gzip',
-          test: /\.js$|\.html$|\.json$|\.css$|\.ttf$/,
-          threshold: 10240, // 对超过10k的数据压缩
-          minRatio: 0.8, // 只有压缩率小于这个值的资源才会被处理
-          deleteOriginalAssets: false // 删除原文件
-        }])
-        .end()
-
-    }
-    config.plugin('html')
-      .tap(args => {
-        args[0].cdn = cdn
-        return args
-      })
-    config.module.rule('images')
-      .use('url-loader')
-      .loader('url-loader')
-      .tap(options => Object.assign(options, {
-        esModule: false
-      }))
-
-
-    // set preserveWhitespace
-    config.module
-      .rule('vue')
-      .use('vue-loader')
-      .loader('vue-loader')
-      .tap(options => {
-        options.compilerOptions.preserveWhitespace = true
-        return options
-      })
-      .end()
-
-    config.when(process.env.NODE_ENV === 'development', config =>
-      config.devtool('cheap-source-map')
-      // config.devtool('source-map') // 源码-慢
-    )
-
-    config.when(process.env.NODE_ENV !== 'development', config => {
-      // // 压缩代码
-      config.optimization.minimize(true)
-      config.optimization.splitChunks({
-        chunks: 'all',
-        cacheGroups: {
-          libs: {
-            name: 'chunk-libs',
-            test: /[\\/]node_modules[\\/]/,
-            priority: 10,
-            chunks: 'initial' //只打包初始时依赖的第三方
-          },
-          // elementUI: {
-          //   name: "chunk-elementUI", // 单独将 elementUI 拆包
-          //   test: /[\\/]node_modules[\\/]element-ui[\\/]/,
-          //   chunks: "all",
-          //   priority: 3,
-          //   reuseExistingChunk: true,
-          //   enforce: true
-          // },
-          commons: {
-            name: 'chunk-commons',
-            test: resolve('src/components'), // 可自定义拓展你的规则
-            minChunks: 3, //  最小共用次数
-            priority: 5,
-            reuseExistingChunk: true,
-            minSize: 0,
-            priority: 1,
-            enforce: true
-          }
-        }
-      })
-      config.optimization.runtimeChunk('single')
-    })
-  }
-}