Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/taskManagement/moveWarehouseTask.vue

@@ -3,11 +3,6 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <!-- <ws-button class="but" type="primary" @click="handlestatus(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" @click="handlestatus('')">全部任务</ws-button> -->
       </template>
       <template slot="right">
         <span style="width: 70px; display: inline-block;color: #8890B1;">状态：</span>
@@ -79,7 +74,9 @@
         </el-table-column>
         <el-table-column prop="transportLoss" label="运输损耗（吨）">
            <template scope="scope">
-            {{ scope.row.weight - scope.row.weightIn - scope.row.stockReturnCount}}
+             <div v-show="scope.row.taskStatus == '已完成'" >
+               {{ scope.row.weight - scope.row.weightIn - scope.row.stockReturnCount}}
+             </div>  
           </template> 
         </el-table-column>
         <el-table-column prop="publisher" label="发布者"> </el-table-column>
@@ -142,9 +139,15 @@
         </el-table-column>
         <el-table-column prop="seller" label="详情" width="200">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="see(scope.row)">
+             <div
+              class="record"
+              @click="see(scope.row)"
+            >
               查看
-            </ws-button>
+            </div>
+            <!-- <ws-button class="completed" @click="see(scope.row)">
+              查看
+            </ws-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -427,16 +430,6 @@ export default {
   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: 50px;
 }

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -34,7 +34,7 @@
         <span style="font-weight: 600">{{ this.moveTaskNo }}</span></span
       >
       <div v-for="(item, index) in moveLookData" :key="index">
-        <ws-info-table class="inout" v-show="item.inOutType == '移库出库'">
+        <ws-info-table class="inout" v-if="item.inOutType == '移库出库'">
           <!--出货库-->
           <div class="library">
             <span style="margin-left: 14px"
@@ -43,7 +43,7 @@
             <span style="margin-left: 10px">{{ item.taskStatus }}</span>
           </div>
           <!--出库经办人-->
-          <ws-form-item label="出库经办人:" span="1" prop="agent">
+          <ws-form-item label="出库经办人：" span="1" prop="agent">
             {{ item.agent }}
           </ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
@@ -62,7 +62,7 @@
             {{ item.predictDate }}
           </ws-form-item>
         </ws-info-table>
-        <ws-info-table class="inout" v-show="item.inOutType == '移库入库'">
+        <ws-info-table class="inout" v-if="item.inOutType == '移库入库'">
           <div class="library">
             <span style="margin-left: 14px">
               入货库：{{ item.warehouseName }}</span
@@ -70,7 +70,7 @@
             <span style="margin-left: 10px">{{ item.taskStatus }}</span>
           </div>
           <!--入库经办人-->
-          <ws-form-item label="入库经办人:" span="1" prop="agent">
+          <ws-form-item label="入库经办人：" span="1" prop="agent">
             {{ item.agent }}
           </ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
@@ -112,7 +112,7 @@
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.bulkDensity+'g/L(容)'"
+          v-model="this.bulkDensity + 'g/L(容)'"
         >
         </el-input>
         <el-divider direction="vertical" class="line1"></el-divider>
@@ -152,21 +152,21 @@
       <ws-info-table class="flow">
         <el-table :data="moveLookData" height="90" border style="width: 100%;">
           <el-table-column prop="weightOut" label="累计出库量（吨）">
-            <template>
+            <!-- <template> -->
               <div class="weights">{{ this.weightOut }}</div>
-            </template>
+            <!-- </template> -->
           </el-table-column>
           <el-table-column prop="weightIn" label="累计入库量（吨）">
-            <template>
+            <!-- <template> -->
               <div class="weights">{{ this.weightIn }}</div>
-            </template>
+            <!-- </template> -->
           </el-table-column>
           <el-table-column prop="transportLoss" label="累计运输损耗（吨）">
-            <template>
+            <!-- <template> -->
               <div class="weights">
                 {{ this.transportLoss }}
               </div>
-            </template>
+            <!-- </template> -->
           </el-table-column>
         </el-table>
       </ws-info-table>

src/views/taskManagement/tranManagementTransport.vue

@@ -22,9 +22,6 @@
             src="../../../public/img/header-add.png"
             alt=""
           />添加</ws-button>
-        <!-- <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="handlestatus(1)">执行中</ws-button>
-        <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="handlestatus('')">全部任务</ws-button> -->
       </template>
       <template slot="right">
         <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
