前端孟祥旭

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -33,63 +33,65 @@
         >移库任务编号:
         <span style="font-weight: 600">{{ this.moveTaskNo }}</span></span
       >
-      <div v-for="(item, index) in moveLookData" :key="index">
-        <ws-info-table class="inout" v-if="item.inOutType == '移库出库'">
-          <!--出货库-->
-          <div class="library">
-            <span style="margin-left: 14px"
-              >出货库：{{ item.sendWarehouse }}</span
-            >
-            <span style="margin-left: 10px">{{ item.taskStatus }}</span>
-          </div>
-          <!--出库经办人-->
-          <ws-form-item label="出库经办人：" span="1" prop="agent">
-            {{ item.agent }}
-          </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
-          <!--出库重量（吨）-->
-          <ws-form-item label="出库重量（吨）：" span="1" prop="weight">
-            {{ item.weight }}
-          </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
-          <!--仓位-->
-          <ws-form-item label="仓位：" span="1" prop="deliveryVolume">
-            {{ item.binNumber == null ? '未指定' : item.binNumber }}
-          </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
-          <!--预计出库日期-->
-          <ws-form-item label="预计出库日期：" span="1" prop="predictDate">
-            {{ item.predictDate }}
-          </ws-form-item>
-        </ws-info-table>
-        <ws-info-table class="inout" v-if="item.inOutType == '移库入库'">
-          <div class="library">
-            <span style="margin-left: 14px">
-              入货库：{{ item.warehouseName }}</span
-            >
-            <span style="margin-left: 10px">{{ item.taskStatus }}</span>
-          </div>
-          <!--入库经办人-->
-          <ws-form-item label="入库经办人：" span="1" prop="agent">
-            {{ item.agent }}
-          </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
-          <!--入库重量（吨）-->
-          <ws-form-item label="入库重量（吨）:" span="1" prop="weight">
-            {{ item.weight }}
-          </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
-          <!-- 仓位 -->
-          <ws-form-item label="仓位：" span="1" prop="deliveryVolume">
-            {{ item.binNumber == null ? '未指定' : item.binNumber }}
-          </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
-          <!--预计入库日期-->
-          <ws-form-item label="预计入库日期：" span="1" prop="predictDate">
-            {{ item.predictDate }}
-          </ws-form-item>
-        </ws-info-table>
-      </div>
+      <!-- <div v-for="(item, index) in shipment" > -->
+      <ws-info-table class="inout">
+        <!--出货库-->
+        <div class="library">
+          <span style="margin-left: 14px"
+            >出货库：{{ this.shipment.sendWarehouse }}</span
+          >
+          <span style="margin-left: 10px">{{ this.shipment.taskStatus }}</span>
+        </div>
+        <!--出库经办人-->
+        <ws-form-item label="出库经办人：" span="1" prop="agent">
+          {{ this.shipment.agent }}
+        </ws-form-item>
+        <el-divider direction="vertical" class="line"></el-divider>
+        <!--出库重量（吨）-->
+        <ws-form-item label="出库重量（吨）：" span="1" prop="weight">
+          {{ shipment.weight }}
+        </ws-form-item>
+        <el-divider direction="vertical" class="line"></el-divider>
+        <!--仓位-->
+        <ws-form-item label="仓位：" span="1" prop="deliveryVolume">
+          {{ shipment.binNumber == null ? '未指定' : shipment.binNumber }}
+        </ws-form-item>
+        <el-divider direction="vertical" class="line"></el-divider>
+        <!--预计出库日期-->
+        <ws-form-item label="预计出库日期：" span="1" prop="predictDate">
+          {{ shipment.predictDate }}
+        </ws-form-item>
+      </ws-info-table>
+      <!-- </div> -->
+      <!-- <div v-for="(items,index) in enter">  -->
+      <ws-info-table class="inout">
+        <div class="library">
+          <span style="margin-left: 14px">
+            入货库：{{ enter.warehouseName }}</span
+          >
+          <span style="margin-left: 10px">{{ enter.taskStatus }}</span>
+        </div>
+        <!--入库经办人-->
+        <ws-form-item label="入库经办人：" span="1" prop="agent">
+          {{ enter.agent }}
+        </ws-form-item>
+        <el-divider direction="vertical" class="line"></el-divider>
+        <!--入库重量（吨）-->
+        <ws-form-item label="入库重量（吨）:" span="1" prop="weight">
+          {{ enter.weight }}
+        </ws-form-item>
+        <el-divider direction="vertical" class="line"></el-divider>
+        <!-- 仓位 -->
+        <ws-form-item label="仓位：" span="1" prop="deliveryVolume">
+          {{ enter.binNumber == null ? '未指定' : enter.binNumber }}
+        </ws-form-item>
+        <el-divider direction="vertical" class="line"></el-divider>
+        <!--预计入库日期-->
+        <ws-form-item label="预计入库日期：" span="1" prop="predictDate">
+          {{ enter.predictDate }}
+        </ws-form-item>
+      </ws-info-table>
+      <!-- </div> -->
       <ws-info-table class="goods">
         <!--货物信息-->
         <div class="library">
