前端

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
       },
       //定金
@@ -719,7 +843,7 @@
         })
       },
       //列表
-      getList(type) {debugger
+      getList(type) {
         // 1自运2他运
         let _data = {
             compId: sessionStorage.getItem('ws-pf_compId'),
@@ -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/tranManagement/tranManagementVehicleDispatching.vue

@@ -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'),

vue.config.js

@@ -142,7 +142,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.122:9100/',
-        target: 'http://192.168.1.107:8090/',
+        target: 'http://192.168.1.108:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址