@@ -55,7 +52,6 @@
           type="input"
           class="findValue"
         ></el-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <div class="search">
           <ws-button class="find" type="primary" @click="lookUp()">
             <img
@@ -80,7 +76,7 @@
         class="wenzi"
         :data="gainList.records"
         style="width: 100%; "
-        height="680"
+        height="780"
       >
         <el-table-column type="index" label="序号">
           <template scope="scope">
@@ -489,10 +485,10 @@ export default {
   width: 62px;
   text-align: right;
 }
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
+// .el-button--primary {
+//   background-color: #5878e8;
+//   border-color: #5878e8;
+// }
 .el-pagination{
   padding-top: 20px;
   text-align: center;
@@ -600,7 +596,6 @@ export default {
 .el-button--primary {
     background-color: #5878e8;
     border-color: #5878e8;
-    margin-left: 6px;
 }
 .el-pagination {
     white-space: nowrap;
@@ -609,4 +604,11 @@ export default {
     font-weight: 700;
 text-align: center;
 }
+.el-select{
+  width: 30%;
+    margin-right: 10px;
+}
+/deep/.typeselect .el-input__inner{
+   color: #8890B1;
+}
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -41,11 +41,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
-        <el-form-item prop="contractNo" label="合同编号" span="1">
-          <el-select v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" class="typeselect">
-          </el-select>
-        </el-form-item>
         <el-form-item prop="contractNo" label="合同编号/移库任务编号" span="1">
           <el-select
             v-model="deptBudgetList.contractNo"
@@ -74,9 +69,6 @@
           </el-select>
         </el-form-item>
         <el-form-item label="重量（吨）" span="1" prop="weight">
-
-          <el-input v-model="deptBudgetList.weight" placeholder="请输入重量" maxlength="20" size="small"></el-input>
-
           <el-input
           @input='weightchange'
             v-model="deptBudgetList.weight"
@@ -89,10 +81,6 @@
       </ws-info-table>
       <ws-info-table class="el-table">
         <div class="start-address" style="width : 36%">
-          <el-radio v-model="deptBudgetList.warehouseType" label="1">常用仓库发货</el-radio>
-          <el-radio v-model="deptBudgetList.warehouseType" label="2">临时仓库发货</el-radio>
-          <el-select v-model="deptBudgetList.sendWarehouse" placeholder="选择仓库" class="typeselect"></el-select>
-
           <el-radio-group @change='warehouseTypechange' v-model="deptBudgetList.warehouseType">
           <el-radio label="1"
             >常用仓库发货</el-radio
@@ -202,6 +190,7 @@
         <div class="driver">
           <span>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
           <img
+          v-if='!endflag'
             width="22"
             height="22"
             class="add"
@@ -217,22 +206,17 @@
             src="../../../public/img/del.png"
             alt
           />
-          <span
+          <!-- <span
             style="margin-left : 20px;font-size : 14px"
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
-          >最终阶段</span>
+          >最终阶段</span> -->
           <el-checkbox
           @change='engflagchange'
            class='endflag'
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             :label="1"
-          ></el-checkbox>
-          <el-checkbox
-            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
-            v-model="item.endFlag"
-            :label="2"
-          ></el-checkbox>
+          >最终阶段</el-checkbox>
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
@@ -774,13 +758,6 @@ export default {
               })
               return
             }
-            if (!this.deptBudgetList.tranProcessInfoList[i].contractNo) {
-              this.$message({
-                message:'合同编号不能为空',
-                type:'warning'
-              })
-              return
-            }
             
           }
 

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -192,7 +192,7 @@
               "
               v-if="scope.row.taskStatus == '待审核'"
               class="adjustment"
-              @click="delivery(scope.row)"
+              @click="audit(scope.row)"
             >
               审核
             </div>