@@ -119,21 +121,21 @@
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.waterContent+'%(水)'"
+          v-model="this.waterContent + '%(水)'"
         >
         </el-input>
         <el-divider direction="vertical" class="line1"></el-divider>
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.weight+'(吨)'"
+          v-model="this.weight + '(吨)'"
         >
         </el-input>
         <el-divider direction="vertical" class="line1"></el-divider>
         <el-input
           placeholder="信息暂无"
           :disabled="true"
-          v-model="this.unitPrice +'(元/吨)'"
+          v-model="this.unitPrice + '(元/吨)'"
         >
         </el-input>
       </ws-info-table>
@@ -150,34 +152,28 @@
       />
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
       <ws-info-table class="flow">
-        <el-table :data="moveLookData" height="90" border style="width: 100%;">
+        <el-table :data="weights" height="90" border style="width: 100%">
           <el-table-column prop="weightOut" label="累计出库量（吨）">
-            <!-- <template> -->
-              <div class="weights">{{ this.weightOut }}</div>
-            <!-- </template> -->
           </el-table-column>
           <el-table-column prop="weightIn" label="累计入库量（吨）">
-            <!-- <template> -->
-              <div class="weights">{{ this.weightIn }}</div>
-            <!-- </template> -->
           </el-table-column>
-          <el-table-column prop="transportLoss" label="累计运输损耗（吨）">
-            <!-- <template> -->
-              <div class="weights">
-                {{ this.transportLoss }}
-              </div>
-            <!-- </template> -->
+          <el-table-column prop="transportLoss" label="累计运输损耗（吨）"> 
+            <!-- <template scope="scope">
+              {{weightOut}}
+            </template> -->
           </el-table-column>
         </el-table>
       </ws-info-table>
       <ws-info-table class="flow1">
-        <el-table :data="moveLookData" height="90" border style="width: 100%">
-          <el-table-column prop="stockReturnCount" label="累计退库量（吨）">
-            <template>
-              <div class="weights">
-                {{ this.retreat == null ? 0 : this.retreat }}
-              </div>
-            </template>
+        <el-table :data="enter.inOutWarehouseTaskList"  border style="width: 100%">
+          <el-table-column prop="weight" label="累计退库量（吨）">
+            <!-- <template>
+              <div>30</div>
+            </template> -->
+             <template scope="scope">
+              {{scope.row.weight}}<span style="margin: 0 20px">至</span>{{scope.row.warehouseName}}
+              <div></div>
+            </template> 
           </el-table-column>
         </el-table>
       </ws-info-table>
@@ -240,10 +236,20 @@ export default {
       unitList: [],
       name: '',
       moveLookData: [],
+      shipment: {},
+      enter: {},
       moveTaskNo: '',
+      weights:[
+        {},
+        // {weightIn: 0},
+        // { transportLoss: 0}
+      ],
       weightOut: 0,
       weightIn: 0,
       transportLoss: 0,
+
+      weightIn: 0,
+     
       retreat: 0,
       goodsName: '',
       grade: '',
@@ -251,7 +257,7 @@ export default {
       waterContent: 0,
       weight: 0,
       unitPrice: 0,
-      businessDescribe:'',
+      businessDescribe: '',
     }
   },
 
