前端gjy

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

@@ -2,14 +2,14 @@ import Layout from '@/layout/index';
 
 const tranManagementRouter = {
 
-  path: '/transportationTask/transportation',
+  path: '/transportationTask',
   component: Layout,
   redirect: '/taskManagement',
   name: 'transportationTask',
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'taskManagement',
-    module: 'transportationTask.transportation',
+    module: 'transportationTask',
     icon: 'cg'
   },
   children: [

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -6,19 +6,15 @@
         <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>
     <div class="basicInformation">
@@ -26,23 +22,26 @@
         <!-- <el-radio label="1">出库</el-radio>
         <el-radio label="2">入库</el-radio>
         <el-radio label="3">移库</el-radio>
-        <el-radio label="4">退库并出库</el-radio> -->
-       
+        <el-radio label="4">退库并出库</el-radio>-->
       </el-radio-group>
-       <span class="ziti">任务类型：<h1 class="ziti1">{{dataList.inOutType}}</h1></span>
-      <div class="nav2" >
-       </div> 
+      <div class="nav">
+      <span class="ziti">
+        任务类型：
+        <h1 class="ziti1">{{dataList.inOutType}}</h1>
+      </span>
+      </div>
+      <div class="nav2"></div>
       <div v-if="dataList.taskTypeKey != 2" class="center1">
         <!--出库=-->
         <div class="small-title">
           <img
-            style="position: relative; top: 40px; left: -35px;" 
+            style="position: relative; top: 40px; left: -22px;"
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
-            alt=""
+            alt
           />
-          <h3>出库任务({{ inOutTaskNo }})</h3>
+          <h3>出库任务({{ dataList.inOutTaskNo }} )</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 仓库名 -->
@@ -52,14 +51,14 @@
               v-model="dataList.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
-            > -->
-              <el-option
-                v-for="item in warehouseNameList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.warehouseName"
-              />
-              {{dataList.warehouseName}}
+            >-->
+            <el-option
+              v-for="item in warehouseNameList"
+              :key="item.constKey"
+              :label="item.warehouseName"
+              :value="item.warehouseName"
+            />
+            {{dataList.warehouseName}}
             <!-- </el-select> -->
           </el-form-item>
           <!-- 出库类型 -->
@@ -69,21 +68,21 @@
               v-model="dataList.inOutType"
               placeholder="请选择出库类型"
               class="typeselect"
-            > -->
-              <el-option
-                v-for="item in storageType"
-                :key="item.constKey"
-                v-if="
+            >-->
+            <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"
-              />
-              {{dataList.inOutType}}
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+            {{dataList.inOutType}}
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
@@ -93,14 +92,14 @@
               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>
-              {{dataList.contractNo}}
+            >-->
+            <el-option
+              v-for="item in contractNoList"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            ></el-option>
+            {{dataList.contractNo}}
             <!-- </el-select> -->
           </el-form-item>
           <!-- 货名 -->
@@ -110,14 +109,14 @@
               v-model="dataList.goodsName"
               placeholder="货名"
               class="huom"
-            > -->
-              <el-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              ></el-option>
-              {{dataList.goodsName}}
+            >-->
+            <el-option
+              v-for="item in goodnameList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            ></el-option>
+            {{dataList.goodsName}}
             <!-- </el-select> -->
           </el-form-item>
           <!--重量（吨）-->
@@ -128,7 +127,7 @@
               placeholder="请输入重量"
               maxlength="120"
                class="huom"
-            /> -->
+            />-->
             {{dataList.weight}}
           </el-form-item>
           <!-- 品级 -->
@@ -138,18 +137,18 @@
               placeholder=""
               class="typeselect"
               disabled
-            > -->
-              <el-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-              {{dataList.grade}}
+            >-->
+            <el-option
+              v-for="item in gradeList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+            {{dataList.grade}}
             <!-- </el-select> -->
           </el-form-item>
           <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>="  >
+          <el-form-item label="容重（克/升）>=">
             <!-- <el-input
               disabled
               v-model="dataList.bulkDensity"
@@ -157,7 +156,7 @@
               maxlength="120"
               size="small"
               class="huom"
-            /> -->
+            />-->
             {{dataList.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
@@ -169,7 +168,7 @@
               maxlength="120"
               size="small"
               class="huom"
-            /> -->
+            />-->
             {{dataList.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
@@ -181,23 +180,18 @@
               maxlength="120"
               size="small"
               class="huom"
-            /> -->
+            />-->
             {{dataList.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计出库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
+          <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"
-            /> -->
+            />-->
             {{dataList.predictDate}}
           </el-form-item>
           <!--经办人-->
@@ -208,14 +202,14 @@
               placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
-            > -->
+            >-->
             {{dataList.agent}}
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
             <!-- </el-select> -->
           </el-form-item>
           <!--业务描述=-->
@@ -226,7 +220,7 @@
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
               size="small"
-            /> -->
+            />-->
             {{dataList.businessDescribe}}
           </el-form-item>
         </el-form>
@@ -234,13 +228,13 @@
       <div v-if="dataList.taskTypeKey != 1" class="center1">
         <div class="small-title">
           <img
-            style="position: relative; top: 40px; left: -35px;" 
+            style="position: relative; top: 40px; left: -22px;"
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
-            alt=""
+            alt
           />
-          <h3>入库任务({{ inOutTaskNo1 }} )</h3>
+          <h3>入库任务({{dataList.inOutTaskNo }} )</h3>
         </div>
         <el-form ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
@@ -250,14 +244,14 @@
               placeholder="请选择仓库名"
               class="typeselect"
               disabled
-            > -->
+            >-->
             {{dataList1.warehouseName}}
-              <el-option
-                v-for="item in warehouseNameList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.warehouseName"
-              />
+            <el-option
+              v-for="item in warehouseNameList"
+              :key="item.constKey"
+              :label="item.warehouseName"
+              :value="item.warehouseName"
+            />
             <!-- </el-select> -->
           </el-form-item>
           <!-- 出库类型 -->
@@ -267,21 +261,21 @@
               placeholder="请选择入库类型"
               class="typeselect"
               disabled
-            > -->
-              <el-option
-                v-for="item in storageType1"
-                :key="item.constKey"
-                v-if="
+            >-->
+            <el-option
+              v-for="item in storageType1"
+              :key="item.constKey"
+              v-if="
                   (dataList.taskTypeKey == 2 &&
                     item.constValue != '移库入库') ||
                   (dataList.taskTypeKey == 3 &&
                     item.constValue == '移库入库') ||
                   (dataList.taskTypeKey == 4 && item.constValue == '退库')
                 "
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-              {{dataList1.inOutType}}
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+            {{dataList1.inOutType}}
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
@@ -291,35 +285,35 @@
               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>
-              {{dataList1.contractNo}}
+            >-->
+            <el-option
+              v-for="item in contractNoList"
+              :key="item.constKey"
+              :label="item.contractNo"
+              :value="item.contractNo"
+            ></el-option>
+            {{dataList1.contractNo}}
             <!-- </el-select> -->
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名"  class="huom">
+          <el-form-item label="货名" class="huom">
             <!-- <el-select
               disabled
               v-model="dataList1.goodsName"
               placeholder="货名"
                class="huom"
-            > -->
-              <el-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              ></el-option>
-              {{dataList1.goodsName}}
+            >-->
+            <el-option
+              v-for="item in goodnameList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            ></el-option>
+            {{dataList1.goodsName}}
             <!-- </el-select> -->
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px" >
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
             <!-- <el-input
               disabled
               v-model="dataList1.weight"
@@ -327,7 +321,7 @@
               maxlength="120"
               size="small"
               class="huom"
-            /> -->
+            />-->
             {{dataList1.weight}}
           </el-form-item>
           <!-- 品级 -->
@@ -337,14 +331,14 @@
               v-model="dataList1.grade"
               placeholder=""
               class="typeselect"
-            > -->
-              <el-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-              {{dataList1.grade}}
+            >-->
+            <el-option
+              v-for="item in gradeList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+            {{dataList1.grade}}
             <!-- </el-select> -->
           </el-form-item>
           <!--容重（克/升）>=-->
@@ -356,7 +350,7 @@
               maxlength="120"
               size="small"
               class="huom"
-            /> -->
+            />-->
             {{dataList1.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
@@ -368,11 +362,11 @@
               maxlength="120"
               size="small"
               class="huom"
-            /> -->
+            />-->
             {{dataList1.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <!-- <el-input
               disabled
               v-model="dataList1.unitPrice"
@@ -380,23 +374,18 @@
               maxlength="120"
               size="small"
               class="huom"
-            /> -->
+            />-->
             {{dataList1.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计入库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
+          <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"
-            /> -->
+            />-->
             {{dataList1.predictDate}}
           </el-form-item>
           <!--经办人-->
@@ -407,14 +396,14 @@
               placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
-            > -->
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
-              {{dataList1.agent}}
+            >-->
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+            {{dataList1.agent}}
             <!-- </el-select> -->
           </el-form-item>
           <!--业务描述=-->
@@ -425,7 +414,7 @@
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
               size="small"
-            /> -->
+            />-->
             {{dataList1.businessDescribe}}
           </el-form-item>
         </el-form>
@@ -433,9 +422,7 @@
     </div>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="close()"
-        >关闭</el-button
-      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="close()">关闭</el-button>
     </div>
   </div>
 </template>
@@ -444,7 +431,7 @@ import {
   getwarehousename,
   xialaNo,
   addoreditoutput,
-  outexamine,
+  outexamine
 } from '@/model/tasksport/index'
 import { packList } from '@/model/contarct/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
@@ -458,7 +445,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     // vesselId(val) {
@@ -466,10 +453,10 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   computed: {
-    ...mapGetters(['deptBudgetList']),
+    ...mapGetters(['deptBudgetList'])
   },
   data() {
     return {
@@ -523,9 +510,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -533,7 +520,7 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+        month: dayjs().format('MM')
       },
       contractList: [],
       inOutTaskNo: '',
@@ -542,11 +529,11 @@ export default {
       dataList1: { taskTypeKey: '1' },
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   mounted() {
@@ -582,7 +569,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
@@ -594,7 +581,7 @@ export default {
       this.deptBudgetList.staffList = val
       if (val) {
         //val存在
-        this.options = this.staffList.filter((item) => {
+        this.options = this.staffList.filter(item => {
           if (
             !!~item.staffName.indexOf(val) ||
             !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
@@ -622,7 +609,7 @@ export default {
       }
     },
     requestadd(list, status) {
-      this.$refs.dataList.validate((valid) => {
+      this.$refs.dataList.validate(valid => {
         if (valid) {
           list.compId = sessionStorage.getItem('ws-pf_compId')
           list.publisher =
@@ -630,7 +617,7 @@ export default {
             sessionStorage.getItem('ws-pf_staffName')
           addoreditoutput(list)
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('添加成功')
               this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
             })
@@ -641,8 +628,8 @@ export default {
       })
     },
     //关闭
-    close(){
-      this.$router.push({path:'tranManagementWarehouseInOutTask'})
+    close() {
+      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
     },
     //提交按钮
     // submit() {
@@ -736,7 +723,7 @@ export default {
       console.log(11111)
       outexamine({ relevanceId: this.$route.query.relevanceId })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           if (response.length > 1) {
             this.dataList = response[0]
             this.dataList1 = response[1]
@@ -752,8 +739,8 @@ export default {
     listQuery() {},
     total() {},
     clearfiltQuery() {},
-    selectCrtDuty() {},
-  },
+    selectCrtDuty() {}
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -889,74 +876,92 @@ export default {
   position: relative;
   width: 100%;
 }
-.annu{
+.annu {
   height: 81px;
-  background: #FFFFFF;
+  background: #ffffff;
   border-radius: 4px;
 }
 .basicInformation .el-form-item {
-    width: 50.3333%;
-    border: none;
-    margin: 0;
+  width: 50.3333%;
+  border: none;
+  margin: 0;
 }
-.huom{
+.huom {
   width: 100px;
-  
 }
-.el-form{
+.el-form {
   font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #8890B1;
+  color: #8890b1;
   line-height: 16px;
 }
-.a{
+.a {
   margin-left: -32px;
 }
- .el-radio-group {
-    margin-left: 80px;
+.el-radio-group {
+  margin-left: 80px;
 }
-.ding{
+.ding {
   height: 23px;
-  background: #E8ECF6;
+  background: #e8ecf6;
   box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-.winseaview-main {
-    position: absolute;
-    left: 200px;
-    padding: 0;
-    width: calc(100% - 200px);
-    height: calc(100% - 50px);
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    height: 130%;
-}
-.nav2{
+.nav2 {
   height: 25px;
-  background: #E8ECF6;
+  background: #e8ecf6;
   margin-top: 15px;
-
 }
-.ziti{
-  width: 70px;
-  height: 20px;
-  font-size: 14px;
+.ziti[data-v-492ee0c6] {
+    width: 72px;
+    height: 20px;
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 20px;
+    margin-left: 130px;
+    /* margin-top: 112px; */
+}
+/deep/.ziti1 {
+    height: 40px;
+    font-size: 16px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #262626;
+    line-height: 20px;
+    margin-left: 206px;
+    margin-top: -23px;
+    width: 100px;
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+/deep/.basicInformation .el-form-item .el-form-item__content {
+  padding-left: 0px;
+  padding-right: 10px;
+  white-space: nowrap;
+  height: 40px;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  text-align: left;
+  overflow: hidden;
+  font-size: 12px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #8890B1;
-  line-height: 20px;
-  margin-left: 80px;
-  margin-top: 5px;
+  color: #232323;
+  line-height: 14px;
 }
-.ziti1{
-  font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  color: #262626;
-  line-height: 22px;
-  margin-left: 240px;
-  margin-top: -27px;
-
+.nav{
+  width: 200px;
+  height: 20px;
 }
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -538,18 +538,6 @@ export default {
         .then((response) => {
           this.contractNoList = response
         })
-      // // 车型
-      // packList({ constId: 'TRAN1' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.carModelList = response
-      //   })
-      // // 车长
-      // packList({ constId: 'TRAN2' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.carLengthList = response
-      //   })
     },
     confirmPositioncity() {
       this.listDate.level = 'city'

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -142,7 +142,6 @@
         >
           <el-select
             v-model="deptBudgetList.receiveWarehouse"
-            :disabled="warehouse"
             placeholder="请输入收货库点"
             class="typeselect"
             style="width: 100%"
@@ -392,6 +391,7 @@ export default {
       radio: '1',
       carModelList: [],
       carLengthList: [],
+      warehouseType: '1',
       options_: regionData,
       heightData: '600px',
       selectedOptions: [],
@@ -496,7 +496,7 @@ export default {
         })
       getwarehousename({
         compId: this.compId,
-        warehouseType: this.deptBudgetList.warehouseType,
+        warehouseType: this.warehouseType,
       })
         .toPromise()
         .then((response) => {

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1376,11 +1376,12 @@ export default {
   background: #FFFFFF;
   border-radius: 4px;
 }
-.basicInformation .el-form-item {
+ 
+.basicInformation
+.el-form-item {
     width: 50.3333%;
     border: none;
     margin: 0;
-    margin-top: 6px;
 }
 .huom{
   width: 100px;
@@ -1404,15 +1405,15 @@ export default {
   background: #E8ECF6;
   box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-/deep/.winseaview-main {
-    position: absolute;
-    left: 200px;
-    padding: 0;
-    width: calc(100% - 200px);
-    // height: calc(100% - 50px);
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    // height: 130%;
+.winseaview-view {
+  padding: 0 0 20px;
 }
-</style>
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.el-radio-group {
+    font-size: 0;
+    margin-top: 20px;
+}
+</style>

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -655,7 +655,7 @@
       >
     </div>
   </div>
-  </div>
+  
 </template>
 <script>
 import {
@@ -1245,6 +1245,7 @@ export default {
   .el-info-table {
     border: none;
     position: relative;
+   
   }
   .el-form-item {
     width: 33.3333%;
@@ -1378,7 +1379,8 @@ export default {
   background: #FFFFFF;
   border-radius: 4px;
 }
-.basicInformation .el-form-item {
+.basicInformation
+.el-form-item {
     width: 50.3333%;
     border: none;
     margin: 0;
@@ -1405,17 +1407,6 @@ export default {
   background: #E8ECF6;
   box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-.winseaview-main {
-    position: absolute;
-    left: 200px;
-    padding: 0;
-    width: calc(100% - 200px);
-    height: calc(100% + 60px);
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    
-}
 .ziti{
   width: 70px;
   height: 20px;
@@ -1437,4 +1428,11 @@ export default {
   margin-top: -27px;
 
 }
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
 </style>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -1,7 +1,7 @@
 //收获反馈
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="14">
+    <BaseHeaderLayout :leftSpan="13">
       <template slot="left">
         <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="statusquery(1)">
           执行中</ws-button
@@ -11,20 +11,20 @@
       </template>
       <!-- 接单开始 -->
       <template slot="right">
-        <span style="display: inline-block; width: 290px;color: #8890B1;">接单日期</span>
-        <ws-date-picker
+       <div>
+          <span style="display: inline-block; width: 239px;color: #8890B1;">接单日期</span>
+        </div>
+        <el-date-picker
           v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择开始日期"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至</span>
-        <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择结束日期"
-          value-format="yyyy-MM-dd"
-        />
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按发货人、收货人、任务编号查找"
@@ -513,6 +513,7 @@ export default {
 }
 .but{
     margin-top: 150px;
+    margin-left: 110px;
 }
 .el-input--small .el-input__inner{
     margin-left: 20px;

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -6,19 +6,15 @@
         <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()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
+          <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>
     <div class="center">
@@ -27,22 +23,16 @@
           <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">
-              {{ deptBudgetList.goodsName }}
-            </ws-form-item>
+            <ws-form-item label="货名" span="1">{{ deptBudgetList.goodsName }}</ws-form-item>
             <!--重量（吨）-->
             <ws-form-item
               label="重量（吨）"
               span="1"
               prop="tare"
               class="readonly"
-            >
-              {{ deptBudgetList.weight }}
-            </ws-form-item>
+            >{{ deptBudgetList.weight }}</ws-form-item>
 
             <!--发货地址-->
             <ws-form-item label="发货地址" span="1" prop="netWeight">
@@ -51,14 +41,10 @@
               }}{{ deptBudgetList.sendDetailedAddress }}
             </ws-form-item>
             <!--发货人-->
-            <ws-form-item label="发货人" span="1" prop="agent">
-              {{ deptBudgetList.sender }}
-            </ws-form-item>
+            <ws-form-item label="发货人" span="1" prop="agent">{{ deptBudgetList.sender }}</ws-form-item>
 
             <!--发货人电话-->
-            <ws-form-item label="发货人电话" span="1" prop="agent">
-              {{ deptBudgetList.senderPhone }}
-            </ws-form-item>
+            <ws-form-item label="发货人电话" span="1" prop="agent">{{ deptBudgetList.senderPhone }}</ws-form-item>
             <!--收货地址-->
             <ws-form-item label="收货地址" span="1" prop="netWeight">
               {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
@@ -66,39 +52,31 @@
               }}{{ deptBudgetList.receiveDetailedAddress }}
             </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="inOutDate"
               class="deliverydate"
-            >
-              {{ deptBudgetList.deliveryDateStart }}
-            </ws-form-item>
+            >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
             <!--最晚发货日期-->
             <ws-form-item
               label="最晚发货日期"
               span="1"
               prop="inOutDate"
               class="deliverydate"
-            >
-              {{ deptBudgetList.deliveryDateEnd }}
-            </ws-form-item>
+            >{{ 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-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>
@@ -109,116 +87,77 @@
           >
             <ws-info-table>
               <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
-             <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
+              <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
               <!--姓名-->
-              <ws-form-item
-              label="姓名："
-              span="1"
-              prop="driver"
-            >
-              <span v-show="item.temporaryDriverFlag == 0"
-                >
-                {{ item.driver }}
-              </span>
-            </ws-form-item>
+              <ws-form-item label="姓名：" span="1" prop="driver">
+                <span v-show="item.temporaryDriverFlag == 0">{{ item.driver }}</span>
+              </ws-form-item>
               <!--电话-->
-            <ws-form-item label="电话：" span="1" prop="driverPhone">
-              <!-- <ws-input
+              <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>
+                />-->
+                <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
+              </ws-form-item>
               <!--车牌号-->
-            <ws-form-item label="车牌号：" span="1" prop="carNo">
-              <!-- <ws-input
+              <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>
+                />-->
+                <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
+              </ws-form-item>
               <!--装车净重-->
-            <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">
-              <!-- <ws-input
+              <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">
+                <!-- <ws-input
                 v-model="item.loadNetWeight"
                 placeholder="请输入装车(吨)"
                 maxlength="20"
                 size="small"
-              /> -->
-              {{item.loadNetWeight}}
-            </ws-form-item>
+                />-->
+                {{item.loadNetWeight}}
+              </ws-form-item>
               <!--卸车净重(吨)-->
-            <ws-form-item label="卸车净重(吨)：" span="1" prop="unloadNetWeight">
-              <ws-input
-                v-model="item.unloadNetWeight"
-                placeholder="请输入卸车净重"
-                maxlength="20"
-                size="small"
-              />
-            </ws-form-item>
+              <ws-form-item label="卸车净重(吨)：" span="1" prop="unloadNetWeight">
+                <ws-input
+                  v-model="item.unloadNetWeight"
+                  placeholder="请输入卸车净重"
+                  maxlength="20"
+                  size="small"
+                />
+              </ws-form-item>
               <!--磅单-->
-            <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
-              <template slot-scope="scope">
-                <img
-                  width="18"
-                  height="20"
-                  style="
+              <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
+                <template slot-scope="scope">
+                  <img
+                    width="18"
+                    height="20"
+                    style="
                     vertical-align: text-top;
                     position: relative;
                     top: -1px;
                   "
-                  src="../../../public/img/fujian.png"
-                  @click="fujian(scope.row)"
-                  alt=""
-                />
-                <span v-if="scope.row.loadPoundImgArray.length >0">{{scope.row.loadPoundImgArray.length}}</span>
-                <!-- <div v-show="item.temporaryDriverFlag == 0">
-                  {{ item.signStatus }}
-                </div> -->
-              </template>
-            </ws-form-item>
+                    src="../../../public/img/fujian.png"
+                    @click="fujian(scope.row)"
+                    alt
+                  />
+                  <span
+                    v-if="scope.row.loadPoundImgArray.length >0"
+                  >{{scope.row.loadPoundImgArray.length}}</span>
+                </template>
+              </ws-form-item>
             </ws-info-table>
-            <!-- <span
-              v-show="!item.temporaryDriverFlag"
-              width="22"
-              height="22"
-              class="del"
-              @click="del(index)"
-              src="../../../public/img/del.png"
-              alt=""
-              >×</span
-            > -->
           </div>
-          <div style="text-align: right; color: #8890b1; font-size: 16px">
-            合计{{ total }}/{{ deptBudgetList.weight }}
-          </div>
-          <!-- <el-button class="add" type="primary" size="small" @click="add()">
-             <img
-                width="22"
-                height="22"
-                @click="add"
-                src="../../../public/img/add.png"
-                alt=""
-              />
-             <div class="spans">添加司机</div>
-            </el-button
-          > -->
+          <div
+            style="text-align: right; color: #8890b1; font-size: 16px"
+          >合计{{ total }}/{{ deptBudgetList.weight }}</div>
           <div style="text-align: right; padding: 10px">
-            <el-button
-              class="bg-bottom-up"
-              type="primary"
-              size="small"
-              @click="submit()"
-            >提交</el-button
-            >
+            <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
           </div>
         </div>
       </ws-form>
@@ -228,26 +167,19 @@
 <script>
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import {
-  seeCat,
-  packList,
-  feedback
-} from '@/model/transport/index'
+import { seeCat, packList, feedback } from '@/model/transport/index'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -271,9 +203,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -281,32 +213,32 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+        month: dayjs().format('MM')
       },
       contractList: [],
       deptBudgetList: {
-        tranCarInfoList: [],
+        tranCarInfoList: []
       },
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   activated() {
     this.getList()
   },
   computed: {
-    total: function () {
+    total: function() {
       var maxStorage = 0
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        maxStorage += Number(this.deptBudgetList.tranCarInfoList[i].loadWeight)
+        maxStorage == Number(this.deptBudgetList.tranCarInfoList[i].loadWeight)
       }
       return maxStorage
-    },
+    }
   },
   mounted() {
     this.deptBudgetList.id = this.$route.query.id
@@ -322,48 +254,46 @@ export default {
         this.deptBudgetList.tranCarInfoList.splice(index, 1)
       }
     },
-    fujian(row){
-      if (row.loadPoundImg === null || row.loadPoundImg ==='') {
+    fujian(row) {
+      if (row.loadPoundImg === null || row.loadPoundImg === '') {
         EventBus.$emit(
           'warning',
           this.$t('system.noticeCircular.NoInformation')
         )
-      }else{
+      } else {
         this.accessoryTFs = true
       }
-      
     },
     selectwaterContent() {},
     //提交按钮
     submit() {
-      for(var i = 0 ; i < this.freightspace.length ; i++){
-          if(this.freightspace[i].unloadNetWeight==null){
-            this.$message({
-              message:"卸重不能为空！",
-              type: "warning"
-            })
-            return
-          }
+      for (var i = 0; i < this.freightspace.length; i++) {
+        if (this.freightspace[i].unloadNetWeight == null) {
+          this.$message({
+            message: '卸重不能为空！',
+            type: 'warning'
+          })
+          return
         }
-      this.$confirm(`所有车辆完成卸车任务后，请及时修改任务状态，确定提交卸车信息？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
+      }
+      this.$confirm(
+        `所有车辆完成卸车任务后，请及时修改任务状态，确定提交卸车信息？`,
+        {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning'
+        }
+      )
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
-              // this.deptBudgetList.totalStorage = this.totalStorage
               this.tranCarInfoList = this.freightspace
               this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
               this.tranCarInfoList.carNo = this.deptBudgetList.carNo
-              this.tranCarInfoList.loadNetWeight =
-                this.deptBudgetList.loadNetWeight
+              this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
               this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.loadPoundImg =
-                this.deptBudgetList.loadPoundImg
-              // this.tranCarInfoList.boxNo = this.arr.toString()
+              this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
                 if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
@@ -375,16 +305,15 @@ export default {
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
               tranProcessInfo.tranCarInfoList = this.tranCarInfoList
-              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
               feedback(tranProcessInfo)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
                   this.$router.push({
-                    path: 'tranManagementReceivingFeedback',
+                    path: 'tranManagementReceivingFeedback'
                   })
                 })
             } else {
@@ -402,29 +331,28 @@ export default {
       this.accessoryTFs = false
     },
 
-   getList() {
+    getList() {
       seeCat({ id: this.deptBudgetList.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.deptBudgetList = response
-          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
           this.freightspace = response.tranCarInfoList
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
             }
           }
-          
         })
-   },
+    },
     carchange(val, index) {
       for (var i = 0; i < this.carList.length; i++) {
         if (this.carList[i].driverName == val) {
-          this.deptBudgetList.tranCarInfoList[index].driverPhone =
-            this.carList[i].driverPhone
+          this.deptBudgetList.tranCarInfoList[index].driverPhone = this.carList[
+            i
+          ].driverPhone
           arrange({ id: this.carList[i].id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               console.log(this, response)
               this.deptBudgetList.tranCarInfoList[index].carNo =
                 response.carNumber
@@ -446,48 +374,47 @@ export default {
         }
       }
     }
-      
-    },
-    phonechange(val, index) {
-      for (var i = 0; i < this.carList.length; i++) {
-        if (this.carList[i].driverPhone == val) {
-          this.deptBudgetList.tranCarInfoList[index].driver =
-            this.carList[i].driver
-          arrange({ id: this.carList[i].id })
-            .toPromise()
-            .then((response) => {
-              console.log(this, response)
-              this.deptBudgetList.tranCarInfoList[index].carNo =
-                response.carNumber
-              if (response.carLoad != null) {
-                this.deptBudgetList.tranCarInfoList[index].loadWeight =
-                  response.carLoad
-              } else {
-                this.deptBudgetList.tranCarInfoList[index].loadWeight = 0
-              }
-              this.deptBudgetList.tranCarInfoList[index].carModel =
-                response.carModel
-              this.deptBudgetList.tranCarInfoList[index].carLength =
-                response.carLength
-              this.deptBudgetList.tranCarInfoList[index].carLengthKey =
-                response.carLengthKey
-              this.deptBudgetList.tranCarInfoList[index].carModelKey =
-                response.carModelKey
-            })
-        }
+  },
+  phonechange(val, index) {
+    for (var i = 0; i < this.carList.length; i++) {
+      if (this.carList[i].driverPhone == val) {
+        this.deptBudgetList.tranCarInfoList[index].driver = this.carList[
+          i
+        ].driver
+        arrange({ id: this.carList[i].id })
+          .toPromise()
+          .then(response => {
+            console.log(this, response)
+            this.deptBudgetList.tranCarInfoList[index].carNo =
+              response.carNumber
+            if (response.carLoad != null) {
+              this.deptBudgetList.tranCarInfoList[index].loadWeight =
+                response.carLoad
+            } else {
+              this.deptBudgetList.tranCarInfoList[index].loadWeight = 0
+            }
+            this.deptBudgetList.tranCarInfoList[index].carModel =
+              response.carModel
+            this.deptBudgetList.tranCarInfoList[index].carLength =
+              response.carLength
+            this.deptBudgetList.tranCarInfoList[index].carLengthKey =
+              response.carLengthKey
+            this.deptBudgetList.tranCarInfoList[index].carModelKey =
+              response.carModelKey
+          })
       }
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
+    }
+  },
+  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() {},
-  }
-
+    }
+  },
+  approve() {},
+  listQuery() {}
+}
 </script>
 <style lang="scss" scoped>
 /deep/.basicInformation {
@@ -601,8 +528,8 @@ export default {
   font-size: 14px;
 }
 /deep/.ws-info-table .el-form-item {
- border: none;
- height: 50px;
+  border: none;
+  height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 40%;
@@ -633,11 +560,11 @@ export default {
   border-bottom: none;
   border-top: none;
 }
-/deep/.liaison .ws-info-table{
-  background: #F6F7FC;
-border-radius: 4px;
-border: 1px solid #D8DCE6;
-margin-top: 20px;
+/deep/.liaison .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
 }
 //送达/未送达
 .noservice,

src/views/tranManagement/tranManagementShipping.vue

@@ -3,7 +3,7 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="statusquery(1)">
+        <ws-button class="but" @click="statusquery(1)">
           执行中</ws-button
         >
         <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
@@ -11,20 +11,20 @@
       </template>
       <!-- 接单开始 -->
       <template slot="right">
-        <span style="display: inline-block; width: 290px;color: #8890B1;">接单日期</span>
-        <ws-date-picker
+        <div>
+        <span style="display: inline-block; width: 239px;color: #8890B1;">接单日期</span>
+        </div>
+        <el-date-picker
           v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择开始日期"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至</span>
-        <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择结束日期"
-          value-format="yyyy-MM-dd"
-        />
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按发货人、收货人、任务编号查找"
@@ -90,19 +90,19 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.processStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.processStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span
+                  >{{ scope.row.processStatus }}
                 </span>
               </template>
               <div>
-                <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
+                <p style="margin-top: 0; padding-left: 10px">历史记录</p>
                 <div v-for="(item, index) in historyList" class="flex" :key="index">
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}
@@ -381,14 +381,14 @@ export default {
       this.getList()
     },
     editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
+      var processStatus = ''
+      if (row.processStatus == '待执行' || row.processStatus == '已完成') {
         status = '执行中'
-      } else if (row.status == '执行中') {
+      } else if (row.processStatus == '执行中') {
         status = '已完成'
       }
       //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
+      this.$confirm(`是否将状态改为${processStatus}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -566,7 +566,8 @@ export default {
 }
 .but{
     margin-top: 150px;
-}
+    margin-left: 110px;
+    }
 .el-input--small .el-input__inner{
     margin-left: 20px;
 }

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -6,248 +6,220 @@
         <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()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
+          <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>
     <div class="center">
-    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules" class="position">
-      <div class="basicInformation">
-         <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="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="sendDetailedAddress">
-            
-            {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
-          </ws-form-item>
-         <!--发货人-->
-          <ws-form-item label="发货人" span="1" prop="sender">
-          
-          {{deptBudgetList.sender}}
-          </ws-form-item>
+      <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules" class="position">
+        <div class="basicInformation">
+          <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="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="sendDetailedAddress"
+            >{{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{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="senderPhone">
-            
-            {{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="senderPhone">{{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="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="deliveryDateEnd">
-          
-          {{deptBudgetList.deliveryDateEnd}}
-        </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
-          class=" position siji"
-          v-for='(item,index) in deptBudgetList.tranCarInfoList'
-          :key="index+'siji'"
-        >
-          <ws-info-table>
-          <!--姓名-->
-          <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-            <el-select
-              v-model="item.driver"
-              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>
-          </ws-form-item>
-          <!--电话-->
-          <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <ws-input
-            :readonly="true"
-            v-model="item.driverPhone"
-            placeholder="请输入电话"
-            maxlength="20"
-            size="small"
-          />
-          </ws-form-item>
-          <!--发船日期-->
-          <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <ws-date-picker
-            v-model="item.sendDateStart"
-            type="date"
-            placeholder="请选择发货日期"
-            value-format="yyyy-MM-dd"
-          />
-          </ws-form-item>
-          <!--预计到港日-->
-          <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-            <ws-date-picker
-            v-model="item.receiveDateEnd"
-            type="date"
-            placeholder="请选择发货日期"
-            value-format="yyyy-MM-dd"
-          />
-          </ws-form-item>
-          <!-- 船名 -->
-          <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-            <ws-input 
-              v-model="item.shipName"
-              placeholder="请输入船名"
-              maxlength="100"
-              size="small"
-            ></ws-input>
-          </ws-form-item>
-          <!-- 航次 -->
-          <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <ws-input 
-              v-model="item.shipNo"
-              placeholder="请选择航次"
-              maxlength="100"
-              size="small"
-            ></ws-input>
-          </ws-form-item>
-          <!-- 类型 -->
-          <ws-form-item label="类型" span="1" prop="shipType" class="siji">
-            <ws-select
-            v-model="item.shipType"
-            placeholder="请输入"
-            class="typeselect"
-          >
-              <ws-option
-              v-for="items in shipType"
-              :key="items.constKey"
-              :label="items.constValue"
-              :value="items.constValue"
-            />
-          </ws-select>
-          </ws-form-item>
-          <ws-form-item label="数量" span="1" prop="boxNumber" class="siji" v-show="item.shipType=='集装箱'">
-            <ws-input
-          v-model="item.boxNumber"
-          placeholder="请输入数量"
-          size="small"
-          ></ws-input>
-          </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="deliveryDateEnd"
+            >{{deptBudgetList.deliveryDateEnd}}</ws-form-item>
+            <!--合同编号-->
+            <ws-form-item label="合同编号" span="1" prop="contractNo">{{deptBudgetList.contractNo}}</ws-form-item>
           </ws-info-table>
-        </div>
-         <div
-          style="width: 530px"
-          class="xia"
-          v-for="(items, index) in freightspace"
-          :key="index"
-        > 
-        <ws-info-table> 
-          <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot" >
-            <!-- <ws-input
-          v-model="items.impurity"
-          placeholder="请输入仓位号"
-          size="small"
-          ></ws-input> -->
-           {{items.impurity}}
-          </ws-form-item>
-          
-        <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot" >
-          <!-- <ws-input
-          v-model="items.positionWeight"
-          placeholder="请输入装仓重量"
-          size="small"
-          ></ws-input> -->
-           {{items.positionWeight}}
-         </ws-form-item> 
-           <span
-              width="22"
-              height="22"
-              class="del"
-              @click="del(index)"
-              src="../../../public/img/del.png"
-              alt=""
-             >X</span
+          <div
+            class="position siji"
+            v-for="(item,index) in deptBudgetList.tranCarInfoList"
+            :key="index+'siji'"
+          >
+            <div class="small-title">联络员及航次</div>
+            <div class="zhong">
+              <ws-info-table>
+                <!--姓名-->
+                <ws-form-item label="姓名" span="1" prop="driver" class="siji">
+                  <el-select
+                    v-model="item.driver"
+                    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>
+                </ws-form-item>
+                <!--电话-->
+                <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
+                  <ws-input
+                    :readonly="true"
+                    v-model="item.driverPhone"
+                    placeholder="请输入电话"
+                    maxlength="20"
+                    size="small"
+                  />
+                </ws-form-item>
+                <!--发船日期-->
+                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
+                  <ws-date-picker
+                    v-model="item.sendDateStart"
+                    type="date"
+                    placeholder="请选择发货日期"
+                    value-format="yyyy-MM-dd"
+                  />
+                </ws-form-item>
+                <!--预计到港日-->
+                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
+                  <ws-date-picker
+                    v-model="item.receiveDateEnd"
+                    type="date"
+                    placeholder="请选择发货日期"
+                    value-format="yyyy-MM-dd"
+                  />
+                </ws-form-item>
+                <!-- 船名 -->
+                <ws-form-item label="船名" span="1" prop="shipName" class="siji">
+                  <ws-input
+                    v-model="item.shipName"
+                    placeholder="请输入船名"
+                    maxlength="100"
+                    size="small"
+                  ></ws-input>
+                </ws-form-item>
+                <!-- 航次 -->
+                <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
+                  <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small"></ws-input>
+                </ws-form-item>
+                <!-- 类型 -->
+                <ws-form-item label="类型" span="1" prop="shipType" class="siji">
+                  <ws-select v-model="item.shipType" placeholder="请输入" class="typeselect">
+                    <ws-option
+                      v-for="items in shipType"
+                      :key="items.constKey"
+                      :label="items.constValue"
+                      :value="items.constValue"
+                    />
+                  </ws-select>
+                </ws-form-item>
+                <ws-form-item
+                  label="数量"
+                  span="1"
+                  prop="boxNumber"
+                  class="siji"
+                  v-show="item.shipType=='集装箱'"
+                >
+                  <ws-input v-model="item.boxNumber" placeholder="请输入数量" size="small"></ws-input>
+                </ws-form-item>
+              </ws-info-table>
+            </div>
+            <div
+              style="width: 530px"
+              class="xia"
+              v-for="(items, index) in freightspace"
+              :key="index"
+              v-show="item.shipType=='散船'"
+            >
+              <ws-info-table>
+                <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"
+                >
+                <el-input
+                  v-model="items.positionWeight"
+                ></el-input>
+                </ws-form-item>
+                <span
+                  width="22"
+                  height="22"
+                  class="del"
+                  @click="del(index)"
+                  src="../../../public/img/del.png"
+                  alt
+                >X</span>
+              </ws-info-table>
+            </div>
+            <div>
+              <el-button
+                class="add bg-bottom"
+                type="primary"
+                size="small"
+                @click="add"
+                v-show="item.shipType=='散船'"
               >
-        </ws-info-table> 
-        
-      </div> 
-       <div>
-         <el-button class="add bg-bottom" type="primary" size="small" @click="add">
-        <img
-          width="22"
-          height="22"
-          @click="add"
-          src="../../../public/img/add.png"
-          alt=""
-        />
-        <div class="spans">添加仓位</div>
-      </el-button>
-      </div>  
-      </div>
-    </ws-form>
-    <div style="text-align: right; padding: 10px">
-        <el-button
-          class="bg-bottom-up"
-          type="primary"
-          size="small"
-          @click="submit()"
-          >提交</el-button
-        >
+                <img width="22" height="22" @click="add" src="../../../public/img/add.png" alt />
+                <div class="spans">添加仓位</div>
+              </el-button>
+            </div>
+          </div>
+        </div>
+      </ws-form>
+      <div style="text-align: right; padding: 10px">
+        <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
       </div>
     </div>
   </div>
-  
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import {shippingLook,packList,dispatchCat} from '@/model/transport/index'
-import{getstaff}from '@/model/warehouse/index'
+import { shippingLook, packList, dispatchCat } from '@/model/transport/index'
+import { getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -256,7 +228,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     // vesselId(val) {
@@ -264,7 +236,7 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -279,8 +251,8 @@ export default {
       showType: true,
       // 年
       year: '',
-      item:[],
-      shipType:[],
+      item: [],
+      shipType: [],
       tranType: 3,
       deptBudgetTotal: 0,
       currentPage: 1,
@@ -299,9 +271,9 @@ export default {
       uploadSuccess: {},
       onChange: {},
       selectedOptions: [],
-        options:[],
+      options: [],
       tranCarInfoList: {},
-        staffList :[],
+      staffList: [],
       gradeList: [],
       rules: {
         netWeight: [
@@ -309,11 +281,11 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
-      arr:[],
+      arr: [],
       freightspace: [
         // {
         //   impurity:'',
@@ -325,58 +297,57 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+        month: dayjs().format('MM')
       },
       contractList: [],
       deptBudgetList: {
-        warehouseInOutDetail: {},
+        warehouseInOutDetail: {}
       },
       historyList: [],
 
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   mounted() {
     this.getList()
-    
   },
- activated(){
-   this.loaddata()
- },
- computed: {
-    totalStorage: function () {
+  activated() {
+    this.loaddata()
+  },
+  computed: {
+    totalStorage: function() {
       var maxStorage = 0
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
       return maxStorage
-    },
+    }
   },
   methods: {
-    getList(){
-     getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-           this.staffList = response
-        })
-        //类型
-        packList({ constId: 'TRAN4' })
+    getList() {
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
-        .then((response) => {
+        .then(response => {
+          this.options = response
+          this.staffList = response
+        })
+      //类型
+      packList({ constId: 'TRAN4' })
+        .toPromise()
+        .then(response => {
           this.shipType = response
         })
-   },
+    },
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
         console.log(val)
-        this.options = this.staffList.filter((item) => {
+        this.options = this.staffList.filter(item => {
           if (
             !!~item.staffName.indexOf(val) ||
             !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
@@ -392,7 +363,9 @@ export default {
       for (var i = 0; i < this.staffList.length; i++) {
         if (this.staffList[i].staffName == e) {
           this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-          this.deptBudgetList.tranCarInfoList[0].driverPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.tranCarInfoList[0].driverPhone = this.staffList[
+            i
+          ].staffMobilePhone
           this.deptBudgetList.personChargeKey = this.staffList[i].staffId
         }
       }
@@ -400,34 +373,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("," )  
-           for(var j = 0;j<num.length;j++){
-            var num2 = num[j].split("/")
-             this.freightspace.push({
-               'impurity': num2[i],
-               'positionWeight':num2[num2.length-1]
-             })
-           }
-
+          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]
+              })
+            }
           }
-    })
-  },
+        })
+    },
     //返回按钮
     revert() {
-      this.freightspace=[]
+      this.freightspace = []
       this.$router.push({ name: 'tranManagementShipping' })
     },
-    del(index){
-        if(this.freightspace.length > 1 ){
-            this.freightspace.splice(index,1)
-        }
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
     },
-      add() {
+    add() {
       this.freightspace.push({
-       impurity:'',
+        impurity: ''
       })
     },
     selectdriver() {},
@@ -441,57 +415,76 @@ export default {
       this.$router.push({ path: 'tranManagementShipping' })
     },
     //提交按钮
-    submit() { 
-      for(var i =0; i < this.deptBudgetList.tranCarInfoList.length;i++){
+    submit() {
+      for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
         if (!this.deptBudgetList.tranCarInfoList[i].driver) {
           this.$message({
-            message:'名字不为空',
-            type:'warning',
+            message: '名字不为空',
+            type: 'warning'
           })
           return
         }
         if (!this.deptBudgetList.tranCarInfoList[i].driverPhone) {
           this.$message({
-            message:'电话号不为空',
-            type:'warning',
+            message: '电话号不为空',
+            type: 'warning'
           })
           return
         }
         if (!this.deptBudgetList.tranCarInfoList[i].sendDateStart) {
           this.$message({
-            message:'发船时间不能为空',
-            type:'warning'
+            message: '发船时间不能为空',
+            type: 'warning'
           })
           return
         }
         if (!this.deptBudgetList.tranCarInfoList[i].receiveDateEnd) {
           this.$message({
-            message:'预计到港时间不能为空',
-            type:'warning'
+            message: '预计到港时间不能为空',
+            type: 'warning'
           })
           return
         }
         if (!this.deptBudgetList.tranCarInfoList[i].shipName) {
           this.$message({
-            message:'船名不能为空',
-            type:'warning',
+            message: '船名不能为空',
+            type: 'warning'
           })
           return
         }
         if (!this.deptBudgetList.tranCarInfoList[i].shipNo) {
           this.$message({
-            message:'航次不能为空',
-            type:'warning',
+            message: '航次不能为空',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].boxNumber) {
+          this.$message({
+            message: '数量不能为空',
+            type: 'warning'
           })
           return
         }
         if (!this.deptBudgetList.tranCarInfoList[i].shipType) {
           this.$message({
-            message:'类型不能为空',
-            type:'warning'
+            message: '类型不能为空',
+            type: 'warning'
           })
           return
         }
+        if (!this.deptBudgetList.tranCarInfoList[i].impurity) {
+          this.$message({
+            message:'仓位号不能为空',
+            type: 'warning'
+          })
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].positionWeight) {
+          this.$message({
+            message:'重量不能为空',
+            type : 'warning'
+          })
+        }
         if (
           new Date(
             this.deptBudgetList.tranCarInfoList[i].sendDateStart
@@ -502,7 +495,7 @@ export default {
         ) {
           this.$message({
             message: '发船时间不能大于最晚到到港时间！',
-            type: 'warning',
+            type: 'warning'
           })
           return
         }
@@ -510,21 +503,21 @@ export default {
       this.$confirm(`提交成功后，任务将下发给相关人员，是否确定提交?`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
-              
-             for(var i = 0; i < this.freightspace.length; i++){
-               var num  = this.freightspace[i].impurity + "/" + this.freightspace[i].positionWeight
-               this.arr.push(
-                 num
-               )  
-             }
-             
-             this.deptBudgetList.totalStorage = this.totalStorage
-             this.tranCarInfoList.driver = this.deptBudgetList.driver
+              for (var i = 0; i < this.freightspace.length; i++) {
+                var num =
+                  this.freightspace[i].impurity +
+                  '/' +
+                  this.freightspace[i].positionWeight
+                this.arr.push(num)
+              }
+
+              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
@@ -542,13 +535,13 @@ export default {
               tranCarInfo.tranCarInfoList = tranList
               dispatchCat(tranCarInfo)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('添加成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
                   this.$router.push({
-                    path: 'tranManagementShipping',
+                    path: 'tranManagementShipping'
                   })
                 })
             } else {
@@ -582,8 +575,8 @@ export default {
       }
     },
     approve() {},
-    listQuery() {},
-  },
+    listQuery() {}
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -592,7 +585,7 @@ export default {
     border: none;
   }
   .el-form-item {
-    border: 1px solid #D8DCE6;
+    border: 1px solid #d8dce6;
     width: 33.3333%;
     border: none;
     .el-form-item__label {
@@ -631,7 +624,7 @@ export default {
   text-align: right;
   padding: 16px 20px;
 }
-.center{
+.center {
   width: 80%;
   margin: 0 auto;
 }
@@ -666,11 +659,11 @@ export default {
   color: #323233;
   line-height: 22px;
 }
-/deep/.position .ws-info-table .el-form-item .el-form-item__label{
+/deep/.position .ws-info-table .el-form-item .el-form-item__label {
   width: 40%;
   text-align: center;
 }
-.position .zaizhong{
+.position .zaizhong {
   width: 16%;
 }
 //减号
@@ -679,7 +672,7 @@ export default {
   width: 13px;
   height: 13px;
 }
-.bot{
+.bot {
   width: 30%;
 }
 //去边框
@@ -723,16 +716,17 @@ export default {
   color: #8890b1;
   line-height: 16px;
 }
-.position{
+.position {
   width: 90%;
 }
 //下表格样式
-/deep/.position.siji{
-  background: #F6F7FC;
+.position.siji {
+  background: white;
   border-radius: 4px;
-  border: 1px solid #D8DCE6;
+  /* border: 1px solid #d8dce6; */
+  width: 1010px;
 }
-/deep/.zi{
+/deep/.zi {
   width: 64px;
   height: 22px;
   font-size: 16px;
@@ -764,10 +758,10 @@ export default {
 /deep/.basicInformation {
   .el-form-item {
     width: 25%;
-    
+
     .el-form-item__label {
       background: transparent;
-       border: none;
+      border: none;
     }
     .el-form-item__content {
       // border: none;
@@ -780,7 +774,7 @@ export default {
 //   border-radius: 4px;
 //   border: 1px solid #D8DCE6;
 //   margin-top: 10px;
-  
+
 // }
 //添加仓位样式
 .add {
@@ -791,7 +785,7 @@ export default {
   color: #5473e8;
   font-size: 14px;
   border: none;
-  margin-top:8px;
+  margin-top: 8px;
 }
 .add img {
   display: inline-block;
@@ -805,39 +799,24 @@ export default {
   line-height: 18px;
 }
 /deep/.xia {
-    width: 500px;
-    height: 54px;
-    border-radius: 4px;
-    border: 1px solid #D8DCE6;
-    margin-top: 10px;
-    width: 462px;
-    height: 54px;
-    background: #F6F7FC;
-    border-radius: 4px;  
-}
- .basicInformation .ws-info-table {
-    border: none;
-    width: 1000px;
+  width: 500px;
+  height: 54px;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 10px;
+  background: #f6f7fc;
+  border-radius: 4px;
 }
- .position.siji {
-    background: #F6F7FC;
-    border-radius: 4px;
-    border: 1px solid #D8DCE6;
-    width: 1010px;
+.basicInformation .ws-info-table {
+  border: none;
+  width: 1000px;
 }
 .el-input--small .el-input__inner {
-    border-block-color:  #F6F7FC;
-    background: #F6F7FC;
-}
-// .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;
-//     font-size: 14px;
-//     font-weight: 400;
-//     color: #8890b1;
-//     line-height: 16px;
-// }
+  border-block-color: #f6f7fc;
+  background: #f6f7fc;
+}
+.zhong {
+  background: #f6f7fc;
+  border: 1px solid #d8dce6;
+}
 </style>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -6,308 +6,294 @@
         <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()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
+          <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>
     <div class="center">
-    <ws-form ref="deptBudgetList" :model="deptBudgetList">
-      <div class="basicInformation">
-        <h2> 任务编号 </h2>
-        <ws-info-table>
-          <!-- 任务编号 -->
-          <ws-form-item label="任务编号" span="1"  prop="processNo">
-            <!-- <ws-input
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <div class="basicInformation">
+          <h2>任务编号</h2>
+          <ws-info-table>
+            <!-- 任务编号 -->
+            <ws-form-item label="任务编号" span="1" prop="processNo">
+              <!-- <ws-input
               v-model="deptBudgetList.processNo" 
               placeholder="请输入任务编号"
               maxlength="20"
               size="small"
-            /> -->
-            {{deptBudgetList.processNo}}
-          </ws-form-item>
-        <!-- 货名 -->
-          <ws-form-item label="货名" span="1" prop="goodsName">
-            <!-- <ws-input
+              />-->
+              {{deptBudgetList.processNo}}
+            </ws-form-item>
+            <!-- 货名 -->
+            <ws-form-item label="货名" span="1" prop="goodsName">
+              <!-- <ws-input
               v-model="deptBudgetList.goodsName"
               placeholder="请输入货名"
               maxlength="20"
               size="small"
-              /> -->
+              />-->
               {{deptBudgetList.goodsName}}
-          </ws-form-item>
-          <!--重量（吨）-->
-          <ws-form-item
-            label="重量（吨）"
-            span="1"
-            prop="weight"
-            class="readonly"
-          >
-            <!-- <ws-input
+            </ws-form-item>
+            <!--重量（吨）-->
+            <ws-form-item label="重量（吨）" span="1" prop="weight" class="readonly">
+              <!-- <ws-input
               v-model="deptBudgetList.weight"
               placeholder="请输入重重"
               maxlength="100"
               size="small"
-            /> -->
-            {{deptBudgetList.weight}}
-          </ws-form-item>
+              />-->
+              {{deptBudgetList.weight}}
+            </ws-form-item>
 
-          <!--发货地址-->
-          <ws-form-item label="发货地址" span="1">
-            <!-- <ws-input
+            <!--发货地址-->
+            <ws-form-item label="发货地址" span="1">
+              <!-- <ws-input
               readonly="readonly"
               v-model="deptBudgetList.sendDetailedAddress"
               placeholder=""
               maxlength="120"
               size="small"
-            /> -->
-             {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
-          </ws-form-item>
-         <!--发货人-->
-          <ws-form-item label="发货人" span="1" prop="sender">
-            <!-- <ws-input
+              />-->
+              {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
+            </ws-form-item>
+            <!--发货人-->
+            <ws-form-item label="发货人" span="1" prop="sender">
+              <!-- <ws-input
               v-model="deptBudgetList.sender"
               placeholder="请输入发货人姓名"
               maxlength="100"
               size="small"
-          /> -->
-          {{deptBudgetList.sender}}
-          </ws-form-item>
+              />-->
+              {{deptBudgetList.sender}}
+            </ws-form-item>
 
-          <!--发货人电话-->
-          <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-            <!-- <ws-input
+            <!--发货人电话-->
+            <ws-form-item label="发货人电话" span="1" prop="senderPhone">
+              <!-- <ws-input
               v-model="deptBudgetList.senderPhone"
               placeholder="请输入发货人电话"
               maxlength="100"
               size="small"
-            /> -->
-            {{deptBudgetList.senderPhone}}
-          </ws-form-item>
-          <!--收货地址-->
-        <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-            <!-- <el-cascader
+              />-->
+              {{deptBudgetList.senderPhone}}
+            </ws-form-item>
+            <!--收货地址-->
+            <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
+              <!-- <el-cascader
             v-model="deptBudgetList.receiveDetailedAddress"
             clearable
             size="large"
             placeholder="请选择发货地址"
             style="width: 200%"
-          /> -->
-          {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
-        </ws-form-item>
-         <!--收货人-->
-          <ws-form-item label="收货人" span="1" prop="receiver">
-            <!-- <ws-input
+              />-->
+              {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
+            </ws-form-item>
+            <!--收货人-->
+            <ws-form-item label="收货人" span="1" prop="receiver">
+              <!-- <ws-input
               v-model="deptBudgetList.receiver"
               placeholder="请输入发货人"
               maxlength="100"
               size="small"
-          /> -->
-          {{deptBudgetList.receiver}}
-          </ws-form-item>
+              />-->
+              {{deptBudgetList.receiver}}
+            </ws-form-item>
 
-          <!--收货人电话-->
-          <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-            <!-- <ws-input
+            <!--收货人电话-->
+            <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
+              <!-- <ws-input
               v-model="deptBudgetList.receiverPhone"
               placeholder="请输入收货人电话"
               maxlength="100"
               size="small"
-            /> -->
-            {{deptBudgetList.receiverPhone}}
-          </ws-form-item>
-         
-          <!--发船日期-->
-        <ws-form-item label="发船日期" span="1" prop="deliveryDateStart">
-          <!-- <ws-input
+              />-->
+              {{deptBudgetList.receiverPhone}}
+            </ws-form-item>
+
+            <!--发船日期-->
+            <ws-form-item label="发船日期" span="1" prop="deliveryDateStart">
+              <!-- <ws-input
             v-model="deptBudgetList.deliveryDateStart"
             placeholder=""
             maxlength="20"
             size="small"
-          /> -->
-          {{deptBudgetList.deliveryDateStart}}
-        </ws-form-item>
-      
-           <!--最晚发货日期-->
-          <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-            <!-- <ws-input
+              />-->
+              {{deptBudgetList.deliveryDateStart}}
+            </ws-form-item>
+
+            <!--最晚发货日期-->
+            <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+              <!-- <ws-input
             v-model="deptBudgetList.deliveryDateEnd"
             placeholder=""
             maxlength="20"
             size="small"
-          /> -->
-          {{deptBudgetList.deliveryDateEnd}}
-        </ws-form-item>
-          <!--合同编号-->
-          <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <!-- <ws-input
+              />-->
+              {{deptBudgetList.deliveryDateEnd}}
+            </ws-form-item>
+            <!--合同编号-->
+            <ws-form-item label="合同编号" span="1" prop="contractNo">
+              <!-- <ws-input
             v-model="deptBudgetList.contractNo"
             placeholder="请输入合同编号"
             maxlength="20"
             size="small"
-          /> -->
-          {{deptBudgetList.contractNo}}
-        </ws-form-item>
-          
-        </ws-info-table>
-       <div class="small-title">联络员及航次</div>
-       <div class="aa">
-       <div class="small-title">航次信息</div>
-      <div
-          style="width: 100%"
-          class="flex position"
-           v-for="(item, index) in deptBudgetList.tranCarInfoList"
-           
-        >
-        <ws-info-table>
-          <!-- 姓名 -->
-          <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-            <!-- <ws-input
-            v-model="item.driver"
-            placeholder="请选择联络员"
-            size="small"
-            ></ws-input> -->
-            {{item.driver}}
-          </ws-form-item>
-          <!-- 电话 -->
-          <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <!-- <ws-input
-            v-model="item.driverPhone"
-            placeholder="联络员电话"
-            size="small"
-            ></ws-input> -->
-          {{item.driverPhone}}
-          </ws-form-item>
-          <!--发船日期-->
-          <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <!-- <ws-input
-                v-model="item.sendDateStart"
-                placeholder="请选择日期"
-            ></ws-input> -->
-            {{item.sendDateStart}}
-          </ws-form-item>
-        <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-          <!-- <ws-input
-              v-model="item.receiveDateEnd"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-              size="small"
-            /> -->
-          {{item.receiveDateEnd}}
-        </ws-form-item>
-          <!-- 船名 -->
-          <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-            <!-- <ws-input 
-              v-model="item.shipName"
-              placeholder="请输入船名"
-              maxlength="100"
-              size="small"
-            ></ws-input> -->
-            {{item.shipName}}
-          </ws-form-item>
-          <!-- 航次 -->
-          <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <!-- <ws-input 
-              v-model="item.shipNo"
-              placeholder="请选择航次"
-              maxlength="100"
-              size="small"
-            ></ws-input> -->
-            {{item.shipNo}}
-          </ws-form-item>
-        <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="shipType" class="siji">
-          <!-- <ws-input
-          v-model="item.shipType"
-          placeholder=""
-          size="small"
-          ></ws-input> -->
-          {{item.shipType}}
-        </ws-form-item>
-        <ws-form-item label="数量" span="1" prop="boxNumber" class="siji" v-show="item.shipType=='集装箱'"> 
-          <!-- <ws-input
+              />-->
+              {{deptBudgetList.contractNo}}
+            </ws-form-item>
+          </ws-info-table>
+          <div class="small-title">联络员及航次</div>
+          <div class="aa">
+            <div class="small-title">航次信息</div>
+            <div
+              style="width: 100%"
+              class="flex position"
+              v-for="(item, index) in deptBudgetList.tranCarInfoList"
+            >
+              <ws-info-table>
+                <!-- 姓名 -->
+                <ws-form-item label="姓名" span="1" prop="driver" class="siji">
+                  <!-- <ws-input
+                  v-model="item.driver"
+                  placeholder="请选择联络员"
+                  size="small"
+                  ></ws-input>-->
+                  {{item.driver}}
+                </ws-form-item>
+                <!-- 电话 -->
+                <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
+                  <!-- <ws-input
+                  v-model="item.driverPhone"
+                  placeholder="联络员电话"
+                  size="small"
+                  ></ws-input>-->
+                  {{item.driverPhone}}
+                </ws-form-item>
+                <!--发船日期-->
+                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
+                  <!-- <ws-input
+                  v-model="item.sendDateStart"
+                  placeholder="请选择日期"
+                  ></ws-input>-->
+                  {{item.sendDateStart}}
+                </ws-form-item>
+                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
+                  <!-- <ws-input
+                  v-model="item.receiveDateEnd"
+                  placeholder="请选择日期"
+                  value-format="yyyy-MM-dd"
+                  size="small"
+                  />-->
+                  {{item.receiveDateEnd}}
+                </ws-form-item>
+                <!-- 船名 -->
+                <ws-form-item label="船名" span="1" prop="shipName" class="siji">
+                  <!-- <ws-input 
+                  v-model="item.shipName"
+                  placeholder="请输入船名"
+                  maxlength="100"
+                  size="small"
+                  ></ws-input>-->
+                  {{item.shipName}}
+                </ws-form-item>
+                <!-- 航次 -->
+                <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
+                  <!-- <ws-input 
+                  v-model="item.shipNo"
+                  placeholder="请选择航次"
+                  maxlength="100"
+                  size="small"
+                  ></ws-input>-->
+                  {{item.shipNo}}
+                </ws-form-item>
+                <!-- 类型 -->
+                <ws-form-item label="类型" span="1" prop="shipType" class="siji">
+                  <!-- <ws-input
+                  v-model="item.shipType"
+                  placeholder=""
+                  size="small"
+                  ></ws-input>-->
+                  {{item.shipType}}
+                </ws-form-item>
+                <ws-form-item
+                  label="数量"
+                  span="1"
+                  prop="boxNumber"
+                  class="siji"
+                  v-show="item.shipType=='集装箱'"
+                >
+                  <!-- <ws-input
           v-model="item.boxNumber"
           placeholder="请输入数量"
           size="small"
-          ></ws-input> -->
-          {{item.boxNumber}}
-        </ws-form-item>
-        </ws-info-table>
-        </div>
-        </div>
-        <div class="xia">
-      <div
-          style="width: 100%"
-          class="flex position"
-         v-for="(items, index) in freightspace"
-         :key='index'
-        >
-     <ws-info-table>
-        <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
-            <!-- <ws-input
+                  ></ws-input>-->
+                  {{item.boxNumber}}
+                </ws-form-item>
+              </ws-info-table>
+            </div>
+          </div>
+          <div class="xia">
+            <div
+              style="width: 100%"
+              class="flex position"
+              v-for="(items, index) in freightspace"
+              :key="index"
+            >
+              <ws-info-table>
+                <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
+                  <!-- <ws-input
           v-model="item.impurity"
           placeholder="请输入仓位号"
           size="small"
-          ></ws-input> -->
-          {{items.impurity}}
-          </ws-form-item>
-          <!-- 重量（吨） -->
-          <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
-          <!-- <ws-input
+                  ></ws-input>-->
+                  {{items.impurity}}
+                </ws-form-item>
+                <!-- 重量（吨） -->
+                <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
+                  <!-- <ws-input
           v-model="item.positionWeight"
           placeholder="请输入装仓重量"
           size="small"
-          ></ws-input> -->
-          {{items.positionWeight}}
-        </ws-form-item>
-        
-     </ws-info-table>
-      <!-- <img
+                  ></ws-input>-->
+                  {{items.positionWeight}}
+                </ws-form-item>
+              </ws-info-table>
+              <!-- <img
             width="22"
             height="22"
             class="del"
             @click="del(index)"
             src="../../../public/img/del.png"
             alt=""
-          /> -->
-      </div>
-      </div>
-      <!-- <el-button
+              />-->
+            </div>
+          </div>
+          <!-- <el-button
           class="add"
           type="primary"
           size="small"
           @click="add()"
           >添加仓位</el-button
-        > -->
-      <div style="text-align: right; padding: 10px">
-        
-        <el-button
-          class="bg-bottom-up"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          >关闭</el-button
-        >
-      </div>
-      </div>
-    </ws-form>
+          >-->
+          <div style="text-align: right; padding: 10px">
+            <el-button class="bg-bottom-up" type="primary" size="small" @click="returnsales()">关闭</el-button>
+          </div>
+        </div>
+      </ws-form>
     </div>
   </div>
-  
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import {shippingList,shippingLook } from '@/model/transport/index'
+import { shippingList, shippingLook } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { dayjs, EventBus } from 'base-core-lib'
@@ -315,7 +301,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     // vesselId(val) {
@@ -323,7 +309,7 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -355,19 +341,19 @@ export default {
       uploadSuccess: {},
       onChange: {},
       gradeList: [],
-       tranCarInfoList: [],
-       list:[],
-       arr:[],
-       freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
+      tranCarInfoList: [],
+      list: [],
+      arr: [],
+      freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
       rules: {
         netWeight: [
           {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -375,21 +361,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() {
@@ -399,15 +385,14 @@ export default {
     this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.getList()
   },
- activated(){
+  activated() {
     this.loaddata()
-    
- },
+  },
   methods: {
     loaddata() {
       shippingLook({ id: this.$route.query.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.deptBudgetList = response
           // this.deptBudgetList.driver = this.deptBudgetList.tranCarInfoList[0].driver
           // this.deptBudgetList.driverPhone = this.deptBudgetList.tranCarInfoList[0].driverPhone
@@ -418,58 +403,59 @@ export default {
           //    this.deptBudgetList.shipNo = this.deptBudgetList.tranCarInfoList[0].shipNo
           //     this.deptBudgetList.shipType = this.deptBudgetList.tranCarInfoList[0].shipType
           //    this.deptBudgetList. boxNumber =this.deptBudgetList.tranCarInfoList[0].boxNumber
-          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]
-             })
-           }
-
-          }  
-    })
-  },
-    getList(){
+          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]
+              })
+            }
+          }
+        })
+    },
+    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 
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        contractType: this.contractType,
+        tranTypeKey: this.tranTypeKey
       })
+        .toPromise()
+        .then(response => {
+          this.warehouseList = response
+        })
     },
     //返回按钮
     revert() {
-      this.freightspace=[]
+      this.freightspace = []
       this.$router.push({ path: 'tranManagementShipping' })
     },
-    del(index){
-        if(this.freightspace.length > 1 ){
-            this.freightspace.splice(index,1)
-        }
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
     },
-      add() {
+    add() {
       this.freightspace.push({
         binNumber: '',
         maxStorage: '',
-        remark: '',
+        remark: ''
       })
     },
     //提交按钮
-    submit() { 
+    submit() {
       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'
@@ -478,7 +464,7 @@ export default {
               this.deptBudgetList.statusFlag = 1
               addstorageputList(this.deptBudgetList)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('暂存成功')
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
@@ -492,9 +478,9 @@ export default {
           return false
         })
     },
-  returnsales(){
-     this.$router.push({ path: 'tranManagementShipping' })
-  },
+    returnsales() {
+      this.$router.push({ path: 'tranManagementShipping' })
+    },
     handleClose() {
       this.accessoryTFs = false
     },
@@ -536,8 +522,8 @@ export default {
       }
     },
     approve() {},
-    listQuery() {},
-  },
+    listQuery() {}
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -584,7 +570,7 @@ export default {
   text-align: right;
   padding: 16px 20px;
 }
-.center{
+.center {
   width: 80%;
   margin: 0 auto;
 }
@@ -614,17 +600,17 @@ export default {
   top: 13px;
   padding: 4px 2px;
 }
-.position{
+.position {
   width: 90%;
 }
-.position .siji{
+.position .siji {
   width: 16%;
 }
-/deep/.position .ws-info-table .el-form-item .el-form-item__label{
+/deep/.position .ws-info-table .el-form-item .el-form-item__label {
   width: 40%;
   text-align: center;
 }
-.position .zaizhong{
+.position .zaizhong {
   width: 16%;
 }
 //减号
@@ -635,7 +621,7 @@ export default {
 //   width: 30%;
 //   border: none;
 // }
-.siji{
+.siji {
   width: 300px;
 }
 /deep/.el-form-item {
@@ -684,7 +670,7 @@ export default {
   border-radius: 4px;
   border: 1px solid #d8dce6;
 }
-/deep/.flex .ws-info-table .el-form-item .el-form-item__content{
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
 /deep/.ws-class-table-col {
@@ -710,12 +696,12 @@ export default {
   }
 }
 //联络员及航次样式
-.aa{
+.aa {
   width: 100%;
   height: 90px;
-  background: #F5F7FA;
+  background: #f5f7fa;
   border-radius: 4px;
-  border: 1px solid #D8DCE6;
+  border: 1px solid #d8dce6;
 }
 // .xia{
 //   width:500px;
@@ -727,31 +713,31 @@ export default {
 //   border: none;
 // }
 .xia {
-    width: 700px;
-    // height: 50px;
-    border-radius: 4px;
-    border: 1px solid #D8DCE6;
-    margin-top: 10px;
-    border: none;
+  width: 700px;
+  // height: 50px;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 10px;
+  border: none;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-    // background-color: #f5f7fa;
-    font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #8890b1;
-    line-height: 16px;
+  // background-color: #f5f7fa;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 .position .siji {
-    width: 14.2%;
+  width: 14.2%;
 }
 .el-form {
-    height: 1000px;
+  height: 1000px;
 }
 .flex {
-    flex-direction: column;
+  flex-direction: column;
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label {
-    background-color: #f5f7fa;
+  background-color: #f5f7fa;
 }
 </style>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -21,7 +21,6 @@
         >
       </el-col>
     </el-row>
-
     <ws-form
       class="position"
       ref="deptBudgetList"
@@ -122,7 +121,7 @@
             <!--司机-->
 
             <ws-form-item
-              label="姓名"
+              label="姓名："
               span="1"
               prop="driver"
               v-show="item.temporaryDriverFlag != 0"
@@ -199,13 +198,15 @@
                     style="
                       vertical-align: text-top;
                       position: relative;
-                      top: -1px;
                     "
                     src="../../../public/img/fujian.png"
                     alt=""
                   />
                 </el-upload>
-                <div v-show="item.temporaryDriverFlag == 0">
+                <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>
@@ -228,12 +229,7 @@
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
       </div>
       <el-button class="add bg-bottom" type="primary" size="small" @click="add">
-        <img
-          width="22"
-          height="22"
-          src="../../../public/img/add.png"
-          alt=""
-        />
+        <img width="22" height="22" src="../../../public/img/add.png" alt="" />
         <div class="spans">添加临时用车</div></el-button
       >
     </ws-form>
@@ -355,11 +351,10 @@ export default {
       appendixIdsAdd: '',
     }
   },
- activated(){
-   this.deptBudgetList.id = this.$route.query.id
-   this.getList()
-
- },
+  activated() {
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
+  },
   computed: {
     totalStorage: function () {
       var maxStorage = 0
@@ -369,7 +364,6 @@ export default {
       return maxStorage
     },
     total: function () {
-      
       if (this.deptBudgetList.tranCarInfoList != null) {
         var maxStorage = 0
         for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
@@ -378,7 +372,7 @@ export default {
           )
         }
         return maxStorage
-      }else{
+      } else {
         return 0
       }
     },
@@ -1009,4 +1003,24 @@ export default {
   height: 20px;
   line-height: 18px;
 }
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 90px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 90px;
+  color: #5473E8;
+  line-height: 24px;
+}
 </style>

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -102,7 +102,7 @@
             <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
              <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
             <!--司机-->
-            <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 0">
+            <ws-form-item label="姓名:" span="1" prop="driver">
               <span>{{ item.driver }} </span>
             </ws-form-item>
 
@@ -115,13 +115,9 @@
               <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="unloadNetWeight">
-              {{item.unloadNetWeight}}
-            </ws-form-item>
             <!--磅单-->
             <ws-form-item label="磅单" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -137,7 +133,10 @@
                   @click="fujian(scope.row)"
                   alt=""
                 />
-                <div v-show="item.temporaryDriverFlag == 0">
+                 <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>
@@ -160,24 +159,27 @@
         >关闭</el-button
       >
     </div>
+ <!-- 附件弹框 -->
     <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
     >
-      <p>上传附件</p>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :file-list="fileList"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.loadPoundImg"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      <p>查看附件</p>
+      <div
+        style="display: inline-block; margin: 5px"
+        v-for="item in appendixIdss"
+      >
+        <img width="100" height="100" :src="item" alt="" />
+      </div>
+    </WinseaContentModal>
+    <WinseaContentModal
+      v-model="accesscard"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose1"
+    >
+      <p>查看附件</p>
+      <img width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
   </div>
 </template>
@@ -249,12 +251,16 @@ export default {
       name: '',
       staffList: [],
       options: [],
-      carModel: [],
+      // carModel: [],
       tranCarInfoList: {},
       //上传
       accessoryTFs: false,
-      fileList: [],
-      appendixIdsAdd: '',
+      accesscard : false,
+      accessurl: '',
+      // fileList: [],
+      // appendixIdsAdd: '',
+      //附件
+      appendixIdss:[],
     }
   },
   mounted() {
@@ -271,6 +277,7 @@ export default {
       return maxStorage
     },
     total: function () {
+      if (this.deptBudgetList.tranCarInfoList != null) {
       var maxStorage = 0
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
         maxStorage += Number(
@@ -278,6 +285,9 @@ export default {
         )
       }
       return maxStorage
+      }else{
+        return 0
+      }
     },
     label1: function () {
       //  for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
@@ -295,32 +305,6 @@ export default {
     },
   },
   methods: {
-    dataFilter(val) {
-      this.deptBudgetList.personCharge = val
-      if (val) {
-        this.options = this.staffList.filter((item) => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
-        })
-      } else {
-        this.options = this.staffList
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-          this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
-          // this.deptBudgetList.tranCarInfoList[i].driverPhone = this.staffList[i].staffMobilePhone
-          console.log(this.freightspace[i].driverPhone, 'dianhu')
-          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-        }
-      }
-    },
     marker: function (item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
@@ -337,9 +321,9 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-
-    //下拉司机姓名改变事件
-    selectdriver() {},
+      handleClose1() {
+      this.accesscard = false
+    },
     handleChange(value) {
       this.selectedOptions = value
     },
@@ -373,27 +357,17 @@ export default {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
             }
+            if (response.records[i].addressUrl != null) {
+              response.records[i].addressUrlArray =
+                response.records[i].addressUrl.split(',')
+              this.fileList[i] = response.records[i].addressUrl.split(',')
+            } else {
+              response.records[i].addressUrlArray = []
+            }
           }
-        })
-      //司机姓名下拉
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-        })
-      //车型
-      packList({ constId: 'TRAN5' })
-        .toPromise()
-        .then((response) => {
-          this.carModel = response
+          
         })
     },
-    handleExamine() {},
-    approve() {},
-    // returnsales() {
-    //   this.$router.push({ path: 'purchaseContract' })
-    // },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
         if (this.ChapterTwoList[i].constValue == e) {
@@ -432,8 +406,8 @@ export default {
     //上传
     fujian(row) {
       if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
+        row.addressUrl === null ||
+        row.addressUrl === ''
       ) {
         EventBus.$emit(
           'warning',
@@ -444,6 +418,7 @@ export default {
       }
       this.appendixIdss = row.receiveAttachmentPath
     },
+
   },
 }
 </script>
@@ -522,7 +497,6 @@ export default {
   width: 100px;
   text-align: center;
   background: #fff;
-  // border: 1px solid #cdd2dc;
 }
 .button-container {
   display: flex;
@@ -600,8 +574,7 @@ export default {
   display: inline-block;
 }
 .center {
-  width: 900px;
-  margin: 0 auto;
+  margin-right: 50px;
 }
 .el-form-item {
   width: 50%;
@@ -770,4 +743,24 @@ margin-top: 20px;
 .catNosCor{
   color: #5473E8;
 }
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 90px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 90px;
+  color: #5473E8;
+  line-height: 24px;
+}
 </style>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -3,16 +3,14 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="statusquery(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but" :type="searchType==1 ?'primary':''" @click="statusquery(1)"> 执行中</ws-button>
+        <ws-button class="but" :type="searchType==2 ?'primary':''" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" :type="searchType== undefined ?'primary':''" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-           <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
+           <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
         </div>
          <el-date-picker
           v-model="deptBudgetList.inOutDate"
@@ -493,6 +491,6 @@ export default {
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
-  margin-left: -20%;
+  margin: 0 10px;
 }
 </style>

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -222,7 +222,8 @@ export default {
       arr: [],
     }
   },
-  mounted() {
+
+  activated() {
     this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
@@ -236,29 +237,6 @@ export default {
     },
   },
   methods: {
-    dataFilter(val) {
-      this.deptBudgetList.personCharge = val
-      if (val) {
-        this.options = this.staffList.filter((item) => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
-        })
-      } else {
-        this.options = this.staffList
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-        }
-      }
-    },
     marker: function (item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
@@ -275,8 +253,6 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    //下拉司机姓名改变事件
-    selectdriver() {},
     handleChange(value) {
       this.selectedOptions = value
     },
@@ -303,7 +279,7 @@ export default {
         .then((response) => {
           this.deptBudgetList = response
           this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          if (this.deptBudgetList.tranCarInfoList.length > 0) {
+          if (this.deptBudgetList.tranCarInfoList.length > 0) {      
             if (response.tranCarInfoList[0].boxNo) {
               this.list = response.tranCarInfoList[0].boxNo.split(',')
               for (var i = 0; i < this.list.length; i++) {
@@ -433,6 +409,7 @@ export default {
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
   border-bottom: 1px solid transparent;
+  margin-top: 6px;
 }
 .readonly {
   position: relative;
@@ -552,8 +529,7 @@ export default {
   display: inline-block;
 }
 .center {
-  width: 900px;
-  margin: 0 auto;
+  margin-right: 50px;
 }
 .el-form-item {
   width: 50%;
@@ -708,7 +684,7 @@ export default {
 /deep/.liaison {
   background: #f5f7fa;
   border-radius: 4px;
-  border: 0px solid #d8dce6;
+  border: 1px solid #d8dce6;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   // border: 0px solid #d8dce6;

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -141,20 +141,17 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-          <!--车型-->
+           <!--车型-->
           <ws-form-item label="车型" span="1" prop="carModel">
             <el-select
               v-model="item.carModel"
-              placeholder="请输入车型"
-              class="typeselect"
-              multiple
+              placeholder="请选择车型"
               filterable
-              allow-create
-              default-first-option
+        
             >
               <el-option
                 v-for="items in carModel"
-                :key="items.constKey"
+                :key="items.value"
                 :label="items.constValue"
                 :value="items.constValue"
               />

src/views/tranManagement/tranManagementVehicle.vue

@@ -3,11 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" :type="status==1?'primary':''" @click="changestatus(1)">
+        <ws-button class="but" :type="searchType == 1?'primary':''" @click="changestatus(1)">
           执行中</ws-button
         >
-        <ws-button class="but" :type="status1==1?'primary':''" @click="changestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="status2==1?'primary':''" @click="changestatus()">全部任务</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">
@@ -308,6 +308,11 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
+    changestatus(state){
+      this.searchType = state
+      this.getList()
+
+    },
     getList() {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),

src/views/warehouse/warehouseManagementPutOut.vue

@@ -107,7 +107,7 @@
                 </span>
               </template>
               <div>
-                <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
+                <p style="margin-top: 0; padding-left: 10px">历史记录</p>
                 <div v-for="(item, index) in historyList" class="flex" :key="index">
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}