@@ -381,14 +381,22 @@ export default {
     // },
     //编辑
     delivery(item) {
+      this.$router.push({
+        path: 'tranManagementWarehouseInOutTaskEdit',
+        query: {
+          relevanceId: item.relevanceId,
+        },
+      })
+    },
+    audit(item) {
       this.$router.push({
         path: 'tranManagementWarehouseInOutTaskaudit',
         query: {
           relevanceId: item.relevanceId,
+          taskId:item.taskId
         },
       })
     },
-
     getSpanArr(data) {
       let that = this
 
@@ -523,29 +531,29 @@ export default {
       this.currentPage = 1
       this.getList()
     },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
+    // async exportlist() {
+    //   const { data } = await export1(
+    //     {
+    //       compId: sessionStorage.getItem('ws-pf_compId'),
+    //       contractType: this.contractType,
+    //       currentPage: this.currentPage,
+    //       pageSize: this.pageSize,
+    //       searchType: this.searchType,
+    //       searchKeyWord: this.searchKeyWord,
+    //       startDate: this.startDate,
+    //       endDate: this.endDate,
+    //     },
+    //     {},
+    //     { responseType: 'blob' }
+    //   ).toPromise()
+    //   downloadFile({
+    //     res: data,
+    //     fileName: `${
+    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
+    //     }_采购合同`,
+    //     type: 'xls',
+    //   })
+    // },
   },
 }
 </script>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -653,7 +653,6 @@
       >
     </div>
   </div>