@@ -297,13 +303,20 @@ export default {
           this.moveLookData = response
           for (var i = 0; i < this.moveLookData.length; i++) {
             if (this.moveLookData[i].inOutType == '移库出库') {
-              this.weightOut = this.moveLookData[i].weight
-              this.retreat = this.moveLookData[i].stockReturnCount
-                 this.businessDescribe = this.moveLookData[i].businessDescribe
-            } else {
-              this.weightIn = this.moveLookData[i].weight
+              this.shipment = this.moveLookData[i]
+               this.weightOut = this.moveLookData[i].weight
+               this.$set(this.weights[0],'weightOut',this.moveLookData[i].weight)
+              // this.weights.splice(1,1,{weightOut:this.moveLookData[i].weight})
+
+            } else  {
+              // if (this.moveLookData[i].inOutType == '移库入库')
+              this.enter = this.shipment = this.moveLookData[i]
+                this.weightIn = this.moveLookData[i].weight
+                this.$set(this.weights[0],'weightIn',this.moveLookData[i].weight)
+              this.businessDescribe = this.moveLookData[i].businessDescribe
             }
-            this.transportLoss = this.weightOut - this.weightIn
+            console.log(this.weights)
+           this.transportLoss = this.weightOut - this.weightIn
             this.goodsName = this.moveLookData[0].goodsName
             this.grade = this.moveLookData[0].grade
             this.bulkDensity = this.moveLookData[0].bulkDensity
@@ -610,8 +623,8 @@ export default {
 .line1 {
   height: 50px;
 }
-/deep/.is-disabled .el-input__inner{
-   margin-top: 4px;
+/deep/.is-disabled .el-input__inner {
+  margin-top: 4px;
 }
 //业务描述
 /deep/.el-textarea {
@@ -663,8 +676,11 @@ export default {
 /deep/.el-textarea__inner {
   border: none;
 }
-/deep/.el-table th>.cell{
-    color: #000 !important;
-    font-weight: 400;
+/deep/.el-table th > .cell {
+  color: #000 !important;
+  font-weight: 400;
+}
+/deep/.el-table td{
+  text-align: center;
 }
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -135,13 +135,14 @@
           style="width: 36%"
         >
           <el-select
+          @change='sendWarehousechange1'
             v-model="deptBudgetList.receiveWarehouse"
             :disabled="warehouse"
             placeholder="请输入收货库点"
             style="width: 100%"
           >
             <el-option
-              v-for="item in warehouseList"
+              v-for="item in warehouseList1"
               :key="item.constKey"
               :label="item.warehouseName"
               :value="item.warehouseName"
@@ -409,6 +410,7 @@ export default {
       mainReportAdd: {},
       appendixIdsAdd: '',
       warehouseList: [],
+      warehouseList1: [],
       size: 10,
       value1: '',
       unitList: [],
@@ -454,6 +456,18 @@ export default {
         }
       }
     },
+    sendWarehousechange1(e){
+      for (let i = 0; i < this.warehouseList1.length; i++) {
+        if(this.warehouseList1[i].warehouseName==e){
+          var tmp=[]
+          tmp[0]=TextToCode[this.warehouseList1[i].warehousePrivate].code
+          tmp[1]=TextToCode[this.warehouseList1[i].warehousePrivate][this.warehouseList1[i].warehouseCity].code
+          tmp[2]=TextToCode[this.warehouseList1[i].warehousePrivate][this.warehouseList1[i].warehouseCity][this.warehouseList1[i].warehouseArea].code
+          this.selectedOptions1=tmp
+          this.deptBudgetList.endDetailedAddress=this.warehouseList1[i].detailedAddress
+        }
+      }
+    },
     warehouseTypechange(){
         getwarehousename({
         compId: this.compId,
@@ -529,6 +543,14 @@ export default {
         .then(response => {
           this.warehouseList = response
         })
+        getwarehousename({
+        compId: this.compId,
+        warehouseType: 1
+      })
+        .toPromise()
+        .then(response => {
+          this.warehouseList1 = response
+        })
       xialaNo({
         compId: this.compId
       })

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -24,10 +24,6 @@
     <div class="basicInformation">
       <div class="annu">
         <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        <!-- <el-radio label="1" class="a">出库</el-radio>
-        <el-radio label="2" class="a">入库</el-radio>
-        <el-radio label="3" class="a">移库</el-radio>
-        <el-radio label="4" class="a">退库并出库</el-radio> -->
       </el-radio-group>
         <div class="nav">
         <span class="ziti">
@@ -270,7 +266,7 @@
         </div>
         <el-form v-if='!deletetask' ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
-          <el-form-item label="仓库名">
+          <el-form-item label="仓库名" v-if="dataList1.inOutType == '移库出库'">
             <el-select
             disabled
               v-model="dataList1.warehouseName"
@@ -286,7 +282,7 @@
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
-          <el-form-item label="入库类型">
+          <el-form-item label="入库类型" v-if="dataList1.inOutType == '移库出库'">
             <el-select
             disabled
               v-model="dataList1.inOutType"
@@ -508,7 +504,7 @@
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
-          <el-form-item label="出库类型">
+          <el-form-item label="出库类型" >
             <el-select              
             :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
               v-model="dataList.inOutType"
@@ -828,7 +824,6 @@ export default {
     }
   },
   activated() {
-    console.log(1111)
     this.getList()
   },
   methods: {
@@ -1236,18 +1231,6 @@ export default {
         .then((response) => {
           this.contractNoList = response
         })
-      // //临时仓库入库类型
-      // pullDown({ constId: 'WARE1' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.storageType = respons
-      //   })
-      // //临时仓库出库类型
-      // pullDown({ constId: 'WARE2' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.deliveryType = response
-      //   })
       //仓库名
       getwarehousename({
         compId: this.compId,
@@ -1301,7 +1284,6 @@ export default {
         query: { id: row.id },
       })
     },
-
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -1314,38 +1296,6 @@ export default {
           this.historyList = response
         })
     },
-
-    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',
-      })
-    },
-
-    // deletecontract(){},
-    //删除
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
   },
 }
 </script>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -218,6 +218,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       feedbackFlag: 1,
+      searchType:1,
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -107,22 +107,22 @@
             </ws-form-item>
            <el-divider direction="vertical" class="line"></el-divider>
             <!--电话-->
-            <ws-form-item label="电话" span="1" prop="driverPhone">
+            <ws-form-item label="电话:" span="1" prop="driverPhone">
               <span>{{ item.driverPhone }} </span>
             </ws-form-item>
              <el-divider direction="vertical" class="line"></el-divider>
             <!--车牌号-->
-            <ws-form-item label="车牌号" span="1" prop="carNo">
+            <ws-form-item label="车牌号:" span="1" prop="carNo">
               <span>{{ item.carNo }} </span>
             </ws-form-item>
              <el-divider direction="vertical" class="line"></el-divider>
             <!--装车净重-->
-            <ws-form-item label="净重(吨)" span="1" prop="loadNetWeight">
+            <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">
+            <ws-form-item label="卸车净重(吨):" span="1" prop="unloadNetWeight">
               {{ item.unloadNetWeight }}
             </ws-form-item>
              <el-divider direction="vertical" class="line"></el-divider>
@@ -715,22 +715,15 @@ activated(){
   border-top: 0px;
 }
 .ws-info-table .el-form-item .el-form-item__content {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+  border: none;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+  border: none;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
   border-radius: 4px;
   border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
   margin-bottom: 5px;
   background-color: #fff;
   font-size: 14px;
@@ -754,6 +747,7 @@ activated(){
 }
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
+  padding: 0px;
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {

src/views/tranManagement/tranManagementShippingLook.vue

@@ -101,52 +101,52 @@
         <div style="margin: 18px;color: #69708C;">航次信息</div>
             <ws-info-table>
               <!-- 姓名 -->
-              <ws-form-item label="姓名" span="1" prop="driver" class="siji">
+              <ws-form-item label="姓名:" span="1" prop="driver" class="siji">
                {{item.driver}}
               </ws-form-item>
-              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 电话 -->
               <ws-form-item
-                label="电话"
+                label="电话:"
                 span="1"
                 prop="driverPhone"
                 class="siji"
               >
                 {{ item.driverPhone }}
               </ws-form-item>
-              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!--发船日期-->
               <ws-form-item
-                label="发船日期"
+                label="发船日期:"
                 span="1"
                 prop="sendDateStart"
                 class="siji"
               >
                 {{ item.sendDateStart }}
               </ws-form-item>
-              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <ws-form-item
-                label="预计到港日期"
+                label="预计到港日期:"
                 span="1"
                 prop="receiveDateEnd"
                 class="siji"
               >
                 {{ item.receiveDateEnd }}
               </ws-form-item>
-              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 船名 -->
-              <ws-form-item label="船名" span="1" prop="shipName" class="siji">
+              <ws-form-item label="船名:" span="1" prop="shipName" class="siji">
                 {{ item.shipName }}
               </ws-form-item>
-            <el-divider direction="vertical" class="line"></el-divider>
+            <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 航次 -->
-              <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
+              <ws-form-item label="航次:" span="1" prop="shipNo" class="siji">
                 {{ item.shipNo }}
               </ws-form-item>
 
-              <el-divider direction="vertical" class="line"></el-divider>
+              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 类型 -->
-              <ws-form-item label="类型" span="1" prop="shipType" class="siji">
+              <ws-form-item label="类型:" span="1" prop="shipType" class="siji">
                 {{ item.shipType }}
               </ws-form-item>
               <ws-form-item
@@ -395,26 +395,6 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    // getList() {
-    //   // 货名
-    //   pullDown({ constId: 'CON2' })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.goodnameList = response
-    //     })
-    //   // 品级
-    //   pullDown({ constId: 'CON3' })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.gradeList = response
-    //     })
-    //   // 类型
-    //   pullDown({ constId: 'CON5' })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.storageType = response
-    //     })
-    // },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {
@@ -563,6 +543,8 @@ export default {
 }
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
+  border-right: 1px solid #D8DCE6;
+  border-radius: 0px;
 }
 /deep/.ws-class-table-col {
   height: auto;
@@ -603,7 +585,7 @@ export default {
   line-height: 16px;
 }
 .position .siji {
-  width: 13%;
+  width: 14.28%;
 }
 .el-form {
   height: 1000px;

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -107,19 +107,19 @@
             </ws-form-item>
 
             <!--电话-->
-            <ws-form-item label="司机电话" span="1" prop="driverPhone">
+            <ws-form-item label="司机电话:" span="1" prop="driverPhone">
               <span>{{ item.driverPhone }} </span>
             </ws-form-item>
             <!--车牌号-->
-            <ws-form-item label="车牌号" span="1" prop="carNo">
+            <ws-form-item label="车牌号:" span="1" prop="carNo">
               <span>{{ item.carNo }} </span>
             </ws-form-item>
             <!--装车(吨)-->
-            <ws-form-item label="装车净重(吨)" span="1" prop="loadNetWeight">
+            <ws-form-item label="装车净重(吨):" span="1" prop="loadNetWeight">
               {{ item.loadNetWeight }}
             </ws-form-item>
             <!--磅单-->
-            <ws-form-item label="磅单" span="1" prop="loadPoundImg">
+            <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
                 <img
                   width="18"
@@ -715,13 +715,16 @@ height: 50px;
 }
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
+  border-right: 1px solid #D8DCE6;
+  border-radius: 0px;
+  padding: 0px;
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
   width: 20%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
+  width: 50%;
   background: #F6F7FC;
 }
 /deep/.liaison .flex {
@@ -748,7 +751,7 @@ margin-top: 20px;
   border-radius: 3px;
   border: 1px solid #5473e8;
   padding: 0 3px;
-  margin-left: 90px;
+  margin-left: 30px;
   color: #ffffff;
   background: #c4cada;
   line-height: 24px;
@@ -759,7 +762,7 @@ margin-top: 20px;
   border-radius: 3px;
   border: 1px solid #5473e8;
   padding: 0 3px;
-  margin-left: 90px;
+  margin-left: 30px;
   color: #5473E8;
   line-height: 24px;
 }

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -216,6 +216,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       deptBudgetTotal: 0,
+      searchType:1,
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -102,19 +102,19 @@
             </span>
           </div>
           <!--姓名-->
-          <ws-form-item label="姓名" span="1" prop="driver">{{
+          <ws-form-item label="姓名:" span="1" prop="driver">{{
             item.driver
           }}</ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
+          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
           <ws-form-item
             class="phone"
-            label="电话"
+            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">
+          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
+          <ws-form-item label="车牌号:" span="1" prop="carNo">
             <template slot-scope="scope">
             <el-popover
               placement="top"
@@ -145,21 +145,21 @@
             </el-popover>
           </template>
           </ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">{{
+          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
+          <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">{{
+          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
+          <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">{{
+          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
+          <ws-form-item label="损耗（吨）:" span="1" prop="loss">{{
             item.loss
           }}</ws-form-item>
-          <el-divider direction="vertical" class="line"></el-divider>
+          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
           <ws-form-item
-            label="合同"
+            label="合同:"
             span="1"
             prop="unloadNetWeight"
             class="hetong"
@@ -440,10 +440,10 @@ export default {
   font-size: 14px;
 }
 /deep/.driver .ws-info-table .el-form-item {
-  width: 13.1%;
+  width: 14.286%;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
-  width: 86px;
+  width: 50%;
   text-align: center;
   background: #f6f7fb;
   font-size: 14px;
@@ -459,7 +459,7 @@ export default {
   margin-left: 15px;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__content {
-  // border-right: 1px solid #8890b1;
+   border-right: 1px solid #D8DCE6;
   background: #f6f7fb;
   font-size: 14px;
   color: #8890b1;