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

src/api/V2/taskspost/index.js

@@ -18,6 +18,10 @@ export const API_POST_TRAN_DEL = '/tranTaskInfo/api/deleteTranTask'
 export const API_GET_TRAN_EXAMINE = '/tranTaskInfo/getTranTask'
 // 运输任务-编辑
 export const API_GET_TRAN_EDIT = '/tranTaskInfo/api/editTranTask'
+// 审核通过不通过接口
+export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+// 审核编辑
+export const API_POST_INOUTWAREHOUSETASK = `/inOutWarehouseTask/api/checkOrUpdateInOutTask`
 // 出入库任务-新增（编辑）
 export const API_POST_OUT_PUT = '/inOutWarehouseTask/api/insertOrUpdateInOutTask'
 // 出入库任务-列表

src/model/tasksport/index.js

@@ -8,6 +8,7 @@ import {
     API_POST_TRAN_LOOK,
     API_GET_TRAN_TASK_WAREHOUSE,
     API_GET_WAREHOUSE_NO,
+    API_POST_WORKFLOW_API_HANDLE,
     API_POST_TRAN_DEL,
     API_GET_TRAN_EXAMINE,
     API_GET_TRAN_EDIT,
@@ -17,6 +18,7 @@ import {
     API_POST_OUT_DEL,
     API_GET_CONTRACT_GOODSNAME,
     API_GET_OUT_MOVE,
+    API_POST_INOUTWAREHOUSETASK,
     API_GET_OUT_MOVELOOK,
     API_POST_OUT_STATES,
     API_POST_OUT_MOVESTATES
@@ -27,6 +29,10 @@ export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filt
 export const addtrantask = appRx.post(API_POST_TRAN_ADD, errorCatcher, errorHandle, filter)
 // 识别身份证
 export const getidentity = appRx.get(API_POST_PERSON, errorCatcher, errorHandle, filter)
+// 审核通过不通过
+export const woekflowhandle = appRx.post(API_POST_WORKFLOW_API_HANDLE, errorCatcher, errorHandle, filter)
+// 审核编辑
+export const warehousetask = appRx.post(API_POST_INOUTWAREHOUSETASK, errorCatcher, errorHandle, filter)
 //运输任务查看
 export const lookTranTask = appRx.get(API_POST_TRAN_LOOK, errorCatcher, errorHandle, filter)
 //运输任务-添加-根据仓库类型选库名

src/views/taskManagement/component/routers/route.js

@@ -125,7 +125,7 @@ const tranManagementRouter = {
       meta: {
         title: 'inOutWarehouseTaskEdit',
         shortcutEntrance: 'tranManagement',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.view',
+        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
       },
       hidden: true
     },
@@ -163,7 +163,7 @@ const tranManagementRouter = {
     {
       path: 'tranManagementWarehouseInOutTaskaudit',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskEdit'),
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAudit'),
       name: 'tranManagementWarehouseInOutTaskEdit',
       meta: {
         title: 'tranManagementWarehouseInOutTaskaudit',

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -858,7 +858,7 @@ export default {
   display: inline-block;
 }
 .center1 .small-title {
-  margin-left: 150px;
+  margin-left: 323px;
 }
 .center1 {
   width: 90%;
@@ -894,6 +894,7 @@ export default {
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
+  margin-left: 130px;
 }
 .a {
   margin-left: -32px;
@@ -919,7 +920,7 @@ export default {
   font-weight: 400;
   color: #8890b1;
   line-height: 20px;
-  margin-left: 130px;
+  margin-left: 314px;
   /* margin-top: 112px; */
 }
 /deep/.ziti1 {
@@ -929,8 +930,8 @@ export default {
   font-weight: 500;
   color: #262626;
   line-height: 20px;
-  margin-left: 206px;
-  margin-top: -23px;
+  margin-left: 381px;
+  margin-top: -21px;
   width: 100px;
 }
 .winseaview-view {
@@ -960,7 +961,7 @@ export default {
   line-height: 14px;
 }
 .nav {
-  width: 200px;
+  width: 400px;
   height: 20px;
 }
 </style>

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

@@ -33,63 +33,69 @@
         >移库任务编号:
         <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 == '移库出库'">
-          <!--出货库-->
-          <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-show="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"
+            >出货库：{{ shipment1.sendWarehouse }}</span
+          >
+          <span class="status" v-show="shipment1.taskStatus == '待审核'">{{ shipment1.taskStatus }}</span>
+           <span class="status2" v-show="shipment1.taskStatus == '执行中'">{{ shipment1.taskStatus }}</span>
+          <span class="status1" v-show="shipment1.taskStatus == '已完成'">{{ shipment1.taskStatus }}</span>
+        </div>
+        <!--出库经办人-->
+        <ws-form-item label="出库经办人：" span="1" prop="agent">
+          {{shipment1.agent}}
+        </ws-form-item>
+        <el-divider direction="vertical" class="line"></el-divider>
+        <!--出库重量（吨）-->
+        <ws-form-item label="出库重量（吨）：" span="1" prop="weight">
+          {{ shipment1.weight }}
+        </ws-form-item>
+        <el-divider direction="vertical" class="line"></el-divider>
+        <!--仓位-->
+        <ws-form-item label="仓位：" span="1" prop="deliveryVolume">
+          {{ shipment1.binNumber == null ? '未指定' : shipment1.binNumber }}
+        </ws-form-item>
+        <el-divider direction="vertical" class="line"></el-divider>
+        <!--预计出库日期-->
+        <ws-form-item label="预计出库日期：" span="1" prop="predictDate">
+          {{ shipment1.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 class="status" v-show="enter.taskStatus == '待审核'">{{ enter.taskStatus }}</span>
+            <span class="status2" v-show="enter.taskStatus == '执行中'">{{ enter.taskStatus }}</span>
+          <span class="status1" v-show="enter.taskStatus  == '已完成'">{{ 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">
@@ -112,28 +118,28 @@
         <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>
         <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 +156,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"  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>
+          <el-table-column prop="transportLoss" label="累计运输损耗（吨）"> 
+            <template scope="scope">
+              {{scope.row.weightOut - scope.row.weightIn}}
             </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 >
+             {{this.enter.stockReturnCount}}
+            </template> 
+             <template scope="scope">
+              {{scope.row.weight}}<span style="margin: 0 30px;color: #8890B1;">退至</span>{{scope.row.warehouseName}}
+              <div></div>
+            </template> 
           </el-table-column>
         </el-table>
       </ws-info-table>
@@ -240,10 +240,21 @@ export default {
       unitList: [],
       name: '',
       moveLookData: [],
+      shipment: {},
+      shipment1:{},
+      enter: {},
       moveTaskNo: '',
+      weights:[
+        {},
+        // {weightIn: 0},
+        // { transportLoss: 0}
+      ],
       weightOut: 0,
       weightIn: 0,
       transportLoss: 0,
+
+      weightIn: 0,
+     
       retreat: 0,
       goodsName: '',
       grade: '',
@@ -251,7 +262,7 @@ export default {
       waterContent: 0,
       weight: 0,
       unitPrice: 0,
-      businessDescribe:'',
+      businessDescribe: '',
     }
   },
 
@@ -297,20 +308,26 @@ 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
-            } else {
-              this.weightIn = this.moveLookData[i].weight
+              this.shipment = this.moveLookData[i]
+              this.shipment1 = this.moveLookData[i]
+               this.weightOut = this.moveLookData[i].weight
+               this.$set(this.weights[0],'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
+           this.transportLoss = this.weightOut - this.weightIn
             this.goodsName = this.moveLookData[0].goodsName
             this.grade = this.moveLookData[0].grade
             this.bulkDensity = this.moveLookData[0].bulkDensity
             this.waterContent = this.moveLookData[0].waterContent
             this.weight = this.moveLookData[0].weight
             this.unitPrice = this.moveLookData[0].unitPrice
-            this.businessDescribe = this.moveLookData[0].businessDescribe
           }
+          console.log(this.shipment1,"出库对象")
         })
     },
     selectChapterTwo(e) {
@@ -610,8 +627,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 {
@@ -631,9 +648,14 @@ export default {
 }
 .flow,
 .flow1 {
-  border-radius: 4px;
+  border-radius: 5px;
   border: 1px solid #d8dce6;
   margin-top: 20px;
+  // border-bottom: 0px;
+  border-top: 0px;
+}
+.flow{
+  height: 95px;
 }
 /deep/.flow .el-form-item {
   display: inline-grid;
@@ -663,8 +685,32 @@ 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;
+}
+.status{
+  margin-left: 10px;
+  background: #E6EAF8;
+  padding: 2px 5px;
+  border-radius: 3px;
+  color: #5473E8;
+}
+.status1{
+   margin-left: 10px;
+background: #E5F1F7;
+  padding: 2px 5px;
+  border-radius: 3px;
+  color: #50CAD4;
+}
+.status2{
+   margin-left: 10px;
+background: #E1E7FD;
+  padding: 2px 5px;
+  border-radius: 3px;
+  color: #5473E8;
 }
 </style>

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
@@ -177,6 +173,14 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      ></el-pagination>
     </div>
   </div>
 </template>
@@ -215,7 +219,9 @@ export default {
       gainList: [],
       currentPage: 1,
       primary: 1,
+      deptBudgetTotal:0,
       pageSize: 10,
+      deptBudgetTotal:0,
       searchType: 1,
       searchTypeText: '执行中',
       searchKeyWord: '',
@@ -282,13 +288,16 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        start:this.start,
-        end:this.end,
-        searchKeyWord: this.searchKeyWord
+        searchKeyWord: this.searchKeyWord,
+        
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
+          console.log(response)
           this.gainList = response
+          this.currentPage = response.current
+          this.pageSize = response.size
+          this.deptBudgetTotal = response.total
         })
     },
     handlestatus(status) {
@@ -472,17 +481,17 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
 .vertical-text-left {
   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;
 }
 .el-button--default {
   color: #8890b1;
@@ -498,17 +507,6 @@ export default {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-// .completed.el-button--default {
-//   border-color: #5878e8;
-//   background-color: #f6f7fc;
-//   color: #5878e8;
-// }
-// .putstorage.el-button--default,
-// .deliverystorage.el-button--default {
-//   border-color: #8890b1;
-//   background-color: #fff;
-//   color: #8890b1;
-// }
 /deep/.el-table tr td:first-child,
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
@@ -530,9 +528,6 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-/deep/.base_header_layout .grid-content {
-  margin-bottom: 60px;
-}
 /deep/.el-table td,
 /deep/.el-table th.is-leaf {
   border-right: 1px solid #E9ECF7;
@@ -601,13 +596,18 @@ export default {
 .el-button--primary {
     background-color: #5878e8;
     border-color: #5878e8;
-    margin-left: 6px;
+}
+.el-pagination {
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+text-align: center;
 }
 .el-select{
   width: 30%;
     margin-right: 10px;
 }
-
 /deep/.typeselect .el-input__inner{
    color: #8890B1;
 }

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -6,26 +6,18 @@
         <h2 class="bg-left title">创建运输任务</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </el-row>
-    <el-form
-      ref="deptBudgetList"
-      :rules="mainReportAdd"
-      :model="deptBudgetList"
-    >
+    <el-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
       <ws-info-table class="el-table">
         <el-form-item label="任务编号" span="1" prop="taskNo" class="forlist">
           <el-input
@@ -84,6 +76,7 @@
             maxlength="20"
             size="small"
           ></el-input>
+
         </el-form-item>
       </ws-info-table>
       <ws-info-table class="el-table">
@@ -102,6 +95,7 @@
             placeholder="选择仓库"
             class="typeselect"
           >
+
             <el-option
               v-for="item in warehouseList"
               :key="item.constKey"
@@ -141,25 +135,21 @@
           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"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="终到地"
-          span="1"
-          prop="contractNo"
-          class="start-address"
-        >
+        <el-form-item label="终到地" span="1" prop="contractNo" class="start-address">
           <el-cascader
             :options="options_"
             v-model="selectedOptions1"
@@ -199,14 +189,15 @@
         :key="index"
       >
         <div class="driver">
-          <span style='vertical-align: top;'>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
-          <img v-if='!endflag'
+          <span>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
+          <img
+          v-if='!endflag'
             width="22"
             height="22"
             class="add"
             @click="add(index)"
             src="../../../public/img/add.png"
-            alt=""
+            alt
           />
           <img
             width="22"
@@ -214,16 +205,19 @@
             class="del"
             @click="del(index)"
             src="../../../public/img/del.png"
-            alt=""
+            alt
           />
+          <!-- <span
+            style="margin-left : 20px;font-size : 14px"
+            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
+          >最终阶段</span> -->
           <el-checkbox
           @change='engflagchange'
            class='endflag'
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             :label="1"
-            >最终阶段</el-checkbox
-          >     
+          >最终阶段</el-checkbox>
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
@@ -261,16 +255,8 @@
             />
           </el-form-item>
           <!-- 本阶段重量 -->
-          <el-form-item
-            label="本阶段运输重量（吨）"
-            span="1"
-            prop="bulkDensity"
-          >
-            <el-input
-              v-model="deptBudgetList.weight"
-              placeholder="请输入本阶段运输重量"
-              size="small"
-            ></el-input>
+          <el-form-item label="本阶段运输重量（吨）" span="1" prop="bulkDensity">
+            <el-input v-model="item.weight" placeholder="请输入本阶段运输重量" size="small"></el-input>
           </el-form-item>
         </ws-info-table>
         <ws-info-table>
@@ -298,20 +284,10 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="发货人" span="1" prop="bulkDensity">
-            <el-input
-              v-model="item.sender"
-              placeholder="请输入发货人"
-              maxlength="20"
-              size="small"
-            ></el-input>
+            <el-input v-model="item.sender" placeholder="请输入发货人" maxlength="20" size="small"></el-input>
           </el-form-item>
           <el-form-item label="发货人电话" span="1" prop="bulkDensity">
-            <el-input
-              v-model="item.senderPhone"
-              placeholder="请输入发货人电话"
-              maxlength="20"
-              size="small"
-            ></el-input>
+            <el-input v-model="item.senderPhone" placeholder="请输入发货人电话" maxlength="20" size="small"></el-input>
           </el-form-item>
         </ws-info-table>
         <ws-info-table>
@@ -339,12 +315,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="收货人" span="1" prop="bulkDensity">
-            <el-input
-              v-model="item.receiver"
-              placeholder="请输入收货人"
-              maxlength="20"
-              size="small"
-            ></el-input>
+            <el-input v-model="item.receiver" placeholder="请输入收货人" maxlength="20" size="small"></el-input>
           </el-form-item>
           <el-form-item label="收货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -359,13 +330,7 @@
     </el-form>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="submit(deptBudgetList)"
-        >提交</el-button
-      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)">提交</el-button>
     </div>
   </div>
 </template>
@@ -379,7 +344,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    mapDrag,
+    mapDrag
   },
   watch: {
     vesselId(val) {
@@ -387,7 +352,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     let self = this
@@ -402,6 +367,7 @@ export default {
         warehouseType: '1',
         tranProcessInfoList: [
           {
+            sort:0,
             processNo: '',
             tranType: '汽运',
             tranTypeKey: '1',
@@ -422,9 +388,9 @@ export default {
             receiver: '',
             senderPhone: '',
             receiverPhone: '',
-            endFlag: '0',
-          },
-        ],
+            endFlag: '0'
+          }
+        ]
       },
       radio: '1',
       options_: regionData,
@@ -445,11 +411,12 @@ export default {
       mainReportAdd: {},
       appendixIdsAdd: '',
       warehouseList: [],
+      warehouseList1: [],
       size: 10,
       value1: '',
       unitList: [],
       name: '',
-      age: '',
+      age: ''
     }
   },
   activated() {
@@ -457,14 +424,14 @@ export default {
     this.showType = this.isShow
   },
   computed: {
-  weight:function(){
-      var maxStorage = 0
-      for(var i =0 ; i<this.deptBudgetList.tranProcessInfoList.length;i++){
-        maxStorage += Number(this.deptBudgetList.tranProcessInfoList[i].weight)
-      }
-      return maxStorage
-    },
-    warehouse: function () {
+    // weight:function(){
+    //     var maxStorage = 0
+    //     for(var i =0 ; i<this.deptBudgetList.tranProcessInfoList.length;i++){
+    //       maxStorage += Number(this.deptBudgetList.tranProcessInfoList[i].weight)
+    //     }
+    //     return maxStorage
+    //   },
+    warehouse: function() {
       if (
         this.deptBudgetList.taskType == '销售出库' ||
         this.deptBudgetList.taskType == '贸易服务出库' ||
@@ -474,7 +441,7 @@ export default {
       } else {
         return false
       }
-    },
+    }
   },
   methods: {
     sendWarehousechange(e){
@@ -490,6 +457,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,
@@ -528,7 +507,7 @@ export default {
         if (i > 90 && i < 97) continue
         arr.push(String.fromCharCode(i))
       }
-      arr.sort(function () {
+      arr.sort(function() {
         return Math.random() - 0.5
       })
       arr.length = 4
@@ -541,36 +520,43 @@ export default {
       // 货名
       packList({ constId: 'CON2' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.goodnameList = response
         })
       // 任务类型
       packList({ constId: 'TRAN3' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.taskType = response
         })
       // 运输方式
       packList({ constId: 'TRAN6' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.taskwayList = response
         })
 
       getwarehousename({
         compId: this.compId,
-        warehouseType: this.deptBudgetList.warehouseType,
+        warehouseType: this.deptBudgetList.warehouseType
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.warehouseList = response
         })
-      xialaNo({
+        getwarehousename({
         compId: this.compId,
-        flag: this.flag
+        warehouseType: 1
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
+          this.warehouseList1 = response
+        })
+      xialaNo({
+        compId: this.compId
+      })
+        .toPromise()
+        .then(response => {
           this.contractNoList = response
         })
     },
@@ -605,7 +591,7 @@ export default {
         receiver: '',
         senderPhone: '',
         receiverPhone: '',
-        endFlag: '0',
+        endFlag: '0'
       })
     },
     del(index) {
@@ -684,8 +670,9 @@ export default {
     selecttaskwayList(e, index) {
       for (var i = 0; i < this.taskwayList.length; i++) {
         if (this.taskwayList[i].constValue == e) {
-          this.deptBudgetList.tranProcessInfoList[index].tranTypeKey =
-            this.taskwayList[i].constKey
+          this.deptBudgetList.tranProcessInfoList[
+            index
+          ].tranTypeKey = this.taskwayList[i].constKey
         }
       }
     },
@@ -698,13 +685,13 @@ export default {
     },
     onChange(files) {
       this.fileNum = files
-      this.$refs.upload.handleSaveBill().then((res) => {
+      this.$refs.upload.handleSaveBill().then(res => {
         console.log(files)
       })
     },
 
     submit() {
-      this.$refs.deptBudgetList.validate((valid) => {
+      this.$refs.deptBudgetList.validate(valid => {
         if (valid) {
           for (
             var i = 0;
@@ -713,12 +700,100 @@ export default {
           ) {
             this.deptBudgetList.tranProcessInfoList[i].processNo =
               this.deptBudgetList.taskNo + (i + 1)
+            if (
+              new Date(
+                this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart
+              ).getTime() >
+              new Date(
+                this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd
+              ).getTime()
+            ) {
+              this.$message({
+                message: '发货日期不能大于最晚到货日期',
+                type: 'warning'
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
+              this.$message({
+                message:'发货日期不能为空',
+                type:'warning'
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
+              this.$message({
+                message:'最晚到货日期不能为空',
+                type:'warning'
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
+              this.$message({
+                message: '重量不能为空',
+                type: 'warning'
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
+              this.$message({
+                message: '发货人不能为空',
+                type: 'warning'
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
+              this.$message({
+                message: '发货人电话不能为空',
+                type: 'warning'
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
+              this.$message({
+                message: '收货人不能为空',
+                type: 'warning'
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
+              this.$message({
+                message: '收货人电话不能为空',
+                type: 'warning'
+              })
+              return
+            }
+            if (
+              !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress
+            ) {
+              this.$message({
+                message: '收获详细地址不能为空',
+                type: 'warning'
+              })
+              return
+            }
+            if (
+              !this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress
+            ) {
+              this.$message({
+                message: '发货详细地址不能为空',
+                type: 'warning'
+              })
+              return
+            }
+            
           }
+
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.tranType = this.checkList.toString()
+          for(var i = 0 ; i < this.deptBudgetList.tranProcessInfoList.length ; i++){
+            this.deptBudgetList.tranProcessInfoList[i].sort = i
+
+          }
+          console.log(this.deptBudgetList.tranProcessInfoList,"数组111")
           addtrantask(this.deptBudgetList)
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('添加成功')
               this.deptBudgetList = {
                 taskNo: '',
@@ -747,8 +822,11 @@ export default {
                     receiver: '',
                     senderPhone: '',
                     receiverPhone: '',
-                  },
-                ],
+                    contractNo:'',
+                    receiveWarehouse:''
+                   
+                  }
+                ]
               }
               this.$router.push({ path: 'tranManagementTransport' })
             })
@@ -760,8 +838,8 @@ export default {
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
-    },
-  },
+    }
+  }
 }
 </script>
 
@@ -801,15 +879,14 @@ export default {
   font-size: 0;
   float: right;
   margin-left: 25px;
-
 }
 .check-box {
   float: left;
   font-size: 14px;
-  color: #8890B1;
+  color: #8890b1;
 }
-.el-checkbox__label{
-  color: #8890B1;
+.el-checkbox__label {
+  color: #8890b1;
 }
 .el-form {
   padding: 0 10%;
@@ -870,7 +947,7 @@ export default {
   margin-top: 10px;
   font-weight: bold;
   margin-left: 20px;
-  color: #5473E8;
+  color: #5473e8;
   font-size: 16px;
 }
 /deep/.nei {

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -78,7 +78,7 @@
         </el-form-item>
         <el-form-item label="重量（吨）" span="1" prop="weight">
           <el-input
-          @input='weightchange'
+            @input="weightchange"
             v-model="deptBudgetList.weight"
             placeholder="请输入重量"
             maxlength="20"
@@ -87,14 +87,13 @@
         </el-form-item>
       </ws-info-table>
       <ws-info-table class="el-table">
-        <div class="start-address" style="width : 36%">
-          <el-radio-group @change='warehouseTypechange' v-model="deptBudgetList.warehouseType">
-          <el-radio label="1"
-            >常用仓库发货</el-radio
-          >
-          <el-radio label="2"
-            >临时仓库发货</el-radio
+        <div class="start-address" style="width: 36%">
+          <el-radio-group
+            @change="warehouseTypechange"
+            v-model="deptBudgetList.warehouseType"
           >
+            <el-radio label="1">常用仓库发货</el-radio>
+            <el-radio label="2">临时仓库发货</el-radio>
           </el-radio-group>
           <el-select
             v-model="deptBudgetList.sendWarehouse"
@@ -198,8 +197,11 @@
         :key="index"
       >
         <div class="driver">
-          <span style='vertical-align: top;'>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
-          <img v-if='!endflag'
+          <span style="vertical-align: top"
+            >运输阶段{{ index + 1 }} {{ item.processNo }}</span
+          >
+          <img
+            v-if="!endflag"
             width="22"
             height="22"
             class="add"
@@ -216,13 +218,13 @@
             alt=""
           />
           <el-checkbox
-          @change='engflagchange'
-           class='endflag'
+            @change="engflagchange"
+            class="endflag"
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             :label="1"
             >最终阶段</el-checkbox
-          >     
+          >
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
@@ -398,7 +400,7 @@ export default {
       checkList: [],
       deptBudgetList: {},
       radio: '1',
-      endflag:false,
+      endflag: false,
       carModelList: [],
       carLengthList: [],
       warehouseType: '1',
@@ -437,8 +439,8 @@ export default {
     },
   },
   methods: {
-    warehouseTypechange(){
-        getwarehousename({
+    warehouseTypechange() {
+      getwarehousename({
         compId: this.compId,
         warehouseType: this.deptBudgetList.warehouseType,
       })
@@ -447,57 +449,82 @@ export default {
           this.warehouseList = response
         })
     },
-    weightchange(e){
-      this.deptBudgetList.tranProcessInfoList[0].weight=e
+    weightchange(e) {
+      this.deptBudgetList.tranProcessInfoList[0].weight = e
     },
-    engflagchange(e){
-      this.endflag=e
+    engflagchange(e) {
+      this.endflag = e
     },
     loaddata() {
       examinetran({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
-          var tmp = []
-          tmp[0] = TextToCode[response.startPrivate].code
-          tmp[1] = TextToCode[response.startPrivate][response.startCity].code
-          tmp[2] =
-            TextToCode[response.startPrivate][response.startCity][
-              response.startArea
-            ].code
-          this.selectedOptions = tmp
-          var tmp1 = []
-          tmp1[0] = TextToCode[response.endPrivate].code
-          tmp1[1] = TextToCode[response.endPrivate][response.endCity].code
-          tmp1[2] =
-            TextToCode[response.endPrivate][response.endCity][
-              response.endArea
-            ].code
-          this.selectedOptions1 = tmp1
-          for (var i = 0; i < response.tranProcessInfoList.length; i++) {
-            var tmp2 = []
-            tmp2[0] =
-              TextToCode[response.tranProcessInfoList[i].sendPrivate].code
-            tmp2[1] =
-              TextToCode[response.tranProcessInfoList[i].sendPrivate][
-                response.tranProcessInfoList[i].sendCity
+          if (
+            response.startPrivate != null &&
+            response.startCity != null &&
+            response.startArea != null
+          ) {
+            var tmp = []
+            tmp[0] = TextToCode[response.startPrivate].code
+            tmp[1] = TextToCode[response.startPrivate][response.startCity].code
+            tmp[2] =
+              TextToCode[response.startPrivate][response.startCity][
+                response.startArea
               ].code
-            tmp2[2] =
-              TextToCode[response.tranProcessInfoList[i].sendPrivate][
-                response.tranProcessInfoList[i].sendCity
-              ][response.tranProcessInfoList[i].sendArea].code
-            response.tranProcessInfoList[i].selectedOptions = tmp2
-            var tmp3 = []
-            tmp3[0] =
-              TextToCode[response.tranProcessInfoList[i].receivePrivate].code
-            tmp3[1] =
-              TextToCode[response.tranProcessInfoList[i].receivePrivate][
-                response.tranProcessInfoList[i].receiveCity
+            this.selectedOptions = tmp
+          }
+          if (
+            response.endPrivate != null &&
+            response.endCity != null &&
+            response.endArea != null
+          ) {
+            var tmp1 = []
+            tmp1[0] = TextToCode[response.endPrivate].code
+            tmp1[1] = TextToCode[response.endPrivate][response.endCity].code
+            tmp1[2] =
+              TextToCode[response.endPrivate][response.endCity][
+                response.endArea
               ].code
-            tmp3[2] =
-              TextToCode[response.tranProcessInfoList[i].receivePrivate][
-                response.tranProcessInfoList[i].receiveCity
-              ][response.tranProcessInfoList[i].receiveArea].code
-            response.tranProcessInfoList[i].selectedOptions1 = tmp3
+            this.selectedOptions1 = tmp1
+          }
+
+          for (var i = 0; i < response.tranProcessInfoList.length; i++) {
+            if (
+              response.tranProcessInfoList[i].sendPrivate != '' &&
+              response.tranProcessInfoList[i].sendCity != '' &&
+              response.tranProcessInfoList[i].sendArea != ''
+            ) {
+              var tmp2 = []
+              tmp2[0] =
+                TextToCode[response.tranProcessInfoList[i].sendPrivate].code
+              tmp2[1] =
+                TextToCode[response.tranProcessInfoList[i].sendPrivate][
+                  response.tranProcessInfoList[i].sendCity
+                ].code
+              tmp2[2] =
+                TextToCode[response.tranProcessInfoList[i].sendPrivate][
+                  response.tranProcessInfoList[i].sendCity
+                ][response.tranProcessInfoList[i].sendArea].code
+              response.tranProcessInfoList[i].selectedOptions = tmp2
+            }
+            if (
+              response.tranProcessInfoList[i].receivePrivate != '' &&
+              response.tranProcessInfoList[i].receiveCity != '' &&
+              response.tranProcessInfoList[i].receiveArea != ''
+            ) {
+              var tmp3 = []
+              tmp3[0] =
+                TextToCode[response.tranProcessInfoList[i].receivePrivate].code
+              tmp3[1] =
+                TextToCode[response.tranProcessInfoList[i].receivePrivate][
+                  response.tranProcessInfoList[i].receiveCity
+                ].code
+              tmp3[2] =
+                TextToCode[response.tranProcessInfoList[i].receivePrivate][
+                  response.tranProcessInfoList[i].receiveCity
+                ][response.tranProcessInfoList[i].receiveArea].code
+              response.tranProcessInfoList[i].selectedOptions1 = tmp3
+            }
           }
           this.checkList = response.tranType.split(',')
           this.deptBudgetList = response
@@ -631,6 +658,87 @@ export default {
           ) {
             this.deptBudgetList.tranProcessInfoList[i].processNo =
               this.deptBudgetList.taskNo + (i + 1)
+            if (
+              new Date(
+                this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart
+              ).getTime() >
+              new Date(
+                this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd
+              ).getTime()
+            ) {
+              this.$message({
+                message: '发货日期不能大于最晚到货日期',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
+              this.$message({
+                message: '发货日期不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
+              this.$message({
+                message: '最晚到货日期不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
+              this.$message({
+                message: '重量不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
+              this.$message({
+                message: '发货人不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
+              this.$message({
+                message: '发货人电话不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
+              this.$message({
+                message: '收货人不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
+              this.$message({
+                message: '收货人电话不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (
+              !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress
+            ) {
+              this.$message({
+                message: '收获详细地址不能为空',
+                type: 'warning',
+              })
+              return
+            }
+            if (
+              !this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress
+            ) {
+              this.$message({
+                message: '发货详细地址不能为空',
+                type: 'warning',
+              })
+              return
+            }
           }
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.tranType = this.checkList.toString()
@@ -666,9 +774,9 @@ export default {
 .position .ws-info-table .el-form-item {
   width: 25%;
 }
-.typeselect{
-  width:42%;
-  margin-left:32px;
+.typeselect {
+  width: 42%;
+  margin-left: 32px;
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label,
 /deep/.position .ws-info-table .el-form-item .el-form-item__content {
@@ -700,8 +808,10 @@ export default {
   color: #8890b1;
   font-size: 14px;
 }
-/deep/.el-table--border:after, /deep/.el-table--group:after, /deep/.el-table:before {
-  background:transparent;
+/deep/.el-table--border:after,
+/deep/.el-table--group:after,
+/deep/.el-table:before {
+  background: transparent;
 }
 .el-form {
   padding: 0 10%;
@@ -801,8 +911,11 @@ export default {
   font-size: 16px;
   color: #5473e8;
 }
-.el-form{
-      height: 73vh;
-    overflow: scroll;
+.el-form {
+  height: 73vh;
+  overflow: scroll;
+}
+.el-cascader{
+  width: 100%;
 }
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -42,7 +42,7 @@
           />
         </ws-select>
         <ws-input
-          v-model="warehouseName"
+          v-model="searchKeyWord"
           placeholder="可按合同编号或任务编号查找"
           clearable
           maxlength="500"
@@ -56,7 +56,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -1px;
+              left: -7px;
             "
             src="../../../public/img/sousuo.png"
             alt
@@ -68,7 +68,7 @@
       <el-table
         class="wenzi"
         :data="gainList.records"
-        style="width: 100%; margin-top: 20px"
+        style="width: 100%;"
         height="780"
       >
         <el-table-column type="index" label="序号">
@@ -77,12 +77,12 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
+         <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
         <el-table-column
           prop="contractNo"
           label="合同编号"
           width="80"
         ></el-table-column>
-        <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
         <el-table-column
           prop="warehouseName"
           class="table_td"
@@ -190,9 +190,9 @@
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
               "
-              v-if="scope.row.taskStatus == '待审核'&&scope.row.taskId!=null"
+              v-if="scope.row.taskStatus == '待审核'"
               class="adjustment"
-              @click="delivery(scope.row)"
+              @click="audit(scope.row)"
             >
               审核
             </div>
@@ -214,8 +214,7 @@
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
               "
               v-if="
-                scope.row.taskStatus == '执行中' ||
-                scope.row.taskStatus == '已驳回'
+                scope.row.taskId==null
               "
               class="adjustment"
               @click="deleteclick(scope.row)"
@@ -389,7 +388,15 @@ export default {
         },
       })
     },
-
+    audit(item) {
+      this.$router.push({
+        path: 'tranManagementWarehouseInOutTaskaudit',
+        query: {
+          relevanceId: item.relevanceId,
+          taskId:item.taskId
+        },
+      })
+    },
     getSpanArr(data) {
       let that = this
 
@@ -524,37 +531,33 @@ 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>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
 .vertical-text-left {
   width: 62px;
   text-align: right;
@@ -617,7 +620,6 @@ export default {
 .el-row {
   height: 50px;
 }
-
 .findValue {
   width: 0%;
   margin-left: 25%;
@@ -637,26 +639,6 @@ export default {
   background: #e8ecf6;
   box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-// .nav {
-//   background: white;
-//   height: 60px;
-//   margin-top: -20px;
-// }
-.navv {
-  background: #ffffff;
-  border-radius: 4px;
-  margin-top: -8px;
-}
-// .nav2{
-//   width: auto;
-//   height: 5px;
-//   background-color: #e8eaf1;
-// }
-.nav2 {
-  height: 25px;
-  background: #e8ecf6;
-  margin-top: 15px;
-}
 .spans {
   display: table-caption;
   width: 17px;

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -33,7 +33,7 @@
       <div class="ding"></div>
        <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
           <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
@@ -102,7 +102,7 @@
           </el-form-item>
           <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
             <el-input
-            @change="selectTaskNo"
+            @input="selectTaskNo"
               v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
               class="typeselect"
@@ -223,7 +223,7 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item label="业务描述" span="20">
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="业务描述" span="20">
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
@@ -236,7 +236,7 @@
       </div>
       <div v-show="dataList.taskTypeKey != 1" class="center1">
         <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
@@ -245,7 +245,7 @@
         <div class="small-title">
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
         </div>
-        <el-form ref="form" :model="form" label-width="140px">
+        <el-form v-if='!deletetask' ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
@@ -261,7 +261,7 @@
               />
             </el-select>
           </el-form-item>
-          <!-- 出库类型 -->
+          <!-- 入库类型 -->
           <el-form-item label="入库类型">
             <el-select
             :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
@@ -430,7 +430,7 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item label="业务描述">
+          <el-form-item v-if='dataList.taskTypeKey != 4' label="业务描述">
             <el-input
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
@@ -653,7 +653,6 @@
       >
     </div>
   </div>
-  </div>
 </template>
 <script>
 import {
@@ -749,6 +748,7 @@ export default {
       warehouseNameList1: [],
       appendixIdsAdd: '',
       uploadSuccess: {},
+      deletetask:false,
       warehouseInOutDetail: {},
       onChange: {},
       deptBudgetList1: [],
@@ -827,7 +827,7 @@ export default {
     },
     selectTaskNo(e){
       if(this.dataList.taskTypeKey==3){
-          this.dataList1.moveTaskNo=e
+        this.$set(this.dataList1,'moveTaskNo',e)
       }
     },
     dataFilter(val) {
@@ -955,7 +955,11 @@ export default {
       ) {
         this.dataList.inOutTaskNo = this.inOutTaskNo
         this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-
+        if(this.dataList.taskTypeKey == 3){
+          this.dataList.businessDescribe=this.dataList1.businessDescribe
+        }else{
+          this.dataList1.businessDescribe=this.dataList.businessDescribe
+        }
         this.requestadd(this.dataList, 'repetition')
         this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.relevanceId = this.dataList.relevanceId
@@ -1103,18 +1107,6 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
-      if (this.$route.query.relevanceId) {
-        outexamine({ relevanceId: this.$route.query.relevanceId })
-          .toPromise()
-          .then((response) => {
-            if (response.length > 1) {
-              this.dataList = response[0]
-              this.dataList1 = response[1]
-            } else {
-              this.dataList = response[0]
-            }
-          })
-      } else {
         this.tasknumber()
         this.$set(this.dataList,'inOutType','销售出库')
         this.$set(this.dataList,'inOutTypeKey','1')
@@ -1126,14 +1118,6 @@ export default {
         this.$set(this.dataList1,'goodsNameKey','1')
         this.$set(this.dataList1,'grade','一等品')
         this.$set(this.dataList1,'gradeKey','1')
-      }
-      switch(this.dataList.inOutType){
-        case "采购出库": this.flag = 0;break
-        case "采购入库": this.flag = 0;break
-        case "销售出库": this.flag = 1;break
-        case "退库": this.flag = 2;break
-      }
-      
       // 货名
       pullDown({ constId: 'CON2' })
         .toPromise()
@@ -1394,7 +1378,7 @@ export default {
   display: inline-block;
 }
 .center1 .small-title {
-  margin-left: 150px;
+  margin-left: 323px;
 }
 .center1 {
   width: 90%;
@@ -1438,7 +1422,7 @@ export default {
   margin-left: -32px;
 }
  .el-radio-group {
-    margin-left: 80px;
+    margin-left: 251px;
 }
 .ding{
   height: 23px;
@@ -1456,4 +1440,15 @@ export default {
     font-size: 0;
     margin-top: 20px;
 }
+/deep/.el-form {
+    padding: 0 15%;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -ms-flex-wrap: wrap;
+    flex-wrap: wrap;
+    margin-left: 130px;
+    margin-top: 15px;
+    width: 110%;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -0,0 +1,1502 @@
+// 审核出入库任务
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">审核出入库任务</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div class="basicInformation">
+      <div class="annu">
+        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
+      </el-radio-group>
+        <div class="nav">
+        <span class="ziti">
+          任务类型：
+          <h1 class="ziti1">{{dataList.inOutType}}</h1>
+        </span>
+      </div>
+      </div>
+      <div class="ding"></div>
+       <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
+          <img
+            style="position: relative; top: 40px; left: 300px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
+        <!--出库=-->
+        <div class="small-title">
+          <h3>出库任务({{ dataList.inOutTaskNo }})</h3>
+        </div>
+        <el-form ref="dataList" :model="dataList" label-width="140px">
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <el-select
+            disabled
+              v-model="dataList.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+              @change="selectwarehouseName"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 出库类型 -->
+          <el-form-item label="出库类型">
+            <el-select
+            disabled       
+              v-model="dataList.inOutType"
+              placeholder="请选择出库类型"
+              class="typeselect"
+              @change="selectstorageType"
+            >
+              <el-option
+                v-for="item in storageType"
+                :key="item.constKey"
+                v-if="
+                  (dataList.taskTypeKey == 1 &&
+                    item.constValue != '移库出库') ||
+                  (dataList.taskTypeKey == 3 &&
+                    item.constValue == '移库出库') ||
+                  (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
+                "
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="合同编号">
+            <el-select
+            disabled
+            @change='changecontract'
+              v-model="dataList.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
+            <el-select
+            disabled
+            @change="selectTaskNo"
+              v-model="dataList.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item label="货名" class="huom">
+            <el-select
+            disabled
+              v-model="dataList.goodsName"
+              placeholder="货名"
+              class="huom"
+              @change="selectgoodsName"
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--重量（吨）-->
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px" >
+            <el-input
+            disabled
+              v-model="dataList.weight"
+              placeholder="请输入重量"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!-- 品级 -->
+          <el-form-item label="品级">
+            <el-select
+              v-model="dataList.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectpackingMethod"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!--容重（克/升）>=-->
+          <el-form-item label="容重（克/升）>=">
+            <el-input
+            @input='bulkDensitychange'
+              v-model="dataList.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small" 
+              class="huom"
+            />
+          </el-form-item>
+          <!--水分（%）<=-->
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px" >
+            <el-input
+            @input='waterContentchange'
+              v-model="dataList.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--单价(元/吨)-->
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
+            <el-input
+            @input='unitPricechange'
+              v-model="dataList.unitPrice"
+              placeholder="请输入单价"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--预计出库日期-->
+          <el-form-item
+            label="预计出库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
+            <el-date-picker
+            disabled
+              v-model="dataList.predictDate"
+              type="date"
+              placeholder="请选择预计出库日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--经办人-->
+          <el-form-item label="出库经办人">
+            <el-select
+            disabled
+              v-model="dataList.agent"
+              placeholder="请选择经办人"
+              filterable
+              :filter-method="dataFilter"
+              @change="selectstaff"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+          </el-form-item>
+          <!--业务描述=-->
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="业务描述" span="1">
+            <el-input
+              v-model="dataList.businessDescribe"
+              placeholder="请输入业务描述，不超过150字"
+              maxlength="150"
+              size="large"
+              class="yewu"
+              
+            />
+          </el-form-item>
+          <el-form-item label="仓位号（选填）" span="1">
+            <el-input
+              v-model="dataList.binNumber"
+              placeholder="请输入仓位号"
+              maxlength="150"
+              size="large"
+              class="yewu"
+              
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div v-show="dataList.taskTypeKey != 1" class="center1">
+        <img
+            style="position: relative; top: 40px; left: 300px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
+        <div class="small-title">
+          <h3>入库任务({{ dataList1.inOutTaskNo }}) <span v-if='deletetask' style='color:red;'>已删除</span></h3>
+        </div>
+        <el-form v-if='!deletetask' ref="form" :model="form" label-width="140px">
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名" v-if="dataList1.inOutType == '移库出库'">
+            <el-select
+            disabled
+              v-model="dataList1.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 出库类型 -->
+          <el-form-item label="入库类型" v-if="dataList1.inOutType == '移库出库'">
+            <el-select
+            disabled
+              v-model="dataList1.inOutType"
+              placeholder="请选择入库类型"
+              class="typeselect"
+              @change="selectstorageType1"
+            >
+              <el-option
+                v-for="item in storageType1"
+                :key="item.constKey"
+                v-if="
+                  (dataList1.taskTypeKey == 2 &&
+                    item.constValue != '移库入库') ||
+                  (dataList1.taskTypeKey == 3 &&
+                    item.constValue == '移库入库') ||
+                  (dataList1.taskTypeKey == 4 && item.constValue == '退库')
+                "
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item v-if='dataList1.taskTypeKey != 3' label="合同编号">
+            <el-select
+            disabled
+            @change='changecontract1'
+              v-model="dataList1.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if='dataList1.taskTypeKey == 3' label="移库任务编号">
+            <el-select
+            disabled
+              v-model="dataList1.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item label="货名" class="huom">
+            <el-select
+            disabled
+              v-model="dataList1.goodsName"
+              placeholder="货名"
+              class="huom"
+              @change="selectgoodsName1"
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--重量（吨）-->
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px"  >
+            <el-input
+            @input='weightchange'
+              v-model="dataList1.weight"
+              placeholder="请输入重量"
+              maxlength="120"
+              size="small"
+              class="huom"
+              
+            />
+          </el-form-item>
+          <!-- 品级 -->
+          <el-form-item label="品级">
+            <el-select
+            :disabled='dataList.taskTypeKey == 3'
+              v-model="dataList1.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectpackingMethod1"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!--容重（克/升）>=-->
+          <el-form-item label="容重（克/升）>=">
+            <el-input
+            @input='bulkDensitychange'
+            :disabled='dataList.taskTypeKey == 3'
+              v-model="dataList1.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--水分（%）<=-->
+          <el-form-item label="水分（%）<="  span="1" style=" margin-left: 350px; margin-top: -40px">
+            <el-input
+            @input='waterContentchange'
+            :disabled='dataList.taskTypeKey == 3'
+              v-model="dataList1.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--单价(元/吨)-->
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
+            <el-input
+            @input='unitPricechange'
+            :disabled='dataList.taskTypeKey == 3'
+              v-model="dataList1.unitPrice"
+              placeholder="请输入单价"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--预计出库日期-->
+          <el-form-item
+            label="预计入库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
+            <el-date-picker
+            disabled
+              v-model="dataList1.predictDate"
+              type="date"
+              placeholder="请选择预计入库日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--经办人-->
+          <el-form-item label="入库经办人">
+            <el-select
+            disabled
+              v-model="dataList1.agent"
+              placeholder="请选择经办人"
+              filterable
+              :filter-method="dataFilter"
+              @change="selectstaff1"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+          </el-form-item>
+          <!--业务描述=-->
+          <el-form-item v-if='dataList.taskTypeKey != 4' label="业务描述">
+            <el-input
+              v-model="dataList1.businessDescribe"
+              placeholder="请输入业务描述，不超过150字"
+              maxlength="150"
+              size="large"
+            />
+          </el-form-item>
+          <el-form-item label="仓位号（选填）" span="1">
+            <el-input
+              v-model="dataList1.binNumber"
+              placeholder="请输入仓位号"
+              maxlength="150"
+              size="large"
+              class="yewu"
+              
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div v-if="dataList.taskTypeKey == 4" class="center1">
+        <!--出库=-->
+        <div class="small-title">
+          <img
+            style="position: relative; top: 40px; left: -22px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
+          <h3>出库任务({{ inOutTaskNo }})</h3>
+        </div>
+        <el-form ref="dataList" :model="dataList" label-width="140px">
+          
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <el-select
+            disabled
+              v-model="dataList.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 出库类型 -->
+          <el-form-item label="出库类型" >
+            <el-select              
+            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              v-model="dataList.inOutType"
+              placeholder="请选择出库类型"
+              class="typeselect"
+              @change="selectstorageType"
+            >
+              <el-option
+                v-for="item in storageType"
+                :key="item.constKey"
+                v-if="
+                  (dataList.taskTypeKey == 1 &&
+                    item.constValue != '移库出库') ||
+                  (dataList.taskTypeKey == 3 &&
+                    item.constValue == '移库出库') ||
+                  (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
+                "
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 合同编号 -->
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="合同编号">
+            <el-select
+            disabled
+              v-model="dataList.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
+            <el-select
+            @change="selectTaskNo"
+              v-model="dataList.moveTaskNo"
+              placeholder="请输入移库任务编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item label="货名" class="huom" >
+            <el-select
+            disabled
+              v-model="dataList.goodsName"
+              placeholder="货名"
+              class="huom"
+              @change="selectgoodsName"
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--重量（吨）-->
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <el-input
+            disabled
+              v-model="dataList.weight"
+              placeholder="请输入重量"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!-- 品级 -->
+          <el-form-item label="品级">
+            <el-select
+            disabled
+              v-model="dataList.grade"
+              placeholder=""
+              class="typeselect"
+              @change="selectpackingMethod"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </el-select>
+          </el-form-item>
+          <!--容重（克/升）>=-->
+          <el-form-item label="容重（克/升）>=">
+            <el-input
+            disabled
+              v-model="dataList.bulkDensity"
+              placeholder="请输入容重"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--水分（%）<=-->
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <el-input
+            disabled
+              v-model="dataList.waterContent"
+              placeholder="请输入水分占比"
+              maxlength="120"
+              size="small"
+              class="huom"
+            />
+          </el-form-item>
+          <!--单价(元/吨)-->
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+            <el-input
+            disabled
+              v-model="dataList.unitPrice"
+              placeholder="请输入单价"
+              maxlength="120"
+              size="small"
+               class="huom"
+            />
+          </el-form-item>
+          <!--预计出库日期-->
+          <el-form-item
+            label="预计出库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
+            <el-date-picker
+              v-model="dataList.predictDate"
+              type="date"
+              placeholder="请选择预计出库日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--经办人-->
+          <el-form-item label="出库经办人">
+            <el-select
+              v-model="dataList.agent"
+              placeholder="请选择经办人"
+              filterable
+              :filter-method="dataFilter"
+              @change="selectstaff"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+          </el-form-item>
+          <!--业务描述=-->
+          <el-form-item label="业务描述">
+            <el-input
+              v-model="dataList.businessDescribe"
+              placeholder="请输入业务描述，不超过150字"
+              maxlength="150"
+              size="large"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button class="bg-bottom" type="primary" size="small" @click="reject()"
+        >驳回</el-button>
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >通过</el-button
+      >
+    </div>
+    <WinseaContentModal
+      v-model="outerVisible"
+      title="驳回原因"
+      @on-cancel="handleClose"
+    >
+      <el-input
+        type="textarea"
+        :rows="2"
+        maxlength="30"
+        placeholder="请输入驳回原因，1~30个字"
+        v-model="auditMind"
+      >
+      </el-input>
+      <div class="dialog-footer">
+        <el-button @click="outerVisible = false">取 消</el-button>
+        <el-button type="primary" @click="disableReasons">确定</el-button>
+      </div>
+    </WinseaContentModal>
+  </div>
+  
+</template>
+<script>
+import {
+  getwarehousename,
+  xialaNo,
+  addoreditoutput,
+  outexamine,
+  getGoodsName,
+  warehousetask,
+  woekflowhandle
+} from '@/model/tasksport/index'
+import { packList } from '@/model/contarct/index'
+import { pullDown, getstaff } from '@/model/warehouse/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import { mapActions, mapGetters, mapState } from 'vuex'
+import WsUpload from '@/components/WsUpload'
+// import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { dayjs, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    // vesselId(val) {
+    //   this.getList()
+    // },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  computed: {
+    ...mapGetters(['deptBudgetList']),
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      disabled:false,
+      // 年
+      year: '',
+      disableReason:'',
+      contractNoList: [],
+      deptBudgetTotal: 0,
+      readonly: true,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      radio: '1',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      goodnameList: [],
+      checked: true,
+      form: {},
+      outerVisible:false,
+      staffList: [],
+      options: [],
+      storageType: [],
+      storageType1: [],
+      outContractNo: [],
+      // 提交类型
+      submitType: true,
+      status: [],
+      auditMind:'',
+      deletetask:false,
+      warehouseNameList: [],
+      warehouseNameList1: [],
+      appendixIdsAdd: '',
+      uploadSuccess: {},
+      warehouseInOutDetail: {},
+      onChange: {},
+      deptBudgetList1: [],
+      gradeList: [],
+      rules: {
+        netWeight: [
+          {
+            required: true,
+            type: 'number',
+            message: '请输入活动名称',
+            trigger: 'blur',
+          },
+        ],
+      },
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      packtypeList: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      inOutTaskNo: '',
+      inOutTaskNo1: '',
+      dataList: { taskTypeKey: '1' },
+      dataList1: { taskTypeKey: '1' },
+      historyList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    this.getList()
+  },
+  methods: {
+    //返回按钮
+    revert() {
+      this.$router.go(-1)
+    },
+    returnsales() {
+      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+    },
+    // 获取当前年月日
+    getdate() {
+      var date = new Date()
+      var year = date.getFullYear() //获取完整的年份(4位)
+      var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+      var datetime = date.getDate() //获取当前日(1-31)
+      if (mouth < 10) {
+        mouth = '0' + mouth
+      }
+      if (datetime < 10) {
+        datetime = '0' + datetime
+      }
+      return year + mouth + datetime
+    },
+    reject(){
+      this.outerVisible=true
+    },
+    // 随机验证码
+    verifyinit() {
+      var arr = []
+      for (var i = 48; i < 123; i++) {
+        if (i > 57 && i < 65) continue
+        if (i > 90 && i < 97) continue
+        arr.push(String.fromCharCode(i))
+      }
+      arr.sort(function () {
+        return Math.random() - 0.5
+      })
+      arr.length = 4
+
+      return arr.join('')
+    },
+    selectTaskNo(e){
+      if(this.dataList.taskTypeKey==3){
+          this.dataList1.moveTaskNo=e
+      }
+    },
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.deptBudgetList.staffList = val
+      if (val) {
+        //val存在
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.staffList
+      }
+    },
+    weightchange(e){
+      if(this.dataList.taskTypeKey==4){
+        this.$set(this.dataList,'weight',e)
+      }
+    },
+    bulkDensitychange(e){
+      if(this.dataList.taskTypeKey==4){
+        this.$set(this.dataList,'bulkDensity',e)
+      }else if(this.dataList1.taskTypeKey==3){
+        this.$set(this.dataList1,'bulkDensity',e)
+      }
+    },
+    waterContentchange(e){
+      if(this.dataList.taskTypeKey==4){
+        this.$set(this.dataList,'waterContent',e)
+      }else if(this.dataList1.taskTypeKey==3){
+        this.$set(this.dataList1,'waterContent',e)
+      }
+    },
+    unitPricechange(e){
+      if(this.dataList.taskTypeKey==4){
+        this.$set(this.dataList,'unitPrice',e)
+      }else if(this.dataList1.taskTypeKey==3){
+        this.$set(this.dataList1,'unitPrice',e)
+      }
+    },
+    changecontract(e){
+      if(this.dataList.taskTypeKey!=3){
+        for (let i = 0; i < this.contractNoList.length; i++) {
+          if(this.contractNoList[i].contractNo==e){
+            getGoodsName({ contractId:this.contractNoList[i].id,contractNo:this.contractNoList[i].contractNo}) .toPromise()
+            .then((response) => {
+              this.$set(this.dataList,'goodsName',response.goodsName)
+              this.$set(this.dataList,'goodsNameKey',response.goodsNameKey)
+              this.$set(this.dataList,'grade',response.grade)
+              this.$set(this.dataList,'gradeKey',response.gradeKey)
+              this.$set(this.dataList,'waterContent',response.waterContent)
+              this.$set(this.dataList,'bulkDensity',response.bulkDensity)
+              this.$set(this.dataList,'weight',response.weight)
+              this.$set(this.dataList,'unitPrice',response.unitContractPrice)
+            })
+          } 
+        }
+      }
+    },
+    changecontract1(e){
+      if(this.dataList1.taskTypeKey!=3){
+        for (let i = 0; i < this.contractNoList.length; i++) {
+          if(this.contractNoList[i].contractNo==e){
+            getGoodsName({ contractId:this.contractNoList[i].id,contractNo:this.contractNoList[i].contractNo}) .toPromise()
+            .then((response) => {
+              this.$set(this.dataList1,'goodsName',response.goodsName)
+              this.$set(this.dataList1,'goodsNameKey',response.goodsNameKey)
+              this.$set(this.dataList1,'grade',response.grade)
+              this.$set(this.dataList1,'gradeKey',response.gradeKey)
+              this.$set(this.dataList1,'waterContent',response.waterContent)
+              this.$set(this.dataList1,'bulkDensity',response.bulkDensity)
+              this.$set(this.dataList1,'weight',response.weight)
+              this.$set(this.dataList1,'unitPrice',response.unitContractPrice)
+            })
+          } 
+        }
+      }
+    },
+    selectstaff(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.dataList.agentKey = this.staffList[i].staffId
+        }
+      }
+    },
+    selectstaff1(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.dataList1.agentKey = this.staffList[i].staffId
+        }
+      }
+    },
+    requestadd(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:'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' })
+            })
+              
+            })
+    },
+    //提交按钮
+    submit() {
+      this.dataList.inOutFlag=1
+      this.dataList1.inOutFlag=2
+      if (this.dataList.taskTypeKey == 1) {
+        
+        this.dataList.inOutTaskNo = this.inOutTaskNo
+        this.requestadd(this.dataList)
+      } else if (this.dataList1.taskTypeKey == 2) {
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        this.requestadd(this.dataList1)
+      } else if (
+        this.dataList.taskTypeKey == 3 ||
+        this.dataList.taskTypeKey == 4
+      ) {
+        this.dataList.inOutTaskNo = this.inOutTaskNo
+        this.requestadd(this.dataList, 'repetition')
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        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) {
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
+        )
+      }
+    },
+    grossWeightchange(e) {
+      if (this.dataList.grossWeight && this.dataList.tare) {
+        this.dataList.netWeight = Number(
+          this.dataList.grossWeight - this.dataList.tare
+        )
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.dataList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectgoodsName1(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.dataList1.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.dataList.gradeKey = this.gradeList[i].constKey
+          if(this.dataList.taskTypeKey==3){
+            this.$set(this.dataList1,'grade',e)
+            this.$set(this.dataList1,'gradeKey',this.gradeList[i].constKey)
+          }
+        }
+      }
+    },
+    selectpackingMethod1(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.dataList1.packingMethodKey = this.gradeList[i].constKey
+          if(this.dataList1.taskTypeKey==4){
+            this.$set(this.dataList,'grade',e)
+            this.$set(this.dataList,'gradeKey',this.gradeList[i].constKey)
+          }
+        }
+      }
+    },
+    selectstorageType(e) {
+      for (var i = 0; i < this.storageType.length; i++) {
+        if (this.storageType[i].constValue == e) {
+          this.dataList.inOutTypeKey = this.storageType[i].constKey
+        }
+      }
+    },
+    selectstorageType1(e) {
+      for (var i = 0; i < this.storageType1.length; i++) {
+        if (this.storageType1[i].constValue == e) {
+          this.dataList1.inOutTypeKey = this.storageType1[i].constKey
+        }
+      }
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    businessDescriptionchange(e) {
+      console.log(e)
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    tasknumber() {
+      if (this.dataList.taskTypeKey == 1) {
+        this.inOutTaskNo = 'CK' + this.getdate() + this.verifyinit()
+      } else if (this.dataList.taskTypeKey == 2) {
+        this.inOutTaskNo1 = 'RK' + this.getdate() + this.verifyinit()
+      } else if (this.dataList.taskTypeKey == 3) {
+        var random=this.getdate() + this.verifyinit()
+        this.inOutTaskNo = 'YKC' + random
+        this.inOutTaskNo1 = 'YKR' + random
+      } else if (this.dataList.taskTypeKey == 4) {
+        var random=this.getdate() + this.verifyinit()
+        this.inOutTaskNo = 'TCC' + random
+        this.inOutTaskNo1 = 'TCR' + random
+      }
+    },
+    tasktypechange(e) {
+      if (!this.$route.query.relevanceId) {
+        this.tasknumber()
+      }
+      this.dataList1.taskTypeKey = e
+      if(this.dataList.taskTypeKey==1){
+        this.dataList.inOutType='销售出库'
+        this.dataList.inOutTypeKey='1'
+      }
+      if(this.dataList1.taskTypeKey==2){
+        this.dataList1.inOutType='采购入库'
+        this.dataList1.inOutTypeKey='1'
+      }
+      else if(this.dataList1.taskTypeKey==3){
+        this.disabled=true
+        this.dataList1.inOutType='移库入库'
+        this.dataList1.inOutTypeKey='3'
+        this.dataList.inOutType='移库出库'
+        this.dataList.inOutTypeKey='3'
+      }else if(this.dataList1.taskTypeKey==4){
+        this.disabled=true
+        this.dataList1.inOutType='退库'
+        this.dataList1.inOutTypeKey='6'
+        this.dataList.inOutType='销售出库'
+        this.dataList.inOutTypeKey='1'
+      }
+    },
+    GetRandomNum(Min, Max) {
+      var Range = Max - Min
+      var Rand = Math.random()
+      return Min + Math.round(Rand * Range)
+    },
+    getList() {
+      if (this.$route.query.relevanceId) {
+        outexamine({ relevanceId: this.$route.query.relevanceId })
+          .toPromise()
+          .then((response) => {
+            if (response.length > 1) {
+              this.dataList = response[0]
+              this.dataList1 = response[1]
+            } else {
+              if(response[0].taskTypeKey==3){
+                this.deletetask=true
+                this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf("C") + 1,response[0].inOutTaskNo.length)
+              }
+              this.dataList = response[0]
+            }
+          })
+      } else {
+        this.tasknumber()
+        this.$set(this.dataList,'inOutType','销售出库')
+        this.$set(this.dataList,'inOutTypeKey','1')
+        this.$set(this.dataList,'goodsName','玉米')
+        this.$set(this.dataList,'goodsNameKey','1')
+        this.$set(this.dataList,'grade','一等品')
+        this.$set(this.dataList,'gradeKey','1')
+        this.$set(this.dataList1,'goodsName','玉米')
+        this.$set(this.dataList1,'goodsNameKey','1')
+        this.$set(this.dataList1,'grade','一等品')
+        this.$set(this.dataList1,'gradeKey','1')
+      }
+      
+      // 货名
+      pullDown({ constId: 'CON2' })
+        .toPromise()
+        .then((response) => {
+          this.goodnameList = response
+        })
+      // 品级
+      pullDown({ constId: 'CON3' })
+        .toPromise()
+        .then((response) => {
+          this.gradeList = response
+        })
+      pullDown({ constId: 'CON6' })
+        .toPromise()
+        .then((response) => {
+          this.storageType = response
+        })
+      pullDown({ constId: 'CON5' })
+        .toPromise()
+        .then((response) => {
+          this.storageType1 = response
+        })
+      xialaNo({
+        compId: this.compId,
+      })
+        .toPromise()
+        .then((response) => {
+          this.contractNoList = response
+        })
+      //仓库名
+      getwarehousename({
+        compId: this.compId,
+        warehouseType: 1,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseNameList = response
+        })
+      getwarehousename({
+        compId: this.compId,
+        warehouseType: 2,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseNameList1 = response
+        })
+      //经办人
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+          //  this.agent = response
+        })
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.receiveAttachmentPath
+    },
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        query: { id: row.id },
+      })
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+/deep/.basicInformation {
+  .el-info-table {
+    border: none;
+    position: relative;
+   
+  }
+  .el-form-item {
+    width: 33.3333%;
+    border: none;
+    margin: 0;
+    .el-form-item__label {
+      text-align: left;
+      font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #8890b1;
+    }
+    .el-form-item__content {
+      padding-left: 0px;
+      padding-right: 10px;
+      // background: #fff;
+      white-space: nowrap;
+      height: 40px;
+      display: flex;
+      -webkit-box-align: center;
+      align-items: center;
+      text-align: left;
+      overflow: hidden;
+    }
+  }
+}
+/deep/.el-radio {
+  color: #606266;
+  font-weight: 500;
+  line-height: 1;
+  cursor: pointer;
+  white-space: nowrap;
+  outline: 0;
+  margin-right: 30px;
+  margin-top: 15px;
+}
+/deep/.el-radio__inner {
+  border: 1px solid #dcdfe6;
+  border-radius: 100%;
+  width: 14px;
+  height: 14px;
+  background-color: #fff;
+  cursor: pointer;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  margin-left: 100px;
+}
+/deep/.el-radio__input {
+  white-space: nowrap;
+  cursor: pointer;
+  outline: 0;
+  line-height: 1;
+  vertical-align: middle;
+  margin-top: -1px;
+}
+.title {
+  position: relative;
+  padding-left: 10px;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-form {
+  padding: 0 15%;
+  display: flex;
+  flex-wrap: wrap;
+  margin-left: -50px;
+  margin-top: 15px;
+  width: 110%;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.bg-right {
+  text-align: right;
+  padding: 16px 20px;
+}
+.center {
+  position: relative;
+  top: 50px;
+  width: 40%;
+  height: 2000px;
+  margin: 0 auto;
+  margin-right: 180px;
+}
+/deep/.el-form-item__label {
+  width: 160px;
+}
+.inspector {
+  width: 50%;
+}
+/deep/.el-form-item--small .el-form-item__label,
+.el-form-item--small .el-form-item__content {
+  text-align: left;
+}
+/deep/.el-input--small {
+  font-size: 13px;
+  position: relative;
+  display: inline-block;
+}
+.center1 .small-title {
+  margin-left: 323px;
+}
+.center1 {
+  width: 90%;
+  margin: 0 auto;
+  margin-left: 10px;
+  margin-top: 25px;
+}
+/deep/.el-input--small .el-input__inner {
+  height: 32px;
+  line-height: 32px;
+}
+/deep/.el-select {
+  display: inline-block;
+  position: relative;
+  width: 100%;
+}
+.annu{
+  height: 81px;
+  background: #FFFFFF;
+  border-radius: 4px;
+}
+.basicInformation
+.el-form-item {
+    width: 50.3333%;
+    border: none;
+    margin: 0;
+}
+.huom{
+  width: 100px;
+  
+}
+.el-form{
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890B1;
+  line-height: 16px;
+  margin-left: 130px;
+}
+.a{
+  margin-left: -32px;
+}
+ .el-radio-group {
+    margin-left: 80px;
+}
+.ding{
+  height: 23px;
+  background: #E8ECF6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+.ziti {
+  width: 72px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 20px;
+  margin-left: 310px;
+  /* margin-top: 112px; */
+}
+.ziti1 {
+    width: 100px;
+    font-size: 16px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #262626;
+    line-height: 22px;
+    margin-left: 381px;
+    margin-top: -21px;
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.nav {
+  width: 381px;
+  height: 20px;
+}
+</style>

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -39,7 +39,7 @@
       <div class="ding"></div>
        <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
           <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
@@ -229,7 +229,7 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item label="业务描述" span="1">
+          <el-form-item v-if='dataList.taskTypeKey != 3' label="业务描述" span="1">
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
@@ -243,16 +243,16 @@
       </div>
       <div v-show="dataList.taskTypeKey != 1" class="center1">
         <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
             alt=""
           />
         <div class="small-title">
-          <h3>入库任务({{ dataList1.inOutTaskNo }} )</h3>
+          <h3>入库任务({{ dataList1.inOutTaskNo }}) <span v-if='deletetask' style='color:red;'>已删除</span></h3>
         </div>
-        <el-form ref="form" :model="form" label-width="140px">
+        <el-form v-if='!deletetask' ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
@@ -437,7 +437,7 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item label="业务描述">
+          <el-form-item v-if='dataList.taskTypeKey != 4' label="业务描述">
             <el-input
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
@@ -740,6 +740,7 @@ export default {
       onChange: {},
       deptBudgetList1: [],
       gradeList: [],
+      deletetask:false,
       rules: {
         netWeight: [
           {
@@ -942,11 +943,17 @@ export default {
       ) {
         this.dataList.inOutTaskNo = this.inOutTaskNo
         this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-
+        if(this.dataList.taskTypeKey == 3){
+          this.dataList.businessDescribe=this.dataList1.businessDescribe
+        }else{
+          this.dataList1.businessDescribe=this.dataList.businessDescribe
+        }
         this.requestadd(this.dataList, 'repetition')
         this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.relevanceId = this.dataList.relevanceId
-        this.requestadd(this.dataList1, 'repetition')
+        if(!this.deletetask){
+          this.requestadd(this.dataList1, 'repetition')
+        }
       }
     },
     selectwarehouseName() {},
@@ -1086,6 +1093,10 @@ export default {
               this.dataList = response[0]
               this.dataList1 = response[1]
             } else {
+               if(response[0].taskTypeKey==3){
+                this.deletetask=true
+                this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf("C") + 1,response[0].inOutTaskNo.length)
+              }
               this.dataList = response[0]
             }
           })
@@ -1362,7 +1373,7 @@ export default {
   display: inline-block;
 }
 .center1 .small-title {
-  margin-left: 150px;
+  margin-left: 323px;
 }
 .center1 {
   width: 90%;
@@ -1400,6 +1411,7 @@ export default {
   font-weight: 400;
   color: #8890B1;
   line-height: 16px;
+  margin-left: 130px;
 }
 .a{
   margin-left: -32px;
@@ -1420,7 +1432,7 @@ export default {
   font-weight: 400;
   color: #8890b1;
   line-height: 20px;
-  margin-left: 130px;
+  margin-left: 310px;
   /* margin-top: 112px; */
 }
 .ziti1 {
@@ -1430,8 +1442,8 @@ export default {
     font-weight: 500;
     color: #262626;
     line-height: 22px;
-    margin-left: 197px;
-    margin-top: -22px;
+    margin-left: 381px;
+    margin-top: -21px;
 }
 .winseaview-view {
   padding: 0 0 20px;
@@ -1441,7 +1453,7 @@ export default {
   height: 93vh;
 }
 .nav {
-  width: 200px;
+  width: 380px;
   height: 20px;
 }
 </style>

src/views/tranManagement/tranManagementDriver.vue

@@ -149,7 +149,7 @@
             </ws-form>
           </template>
         </el-table-column>
-        <el-table-column type="index" label="序号">
+        <el-table-column type="index" label="序号" width="80">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
@@ -233,7 +233,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="address" label="操作" width="500">
+        <el-table-column prop="address" label="操作" >
           <template slot-scope="scope">
             <el-button size="medium" type="text" class="record" @click="look(scope.row)"
               >查看</el-button
@@ -264,7 +264,7 @@
                 class="record1"
                 size="medium"
                 type="text"
-                style="font-size:14px"
+                style="font-size:14px;color:#F83535;"
                 @click="relieve(scope.row)"
                 >已禁用</el-button
               >

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -6,37 +6,24 @@
         <h2 class="bg-left title">编辑司机</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </el-row>
 
-    <ws-form
-      ref="deptBudgetList"
-      :rules="mainReportAdd"
-      :model="deptBudgetList"
-    >
+    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
       <div class="small-title">司机信息</div>
       <div class="drivermessage">
         <ws-info-table>
           <!--司机姓名-->
-          <ws-form-item
-            label="姓名"
-            span="1"
-            prop="contractNo"
-            class="readonly bg-right"
-          >
+          <ws-form-item label="姓名" span="1" prop="contractNo" class="readonly bg-right">
             <ws-input
               v-model="deptBudgetList.driverName"
               placeholder="请输入司机姓名"
@@ -45,12 +32,7 @@
             />
           </ws-form-item>
           <!--手机号-->
-          <ws-form-item
-            label="手机号"
-            span="1"
-            prop="driverPhone"
-            class="readonly"
-          >
+          <ws-form-item label="手机号" span="1" prop="driverPhone" class="readonly">
             <ws-input
               v-model="deptBudgetList.driverPhone"
               placeholder="请输入手机号"
@@ -74,12 +56,7 @@
           </ws-form-item>
 
           <!--身份证号-->
-          <ws-form-item
-            label="身份证号"
-            span="1"
-            prop="driverNo"
-            class="readonly"
-          >
+          <ws-form-item label="身份证号" span="1" prop="driverNo" class="readonly">
             <ws-input
               v-model="deptBudgetList.numberCard"
               placeholder="请输入身份证号"
@@ -92,11 +69,7 @@
         <span v-if="age && age > 60" class="big">{{ age }}岁</span>
       </div>
     </ws-form>
-    <ws-form
-      ref="deptBudgetList"
-      :rules="mainReportAdd"
-      :model="deptBudgetList"
-    >
+    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
       <div class="small-title">货车信息</div>
       <div
         style="width: 100%"
@@ -104,45 +77,35 @@
         v-for="(item, index) in deptBudgetList.driverCarInfoList"
       >
         <div class="trucks">
-          <div class="driver">货车信息-{{ index + 1 }}
-             <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(item, index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
+          <div class="driver">
+            货车信息-{{ index + 1 }}
+            <img
+              width="22"
+              height="22"
+              class="add"
+              @click="add"
+              src="../../../public/img/add.png"
+              alt
+            />
+            <img
+              width="22"
+              height="22"
+              class="del"
+              @click="del(item, index)"
+              src="../../../public/img/del.png"
+              alt
+            />
           </div>
           <ws-info-table class="el-table">
             <!--车牌号-->
-            <ws-form-item
-              label="车牌号"
-              span="1"
-              prop="carNumber"
-              class="forlist"
-              width="400px"
-            >
-              <ws-input
-                v-model="item.carNumber"
-                placeholder="请输入车牌号"
-                maxlength="20"
-                size="small"
-              />
+            <ws-form-item label="车牌号" span="1" prop="carNumber" class="forlist" width="400px">
+              <ws-input v-model="item.carNumber" placeholder="请输入车牌号" maxlength="20" size="small" />
             </ws-form-item>
             <!--车型-->
             <ws-form-item label="车型" span="1" prop="carModel" class="forlist">
               <ws-select
                 v-model="item.carModel"
-                placeholder=""
+                placeholder
                 class="typeselect"
                 @change="
                   (value) => {
@@ -159,15 +122,10 @@
               </ws-select>
             </ws-form-item>
             <!--车长-->
-            <ws-form-item
-              label="不含车头车长（米）"
-              span="1"
-              prop="carLength"
-              class="forlist"
-            >
+            <ws-form-item label="不含车头车长（米）" span="1" prop="carLength" class="forlist">
               <ws-select
                 v-model="item.carLength"
-                placeholder=""
+                placeholder
                 class="typeselect"
                 @change="
                   (value) => {
@@ -185,21 +143,11 @@
             </ws-form-item>
             <!--载重-->
             <ws-form-item label="载重" span="1" prop="carLoad" class="forlist">
-              <ws-input
-                v-model="item.carLoad"
-                placeholder="请输入载重"
-                maxlength="100"
-                size="small"
-              />
+              <ws-input v-model="item.carLoad" placeholder="请输入载重" maxlength="100" size="small" />
             </ws-form-item>
 
             <!--出厂年份-->
-            <ws-form-item
-              label="出厂年份"
-              span="1"
-              prop="yearManufacture"
-              class="forlist"
-            >
+            <ws-form-item label="出厂年份" span="1" prop="yearManufacture" class="forlist">
               <ws-input
                 v-model="item.yearManufacture"
                 placeholder="请输入年份"
@@ -208,15 +156,10 @@
               />
             </ws-form-item>
           </ws-info-table>
-         
         </div>
       </div>
     </ws-form>
-    <ws-form
-      ref="deptBudgetList"
-      :rules="mainReportAdd"
-      :model="deptBudgetList"
-    >
+    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
       <div class="small-title">收款人账户信息</div>
       <div
         style="width: 100%"
@@ -224,47 +167,34 @@
         v-for="(item, index) in deptBudgetList.driverPayeeInfoList"
       >
         <div class="gathering">
-          <div class="driver">收款人账户信息-{{ index + 1 }}
-             <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add1"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del1(item, index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
+          <div class="driver">
+            收款人账户信息-{{ index + 1 }}
+            <img
+              width="22"
+              height="22"
+              class="add"
+              @click="add1"
+              src="../../../public/img/add.png"
+              alt
+            />
+            <img
+              width="22"
+              height="22"
+              class="del"
+              @click="del1(item, index)"
+              src="../../../public/img/del.png"
+              alt
+            />
           </div>
           <ws-info-table class="el-table">
             <!--账户类型-->
-            <ws-form-item
-              label="账户类型"
-              span="1"
-              prop="contractNo"
-              class="el-car bg-right"
-            >
-              <el-radio v-model="item.accountTypeFlag" label="1"
-                >私人账号</el-radio
-              >
-              <el-radio v-model="item.accountTypeFlag" label="2"
-                >企业账户</el-radio
-              >
+            <ws-form-item label="账户类型" span="1" prop="contractNo" class="el-car bg-right">
+              <el-radio v-model="item.accountTypeFlag" label="1">私人账号</el-radio>
+              <el-radio v-model="item.accountTypeFlag" label="2">企业账户</el-radio>
             </ws-form-item>
             <!--账号-->
             <ws-form-item label="账号" span="1" prop="bankCard" class="el-car">
-              <ws-input
-                v-model="item.bankCard"
-                placeholder="请输入账号"
-                maxlength="100"
-                size="small"
-              />
+              <ws-input v-model="item.bankCard" placeholder="请输入账号" maxlength="100" size="small" />
               <el-upload
                 action="https://www.zthymaoyi.com/upload/admin"
                 :show-file-list="false"
@@ -275,7 +205,8 @@
                 "
                 class="avatar-uploader"
                 accept=".jpg, .jpeg, .png, .gif"
-                ><img
+              >
+                <img
                   width="18"
                   height="20"
                   style="
@@ -284,17 +215,12 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  alt=""
+                  alt
                 />
               </el-upload>
             </ws-form-item>
             <!--开户行-->
-            <ws-form-item
-              label="开户行"
-              span="1"
-              prop="bankDeposit"
-              class="el-car"
-            >
+            <ws-form-item label="开户行" span="1" prop="bankDeposit" class="el-car">
               <ws-input
                 v-model="item.bankDeposit"
                 placeholder="请输入开户行"
@@ -311,28 +237,11 @@
               class="el-car"
               width="150px"
             >
-              <ws-input
-                v-model="item.payeeName"
-                placeholder="请输入姓名"
-                maxlength="100"
-                size="small"
-              />
+              <ws-input v-model="item.payeeName" placeholder="请输入姓名" maxlength="100" size="small" />
             </ws-form-item>
             <!--企业名称-->
-            <ws-form-item
-              label="企业名称"
-              v-else
-              span="1"
-              prop="compName"
-              class="el-car"
-              width="150px"
-            >
-              <ws-input
-                v-model="item.compName"
-                placeholder="请输入企业名称"
-                maxlength="100"
-                size="small"
-              />
+            <ws-form-item label="企业名称" v-else span="1" prop="compName" class="el-car" width="150px">
+              <ws-input v-model="item.compName" placeholder="请输入企业名称" maxlength="100" size="small" />
             </ws-form-item>
 
             <!--身份证号-->
@@ -359,7 +268,8 @@
                 "
                 class="avatar-uploader"
                 accept=".jpg, .jpeg, .png, .gif"
-                ><img
+              >
+                <img
                   width="18"
                   height="20"
                   style="
@@ -368,19 +278,14 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  alt=""
+                  alt
                 />
               </el-upload>
             </ws-form-item>
-            <ws-form-item
-              label="开户支行"
-              span="1"
-              prop="bankDepositBranch"
-              class="el-car"
-            >
+            <ws-form-item label="开户支行" span="1" prop="bankDepositBranch" class="el-car">
               <ws-select
                 v-model="item.bankDepositBranch"
-                placeholder=""
+                placeholder
                 class="typeselect"
                 @change="
                   (value) => {
@@ -397,15 +302,10 @@
               </ws-select>
             </ws-form-item>
           </ws-info-table>
-         
         </div>
       </div>
     </ws-form>
-    <ws-form
-      ref="deptBudgetList"
-      :rules="mainReportAdd"
-      :model="deptBudgetList"
-    >
+    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
       <div class="flex">
         <div>
           <el-upload
@@ -414,17 +314,10 @@
             :on-success="uploadSuccessHandletravel"
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
-            ><el-button class="upload button" size="small" type="primary"
-              >行驶证</el-button
-            >
+          >
+            <el-button class="upload button" size="small" type="primary">行驶证</el-button>
           </el-upload>
-          <img
-            v-show="addressUrls.travel"
-            width="100"
-            height="100"
-            :src="addressUrls.travel"
-            alt=""
-          />
+          <img v-show="addressUrls.travel" width="100" height="100" :src="addressUrls.travel" alt />
         </div>
         <div>
           <el-upload
@@ -433,17 +326,10 @@
             :on-success="uploadSuccessHandledrive"
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
-            ><el-button class="upload button" size="small" type="primary"
-              >驾驶证</el-button
-            >
+          >
+            <el-button class="upload button" size="small" type="primary">驾驶证</el-button>
           </el-upload>
-          <img
-            v-if="addressUrls.drive"
-            width="100"
-            height="100"
-            :src="addressUrls.drive"
-            alt=""
-          />
+          <img v-if="addressUrls.drive" width="100" height="100" :src="addressUrls.drive" alt />
         </div>
         <div>
           <el-upload
@@ -452,17 +338,10 @@
             :on-success="uploadSuccessHandleway"
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
-            ><el-button class="upload button-green" size="small" type="primary"
-              >道路运营证</el-button
-            >
+          >
+            <el-button class="upload button-green" size="small" type="primary">道路运营证</el-button>
           </el-upload>
-          <img
-            v-if="addressUrls.way"
-            width="100"
-            height="100"
-            :src="addressUrls.way"
-            alt=""
-          />
+          <img v-if="addressUrls.way" width="100" height="100" :src="addressUrls.way" alt />
         </div>
         <div>
           <el-upload
@@ -471,16 +350,16 @@
             :on-success="uploadSuccessHandlequalification"
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
-            ><el-button class="upload button-green" size="small" type="primary"
-              >从业资格证</el-button
-            >
+           
+          >
+            <el-button class="upload button-green" size="small" type="primary">从业资格证</el-button>
           </el-upload>
           <img
             v-if="addressUrls.qualification"
             width="100"
             height="100"
             :src="addressUrls.qualification"
-            alt=""
+            alt
           />
         </div>
         <div>
@@ -490,16 +369,15 @@
             :on-success="uploadSuccessHandleidentityjust"
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
-            ><el-button class="upload button-yellow" size="small" type="primary"
-              >身份证正面</el-button
-            >
+          >
+            <el-button class="upload button-yellow" size="small" type="primary">身份证正面</el-button>
           </el-upload>
           <img
             v-if="addressUrls.identityjust"
             width="100"
             height="100"
             :src="addressUrls.identityjust"
-            alt=""
+            alt
           />
         </div>
         <div>
@@ -509,29 +387,22 @@
             :on-success="uploadSuccessHandleidentityagainst"
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
-            ><el-button class="upload button-yellow" size="small" type="primary"
-              >身份证反面</el-button
-            >
+          >
+            <el-button class="upload button-yellow" size="small" type="primary">身份证反面</el-button>
           </el-upload>
           <img
             v-if="addressUrls.identityagainst"
             width="100"
             height="100"
             :src="addressUrls.identityagainst"
-            alt=""
+            alt
           />
         </div>
       </div>
     </ws-form>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="submit(deptBudgetList)"
-        >提交</el-button
-      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)">提交</el-button>
     </div>
   </div>
 </template>
@@ -539,7 +410,7 @@
 import {
   provinceAndCityData,
   CodeToText,
-  TextToCode,
+  TextToCode
 } from 'element-china-area-data'
 import {
   lookDriver,
@@ -548,7 +419,7 @@ import {
   getidentity,
   getbank,
   packList,
-  editdriver,
+  editdriver
 } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -556,7 +427,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    mapDrag,
+    mapDrag
   },
   watch: {
     vesselId(val) {
@@ -564,7 +435,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     let self = this
@@ -572,9 +443,9 @@ export default {
       deptBudgetList: {
         totalStorage: 0,
         drivercarInfo: {
-          goodsName: '',
+          goodsName: ''
         },
-        driverPayeeInfo: {},
+        driverPayeeInfo: {}
       },
       radio: '1',
       carModelList: [],
@@ -591,6 +462,7 @@ export default {
       appendixIdsAdd: '',
       size: 10,
       value1: '',
+      fileList:[],
       unitList: [],
       accessoryBankTFs: false,
       freightspace: [
@@ -601,8 +473,8 @@ export default {
           carLength: '13',
           carLengthKey: '1',
           carLoad: '',
-          yearManufacture: '',
-        },
+          yearManufacture: ''
+        }
       ],
       freightspace1: [
         {
@@ -613,12 +485,12 @@ export default {
           payeeNumberCard: '',
           compName: '',
           bankDeposit: '',
-          bankCard: '',
-        },
+          bankCard: ''
+        }
       ],
       name: '',
       age: '',
-      addressUrls: {},
+      addressUrls: {}
     }
   },
   activated() {
@@ -648,12 +520,16 @@ export default {
     loaddata() {
       lookDriver({ id: this.$route.query.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           // this.selectedOptions.push()
+          
           for (var i = 0; i < response.driverPayeeInfoList.length; i++) {
             if (response.driverPayeeInfoList[i].cardAddressUrl != null) {
-              response.driverPayeeInfoList[i].cardAddressUrlArray =
-                response.driverPayeeInfoList[i].cardAddressUrl.split(',')
+              response.driverPayeeInfoList[
+                i
+              ].cardAddressUrlArray = response.driverPayeeInfoList[
+                i
+              ].cardAddressUrl.split(',')
             } else {
               response.driverPayeeInfoList[i].cardAddressUrlArray = []
             }
@@ -668,19 +544,18 @@ export default {
             TextToCode[this.deptBudgetList.residentCityProvincial][
               this.deptBudgetList.residentCityMunicipal
             ].code
-          this.selectedOptions = tmp
+          this.selectedOptions = tmp         
         })
-      console.log(11111)
       // 车型
       packList({ constId: 'TRAN1' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.carModelList = response
         })
       // 车长
       packList({ constId: 'TRAN2' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.carLengthList = response
         })
     },
@@ -694,7 +569,7 @@ export default {
 
       getidentity({ personImg: e.url })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           for (
             var i = 0;
             i < this.deptBudgetList.driverPayeeInfoList.length;
@@ -716,7 +591,7 @@ export default {
       // this.deptBudgetList.cardAddressUrl = e.url
       getbank({ bankImg: e.url })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           for (
             var i = 0;
             i < this.deptBudgetList.driverPayeeInfoList.length;
@@ -765,7 +640,7 @@ export default {
         carLength: '13',
         carLengthKey: '1',
         carLoad: '',
-        yearManufacture: '',
+        yearManufacture: ''
       })
     },
     del(row, index) {
@@ -773,7 +648,7 @@ export default {
         if (row.id) {
           deltrancar({ id: row.id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('删除成功')
             })
         }
@@ -789,7 +664,7 @@ export default {
         payeeNumberCard: '',
         compName: '',
         bankDeposit: '',
-        bankCard: '',
+        bankCard: ''
       })
     },
     del1(row, index) {
@@ -797,7 +672,7 @@ export default {
         if (row.id) {
           deltranprocess({ id: row.id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('删除成功')
             })
         }
@@ -828,16 +703,18 @@ export default {
     selectcarModel(e, index) {
       for (var i = 0; i < this.carModelList.length; i++) {
         if (this.carModelList[i].constValue == e) {
-          this.deptBudgetList.driverCarInfoList[index].carModelKey =
-            this.carModelList[i].constKey
+          this.deptBudgetList.driverCarInfoList[
+            index
+          ].carModelKey = this.carModelList[i].constKey
         }
       }
     },
     selectcarLength(e, index) {
       for (var i = 0; i < this.carLengthList.length; i++) {
         if (this.carLengthList[i].constValue == e) {
-          this.deptBudgetList.driverCarInfoList[index].carLengthKey =
-            this.carLengthList[i].constKey
+          this.deptBudgetList.driverCarInfoList[
+            index
+          ].carLengthKey = this.carLengthList[i].constKey
         }
       }
     },
@@ -847,13 +724,13 @@ export default {
     },
     onChange(files) {
       this.fileNum = files
-      this.$refs.upload.handleSaveBill().then((res) => {
+      this.$refs.upload.handleSaveBill().then(res => {
         console.log(files)
       })
     },
 
     submit() {
-      this.$refs.deptBudgetList.validate((valid) => {
+      this.$refs.deptBudgetList.validate(valid => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.residentCityProvincial =
@@ -862,7 +739,8 @@ export default {
             CodeToText[this.selectedOptions[1]]
           editdriver(this.deptBudgetList)
             .toPromise()
-            .then((response) => {
+            .then(response => {
+              
               this.$message.success('添加成功')
               this.$router.go(-1)
             })
@@ -874,8 +752,8 @@ export default {
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
-    },
-  },
+    }
+  }
 }
 </script>
 
@@ -886,7 +764,7 @@ export default {
 .add,
 .del {
   position: absolute;
- margin-left: 23px;
+  margin-left: 23px;
   top: 27px;
   cursor: pointer;
 }
@@ -1070,7 +948,7 @@ export default {
   padding: 12px;
   border-radius: 3px;
   margin: 10px 0;
-  background: #F6F7FC;
+  background: #f6f7fc;
 }
 /deep/.trucks .ws-info-table,
 /deep/.trucks .ws-info-table .el-form-item,
@@ -1080,7 +958,7 @@ export default {
 /deep/.trucks .el-table__expanded-cell,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__content {
-  background: #F6F7FC;
+  background: #f6f7fc;
 }
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label {
   color: #8890b1;

src/views/tranManagement/tranManagementDriverLook.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left title">添加新司机</h2>
+        <h2 class="bg-left title">查看司机信息</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button

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">
@@ -28,7 +23,7 @@
           />
         </ws-select>
        <div>
-          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 70px;color: #8890B1;">接单日期：</span>
         </div>
         <el-date-picker
           v-model="inOutDate"
@@ -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,13 +82,13 @@
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
          
         </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send" width="240">
+        <el-table-column class="table_td" label="发货" prop="send" >
           
         </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive" width="240">
+        <el-table-column class="table_td" label="收货" prop="receive" >
           
         </el-table-column>
-        <el-table-column class="table_td" label="运输周期" prop="tranCycle">
+        <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
          <template scope="scope">
                {{scope.row.deliveryDateStart}} ~ {{scope.row.deliveryDateEnd}}
              </template>
@@ -154,18 +148,26 @@
           />
         </template>
       </el-table-column>
-      <el-table-column class="table_td" label="接单日期" prop="createDate">
+      <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
-            <template slot-scope="scope">
-            <div class="record" @click="trainSee(scope.row)">
-              查看
-            </div>
-            <div class="adjustment" @click="feedback(scope.row)"
-              v-show="scope.row.tranType == '汽运'"
-            >
-              反馈
-            </div>
+     <el-table-column prop="seller" label="操作" width="300">
+          <template  slot-scope="scope">
+              <template v-if="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus != '已完成'
+              ">
+                <div class="record" @click="trainSee(scope.row)">查看</div>
+                <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+              </template>
+              <template v-else-if="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus == '已完成'
+              ">
+                <div class="record1" @click="trainSee(scope.row)">查看</div>
+              </template>
+               <template v-else>
+                <div class="record1">—— ——</div>
+              </template>
           </template>
         </el-table-column>
       </el-table>
@@ -224,6 +226,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       feedbackFlag: 1,
+      searchType:1,
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
@@ -520,12 +523,13 @@ export default {
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
 }
-.record,
+.record,.record1,
 .adjustment {
   display: inline-block;
   color: #5878e8;
   padding: 0 4px !important;
   position: relative;
+  font-size: 14px;
 }
 .record:after {
   position: absolute;
@@ -572,13 +576,13 @@ export default {
 .done {
   background: #50cad4;
 }
-.record, .adjustment {
-    display: inline-block;
-    color: #5878e8;
-    padding: 0 4px !important;
-    position: relative;
-    font-size: 14px;
-}
+// .record, .adjustment {
+//     display: inline-block;
+//     color: #5878e8;
+//     padding: 0 4px !important;
+//     position: relative;
+//     font-size: 14px;
+// }
 /deep/.el-pagination {
     text-align: center;
     white-space: nowrap;

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -92,36 +92,22 @@
               <ws-form-item label="姓名：" span="1" prop="driver">
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driver }}</span>
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--电话-->
               <ws-form-item label="电话：" span="1" prop="driverPhone">
-                <!-- <ws-input
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.driverPhone"
-                maxlength="20"
-                size="small"
-                />-->
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--车牌号-->
               <ws-form-item label="车牌号：" span="1" prop="carNo">
-                <!-- <ws-input
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.carNo"
-                maxlength="20"
-                size="small"
-                />-->
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--装车净重-->
               <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">
-                <!-- <ws-input
-                v-model="item.loadNetWeight"
-                placeholder="请输入装车(吨)"
-                maxlength="20"
-                size="small"
-                />-->
                 {{item.loadNetWeight}}
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--卸车净重(吨)-->
               <ws-form-item label="卸车净重(吨)：" span="1" prop="unloadNetWeight">
                 <ws-input
@@ -131,6 +117,7 @@
                   size="small"
                 />
               </ws-form-item>
+               <el-divider direction="vertical" class="line"></el-divider>
               <!--磅单-->
               <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -155,12 +142,6 @@
                     alt=""
                   />
                 </el-upload>
-                <!-- <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未上传'" class="signStatus">
-                  {{ item.signStatus }}
-                </div>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已上传'" class="signStatus1">
-                  {{ item.signStatus }}
-                </div> -->
               </template>
             </ws-form-item>
             </ws-info-table>
@@ -489,7 +470,7 @@ export default {
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: left;
-  font-size: 14px;
+  font-size: 13px;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
@@ -537,13 +518,14 @@ export default {
   background: #f5f7fa;
   border-radius: 4px;
   color: #8890b1;
-  font-size: 14px;
+  font-size: 12px;
+  font-weight: 400;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 72px;
 }
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 16.66%;
+  width: 14.66%;
   color: #8890b1;
   font-size: 14px;
 }
@@ -552,7 +534,7 @@ export default {
   height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 40%;
+  width:55%;
   border: 0px solid #d8dce6;
   background: #f5f7fa;
   text-align: center;
@@ -628,4 +610,22 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+    // background-color: #eee;
+    // padding-right: 8px;
+    // padding-left: 8px;
+    // width: 100px;
+    font-size: 12px;
+    font-weight: bold;
+    // color: #333;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
+    white-space: nowrap;
+    // line-height: 40px;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -105,23 +105,27 @@
             <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 0">
               <span>{{ item.driver }} </span>
             </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>
             <!--磅单-->
             <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -711,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;
@@ -736,7 +733,7 @@ activated(){
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
-  font-size: 14px;
+  font-size: 13px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
@@ -750,14 +747,15 @@ 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 {
-  width: 16%;
+  width: 15%;
   height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
+  width: 53%;
   background: #F6F7FC;
 }
 /deep/.liaison .flex {
@@ -779,4 +777,9 @@ margin-top: 20px;
 .catNosCor{
   color: #5473E8;
 }
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
 </style>

src/views/tranManagement/tranManagementShipping.vue

@@ -23,8 +23,8 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px; color: #8890b1"
-            >接单日期</span
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
           >
         </div>
         <el-date-picker
@@ -45,7 +45,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
@@ -144,7 +143,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="接单日期" prop="createDate">
+        <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/tranManagementShippingArrangemen.vue

@@ -69,7 +69,7 @@
                     filterable
                     :filter-method="dataFilter"
                     @change="selectstaff"
-                    class="small"
+                     size="small"
                   >
                     <el-option
                       v-for="item in options"
@@ -82,6 +82,7 @@
                 </ws-form-item>
                 <ws-form-item label="电话" span="1" prop="driverPhone" class="biao">
                   <ws-input
+                    
                     :readonly="true"
                     v-model="item.driverPhone"
                     placeholder="请输入电话"
@@ -143,27 +144,27 @@
               </ws-info-table>
             </div>
             <div
-              style="width: 530px"
+              style=" width: 536px;"
               class="xia"
               v-for="(items, index) in freightspace"
               v-show="item.shipType=='散船'"
               :key="index"
             >
               <ws-info-table>
-                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot">
+                <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity"  class="bot" >
                   <el-input v-model="items.impurity"></el-input>
                 </ws-form-item>
-                <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
+                 <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot" >
                   <el-input v-model="items.positionWeight"></el-input>
-                </ws-form-item>
-                <span
+                </ws-form-item> 
+                 <span
                   width="22"
                   height="22"
                   class="del"
                   @click="del(index)"
                   src="../../../public/img/del.png"
                   alt
-                >X</span>
+                >×</span>
               </ws-info-table>
             </div>
             <div>
@@ -174,7 +175,7 @@
                 @click="add"
                 v-show="item.shipType=='散船'"
               >
-                <img width="22" height="22" @click="add" src="../../../public/img/add.png" alt />
+                <img width="22" height="22" src="../../../public/img/add.png" alt />
                 <div class="spans">添加仓位</div>
               </el-button>
             </div>
@@ -289,6 +290,8 @@ export default {
   },
   activated() {
     this.loaddata()
+     this.getList()
+    
   },
   computed: {
     totalStorage: function() {
@@ -346,10 +349,31 @@ export default {
         .toPromise()
         .then(response => {
           this.deptBudgetList = response
-          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            var num = this.deptBudgetList.tranCarInfoList[
-              i
-            ].positionWeight.split(',')
+
+          //     for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          //   var num = this.deptBudgetList.tranCarInfoList[
+          //     i
+          //   ].positionWeight.split(',')
+          //   for (var j = 0; j < num.length; j++) {
+          //     var num2 = num[j].split('/')
+          //     this.freightspace.push({
+          //       impurity: num2[i],
+          //       positionWeight: num2[num2.length - 1]
+          //     })
+          //   }
+          // }
+          if(response.tranCarInfoList.length>0) {
+            // if(response.tranCarInfoList[i].positionWeight) {
+            //   this.list = response.tranCarInfoList[0].positionWeight.splice(',')
+            //   for(var i = 0;i<this.list.length;i++) {
+            //     var num = this.list[i]
+            //     this.freightspace.push({
+            //       trandriver:num,
+            //     })
+            //   }
+            // }
+            for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+              var num = this.deptBudgetList.tranCarInfoList[i].positionWeight.split(',')
             for (var j = 0; j < num.length; j++) {
               var num2 = num[j].split('/')
               this.freightspace.push({
@@ -358,6 +382,24 @@ export default {
               })
             }
           }
+          }else{
+            this.deptBudgetList.tranCarInfoList = [
+              {
+                driver:'',
+                driverPhone:'',
+                sendDateStart:'',
+                receiveDateEnd: '',
+                shipNo:'',
+                shipName:'',
+                shipType:'',
+                boxNumber:'',
+                positionWeight:'',
+                impurity:'',
+
+
+              }
+            ]
+          }
         })
     },
     //返回按钮
@@ -381,7 +423,7 @@ export default {
     },
     returnsales() {
       this.deptBudgetList = {}
-      this.freightspace = {}
+      this.freightspace =[]
       this.selectedOptions = ''
       this.$router.push({ path: 'tranManagementShipping' })
     },
@@ -430,6 +472,7 @@ export default {
           })
           return
         }
+         if(this.deptBudgetList.tranCarInfoList[i].shipType == '集装箱'){
         if (!this.deptBudgetList.tranCarInfoList[i].boxNumber) {
           this.$message({
             message: '数量不能为空',
@@ -437,6 +480,7 @@ export default {
           })
           return
         }
+        }
         if (!this.deptBudgetList.tranCarInfoList[i].shipType) {
           this.$message({
             message: '类型不能为空',
@@ -444,24 +488,31 @@ export default {
           })
           return
         }
-        if (!this.deptBudgetList.tranCarInfoList[i].impurity) {
+// console.log(this.freightspace,"仓位号")
+        for(var i = 0 ; i < this.freightspace.length ; i++){
+          if (!this.freightspace[i].impurity) {
           this.$message({
             message: '仓位号不能为空',
             type: 'warning'
           })
+          return
         }
-        if (!this.deptBudgetList.tranCarInfoList[i].positionWeight) {
+        if (!this.freightspace[i].positionWeight) {
           this.$message({
             message: '重量不能为空',
             type: 'warning'
           })
+          return
+        }
+
         }
+        
         if (
           new Date(
-            this.deptBudgetList.tranCarInfoList[i].sendDateStart
+            this.deptBudgetList.tranCarInfoList[0].sendDateStart
           ).getTime() >
           new Date(
-            this.deptBudgetList.tranCarInfoList[i].receiveDateEnd
+            this.deptBudgetList.tranCarInfoList[0].receiveDateEnd
           ).getTime()
         ) {
           this.$message({
@@ -488,16 +539,16 @@ export default {
               }
 
               this.deptBudgetList.totalStorage = this.totalStorage
-              this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.sendDateStart = this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.receiveDateEnd
-              this.tranCarInfoList.shipName = this.deptBudgetList.shipName
-              this.tranCarInfoList.shipNo = this.deptBudgetList.shipNo
+              this.tranCarInfoList.driver = this.deptBudgetList.tranCarInfoList[0].trandriver
+              this.tranCarInfoList.driverPhone = this.deptBudgetList.tranCarInfoList[0].driverPhone
+              this.tranCarInfoList.sendDateStart = this.deptBudgetList.tranCarInfoList[0].sendDateStart
+              this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.tranCarInfoList[0].receiveDateEnd
+              this.tranCarInfoList.shipName = this.deptBudgetList.tranCarInfoList[0].shipName
+              this.tranCarInfoList.shipNo = this.deptBudgetList.tranCarInfoList[0].shipNo
               this.tranCarInfoList.id = this.deptBudgetList.tranCarInfoList[0].id
-              this.tranCarInfoList.tranType = this.deptBudgetList.tranType
-              this.tranCarInfoList.boxNumber = this.deptBudgetList.boxNumber
-              this.tranCarInfoList.shipType = this.deptBudgetList.shipType
+              this.tranCarInfoList.tranType = this.deptBudgetList.tranCarInfoList[0].tranType
+              this.tranCarInfoList.boxNumber = this.deptBudgetList.tranCarInfoList[0].boxNumber
+              this.tranCarInfoList.shipType = this.deptBudgetList.tranCarInfoList[0].shipType
               this.tranCarInfoList.positionWeight = this.arr.toString()
               var tranCarInfo = {}
               var tranList = [this.tranCarInfoList]
@@ -507,7 +558,7 @@ export default {
               dispatchCat(tranCarInfo)
                 .toPromise()
                 .then(response => {
-                  this.$message.success('添加成功')
+                  this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
@@ -549,38 +600,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/.basicInformation {
-  .ws-info-table {
-    border: none;
-  }
-  .el-form-item {
-    border: 1px solid #d8dce6;
-    width: 33.3333%;
-    border: none;
-    .el-form-item__label {
-      background: transparent;
-      border: none;
-    }
-    .el-form-item__content {
-      border: none;
-    }
-  }
-}
-.title {
+.position {
   position: relative;
-  // padding-left: 10px;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-form {
-  padding: 0 10%;
 }
 .el-button--primary {
   background-color: #5878e8;
@@ -594,7 +615,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
 }
 
@@ -611,38 +632,16 @@ export default {
   position: relative;
   padding: 10px;
   font-weight: 600;
+  margin-left: 27px;
 }
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-  padding: 4px 2px;
-  font-size: 16px;
-  font-family: PingFangSC-Semibold, PingFang SC;
-  font-weight: 600;
-  color: #323233;
-  line-height: 22px;
-}
-/deep/.position .ws-info-table .el-form-item .el-form-item__label {
-  width: 40%;
-  text-align: center;
-}
+
 .position .zaizhong {
   width: 16%;
 }
-//减号
-.del {
-  right: -70px;
-  width: 13px;
-  height: 13px;
-}
+
 .bot {
   width: 30%;
+ 
 }
 //去边框
 /deep/.el-form-item {
@@ -693,7 +692,7 @@ export default {
   background: white;
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
-  width: 1010px;
+  width: 1219px;
   
 }
 /deep/.zi {
@@ -738,14 +737,6 @@ export default {
     }
   }
 }
-//下方表格
-// .biao{
-//   background: #F6F7FC;
-//   border-radius: 4px;
-//   border: 1px solid #D8DCE6;
-//   margin-top: 10px;
-
-// }
 //添加仓位样式
 .add {
   width: 100px;
@@ -769,13 +760,14 @@ export default {
   line-height: 18px;
 }
 /deep/.xia {
-  width: 500px;
+  width: 715px;
   height: 54px;
   border-radius: 4px;
   border: 1px solid #d8dce6;
   margin-top: 10px;
   background: #f6f7fc;
   border-radius: 4px;
+  margin-left: 24px;
 }
 .basicInformation .ws-info-table {
   border: none;
@@ -787,47 +779,51 @@ export default {
     font-size: 12px !important;
     width: 150px;
 }
-// .el-input--small .el-input__inner {
-//   height: 32px;
-//     line-height: 32px;
-//     width: 150px;
-//   border-block-color: #f6f7fc;
-//   background: #f6f7fc;
-  
-// }
 .zhong {
-  background: #f6f7fc;
-  border: 1px solid #d8dce6;
+    height: 111px;
+    background: #F6F7FC;
+    border-radius: 4px;
+    border: 1px solid #D8DCE6;
+    width: 99%;
+    margin: 0 2%;
+    // margin-left: -76px;
 }
 .bg-left {
   padding-left: 30px;
 }
 /deep/.el-icon-arrow-up:before {
-    margin-left: 116px;
+    margin-left: 171px;
+    // display: none;
 }
 /deep/.el-input--prefix .el-input__inner {
     padding-left: 30px;
     width: 150px;
 }
+.basicInformation .ws-info-table {
+    border: none;
+    width: 141%;
+    margin: 0 auto;
+    // margin-left: -89px;
+}
 .ys{
   // margin-left: 300px;
   width: 100px;
 
 }
 .biao{
-  margin-left: 200px;
+  margin-left: 240px;
   margin-top: -57px;
 }
 .biao2{
-  margin-left: 350px;
+  margin-left: 441px;
   margin-top: -57px;
 }
 .biao3{
-   margin-left: 580px;
+   margin-left: 722px;
   margin-top: -57px;
 }
 .biao4{
-  margin-left: 850px;
+  margin-left: 1016px;
   margin-top: -57px;
 }
 .biao5{
@@ -835,7 +831,347 @@ export default {
   margin-top: -57px;
 }
 .biao6{
-  margin-left: 400px;
+  margin-left: 450px;
   margin-top: -57px;
 }
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.position {
+  position: relative;
+}
+
+.del {
+  // position: absolute;
+  // right: -38px;
+  top: 9px;
+  cursor: pointer;
+  right: 0;
+  display: inline-block;
+  font-size: 20px;
+  width: 16px;
+  height: 10px;
+  line-height: 0px;
+  margin-top: 10px;
+  margin-left: 17px;
+}
+
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.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;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+  // border: 1px solid #cdd2dc;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.center {
+  width: 86%;
+  margin: 0 auto;
+  // margin: 0 -29%;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border: none;
+  height: 50px;
+  // margin: 0 auto;
+}
+/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;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+  border: 0px;
+}
+.add {
+  width: 100px;
+  height: 34px;
+  background: #f6f7fb;
+  border-radius: 17px;
+  color: #5473e8;
+  font-size: 14px;
+  border: none;
+  margin-left: 17px;
+  // margin-left: -79px;
+}
+.add img {
+  display: inline-block;
+  margin-top: 3px;
+  margin-left: -12px;
+}
+.add .spans {
+  display: table-caption;
+  width: 56px;
+  height: 20px;
+  line-height: 18px;
+}
+/deep/.carnum {
+  display: contents;
+}
+/deep/.carnum .ws-info-table .el-form-item {
+  width: 20%;
+}
+// /deep/.liaison .carnum .ws-info-table .el-form-item {
+//   border-radius: 10px;
+//   right: 20px;
+// }
+ /deep/.ws-info-table .el-form-item .el-form-item__label {
+    /* background-color: #fff; */
+    font-size: 14px;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+    background: border-box;
+}
+ /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    /* border: 1px solid #d8dce6; */
+    border: none;
+}
+ /deep/.basicInformation .el-form-item .el-form-item__label {
+    background: transparent;
+    border: none;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890B1;
+    line-height: 16px;
+    margin-left: 22px;
+}
 </style>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -6,12 +6,7 @@
         <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"
@@ -28,22 +23,16 @@
           <div class="small-title">任务详情</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"
               class="readonly"
-            >
-              {{ deptBudgetList.weight }}
-            </ws-form-item>
+            >{{ deptBudgetList.weight }}</ws-form-item>
 
             <!--发货地址-->
             <ws-form-item label="发货地址" span="1">
@@ -51,122 +40,98 @@
               }}{{ deptBudgetList.sendArea }}
             </ws-form-item>
             <!--发货人-->
-            <ws-form-item label="发货人" span="1" prop="sender">
-              {{ deptBudgetList.sender }}
-            </ws-form-item>
+            <ws-form-item label="发货人" span="1" prop="sender">{{ deptBudgetList.sender }}</ws-form-item>
 
             <!--发货人电话-->
-            <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-              {{ deptBudgetList.senderPhone }}
-            </ws-form-item>
+            <ws-form-item label="发货人电话" span="1" prop="senderPhone">{{ deptBudgetList.senderPhone }}</ws-form-item>
             <!--收货地址-->
-            <ws-form-item
-              label="收货地址"
-              span="1"
-              prop="receiveDetailedAddress"
-            >
+            <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">联络员及航次</div>
           <div
-            style="width: 100%"
+            style="width: 100% "
             class="flex position middle"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
           >
-        <div style="margin: 18px;color: #69708C;">航次信息</div>
+            <div style="margin: 18px;color: #69708C;">航次信息</div>
             <ws-info-table>
               <!-- 姓名 -->
-              <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-                {{ item.driver }}
-              </ws-form-item>
-              <el-divider direction="vertical" class="line"></el-divider>
+              <ws-form-item label="姓名:" span="1" prop="driver" class="siji">{{item.driver}}</ws-form-item>
+              <!-- <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>
+              >{{ item.driverPhone }}</ws-form-item>
+              <!-- <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>
+              >{{ item.sendDateStart }}</ws-form-item>
+              <!-- <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>
+              >{{ item.receiveDateEnd }}</ws-form-item>
+              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 船名 -->
-              <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-                {{ item.shipName }}
-              </ws-form-item>
-            <el-divider direction="vertical" class="line"></el-divider>
+              <ws-form-item label="船名:" span="1" prop="shipName" class="siji">{{ item.shipName }}</ws-form-item>
+              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 航次 -->
-              <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-                {{ item.shipNo }}
-              </ws-form-item>
+              <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">
-                {{ item.shipType }}
-              </ws-form-item>
+              <ws-form-item label="类型:" span="1" prop="shipType" class="siji">{{ item.shipType }}</ws-form-item>
               <ws-form-item
                 label="数量"
                 span="1"
                 prop="boxNumber"
                 class="siji"
                 v-show="item.shipType == '集装箱'"
-              >
-                {{ item.boxNumber }}
-              </ws-form-item>
-               
+              >{{ item.boxNumber }}</ws-form-item>
             </ws-info-table>
           </div>
           <div class="xia">
             <div
               style="width: 100%"
-              class="flex position"
+              class="flex position cangno"
               v-for="(items, index) in freightspace"
-              :key="index"
             >
               <ws-info-table>
                 <ws-form-item
@@ -174,29 +139,19 @@
                   span="1"
                   prop="impurity"
                   class="bot"
-                >
-                  {{ items.impurity }}
-                </ws-form-item>
+                >{{ items.impurity }}</ws-form-item>
                 <!-- 重量（吨） -->
                 <ws-form-item
                   label="重量(吨)"
                   span="1"
                   prop="positionWeight"
                   class="bot"
-                >
-                  {{ items.positionWeight }}
-                </ws-form-item>
+                >{{ items.positionWeight }}</ws-form-item>
               </ws-info-table>
             </div>
           </div>
           <div style="text-align: right; padding: 10px">
-            <el-button
-              class="bg-bottom-up"
-              type="primary"
-              size="small"
-              @click="returnsales()"
-              >关闭</el-button
-            >
+            <el-button class="bg-bottom-up" type="primary" size="small" @click="returnsales()">关闭</el-button>
           </div>
         </div>
       </ws-form>
@@ -213,7 +168,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     // vesselId(val) {
@@ -221,7 +176,7 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -263,9 +218,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -273,21 +228,21 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+        month: dayjs().format('MM')
       },
       contractList: [],
       deptBudgetList: {
         warehouseInOutDetail: {},
-        tranCarInfoList: [],
+        tranCarInfoList: []
       },
       historyList: [],
 
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   mounted() {
@@ -295,7 +250,7 @@ export default {
     this.deptBudgetList.positionId = this.$route.query.positionId
     this.deptBudgetList.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList.binNumber = this.$route.query.binNumber
-    this.getList()
+    // this.getList()
   },
   activated() {
     this.loaddata()
@@ -304,34 +259,35 @@ export default {
     loaddata() {
       shippingLook({ id: this.$route.query.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.deptBudgetList = response
           for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            var num =
-              this.deptBudgetList.tranCarInfoList[i].positionWeight.split(',')
+            var num = this.deptBudgetList.tranCarInfoList[
+              i
+            ].positionWeight.split(',')
             for (var j = 0; j < num.length; j++) {
               var num2 = num[j].split('/')
               this.freightspace.push({
                 impurity: num2[i],
-                positionWeight: num2[num2.length - 1],
+                positionWeight: num2[num2.length - 1]
               })
             }
           }
         })
     },
-    getList() {
-      shippingList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        contractType: this.contractType,
-        tranTypeKey: this.tranTypeKey,
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = response
-        })
-    },
+    // getList() {
+    //   shippingList({
+    //     compId: sessionStorage.getItem('ws-pf_compId'),
+    //     currentPage: this.currentPage,
+    //     pageSize: this.pageSize,
+    //     contractType: this.contractType,
+    //     tranTypeKey: this.tranTypeKey,
+    //   })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.warehouseList = response
+    //     })
+    // },
     //返回按钮
     revert() {
       this.freightspace = []
@@ -346,7 +302,7 @@ export default {
       this.freightspace.push({
         binNumber: '',
         maxStorage: '',
-        remark: '',
+        remark: ''
       })
     },
     //提交按钮
@@ -354,18 +310,19 @@ export default {
       this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId = sessionStorage.getItem(
+                'ws-pf_compId'
+              )
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
               addstorageputList(this.deptBudgetList)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('暂存成功')
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
@@ -380,7 +337,7 @@ export default {
         })
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementShipping' })
+      this.$router.go(-1)
     },
     handleClose() {
       this.accessoryTFs = false
@@ -388,33 +345,13 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
-      this.getList()
+      // this.getList()
     },
     handleCurrentChange(val) {
       this.currentPage = val
       console.log(`当前页: ${val}`)
-      this.getList()
+      // 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) {
@@ -423,8 +360,8 @@ export default {
       }
     },
     approve() {},
-    listQuery() {},
-  },
+    listQuery() {}
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -472,7 +409,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  width: 80%;
+  width: 106%;
   margin: 0 auto;
 }
 
@@ -508,8 +445,7 @@ export default {
   width: 16%;
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label {
-  width: 40%;
-  text-align: center;
+  background-color: #f5f7fa;
 }
 .position .zaizhong {
   width: 16%;
@@ -552,20 +488,11 @@ export default {
   font-family: PingFangSC-Regular, PingFang SC;
   margin-bottom: 5px;
   background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  background-color: #fff;
-  font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 12px;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
 }
-
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
   border-radius: 4px;
@@ -573,6 +500,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;
@@ -606,14 +535,14 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   // background-color: #f5f7fa;
-  font-size: 14px;
+  font-size: 12px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
 }
 .position .siji {
-  width: 13%;
+  width: 14.28%;
 }
 .el-form {
   height: 1000px;
@@ -623,15 +552,34 @@ export default {
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label {
   background-color: #f5f7fa;
+  // text-align: center;
+  width: 48%;
 }
 .middle {
   background: #f6f7fc;
   border-radius: 4px;
   border: 1px solid #d8dce6;
 }
-.line{
+.line {
   height: 26px;
   margin-top: 6px;
-  left: -20px;
+  left: 2px;
+}
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
+  // background-color: #eee;
+  // padding-right: 8px;
+  // padding-left: 8px;
+  // width: 100px;
+  font-size: 13px;
+  // font-weight: bold;
+  // color: #333;
+  // overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  // line-height: 40px;
+  text-align: center;
+}
+/deep/.cangno .ws-info-table .el-form-item .el-form-item__content {
+  border: none;
 }
 </style>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -141,9 +141,7 @@
                   :value="item.staffName"
                 />
               </el-select>
-              <!-- <span v-show="item.temporaryDriverFlag == 0">{{item.driver}} </span>  -->
             </ws-form-item>
-
             <!--电话-->
             <ws-form-item label="司机电话：" span="1" prop="driverPhone">
               <ws-input
@@ -157,6 +155,7 @@
                 >{{ item.driverPhone }}
               </span>
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--车牌号-->
             <ws-form-item label="车牌号：" span="1" prop="carNo">
               <ws-input
@@ -170,6 +169,7 @@
                 >{{ item.carNo }}
               </span>
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--装车净重-->
             <ws-form-item label="装车净重：" span="1" prop="loadNetWeight">
               <ws-input
@@ -179,6 +179,7 @@
                 size="small"
               />
             </ws-form-item>
+             <el-divider direction="vertical" class="line"></el-divider>
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -941,7 +942,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
-  font-size: 14px;
+  font-size: 13px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
@@ -958,10 +959,10 @@ export default {
 }
 //联络员及车次
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
+  width: 18%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
+  width: 41%;
   background: #f6f7fc;
 }
 /deep/.liaison .flex {
@@ -1012,6 +1013,7 @@ export default {
   color: #ffffff;
   background: #c4cada;
   line-height: 24px;
+  margin-left: 18px;
 }
 .signStatus1 {
   height: 25px;
@@ -1023,4 +1025,9 @@ export default {
   color: #5473E8;
   line-height: 24px;
 }
+.line{
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
 </style>

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

@@ -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">
@@ -28,8 +23,8 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px; color: #8890b1"
-            >接单日期</span
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
           >
         </div>
         <el-date-picker
@@ -85,13 +80,13 @@
         </el-table-column>
         <el-table-column prop="goodsName" label="货名" >
         </el-table-column>
-        <el-table-column prop="weight" label="重量（吨）" width="120">
+        <el-table-column prop="weight" label="重量（吨）" >
         </el-table-column>
-        <el-table-column prop="send" label="发货" width="240">
+        <el-table-column prop="send" label="发货" >
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="240">
+        <el-table-column prop="receive" label="收货" >
         </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期" width="160">
+        <el-table-column prop="tranCycle" label="运输周期" width="160" >
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
@@ -155,7 +150,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" 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">
@@ -166,9 +161,15 @@
                 <div class="record" @click="trainSee(scope.row)">查看</div>
                 <div class="adjustment" @click="feedback(scope.row)">反馈</div>
               </template>
-              <template v-else>
+              <template v-else-if="
+                scope.row.tranType == '汽运' &&
+                scope.row.feedbackStatus == '已完成'
+              ">
                 <div class="record1" @click="trainSee(scope.row)">查看</div>
               </template>
+               <template v-else>
+                <div class="record1">—— ——</div>
+              </template>
           </template>
         </el-table-column>
       </el-table>
@@ -221,6 +222,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       deptBudgetTotal: 0,
+      searchType:1,
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
@@ -285,12 +287,14 @@ export default {
     },
     //查看火运调度详细
     trainSee(row) {
-      this.$router.push({
-        path: 'tranManagementTransporFeedbackLook',
-        query: {
-          id: row.id,
-        },
-      })
+            if (row.tranType == '汽运') {
+        this.$router.push({
+          path: 'tranManagementTransporFeedbackLook',
+          query: {
+            id: row.id,
+          },
+        })
+      } 
     },
     //反馈
     feedback(row) {

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -23,8 +23,8 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px; color: #8890b1"
-            >接单日期</span
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
           >
         </div>
         <el-date-picker
@@ -75,17 +75,17 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" width="120">
+        <el-table-column prop="processNo" label="运输任务编号">
         </el-table-column>
-        <el-table-column prop="goodsName" label="货名" width="80">
+        <el-table-column prop="goodsName" label="货名" >
         </el-table-column>
-        <el-table-column prop="weight" label="重量（吨）" width="120">
+        <el-table-column prop="weight" label="重量（吨）">
         </el-table-column>
-        <el-table-column prop="send" label="发货" width="200">
+        <el-table-column prop="send" label="发货">
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="200">
+        <el-table-column prop="receive" label="收货">
         </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期" width="160">
+        <el-table-column prop="tranCycle" label="运输周期" >
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
@@ -149,7 +149,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" 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/tranManagementTransporTrainNo.vue

@@ -461,7 +461,7 @@ export default {
               dispatchCat(tranCarInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('添加成功')
+                  this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''

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">
@@ -29,7 +24,7 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 70px;color: #8890B1;">接单日期：</span>
         </div>
         <el-date-picker
           v-model="inOutDate"
@@ -78,7 +73,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" width="120">
+        <el-table-column prop="processNo" label="运输任务编号" >
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -1,4 +1,4 @@
-// 汽车调度
+// 汽车调度派车
 <template>
   <div class="container">
     <el-row>
@@ -103,7 +103,7 @@
           <div
             class="driver position liaison"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
-            :key='index'
+            :key="index"
           >
             <ws-info-table>
               <div class="catNos">
@@ -344,6 +344,7 @@ export default {
         },
       },
       accessoryTFs: false,
+      index:0,
     }
   },
   activated() {
@@ -373,7 +374,6 @@ export default {
       }
     },
     add() {
-      console.log(this.deptBudgetList.tranCarInfoList, 'sasasasas')
       this.deptBudgetList.tranCarInfoList.push({
         driverName: '',
         driverPhone: '',
@@ -387,9 +387,26 @@ export default {
         tranType: '1',
       })
     },
-    selectwaterContent() {},
     //提交按钮
     submit() {
+      for (var i = this.index; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+        if (!this.deptBudgetList.tranCarInfoList[i].driver) {
+          this.$message({
+            message: '姓名不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        for(var j = 0 ; j < this.carList.length ; j++){   
+           if (this.carList[j].driverName == this.deptBudgetList.tranCarInfoList[i].driver && this.carList[j].disableStatusFlag == 1) { 
+            this.$message({
+              message: this.deptBudgetList.tranCarInfoList[i].driver+'该司机已被禁用！',
+              type: 'warning',
+            })
+            return
+          }
+        }  
+      }
       this.$confirm(`提交成功后，任务将下发给司机，是否确定提交？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -405,7 +422,7 @@ export default {
               dispatchCat(tranCarInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('派车成功')
+                  this.$message.success('提交成功')
                   this.$router.go(-1)
                 })
             } else {
@@ -428,6 +445,7 @@ export default {
         .toPromise()
         .then((response) => {
           if (response.tranCarInfoList.length > 0) {
+            this.index = response.tranCarInfoList.length
             for (var i = 0; i < response.tranCarInfoList.length; i++) {
               if (response.tranCarInfoList[i].id) {
                 response.tranCarInfoList[i].disabled = true
@@ -516,15 +534,15 @@ export default {
         }
       }
     },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    approve() {},
-    listQuery() {},
+    // selecttaskType(e) {
+    //   for (var i = 0; i < this.taskTypeList.length; i++) {
+    //     if (this.taskTypeList[i].value == e) {
+    //       this.searchType = this.taskTypeList[i].type
+    //     }
+    //   }
+    // },
+    // approve() {},
+    // listQuery() {},
   },
 }
 </script>
@@ -582,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

@@ -11,32 +11,33 @@
           type="primary"
           size="small"
           @click="revert()"
-          ><img
+        >
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </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">
@@ -45,9 +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
@@ -55,79 +56,114 @@
           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"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
-        :key='index'
+        :key="index"
       >
         <ws-info-table>
           <div class="catNos">
             司机-{{ index + 1 }}
-            <span class="noservice" v-show="item.status == '未送达'">{{
-              item.status
-            }}</span>
-            <span class="service" v-show="item.status == '已送达'">{{
-              item.status
-            }}</span>
+            <span class="noservice" v-show="item.status == '未送达'">
+              {{ item.status }}
+            </span>
+            <span class="service" v-show="item.status == '已送达'">
+              {{ item.status }}
+            </span>
           </div>
           <!--姓名-->
-          <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>
-           <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="车牌号" span="1" prop="carNo">
-            {{ item.carNo }}
-          </ws-form-item>
-            <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">
-            {{ 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>
-            <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="合同" span="1" prop="unloadNetWeight" class="hetong">
+          <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
+          >
+          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
+          <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>
+          <!-- <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">{{
+            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-info-table>
       </div>
     </ws-form>
@@ -175,24 +211,15 @@ 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: [
           {
@@ -205,18 +232,13 @@ export default {
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM'),
       },
-      contractList: [],
       deptBudgetList: {
         warehouseInOutDetail: {},
       },
-      historyList: [],
-
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -266,19 +288,6 @@ export default {
         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() {},
@@ -409,7 +418,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
-    color: #8890B1;
+  color: #8890b1;
   font-size: 14px;
 }
 .driver {
@@ -427,14 +436,14 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background: #fff;
-  color: #8890B1;
+  color: #8890b1;
   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;
@@ -450,12 +459,12 @@ 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;
 }
-/deep/.hetong .ws-info-table .el-form-item .el-form-item__content{
+/deep/.hetong .ws-info-table .el-form-item .el-form-item__content {
   border: none;
 }
 //送达/未送达
@@ -475,12 +484,12 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
-/deep/.driver.ws-info-table .el-form-item .el-form-item__content{
-  border:none
+/deep/.driver.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
 }
-.line{
- height: 26px;
- margin-top: 6px;
-left: -36px;
+.line {
+  height: 26px;
+  margin-top: 6px;
+  left: -14px;
 }
 </style>

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -80,24 +80,6 @@
           <el-table-column prop="updateDate" label="保存时间">
           </el-table-column>
           <el-table-column prop="address" label="操作" width="200">
-            <!-- <template scope="scope"> -->
-            <!-- <ws-button
-            type="primary"
-             @click="edits(scope.row)"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "    
-            >编辑</ws-button
-          > -->
-            <!-- <ws-button
-            type="primary"
-            @click="handleDelete(scope.row)"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-            >删除</ws-button
-          > -->
-            <!-- </template> -->
             <template slot-scope="scope">
               <div class="record" @click="edits(scope.row)">编辑</div>
               <div class="adjustment" @click="handleDelete(scope.row)">
@@ -245,7 +227,8 @@ export default {
             warehouseName: row.warehouseName,
             warehouseInOutDetail: row.warehouseInOutDetail,
             warehouseType: this.deptBudgetList.warehouseType,
-            createType: this.createType
+            createType: this.createType,
+            temporaryOutType : row.temporaryOutType
           
           },
         })
@@ -277,6 +260,7 @@ export default {
             warehouseName: row.warehouseName,
             warehouseInOutDetail: row.warehouseInOutDetail,
             warehouseType: this.deptBudgetList.warehouseType,
+             temporaryOutType : this.temporaryOutType
           },
         })
       }

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -548,7 +548,7 @@ export default {
       }
       if (!this.dataList.inOutType) {
         this.$message({
-          message: '入库类型不能为空！',
+          message: '出库类型不能为空！',
           type: 'warning',
         })
         return

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -192,7 +192,7 @@
             <!-- 出库类型 -->
             <ws-form-item label="出库类型" span="1">
               <ws-select
-                v-model="deptBudgetList.deliveryType"
+                v-model="dataList.temporaryOutType"
                 placeholder=""
                 class="typeselect"
               >
@@ -463,6 +463,7 @@ export default {
     this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
     this.deptBudgetList.createType = this.$route.query.createType
+      this.dataList.temporaryOutType = this.$route.query.temporaryOutType
   },
   methods: {
     //返回按钮

src/views/warehouse/warehouseManagementPut.vue

@@ -189,9 +189,10 @@
             v-show="checked == true && this.deptBudgetList.createType == 2"
           >
             <!-- 出库类型 -->
-            <ws-form-item label="出库类型" span="1">
+            <ws-form-item label="出库类型" span="1" prop="temporaryOutType">
+               <!-- v-model="deptBudgetList.deliveryType" -->
               <ws-select
-                v-model="deptBudgetList.deliveryType"
+                v-model="deptBudgetList.temporaryOutType"
                 placeholder=""
                 class="typeselect"
               >
@@ -425,6 +426,7 @@ export default {
     this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
     this.deptBudgetList.createType = this.$route.query.createType
+ 
     this.getList()
     this.deptBudgetList.goodsName = '玉米'
     this.deptBudgetList.goodsNameKey = '1'
@@ -588,14 +590,6 @@ export default {
         })
         return
       }
-
-      // if (this.deptBudgetList.netWeight > this.$route.query.capacity) {
-      //   this.$message({
-      //     message: '入库量大于该仓库容量！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
       //自检员
       if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
         if (
@@ -1269,22 +1263,6 @@ export default {
         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() {},
   },
 }
 </script>