-  </div>
 </template>
 <script>
 import {

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -494,10 +494,10 @@
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
+            disabled
               v-model="dataList.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
-              @change="selectwarehouseName"
             >
               <el-option
                 v-for="item in warehouseNameList"
@@ -534,7 +534,7 @@
           <!-- 合同编号 -->
           <el-form-item v-if='dataList.taskTypeKey != 3' label="合同编号">
             <el-select
-            @change='changecontract'
+            disabled
               v-model="dataList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
@@ -565,7 +565,7 @@
           <!-- 货名 -->
           <el-form-item label="货名" class="huom" >
             <el-select
-            :disabled='dataList.taskTypeKey != 3'
+            disabled
               v-model="dataList.goodsName"
               placeholder="货名"
               class="huom"
@@ -582,7 +582,7 @@
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
-            :disabled='dataList.taskTypeKey == 4'
+            disabled
               v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
@@ -593,7 +593,7 @@
           <!-- 品级 -->
           <el-form-item label="品级">
             <el-select
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+            disabled
               v-model="dataList.grade"
               placeholder=""
               class="typeselect"
@@ -610,7 +610,7 @@
           <!--容重（克/升）>=-->
           <el-form-item label="容重（克/升）>=">
             <el-input
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+            disabled
               v-model="dataList.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
@@ -621,7 +621,7 @@
           <!--水分（%）<=-->
           <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+            disabled
               v-model="dataList.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
@@ -632,7 +632,7 @@
           <!--单价(元/吨)-->
           <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <el-input
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+            disabled
               v-model="dataList.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
@@ -701,7 +701,7 @@
         :rows="2"
         maxlength="30"
         placeholder="请输入驳回原因，1~30个字"
-        v-model="disableReason"
+        v-model="auditMind"
       >
       </el-input>
       <div class="dialog-footer">
@@ -785,6 +785,7 @@ export default {
       // 提交类型
       submitType: true,
       status: [],
+      auditMind:'',
       deletetask:false,
       warehouseNameList: [],
       warehouseNameList1: [],
@@ -979,9 +980,28 @@ export default {
           warehousetask(list)
             .toPromise()
             .then((response) => {
-              // woekflowhandle
-              // this.$message.success('添加成功')
-              // this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+              woekflowhandle({taskId:list.taskId,approved:true,auditMind:'34',needReapply:false}).toPromise()
+            .then((response) => {
+              this.$message.success('审核成功')
+              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+            })
+              
+            })
+    },
+    requestaudit(list, status) {
+          list.compId = sessionStorage.getItem('ws-pf_compId')
+          list.publisher =
+            sessionStorage.getItem('ws-pf_roleName') +
+            sessionStorage.getItem('ws-pf_staffName')
+          warehousetask(list)
+            .toPromise()
+            .then((response) => {
+              woekflowhandle({taskId:list.taskId,approved:true,auditMind:this.auditMind,needReapply:false}).toPromise()
+            .then((response) => {
+              this.$message.success('驳回成功')
+              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+            })
+              
             })
     },
     //提交按钮
@@ -1000,18 +1020,34 @@ export default {
         this.dataList.taskTypeKey == 4
       ) {
         this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-
         this.requestadd(this.dataList, 'repetition')
         this.dataList1.inOutTaskNo = this.inOutTaskNo1
-        this.dataList1.relevanceId = this.dataList.relevanceId
         if(!this.deletetask){
           this.requestadd(this.dataList1, 'repetition')
         }
       }
     },
     disableReasons(){
-
+      this.dataList.inOutFlag=1
+      this.dataList1.inOutFlag=2
+      if (this.dataList.taskTypeKey == 1) {
+        
+        this.dataList.inOutTaskNo = this.inOutTaskNo
+        this.requestaudit(this.dataList)
+      } else if (this.dataList1.taskTypeKey == 2) {
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        this.requestaudit(this.dataList1)
+      } else if (
+        this.dataList.taskTypeKey == 3 ||
+        this.dataList.taskTypeKey == 4
+      ) {
+        this.dataList.inOutTaskNo = this.inOutTaskNo
+        this.requestaudit(this.dataList, 'repetition')
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        if(!this.deletetask){
+          this.requestaudit(this.dataList1, 'repetition')
+        }
+      }
     },
     selectwarehouseName() {},
     tarechange(e) {

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -3,11 +3,6 @@
   <div>
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-        <!-- <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button> -->
       </template>
       <!-- 接单开始 -->
       <template slot="right">
@@ -49,7 +44,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
@@ -88,10 +82,10 @@
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
          
         </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send" width="">
+        <el-table-column class="table_td" label="发货" prop="send" >
           
         </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive" width="">
+        <el-table-column class="table_td" label="收货" prop="receive" >
           
         </el-table-column>
         <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
@@ -154,7 +148,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column class="table_td" label="接单时间" prop="receivingDate">
+      <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
             <template slot-scope="scope">

src/views/tranManagement/tranManagementShipping.vue

@@ -70,7 +70,7 @@
       >
         <el-table-column type="index" label="序号" width="80">
         </el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务编号" width="120">
+        <el-table-column class="table_td" prop="processNo" label="运输任务编号">
         </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
         </el-table-column>
@@ -144,7 +144,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="接单时间" prop="receivingDate">
+        <el-table-column class="table_td" label="接单日期" prop="createDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -3,11 +3,6 @@
   <div>
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-         <!-- <ws-button class="but"  :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but"  :type="primary == 2 ? 'primary' : ''" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but"  :type="primary == 3 ? 'primary' : ''" @click="statusquery()">全部任务</ws-button> -->
       </template>
       <!-- 接单开始 -->
       <template slot="right">
@@ -155,7 +150,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" class="table_td" label="接单时间">
+        <el-table-column prop="createDate" class="table_td" label="接单时间">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template  slot-scope="scope">

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -149,7 +149,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" class="table_td" label="接单时间">
+        <el-table-column prop="createDate" class="table_td" label="接单时间">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -99,22 +99,22 @@
           <ws-form-item label="姓名：" span="1" prop="driver">
             {{ item.driver }}
           </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
+         
           <!--电话-->
           <ws-form-item label="电话：" span="1" prop="driverPhone">
             {{ item.driverPhone }}
           </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
+        
           <!--发车日期-->
           <ws-form-item label="发车日期：" span="1" prop="sendDateStart">
             {{ item.sendDateStart }}
           </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
+          
           <!--到站日期-->
           <ws-form-item label="到站日期：" span="1" prop="receiveDateEnd">
             {{ item.receiveDateEnd }}
           </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
+          
           <!--车型-->
           <ws-form-item label="车型：" span="1" prop="carModel">
             {{ item.carModel }}
@@ -135,7 +135,6 @@
             >
               {{ items.trainNo }}
             </ws-form-item>
-               <el-divider direction="vertical" class="line" v-if="(index+1) % 5 != 0"></el-divider>
           </div>
         </ws-info-table>
       </div>
@@ -665,12 +664,13 @@ export default {
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 18.7%;
+  width: 20%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
+  width: 50%;
   background: #f5f7fa;
   border: none;
+  text-align: center;
 }
 /deep/.liaison .flex {
   display: contents;
@@ -681,13 +681,8 @@ export default {
   border: 1px solid #d8dce6;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-  // border: 0px solid #d8dce6;
-  border-radius: 0px;
-border: none;
-}
-.line{
-  height: 26px;
-  margin-top: 14px;
-  left: -34px;
+border-right: 1px solid #D8DCE6;
+padding: 0px;
+border-radius: 0px;
 }
 </style>

src/views/tranManagement/tranManagementVehicle.vue

@@ -3,11 +3,6 @@
   <div>
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-        <!-- <ws-button class="but" :type="searchType == 1?'primary':''" @click="changestatus(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" :type="searchType == 2?'primary':''" @click="changestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="searchType == undefined?'primary':''" @click="changestatus()">全部任务</ws-button> -->
       </template>
       <!-- 接单开始 -->
       <template slot="right">

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -600,7 +600,7 @@ export default {
 
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: left;
+  text-align: center;
   font-size: 14px;
   font-weight: 400;
   color: #8890b1;

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -6,7 +6,12 @@
         <h2 class="bg-left title">查看派车详情</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="revert()"
+        >
           <img
             width="6"
             height="10"
@@ -19,14 +24,20 @@
     </el-row>
 
     <ws-form ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
-      <div class="small-title" style="font-size: 16px;">任务详情</div>
+      <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
-        <ws-form-item label="任务编号" span="1" prop="processNo">{{ deptBudgetList.processNo }}</ws-form-item>
+        <ws-form-item label="任务编号" span="1" prop="processNo">{{
+          deptBudgetList.processNo
+        }}</ws-form-item>
         <!--货名-->
-        <ws-form-item label="货名" span="1" prop="goodsName">{{ deptBudgetList.goodsName }}</ws-form-item>
+        <ws-form-item label="货名" span="1" prop="goodsName">{{
+          deptBudgetList.goodsName
+        }}</ws-form-item>
         <!--重量（吨）-->
-        <ws-form-item label="重量（吨）" span="1" prop="weight">{{ deptBudgetList.weight }}</ws-form-item>
+        <ws-form-item label="重量（吨）" span="1" prop="weight">{{
+          deptBudgetList.weight
+        }}</ws-form-item>
 
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
@@ -35,12 +46,9 @@
         </ws-form-item>
 
         <!--发货人-->
-        <ws-form-item
-          label="发货人"
-          span="1"
-          prop="sender"
-          class="readonly"
-        >{{ deptBudgetList.sender }}</ws-form-item>
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">{{
+          deptBudgetList.sender
+        }}</ws-form-item>
 
         <!--发货人电话-->
         <ws-form-item
@@ -48,32 +56,35 @@
           span="1"
           prop="senderPhone"
           class="readonly"
-        >{{ deptBudgetList.senderPhone }}</ws-form-item>
+          >{{ deptBudgetList.senderPhone }}</ws-form-item
+        >
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
         <!--收货人-->
-        <ws-form-item label="收货人" span="1" prop="receiver">{{ deptBudgetList.receiver }}</ws-form-item>
+        <ws-form-item label="收货人" span="1" prop="receiver">{{
+          deptBudgetList.receiver
+        }}</ws-form-item>
         <!--收货人电话-->
-        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{ deptBudgetList.receiverPhone }}</ws-form-item>
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{
+          deptBudgetList.receiverPhone
+        }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item
-          label="发货日期"
-          span="1"
-          prop="deliveryDateStart"
-        >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">{{
+          deptBudgetList.deliveryDateStart
+        }}</ws-form-item>
         <!--最晚到货日期-->
-        <ws-form-item
-          label="最晚到货日期"
-          span="1"
-          prop="deliveryDateEnd"
-        >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">{{
+          deptBudgetList.deliveryDateEnd
+        }}</ws-form-item>
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
+        <ws-form-item label="合同编号" span="1" prop="contractNo">{{
+          deptBudgetList.contractNo
+        }}</ws-form-item>
       </ws-info-table>
-      <div class="small-title" style="font-size: 16px;">派车</div>
+      <div class="small-title" style="font-size: 16px">派车</div>
       <div
         style="width: 100%"
         class="driver"
@@ -84,35 +95,86 @@
           <div class="catNos">
             司机-{{ index + 1 }}
             <span class="noservice" v-show="item.status == '未送达'">
-              {{
-              item.status
-              }}
+              {{ item.status }}
             </span>
             <span class="service" v-show="item.status == '已送达'">
-              {{
-              item.status
-              }}
+              {{ item.status }}
             </span>
           </div>
           <!--姓名-->
-          <ws-form-item label="姓名" span="1" prop="driver">{{ item.driver }}</ws-form-item>
+          <ws-form-item label="姓名" span="1" prop="driver">{{
+            item.driver
+          }}</ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item class="phone" label="电话" span="1" prop="driverPhone">{{ item.driverPhone }}</ws-form-item>
+          <ws-form-item
+            class="phone"
+            label="电话"
+            span="1"
+            prop="driverPhone"
+            >{{ item.driverPhone }}</ws-form-item
+          >
           <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="车牌号" span="1" prop="carNo">{{ item.carNo }}</ws-form-item>
+          <ws-form-item label="车牌号" span="1" prop="carNo">
+            <template slot-scope="scope">
+            <el-popover
+              placement="top"
+              :width="160"
+              trigger="hover"
+              visible-arrow="false"
+              @show="hover(scope.row)"
+            >
+              <template>
+                <span slot="reference">
+                  <span
+                    class="executory"
+                  >
+                  {{ item.carNo }}
+                  </span>
+                </span>
+              </template>
+              <div>
+                  <span>车型：</span>
+                  <span>{{item.carModel }}</span>
+                  <br>
+                  <span>车长（米）：</span>
+                  <span>{{item.carLength}}</span>
+                  <br>
+                   <span>载重（吨）：</span>
+                  <span>{{item.loadWeight}}</span>
+              </div>
+            </el-popover>
+          </template>
+          </ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">{{ item.loadNetWeight }}</ws-form-item>
+          <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">{{
+            item.loadNetWeight
+          }}</ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="卸车（吨）" span="1" prop="unloadNetWeight">{{ item.unloadNetWeight }}</ws-form-item>
+          <ws-form-item label="卸车（吨）" span="1" prop="unloadNetWeight">{{
+            item.unloadNetWeight
+          }}</ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="损耗（吨）" span="1" prop="loss">{{ item.loss }}</ws-form-item>
+          <ws-form-item label="损耗（吨）" span="1" prop="loss">{{
+            item.loss
+          }}</ws-form-item>
           <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="合同" span="1" prop="unloadNetWeight" class="hetong"></ws-form-item>
+          <ws-form-item
+            label="合同"
+            span="1"
+            prop="unloadNetWeight"
+            class="hetong"
+          ></ws-form-item>
         </ws-info-table>
       </div>
     </ws-form>
     <div style="text-align: right; padding: 10px">
-      <el-button class="bg-bottom-up" type="primary" size="small" @click="revert()">关闭</el-button>
+      <el-button
+        class="bg-bottom-up"
+        type="primary"
+        size="small"
+        @click="revert()"
+        >关闭</el-button
+      >
     </div>
   </div>
 </template>
@@ -126,7 +188,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination
+    Pagination,
   },
   watch: {
     // vesselId(val) {
@@ -134,7 +196,7 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    }
+    },
   },
   data() {
     return {
@@ -149,54 +211,40 @@ export default {
       showType: true,
       // 年
       year: '',
-      disabled: true,
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
-      searchKeyWord: '',
-      contractType: 2,
       startDate: null,
       endDate: null,
-      goodnameList: {},
       // 提交类型
       submitType: true,
-      storageType: [],
       readonly: true,
-      appendixIdsAdd: '',
-      uploadSuccess: {},
-      onChange: {},
-      gradeList: [],
       rules: {
         netWeight: [
           {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur'
-          }
-        ]
+            trigger: 'blur',
+          },
+        ],
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM')
+        month: dayjs().format('MM'),
       },
-      contractList: [],
       deptBudgetList: {
-        warehouseInOutDetail: {}
+        warehouseInOutDetail: {},
       },
-      historyList: [],
-
       pickerBeginDateBefore: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
-        }
+        },
       },
-      accessoryTFs: false
+      accessoryTFs: false,
     }
   },
   activated() {
@@ -215,7 +263,7 @@ export default {
     getList() {
       seeCat({ id: this.$route.query.id })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           for (var i = 0; i < response.tranCarInfoList.length; i++) {
             if (
               response.tranCarInfoList[i].loadNetWeight &&
@@ -237,26 +285,13 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id }
+        query: { id: row.id },
       })
     },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    // handleCloe() {
-    //   this.dialogViewSpareMoney = false
-    // },
-    // history(row) {
-    //   billoperatehis({ id: row.id })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.historyList = response
-    //     })
-    // },
-    // deletecontract(){},
     //删除
     approve() {},
-    listQuery() {}
-  }
+    listQuery() {},
+  },
 }
 </script>
 <style lang="scss" scoped>

vue.config.js

@@ -145,7 +145,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.116:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',