前端gjy

src/lang/zh.js

@@ -520,6 +520,7 @@
     tranManagementTransportEdit: '运输任务编辑',
     tranManagementWarehouseInOutTask: '出入库任务',
     tranManagementWarehouseInOutTaskAdd: '出入库任务添加',
+    tranManagementWarehouseInOutTaskEdit:'编辑',
     tranManagementVehicle: '汽运调度',
     tranManagementVehicleDispatching: '汽车调度',
     tranManagementVehicleLook: '查看派车详情',
@@ -4781,6 +4782,7 @@
   },
   // 任务管理
   tranManagement: '任务管理',
+  tranManagementWarehouseInOutTaskEdit:'编辑',
   // 年度培训
   annualTraining: {
     trainingResults: '培训结果',

src/views/contractManagement/purchaseContractExamine.vue

@@ -159,8 +159,9 @@
         <h3>流程信息</h3>
       </div>
       <ws-info-table>
-        <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
-          {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
+         <!--已付款（元）-->
+        <ws-form-item label="已付款（元）" span="1" prop="goodsNameKey">
+          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
         </ws-form-item>
         <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
           {{ deptBudgetList.contractProcessInfo.goodsName }}
@@ -171,9 +172,6 @@
         <ws-form-item label="未开发票（元）" span="1" prop="impurity"
           >{{ deptBudgetList.contractProcessInfo.impurity }}
         </ws-form-item>
-        <ws-form-item label="未回款（元）" span="1" prop="mildewGrain"
-          >{{ deptBudgetList.contractProcessInfo.mildewGrain }}
-        </ws-form-item>
         <ws-form-item
           label="已完成发运量（吨）"
           span="1"

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

@@ -142,6 +142,21 @@ const tranManagementRouter = {
       },
       hidden: true
     },
+    //出入库任务编辑
+    {
+      path: 'tranManagementWarehouseInOutTaskEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskEdit'),
+      name: 'tranManagementWarehouseInOutTaskEdit',
+      meta: {
+        title: 'tranManagementWarehouseInOutTaskEdit',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementWarehouseInOutTaskEdit',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
 
   ],
 

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -1,9 +1,9 @@
-// 创建出入库任务
+// 查看出入库任务
 <template>
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left title">创建出入库任务</h2>
+        <h2 class="bg-left title">查看出入库任务</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -23,41 +23,53 @@
     </el-row>
     <div class="basicInformation">
       <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        <el-radio label="1">出库</el-radio>
+        <!-- <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 v-if="dataList.taskTypeKey != 2" class="center1">
         <!--出库=-->
         <div class="small-title">
+          <img
+            style="position: relative; top: 40px; left: -35px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
-            >
+            > -->
               <el-option
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
                 :value="item.warehouseName"
               />
-            </el-select>
+              {{dataList.warehouseName}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList.inOutType"
               placeholder="请选择出库类型"
               class="typeselect"
-            >
+            > -->
               <el-option
                 v-for="item in storageType"
                 :key="item.constKey"
@@ -71,95 +83,106 @@
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+              {{dataList.inOutType}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
-            >
+            > -->
               <el-option
                 v-for="item in contractNoList"
                 :key="item.constKey"
                 :label="item.contractNo"
                 :value="item.contractNo"
               ></el-option>
-            </el-select>
+              {{dataList.contractNo}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
-            <el-select
+          <el-form-item label="货名" class="huom">
+            <!-- <el-select
               disabled
               v-model="dataList.goodsName"
               placeholder="货名"
-              class="typeselect"
-            >
+              class="huom"
+            > -->
               <el-option
                 v-for="item in goodnameList"
                 :key="item.constKey"
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+              {{dataList.goodsName}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）">
-            <el-input
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <!-- <el-input
               disabled
               v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
-              size="small"
-            />
+               class="huom"
+            /> -->
+            {{dataList.weight}}
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
+            <!-- <el-select
               v-model="dataList.grade"
               placeholder=""
               class="typeselect"
               disabled
-            >
+            > -->
               <el-option
                 v-for="item in gradeList"
                 :key="item.constKey"
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+              {{dataList.grade}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--容重（克/升）>=-->
-          <el-form-item label="容重（克/升）>=">
-            <el-input
+          <el-form-item label="容重（克/升）>="  >
+            <!-- <el-input
               disabled
               v-model="dataList.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
-            <el-input
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <!-- <el-input
               disabled
               v-model="dataList.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
-            <el-input
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+            <!-- <el-input
               disabled
               v-model="dataList.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
           <el-form-item
@@ -168,72 +191,83 @@
             prop="predictDate"
             class="deliverydate"
           >
-            <el-date-picker
+            <!-- <el-date-picker
               disabled
               v-model="dataList.predictDate"
               type="date"
               placeholder="请选择预计出库日期"
               value-format="yyyy-MM-dd"
-            />
+            /> -->
+            {{dataList.predictDate}}
           </el-form-item>
           <!--经办人-->
           <el-form-item label="出库经办人">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList.agent"
               placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
-            >
+            > -->
+            {{dataList.agent}}
               <el-option
                 v-for="item in options"
                 :key="item.value"
                 :label="item.staffName"
                 :value="item.staffName"
               />
-            </el-select>
+            <!-- </el-select> -->
           </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <el-input
+            <!-- <el-input
               disabled
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
               size="small"
-            />
+            /> -->
+            {{dataList.businessDescribe}}
           </el-form-item>
         </el-form>
       </div>
       <div v-if="dataList.taskTypeKey != 1" class="center1">
         <div class="small-title">
+          <img
+            style="position: relative; top: 40px; left: -35px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
         </div>
         <el-form ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <el-select
+            <!-- <el-select
               v-model="dataList1.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
               disabled
-            >
+            > -->
+            {{dataList1.warehouseName}}
               <el-option
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
                 :value="item.warehouseName"
               />
-            </el-select>
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="入库类型">
-            <el-select
+            <!-- <el-select
               v-model="dataList1.inOutType"
               placeholder="请选择入库类型"
               class="typeselect"
               disabled
-            >
+            > -->
               <el-option
                 v-for="item in storageType1"
                 :key="item.constKey"
@@ -247,95 +281,107 @@
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+              {{dataList1.inOutType}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList1.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
-            >
+            > -->
               <el-option
                 v-for="item in contractNoList"
                 :key="item.constKey"
                 :label="item.contractNo"
                 :value="item.contractNo"
               ></el-option>
-            </el-select>
+              {{dataList1.contractNo}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
-            <el-select
+          <el-form-item label="货名"  class="huom">
+            <!-- <el-select
               disabled
               v-model="dataList1.goodsName"
               placeholder="货名"
-              class="typeselect"
-            >
+               class="huom"
+            > -->
               <el-option
                 v-for="item in goodnameList"
                 :key="item.constKey"
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+              {{dataList1.goodsName}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）">
-            <el-input
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px" >
+            <!-- <el-input
               disabled
               v-model="dataList1.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList1.weight}}
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList1.grade"
               placeholder=""
               class="typeselect"
-            >
+            > -->
               <el-option
                 v-for="item in gradeList"
                 :key="item.constKey"
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+              {{dataList1.grade}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--容重（克/升）>=-->
           <el-form-item label="容重（克/升）>=">
-            <el-input
+            <!-- <el-input
               disabled
               v-model="dataList1.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList1.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
-            <el-input
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <!-- <el-input
               disabled
               v-model="dataList1.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList1.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
-            <el-input
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
+            <!-- <el-input
               disabled
               v-model="dataList1.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList1.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
           <el-form-item
@@ -344,48 +390,51 @@
             prop="predictDate"
             class="deliverydate"
           >
-            <el-date-picker
+            <!-- <el-date-picker
               disabled
               v-model="dataList1.predictDate"
               type="date"
               placeholder="请选择预计入库日期"
               value-format="yyyy-MM-dd"
-            />
+            /> -->
+            {{dataList1.predictDate}}
           </el-form-item>
           <!--经办人-->
           <el-form-item label="入库经办人">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList1.agent"
               placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
-            >
+            > -->
               <el-option
                 v-for="item in options"
                 :key="item.value"
                 :label="item.staffName"
                 :value="item.staffName"
               />
-            </el-select>
+              {{dataList1.agent}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <el-input
+            <!-- <el-input
               disabled
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
               size="small"
-            />
+            /> -->
+            {{dataList1.businessDescribe}}
           </el-form-item>
         </el-form>
       </div>
     </div>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
-        >提交</el-button
+      <el-button class="bg-bottom" type="primary" size="small" @click="close()"
+        >关闭</el-button
       >
     </div>
   </div>
@@ -591,26 +640,30 @@ export default {
         }
       })
     },
-    //提交按钮
-    submit() {
-      if (this.dataList.taskTypeKey == 1) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.requestadd(this.dataList)
-      } else if (this.dataList.taskTypeKey == 2) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo1
-        this.requestadd(this.dataList)
-      } else if (
-        this.dataList.taskTypeKey == 3 ||
-        this.dataList.taskTypeKey == 4
-      ) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-        this.requestadd(this.dataList, 'repetition')
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
-        this.dataList1.relevanceId = this.dataList.relevanceId
-        this.requestadd(this.dataList1, 'repetition')
-      }
+    //关闭
+    close(){
+      this.$router.push({path:'tranManagementWarehouseInOutTask'})
     },
+    //提交按钮
+    // submit() {
+    //   if (this.dataList.taskTypeKey == 1) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.requestadd(this.dataList)
+    //   } else if (this.dataList.taskTypeKey == 2) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo1
+    //     this.requestadd(this.dataList)
+    //   } else if (
+    //     this.dataList.taskTypeKey == 3 ||
+    //     this.dataList.taskTypeKey == 4
+    //   ) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
+    //     this.requestadd(this.dataList, 'repetition')
+    //     this.dataList1.inOutTaskNo = this.inOutTaskNo1
+    //     this.dataList1.relevanceId = this.dataList.relevanceId
+    //     this.requestadd(this.dataList1, 'repetition')
+    //   }
+    // },
     selectwarehouseName() {},
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
@@ -723,7 +776,7 @@ export default {
     .el-form-item__content {
       padding-left: 0px;
       padding-right: 10px;
-      background: #fff;
+      // background: #fff;
       white-space: nowrap;
       height: 40px;
       display: flex;
@@ -836,4 +889,74 @@ export default {
   position: relative;
   width: 100%;
 }
+.annu{
+  height: 81px;
+  background: #FFFFFF;
+  border-radius: 4px;
+}
+.basicInformation .el-form-item {
+    width: 50.3333%;
+    border: none;
+    margin: 0;
+}
+.huom{
+  width: 100px;
+  
+}
+.el-form{
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890B1;
+  line-height: 16px;
+}
+.a{
+  margin-left: -32px;
+}
+ .el-radio-group {
+    margin-left: 80px;
+}
+.ding{
+  height: 23px;
+  background: #E8ECF6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+.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{
+  height: 25px;
+  background: #E8ECF6;
+  margin-top: 15px;
+
+}
+.ziti{
+  width: 70px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890B1;
+  line-height: 20px;
+  margin-left: 80px;
+  margin-top: 5px;
+}
+.ziti1{
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #262626;
+  line-height: 22px;
+  margin-left: 240px;
+  margin-top: -27px;
+
+}
 </style>

src/views/taskManagement/moveWarehouseTask.vue

@@ -54,7 +54,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="moveTaskNo" label="移库任务编号" width="80"></el-table-column>
+        <el-table-column prop="moveTaskNo" label="移库任务编号" width="120"></el-table-column>
         <el-table-column prop="sendWarehouse" label="发货库"> </el-table-column>
         <el-table-column prop="receiveWarehouse" label="收货库"> </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -67,7 +67,8 @@
           {{ deptBudgetList.predictDate }}
         </ws-form-item>
         <!--货物信息-->
-        <span style="line-height: 50px; margin-left: 16px; color: #8890b1"
+        
+        <span style="line-height: 50px; text-align: center; color: #8890b1"
           >货物信息</span
         >
         <!-- <ws-form-item label="货物信息" span="1" prop="sendDetailedAddress">
@@ -78,7 +79,7 @@
         <el-input placeholder="请输入内容" :disabled="true"> </el-input>
         <el-input placeholder="请输入内容" :disabled="true"> </el-input>
         <el-input placeholder="请输入内容" :disabled="true"> </el-input>
-        <span style="line-height: 40px; margin-left: 16px; color: #8890b1"
+        <span style="line-height: 40px; text-align: center; color: #8890b1"
           >业务描述</span
         >
         <!--业务描述-->
@@ -89,6 +90,7 @@
           placeholder="请输入备注信息，不超过200字"
           maxlength="200"
         />
+        
       </ws-info-table>
 
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
@@ -785,7 +787,7 @@ export default {
 }
 //输入框
 /deep/.el-input {
-  width: 14.6%;
+  width: 15%;
   margin-left: 10px;
 }
 /deep/.is-disabled .el-input__inner {
@@ -796,6 +798,7 @@ export default {
 .line {
   width: 100%;
 }
+
 //业务描述
 /deep/.el-textarea {
   width: 90%;

src/views/taskManagement/tranManagementLook.vue

@@ -28,8 +28,8 @@
           <ws-form-item label="任务编号" span="1" prop="taskNo">
             {{ deptBudgetList.taskNo }}
           </ws-form-item>
-          <!--合同编号（选填）-->
-          <ws-form-item label="合同编号（选填）" span="1" prop="contractNo">
+          <!--合同编号-->
+          <ws-form-item label="合同编号" span="1" prop="contractNo">
             {{ deptBudgetList.contractNo }}
           </ws-form-item>
           <!--货名-->
@@ -89,9 +89,9 @@
         </ws-info-table>
         <!-- </div>-->
         <ws-info-table>
-          <!--发货日期-->
+          <!--发货地区-->
           <ws-form-item label="发货地区" span="1" prop="waterContent">
-            {{ item.sendPrivate }}/{{ item.sendCity }}{{ item.sendArea }}
+            {{ item.sendPrivate }}/{{ item.sendCity }}/{{ item.sendArea }}
           </ws-form-item>
           <!--发货地详细地址-->
           <ws-form-item
@@ -113,12 +113,12 @@
 
         <!-- <div class="nei"> -->
         <ws-info-table>
-          <!--发货日期-->
+          <!--收货地区-->
           <ws-form-item label="收货地区" span="1" prop="waterContent">
             {{ item.receivePrivate }}/{{ item.receiveCity
-            }}{{ item.receiveArea }}
+            }}/{{ item.receiveArea }}
           </ws-form-item>
-          <!--发货地详细地址-->
+          <!--收货地详细地址-->
           <ws-form-item
             label="收货地详细地址"
             span="1"

src/views/taskManagement/tranManagementTransport.vue

@@ -3,8 +3,7 @@
   <div>
     <BaseHeaderLayout :leftSpan="15">
       <template slot="left">
-        <span style='width: 134px;
-    display: inline-block;'>起点：</span>
+        <span style="width: 134px; display: inline-block">起点：</span>
         <el-input
           label="起点"
           placeholder="请输入起点"
@@ -12,8 +11,7 @@
           maxlength="200"
           type="input"
         ></el-input>
-        <span style='width: 134px;
-    display: inline-block;'>终点：</span>
+        <span style="width: 134px; display: inline-block">终点：</span>
         <el-input
           label="终点"
           placeholder="请输入终点"
@@ -53,18 +51,32 @@
       </template>
     </BaseHeaderLayout>
     <div>
-        <ws-button class="but" :type="primary==1?'primary':''" @click="handlestatus(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" :type="primary==2?'primary':''" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="primary==3?'primary':''" @click="handlestatus('')">全部任务</ws-button>
+      <ws-button
+        class="but"
+        :type="primary == 1 ? 'primary' : ''"
+        @click="handlestatus(1)"
+      >
+        执行中</ws-button
+      >
+      <ws-button
+        class="but"
+        :type="primary == 2 ? 'primary' : ''"
+        @click="handlestatus(2)"
+        >已完成</ws-button
+      >
+      <ws-button
+        class="but"
+        :type="primary == 3 ? 'primary' : ''"
+        @click="handlestatus('')"
+        >全部任务</ws-button
+      >
       <el-table
         class="wenzi"
         :data="gainList.records"
         style="width: 100%; margin-top: 20px"
         height="780"
       >
-        <el-table-column type="index">
+        <el-table-column type="index" label="序号">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
@@ -72,13 +84,19 @@
         </el-table-column>
         <el-table-column prop="taskNo" label="运输任务编号" width="140">
         </el-table-column>
-        <el-table-column prop="contractNo" label="合同编号"> </el-table-column>
+        <el-table-column prop="contractNo" label="合同编号" width="160">
+        </el-table-column>
         <el-table-column prop=" weight" class="table_td" label="货物（吨数）">
           <template slot-scope="scope">
             {{ scope.row.goodsName }}({{ scope.row.weight }})
           </template>
         </el-table-column>
-        <el-table-column prop="tranType" class="table_td" label="运输方式">
+        <el-table-column
+          prop="tranType"
+          class="table_td"
+          label="运输方式"
+          width="120"
+        >
         </el-table-column>
         <el-table-column prop="" class="table_td" label="起点">
           <template slot-scope="scope">
@@ -153,13 +171,22 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
+            <!-- <ws-button class="completed" @click="nocomplete(scope.row)">
               查看
             </ws-button>
             <ws-button class="putstorage" @click="delivery(scope.row)">
               编辑
             </ws-button>
-            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button>
+            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button> -->
+            <div class="record" @click="nocomplete(scope.row)">
+              查看
+            </div>
+            <div class="record" @click="delivery(scope.row)">
+              编辑
+            </div>
+            <div class="record" @click="deleteclick(scope.row)">
+              删除
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -202,7 +229,7 @@ export default {
       year: '',
       gainList: [],
       currentPage: 1,
-      primary:1,
+      primary: 1,
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
@@ -274,12 +301,12 @@ export default {
     },
     handlestatus(status) {
       this.searchType = status
-      if(status==1){
-        this.primary=1
-      }else if(status==2){
-        this.primary=2
-      }else{
-        this.primary=3
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
       }
       this.getList()
     },
@@ -508,17 +535,17 @@ export default {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
-  color: #5878e8;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
+// .completed.el-button--default {
+//   border-color: #5878e8;
+//   background-color: #f6f7fc;
+//   color: #5878e8;
+// }
+// .putstorage.el-button--default,
+// .deliverystorage.el-button--default {
+//   border-color: #8890b1;
+//   background-color: #fff;
+//   color: #8890b1;
+// }
 /deep/.el-table tr td:first-child,
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
@@ -540,20 +567,62 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
- /deep/.base_header_layout .grid-content {
- margin-bottom: 60px;
+/deep/.base_header_layout .grid-content {
+  margin-bottom: 60px;
 }
-/deep/.el-table td, /deep/.el-table th.is-leaf {
-    border-right: 1px solid transparent; 
+/deep/.el-table td,
+/deep/.el-table th.is-leaf {
+  border-right: 1px solid transparent;
+  text-align: center;
 }
 .findValue.el-input {
   width: 50%;
-  margin:0;
+  margin: 0;
+}
+.el-input {
+  margin: 0 10px;
+}
+/deep/.search .el-button--small {
+  padding: 0;
+}
+//操作按钮
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 5px;
+  right: -2px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
+//状态样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
 }
-.el-input{
-  margin:0 10px;
+.inExecution {
+  background: #5878e8;
 }
-/deep/.search .el-button--small{
-  padding:0;
+.done {
+  background: #50cad4;
 }
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -183,7 +183,7 @@
           ></el-input>
         </el-form-item>
         <div class="check-box">
-          <span class="check-box" >运输方式</span>
+          <span class="check-box">运输方式</span>
           <el-checkbox-group v-model="checkList" prop="tranType">
             <el-checkbox label="汽运"></el-checkbox>
             <el-checkbox label="火运"></el-checkbox>
@@ -857,4 +857,5 @@ export default {
 .el-cascader {
   width: 100%;
 }
+
 </style>

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -134,16 +134,18 @@
           ></el-input>
         </el-form-item>
         <el-form-item
-          label="收获库点"
+          label="收货库点"
           span="1"
           prop="contractNo"
           class="start-address"
+          style="width: 33.333%"
         >
           <el-select
             v-model="deptBudgetList.receiveWarehouse"
             :disabled="warehouse"
-            placeholder="货名"
+            placeholder="请输入收货库点"
             class="typeselect"
+            style="width: 100%"
           >
             <el-option
               v-for="item in warehouseList"
@@ -182,7 +184,7 @@
             size="small"
           ></el-input>
         </el-form-item>
-        <div>
+        <div class="check-box">
           <span class="check-box">运输方式</span>
           <el-checkbox-group v-model="checkList" prop="tranType">
             <el-checkbox label="汽运"></el-checkbox>
@@ -629,17 +631,41 @@ export default {
 <style lang="scss" scoped>
 .position {
   position: relative;
+  border-radius: 5px;
+  border: 1px solid #5473e8;
+  margin-top: 20px;
+  background: #f6f7fc;
+  border-left: 5px solid #5473e8;
+}
+.position .ws-info-table .el-form-item {
+  width: 25%;
+}
+/deep/.position .ws-info-table .el-form-item .el-form-item__label,
+/deep/.position .ws-info-table .el-form-item .el-form-item__content {
+  background: #f6f7fc;
+}
+/deep/.position .el-select {
+  width: 100%;
 }
 .del,
 .add {
   cursor: pointer;
+  margin-left: 10px;
 }
 .el-checkbox-group {
   font-size: 0;
   float: right;
+  margin-left: 24px;
+  color: #8890b1;
 }
-.check-box[data-v-5c5ac25d] {
-  float: left;
+/deep/.el-checkbox__label {
+  color: #8890b1;
+}
+.check-box {
+  margin-top: 10px;
+  margin-left: 16px;
+  color: #8890b1;
+  font-size: 14px;
 }
 .el-form {
   padding: 0 10%;
@@ -648,8 +674,8 @@ export default {
   border: none;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 1px solid #cdd2dc;
-  border-bottom: 1px solid #cdd2dc;
+  border: none;
+  height: 50px;
 }
 .readonly {
   position: relative;
@@ -716,4 +742,29 @@ export default {
     }
   }
 }
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background: #fff;
+  text-align: center;
+  color: #8890b1;
+  font-size: 14px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.start-address {
+  width: 33.333%;
+}
+/deep/.start-address .ws-info-table .el-form-item .el-form-item__content {
+  width: 100%;
+  color: #8890b1;
+  font-size: 14px;
+}
+.driver {
+  height: 30px;
+  margin-left: 20px;
+  margin-top: 10px;
+  line-height: 30px;
+  font-size: 16px;
+  color: #5473e8;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,30 +1,29 @@
 <!--出入库任务-->
 <template>
-  <div>
-    <BaseHeaderLayout :leftSpan="20">
-      <template slot="right">
-        <ws-button class="but" type="primary" @click="handleAdd()"
-          >添加</ws-button
+   <div class="container">
+      <div class="nav">
+        <ws-button class="butt" type="primary" @click="handleAdd()"
+          ><img
+            width="13"
+            height="13"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 2px;
+              left: -4px;
+            "
+            src="../../../public/img/header-add.png"
+            alt=""
+          />添加</ws-button
         >
-      </template>
-      <template slot="left">
-        <ws-button class="but" type="primary" @click="handlestatus(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" @click="handlestatus('')">全部任务</ws-button>
-      </template>
-      <template slot="left">
         <ws-input
           v-model="warehouseName"
           placeholder="可按合同编号或任务编号查找"
           clearable
           maxlength="500"
           type="input"
-          class="findValue"
-        ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <div class="search">
+          class="Value"
+        ></ws-input> 
           <ws-button class="find" type="primary" @click="lookUp()"
             ><img
               width="16"
@@ -37,11 +36,20 @@
               "
               src="../../../public/img/sousuo.png"
               alt=""
-          /></ws-button>
-        </div>
-      </template>
-    </BaseHeaderLayout>
-    <div>
+          /></ws-button> 
+      </div>
+    <div class="nav2" >
+       </div> 
+    <div class="navv">
+        <ws-button class="but"  @click="handlestatus()">
+          待审核</ws-button>
+          <ws-button class="but"  @click="handlestatus()">
+          已驳回</ws-button>
+        <ws-button class="but"  @click="handlestatus(1)">
+          执行中</ws-button
+        >
+        <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
+        <ws-button class="but" type="primary" @click="handlestatus('')">全部任务</ws-button>
       <el-table
         class="wenzi"
         :data="gainList.records"
@@ -128,35 +136,36 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
+            <div class="record" @click="nocomplete(scope.row)">
               查看
-            </ws-button>
-            <ws-button
+            </div>
+            <div
               v-if="scope.row.taskStatus == '待审核'"
-              class="putstorage"
+              class="adjustment"
               @click="delivery(scope.row)"
             >
               审核
-            </ws-button>
-            <ws-button
+            </div>
+            <div
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
-              class="putstorage"
+              class="record"
               @click="delivery(scope.row)"
             >
               编辑
-            </ws-button>
-            <ws-button
+            </div>
+            <div
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
+              class="adjustment"
               @click="deleteclick(scope.row)"
             >
               删除
-            </ws-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -300,7 +309,7 @@ export default {
     //编辑
     delivery(item) {
       this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskAdd',
+        path: 'tranManagementWarehouseInOutTaskEdit',
         query: {
           relevanceId: item.relevanceId,
         },
@@ -532,13 +541,14 @@ export default {
   background: #e9ecf7;
 }
 .el-row {
-  height: 150px;
+  height: 80px;
 }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
 .but {
-  margin-top: 150px;
+  margin-left: 55px;
+  margin-top: 30px;
 }
 .findValue {
   width: 0%;
@@ -548,4 +558,64 @@ export default {
 .search {
   margin-left: -250px;
 }
+.butt{
+ margin-left: 60px;
+ margin-top: 20px;
+}
+.Value{
+  width: 300px;
+}
+.el-pagination {
+  margin-bottom: 20px;
+  margin-left: 40%;
+}
+.winseaview-main{
+ background: #E8ECF6;
+box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+.nav{
+  background: white
+  
+}
+.navv{
+  background: #FFFFFF;
+  border-radius: 4px;
+  margin-top: -8px;
+}
+// .nav2{
+//   width: auto;
+//   height: 5px;
+//   background-color: #e8eaf1;
+// }
+.nav2{
+  height: 25px;
+  background: #E8ECF6;
+  margin-top: 15px;
+}
+.spans {
+  display: table-caption;
+  width: 17px;
+  line-height: 19px;
+}
+//执行样式
+.executory,
+.inExecution,
+.done {
+  width: 6px;
+  height: 6px;
+  display: inline-block;
+  border-radius: 50%;
+  position: relative;
+  top: -1px;
+  font-size: 14px;
+}
+.executory {
+  background: #ff9f24;
+}
+.inExecution {
+  background: #5878e8;
+}
+.done {
+  background: #50cad4;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -22,18 +22,28 @@
       </el-col>
     </el-row>
     <div class="basicInformation">
-      <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        <el-radio label="1">出库</el-radio>
-        <el-radio label="2">入库</el-radio>
-        <el-radio label="3">移库</el-radio>
-        <el-radio label="4">退库并出库</el-radio>
+      <div class="annu">
+        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
+        <el-radio label="1" class="a">出库</el-radio>
+        <el-radio label="2" class="a">入库</el-radio>
+        <el-radio label="3" class="a">移库</el-radio>
+        <el-radio label="4" class="a">退库并出库</el-radio>
       </el-radio-group>
-      <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
+      </div>
+      <div class="ding"></div>
+       <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
+          <img
+            style="position: relative; top: 40px; left: 128px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
         <!--出库=-->
         <div class="small-title">
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
-        <el-form ref="dataList" :model="dataList" label-width="140px">
+        <el-form ref="dataList" :model="dataList" label-width="140px" input-width="300px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
@@ -106,12 +116,12 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
+          <el-form-item label="货名" class="huom">
             <el-select
             :disabled='dataList.taskTypeKey != 3'
               v-model="dataList.goodsName"
               placeholder="货名"
-              class="typeselect"
+              class="huom"
               @change="selectgoodsName"
             >
               <el-option
@@ -123,12 +133,13 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）">
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px" >
             <el-input
               v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -154,27 +165,30 @@
               v-model="dataList.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
-              size="small"
+              size="small" 
+              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px" >
             <el-input
             @input='waterContentchange'
               v-model="dataList.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
             <el-input
             @input='unitPricechange'
               v-model="dataList.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -209,17 +223,25 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item label="业务描述">
+          <el-form-item label="业务描述" span="20">
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
-              size="small"
+              size="large"
+              
             />
           </el-form-item>
         </el-form>
       </div>
-      <div v-if="dataList.taskTypeKey != 1" class="center1">
+      <div v-show="dataList.taskTypeKey != 1" class="center1">
+        <img
+            style="position: relative; top: 40px; left: 128px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
         <div class="small-title">
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
         </div>
@@ -295,12 +317,12 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
+          <el-form-item label="货名" class="huom">
             <el-select
             :disabled='dataList.taskTypeKey != 3'
               v-model="dataList1.goodsName"
               placeholder="货名"
-              class="typeselect"
+              class="huom"
               @change="selectgoodsName1"
             >
               <el-option
@@ -312,13 +334,15 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）">
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px"  >
             <el-input
             @input='weightchange'
               v-model="dataList1.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
+              class="huom"
+              
             />
           </el-form-item>
           <!-- 品级 -->
@@ -347,10 +371,11 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item label="水分（%）<="  span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
             @input='waterContentchange'
             :disabled='dataList.taskTypeKey == 3'
@@ -358,10 +383,11 @@
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
             <el-input
             @input='unitPricechange'
             :disabled='dataList.taskTypeKey == 3'
@@ -369,6 +395,7 @@
               placeholder="请输入单价"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -408,7 +435,7 @@
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
-              size="small"
+              size="large"
             />
           </el-form-item>
         </el-form>
@@ -416,9 +443,17 @@
       <div v-if="dataList.taskTypeKey == 4" class="center1">
         <!--出库=-->
         <div class="small-title">
+          <img
+            style="position: relative; top: 40px; left: -22px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
+          
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
@@ -491,12 +526,12 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
+          <el-form-item label="货名" class="huom" >
             <el-select
             :disabled='dataList.taskTypeKey != 3'
               v-model="dataList.goodsName"
               placeholder="货名"
-              class="typeselect"
+              class="huom"
               @change="selectgoodsName"
             >
               <el-option
@@ -508,13 +543,14 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）">
+          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
             :disabled='dataList.taskTypeKey == 4'
               v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -542,26 +578,29 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
             :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
               v-model="dataList.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <el-input
             :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
               v-model="dataList.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
+               class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -601,7 +640,7 @@
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
-              size="small"
+              size="large"
             />
           </el-form-item>
         </el-form>
@@ -614,6 +653,7 @@
       >
     </div>
   </div>
+  </div>
 </template>
 <script>
 import {
@@ -1218,7 +1258,7 @@ export default {
     .el-form-item__content {
       padding-left: 0px;
       padding-right: 10px;
-      background: #fff;
+      // background: #fff;
       white-space: nowrap;
       height: 40px;
       display: flex;
@@ -1331,4 +1371,48 @@ export default {
   position: relative;
   width: 100%;
 }
+.annu{
+  height: 81px;
+  background: #FFFFFF;
+  border-radius: 4px;
+}
+.basicInformation .el-form-item {
+    width: 50.3333%;
+    border: none;
+    margin: 0;
+    margin-top: 6px;
+}
+.huom{
+  width: 100px;
+  
+}
+.el-form{
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890B1;
+  line-height: 16px;
+}
+.a{
+  margin-left: -32px;
+}
+ .el-radio-group {
+    margin-left: 80px;
+}
+.ding{
+  height: 23px;
+  background: #E8ECF6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+/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%;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

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

src/views/tranManagement/tranManagementDriver.vue

@@ -6,23 +6,9 @@
         <ws-button type="primary" @click="handleAdd()">添加</ws-button>
       </template>
       <template slot="left">
-        <!-- <ws-select
-          v-model="searchTypeText"
-          placeholder="请选择所在城市"
-          :value="searchType"
-          @change="selecttaskType"
-        >
-        <ws-option
-            v-for="item in options_"
-            :key="item.value"
-            :label="item.label"
-            :value="item.label"
-          />
-        </ws-select> -->
         <span style="display: inline-block; width: 60px; color: #8890b1"
           >城市</span
         >
-
         <el-cascader
           :options="options_"
           v-model="searchTypeText"

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -937,35 +937,35 @@ export default {
           this.deptBudgetList.addressUrl = arr.toString()
           this.deptBudgetList.driverCarInfoList = this.freightspace
           this.deptBudgetList.driverPayeeInfoList = this.freightspace1
-          // addDriver(this.deptBudgetList)
-          //   .toPromise()
-          //   .then((response) => {
-          //     this.$message.success('添加成功')
-          //     this.deptBudgetList = {}
-          //     this.freightspace = [
-          //       {
-          //         carNumber: '',
-          //         carModel: '高栏',
-          //         carModelKey: '1',
-          //         carLength: '13',
-          //         carLengthKey: '1',
-          //         carLoad: '',
-          //         yearManufacture: '',
-          //       },
-          //     ]
-          //     this.freightspace1 = [
-          //       {
-          //         accountTypeFlag: '1',
-          //         payeeName: '',
-          //         payeeNumberCard: '',
-          //         compName: '',
-          //         bankDeposit: '',
-          //         addressUrlArray: [],
-          //         bankCard: '',
-          //       },
-          //     ]
-          //     this.$router.push({ path: 'tranManagementDriver' })
-          //   })
+          addDriver(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.deptBudgetList = {}
+              this.freightspace = [
+                {
+                  carNumber: '',
+                  carModel: '高栏',
+                  carModelKey: '1',
+                  carLength: '13',
+                  carLengthKey: '1',
+                  carLoad: '',
+                  yearManufacture: '',
+                },
+              ]
+              this.freightspace1 = [
+                {
+                  accountTypeFlag: '1',
+                  payeeName: '',
+                  payeeNumberCard: '',
+                  compName: '',
+                  bankDeposit: '',
+                  addressUrlArray: [],
+                  bankCard: '',
+                },
+              ]
+              this.$router.push({ path: 'tranManagementDriver' })
+            })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
           return false

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -28,7 +28,7 @@
       :rules="rules"
       :model="deptBudgetList"
     >
-      <div class="small-title" style="font-size: 16px;">任务详情</div>
+      <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
         <ws-form-item label="任务编号" span="1" prop="processNo">
@@ -90,7 +90,7 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
-      <div class="small-title" style="font-size: 16px;">装车详情</div>
+      <div class="small-title" style="font-size: 16px">装车详情</div>
       <div class="liaison">
         <div
           style="width: 100%"
@@ -99,8 +99,15 @@
           :key="index"
         >
           <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" v-show="item.temporaryDriverFlag == 0">
+              司机-{{ index + 1 }}
+            </div>
+            <div
+              class="catNos catNosCor"
+              v-show="item.temporaryDriverFlag != 0"
+            >
+              司机-{{ index + 1 }}(临)
+            </div>
             <!--司机-->
             <ws-form-item
               label="姓名："
@@ -177,58 +184,58 @@
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
                 <el-upload
-                action="https://www.zthymaoyi.com/upload/admin"
-                :show-file-list="false"
-                :on-success="
-                  (res, file) => {
-                    uploadSuccessHandle1(index, res, file)
-                  }
-                "
-                class="avatar-uploader"
-                accept=".jpg, .jpeg, .png, .gif"
-                ><img
-                  width="18"
-                  height="20"
-                  style="
-                    vertical-align: text-top;
-                    position: relative;
-                    top: -1px;
+                  action="https://www.zthymaoyi.com/upload/admin"
+                  :show-file-list="false"
+                  :on-success="
+                    (res, file) => {
+                      uploadSuccessHandle1(index, res, file)
+                    }
                   "
-                  src="../../../public/img/fujian.png"
-                  alt=""
-                />
-              </el-upload>
+                  class="avatar-uploader"
+                  accept=".jpg, .jpeg, .png, .gif"
+                  ><img
+                    width="18"
+                    height="20"
+                    style="
+                      vertical-align: text-top;
+                      position: relative;
+                      top: -1px;
+                    "
+                    src="../../../public/img/fujian.png"
+                    alt=""
+                  />
+                </el-upload>
                 <div v-show="item.temporaryDriverFlag == 0">
                   {{ item.signStatus }}
                 </div>
               </template>
             </ws-form-item>
-            
+
             <span
-            v-show="item.temporaryDriverFlag != 0"
-                width="22"
-                height="22"
-                class="del"
-                @click="del(index)"
-                src="../../../public/img/del.png"
-                alt=""
-                >×</span
-              >
+              v-show="item.temporaryDriverFlag != 0"
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+              >×</span
+            >
           </ws-info-table>
         </div>
       </div>
-      <div style="text-align: right;color: #8890B1;font-size: 16px;">
+      <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
       </div>
       <el-button class="add bg-bottom" type="primary" size="small" @click="add">
-         <img
+        <img
           width="22"
           height="22"
           @click="add"
           src="../../../public/img/add.png"
           alt=""
         />
-       <div class="spans"> 添加临时用车</div></el-button
+        <div class="spans">添加临时用车</div></el-button
       >
     </ws-form>
     <!-- 提交 -->
@@ -264,7 +271,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback ,getbank} from '@/model/transport/index'
+import { seeCat, packList, feedback, getbank } from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -349,11 +356,11 @@ export default {
       appendixIdsAdd: '',
     }
   },
-  mounted() {
-    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
@@ -363,13 +370,18 @@ export default {
       return maxStorage
     },
     total: function () {
-      var maxStorage = 0
-      for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        maxStorage += Number(
-          this.deptBudgetList.tranCarInfoList[i].loadNetWeight
-        )
+      
+      if (this.deptBudgetList.tranCarInfoList != null) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+          )
+        }
+        return maxStorage
+      }else{
+        return 0
       }
-      return maxStorage
     },
   },
   methods: {
@@ -437,6 +449,7 @@ export default {
       this.deptBudgetList = {}
       this.freightspace = {}
       this.selectedOptions = ''
+      this.deptBudgetList.tranCarInfoList = []
       this.$router.push({ path: 'tranManagementTransporHairRespond' })
     },
     // confirmPosition() {
@@ -450,37 +463,36 @@ export default {
       this.accessoryTFs = false
     },
     submit() {
-      for(var i = 0 ; i < this.freightspace.length ; i++){
-        if(this.freightspace[i].temporaryDriverFlag != 0){
-          if(!this.freightspace[i].driver){
+      for (var i = 0; i < this.freightspace.length; i++) {
+        if (this.freightspace[i].temporaryDriverFlag != 0) {
+          if (!this.freightspace[i].driver) {
             this.$message({
-              message : '司机姓名不能为空！',
-              type: 'warning'
+              message: '司机姓名不能为空！',
+              type: 'warning',
             })
             return
           }
-          if(!this.freightspace[i].driverPhone){
+          if (!this.freightspace[i].driverPhone) {
             this.$message({
-              message:'司机电话不能为空！',
-              type: "warning"
+              message: '司机电话不能为空！',
+              type: 'warning',
             })
             return
           }
-          if(!this.freightspace[i].carNo){
+          if (!this.freightspace[i].carNo) {
             this.$message({
-              message : "车牌号不能为空！",
-              type:"warning"
+              message: '车牌号不能为空！',
+              type: 'warning',
             })
             return
           }
-          if(!this.freightspace[i].loadNetWeight){
+          if (!this.freightspace[i].loadNetWeight) {
             this.$message({
-              message:"装载净重不能为空！",
-              type: "warning"
+              message: '装载净重不能为空！',
+              type: 'warning',
             })
             return
           }
-
         }
       }
       this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交装车信息？`, {
@@ -916,11 +928,11 @@ export default {
   border-top: 0px;
 }
 .ws-info-table .el-form-item .el-form-item__content {
-border: none;
+  border: none;
 }
 /deep/.ws-info-table .el-form-item {
- border: none;
- height: 50px;
+  border: none;
+  height: 50px;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
@@ -957,26 +969,26 @@ border: none;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 30%;
-  background: #F6F7FC;
+  background: #f6f7fc;
 }
 /deep/.liaison .flex {
   display: contents;
 }
-/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;
 }
-.catNos{
+.catNos {
   width: 100%;
   height: 30px;
   margin-top: 10px;
   margin-left: 20px;
   font-size: 14px;
 }
-.catNosCor{
-  color: #5473E8;
+.catNosCor {
+  color: #5473e8;
 }
 .add {
   width: 130px;

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -1,4 +1,4 @@
-//反馈
+//反馈查看
 <template>
   <div class="container">
     <el-row>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -379,30 +379,7 @@ export default {
     find() {
       this.currentPage = 1
       this.getList()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
+    }
   },
 }
 </script>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -14,20 +14,6 @@
         <div>
            <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
         </div>
- 
-        <!-- <ws-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"
-        /> -->
          <el-date-picker
           v-model="deptBudgetList.inOutDate"
           type="daterange"
@@ -91,7 +77,7 @@
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="processStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -103,15 +89,15 @@
               <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>
@@ -150,7 +136,6 @@
              <div
               class="record"
               @click="trainSee(scope.row)"
-              
             >
               查看
             </div>

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -28,7 +28,7 @@
       :rules="rules"
       :model="deptBudgetList"
     >
-      <div class="small-title" style="font-size: 16px;">任务详情</div>
+      <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
         <ws-form-item label="任务编号" span="1" prop="processNo">
@@ -88,8 +88,12 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
-      <div class="small-title" style="font-size: 16px;">联络员及车皮信息</div>
-      <div class="liaison" v-for="(item, index) in deptBudgetList.tranCarInfoList" :key="index">
+      <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
+      <div
+        class="liaison"
+        v-for="(item, index) in deptBudgetList.tranCarInfoList"
+        :key="index"
+      >
         <ws-info-table>
           <!--姓名-->
           <ws-form-item label="姓名：" span="1" prop="driver">
@@ -109,7 +113,7 @@
           </ws-form-item>
           <!--车型-->
           <ws-form-item label="车型：" span="1" prop="carModel">
-            {{item.carModel }}
+            {{ item.carModel }}
           </ws-form-item>
         </ws-info-table>
         <ws-info-table>
@@ -121,7 +125,7 @@
           >
             <!--车厢号-->
             <ws-form-item
-              :label="'车厢号-' + (index + 1)+'：'"
+              :label="'车厢号-' + (index + 1) + '：'"
               span="1"
               prop="trainNo"
             >
@@ -299,13 +303,15 @@ export default {
         .then((response) => {
           this.deptBudgetList = response
           this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          if (response.tranCarInfoList[0].boxNo) {
-            this.list = response.tranCarInfoList[0].boxNo.split(',')
-            for (var i = 0; i < this.list.length; i++) {
-              var num = this.list[i]
-              this.freightspace.push({
-                trainNo: num,
-              })
+          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++) {
+                var num = this.list[i]
+                this.freightspace.push({
+                  trainNo: num,
+                })
+              }
             }
           }
         })
@@ -693,16 +699,16 @@ export default {
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 30%;
-  background: #F5F7FA;
+  background: #f5f7fa;
   border: none;
 }
 /deep/.liaison .flex {
   display: contents;
 }
-/deep/.liaison{
-  background: #F5F7FA;
-border-radius: 4px;
-border: 0px solid #D8DCE6;
+/deep/.liaison {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 0px solid #d8dce6;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   // border: 0px solid #d8dce6;
@@ -711,5 +717,4 @@ border: 0px solid #D8DCE6;
   border-bottom: none;
   border-top: none;
 }
-
 </style>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -92,7 +92,6 @@
       <div
         class="liaison"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
-        :key="index"
       >
         <ws-info-table>
           <!--姓名-->
@@ -143,7 +142,7 @@
           </ws-form-item>
           <!--车型-->
           <ws-form-item label="车型" span="1" prop="carModel">
-            <ws-select
+            <el-select
               v-model="item.carModel"
               placeholder="请输入车型"
               class="typeselect"
@@ -152,23 +151,23 @@
               allow-create
               default-first-option
             >
-              <ws-option
+              <el-option
                 v-for="items in carModel"
                 :key="items.constKey"
                 :label="items.constValue"
                 :value="items.constValue"
               />
-            </ws-select>
+            </el-select>
           </ws-form-item>
         </ws-info-table>
-         <ws-info-table>
+        <ws-info-table>
           <div
             style="width: 100%"
             class="flex position carnum"
             v-for="(item1, index) in freightspace"
             :key="index"
           >
-          <!--车厢号-->
+            <!--车厢号-->
             <ws-form-item
               :label="'车厢号-' + (index + 1)"
               span="1"
@@ -191,7 +190,7 @@
               >
             </ws-form-item>
           </div>
-        </ws-info-table> 
+        </ws-info-table>
       </div>
       <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img
@@ -275,11 +274,7 @@ export default {
       size: 10,
       value1: '',
       unitList: [],
-      freightspace: [
-        // {
-        //   trainNo: '',
-        // },
-      ],
+      freightspace: [],
       name: '',
       list: [],
       staffList: [],
@@ -289,7 +284,7 @@ export default {
       arr: [],
     }
   },
-  mounted() {
+  activated() {
     this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
@@ -361,7 +356,7 @@ export default {
     },
     returnsales() {
       this.deptBudgetList = {}
-      this.freightspace = {}
+      this.freightspace = []
       this.selectedOptions = ''
       this.$router.push({ path: 'tranManagementTransporTationFire' })
     },
@@ -372,7 +367,7 @@ export default {
     uploadSuccess(data, files, url) {
       console.log(data, files, url)
     },
-    submit() {
+    submit(deptBudgetList) {
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
         if (!this.deptBudgetList.tranCarInfoList[i].driver) {
           this.$message({
@@ -447,13 +442,16 @@ export default {
                 this.arr.push(num)
               }
               this.deptBudgetList.totalStorage = this.totalStorage
-              this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              this.tranCarInfoList.driver =
+                this.deptBudgetList.tranCarInfoList[0].driver
+              this.tranCarInfoList.driverPhone =
+                this.deptBudgetList.tranCarInfoList[0].driverPhone
               this.tranCarInfoList.sendDateStart =
-                this.deptBudgetList.sendDateStart
+                this.deptBudgetList.tranCarInfoList[0].sendDateStart
               this.tranCarInfoList.receiveDateEnd =
-                this.deptBudgetList.receiveDateEnd
-              this.tranCarInfoList.carModel = this.deptBudgetList.carModel
+                this.deptBudgetList.tranCarInfoList[0].receiveDateEnd
+              this.tranCarInfoList.carModel =
+                this.deptBudgetList.tranCarInfoList[0].carModel.toString()
               this.tranCarInfoList.id =
                 this.deptBudgetList.tranCarInfoList[0].id
               this.tranCarInfoList.tranType = this.tranType
@@ -494,14 +492,33 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          if (response.tranCarInfoList[0].boxNo) {
-            this.list = response.tranCarInfoList[0].boxNo.split(',')
-            for (var i = 0; i < this.list.length; i++) {
-              var num = this.list[i]
-              this.freightspace.push({
-                trainNo: num,
-              })
+          if (response.tranCarInfoList.length > 0) {
+            if (response.tranCarInfoList[0].boxNo) {
+              this.list = response.tranCarInfoList[0].boxNo.split(',')
+              for (var i = 0; i < this.list.length; i++) {
+                var num = this.list[i]
+                this.freightspace.push({
+                  trainNo: num,
+                })
+              }
             }
+          } else {
+            this.deptBudgetList.tranCarInfoList = [
+              {
+                driver: '',
+                driverPhone: '',
+                sendDateStart: '',
+                receiveDateEnd: '',
+                carModel: '',
+              },
+            ]
+          }
+          if (!this.deptBudgetList.tranCarInfoList[0].boxNo ) {
+            this.freightspace = [
+              {
+                trainNo: '',
+              },
+            ]
           }
         })
       //司机姓名下拉
@@ -926,13 +943,13 @@ export default {
   line-height: 18px;
 }
 /deep/.carnum {
-     display: contents;
+  display: contents;
 }
 /deep/.carnum .ws-info-table .el-form-item {
   width: 20%;
 }
 /deep/.liaison .carnum .ws-info-table .el-form-item {
   border-radius: 10px;
-right: 20px;
+  right: 20px;
 }
 </style>

src/views/tranManagement/tranManagementVehicle.vue

@@ -7,27 +7,13 @@
           执行中</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(1)">全部任务</ws-button>
+        <ws-button class="but" :type="status2==1?'primary':''" @click="changestatus()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
         <div>
           <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
         </div>
-        
-        <!-- <ws-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"
-        /> -->
         <el-date-picker
           v-model="deptBudgetList.inOutDate"
           type="daterange"
@@ -87,7 +73,7 @@
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="processStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -99,15 +85,15 @@
               <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>
@@ -377,13 +363,13 @@ export default {
           return false
         })
     },
-    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
+    //     }
+    //   }
+    // },
     fujian(row) {
       if (
         row.receiveAttachmentPath === null ||
@@ -419,29 +405,29 @@ export default {
       this.currentPage = 1
       this.getList()
     },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
+    // async exportlist() {
+    //   const { data } = await export1(
+    //     {
+    //       compId: sessionStorage.getItem('ws-pf_compId'),
+    //       contractType: this.contractType,
+    //       currentPage: this.currentPage,
+    //       pageSize: this.pageSize,
+    //       searchType: this.searchType,
+    //       searchKeyWord: this.searchKeyWord,
+    //       startDate: this.startDate,
+    //       endDate: this.endDate,
+    //     },
+    //     {},
+    //     { responseType: 'blob' }
+    //   ).toPromise()
+    //   downloadFile({
+    //     res: data,
+    //     fileName: `${
+    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
+    //     }_采购合同`,
+    //     type: 'xls',
+    //   })
+    // },
   },
 }
 </script>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -251,23 +251,21 @@
             合计{{ 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
-          >
+            <img
+              width="22"
+              height="22"
+              src="../../../public/img/add.png"
+              alt=""
+            />
+            <div class="spans">添加司机</div>
+          </el-button>
           <div style="text-align: right; padding: 10px">
             <el-button
               class="bg-bottom-up"
               type="primary"
               size="small"
               @click="submit()"
-            >提交</el-button
+              >提交</el-button
             >
           </div>
         </div>
@@ -352,11 +350,15 @@ export default {
   },
   computed: {
     total: function () {
-      var maxStorage = 0
-      for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        maxStorage += Number(this.deptBudgetList.tranCarInfoList[i].loadWeight)
+      if (this.deptBudgetList.tranCarInfoList.length > 0) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].loadWeight
+          )
+        }
+        return maxStorage
       }
-      return maxStorage
     },
   },
   methods: {
@@ -527,7 +529,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 /deep/.basicInformation {
-  height:87vh;
+  height: 87vh;
   overflow: scroll;
   .ws-info-table {
     border: none;
@@ -639,8 +641,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%;
@@ -671,11 +673,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/warehouse/warehouseManagementList.vue

@@ -17,7 +17,7 @@
         <ws-button @click="handleLook()">查看</ws-button>
         <ws-button @click="handleEdit()">编辑</ws-button>
         <ws-button @click="handleDelete()">删除</ws-button>
-        <ws-button @click="handlTask()">任务{{}}</ws-button>
+        <ws-button @click="handlTask()">任务</ws-button>
       </template>
       <template slot="left">
         <div style="margin-top: 2px">

src/views/warehouse/warehouseManagementPutOut.vue

@@ -1,11 +1,11 @@
 //出入库任务
 <template>
  <div class="container">
-      <el-row>
-      <el-col :span="20">
+    <el-row>
+      <el-col :span="12">
         <h2 class="bg-left title">出入库任务</h2>
       </el-col>
-      <el-col :span="4" class="bg-right">
+      <el-col :span="12" class="bg-right">
         <el-button
           class="bg-bottom"
           type="primary"
@@ -20,26 +20,18 @@
           />返回</el-button
         >
       </el-col>
-    </el-row>
-    <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>
-      </template>
-      <!-- 接单开始 -->
-      <template slot="right">
-        <ws-input
+    </el-row>  
+    <!-- <div> -->
+     <div>
+       <ws-input
           v-model="searchKeyWord"
-          placeholder="可按发货人、收货人、任务编号查找"
+          placeholder="可按照合同编号和任务编号进行查找"
           clearable
           maxlength="500"
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button class="find" type="primary" @click="find()"
+        <ws-button class="but" type="primary" @click="find()"
           ><img
             width="16"
             height="16"
@@ -52,10 +44,11 @@
             src="../../../public/img/sousuo.png"
             alt=""
         /></ws-button>
-       
-      </template>
-    </BaseHeaderLayout>
-    <div>
+     </div>
+        <ws-button  type="primary" @click="statusquery(1)" >
+          执行中</ws-button
+        >
+        <ws-button  @click="statusquery(2)">已完成</ws-button>
       <el-table
         class="wenzi"
         :data="warehouseList.records"
@@ -90,7 +83,7 @@
         <el-table-column class="table_td" prop="agent" label="经办人" >
           
         </el-table-column>
-      <el-table-column prop="status" label="状态">
+      <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -102,15 +95,15 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.taskStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.taskStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.taskStatus == '已完成'" class="done"></span
+                  >{{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
@@ -158,13 +151,13 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize"
+        :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
       >
       </el-pagination>
     </div>
-  </div>
+  <!-- </div> -->
 </template>
 <script>
 import {
@@ -219,7 +212,8 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
-      warehouseName: '',
+      contractNo: '',
+      inOutTaskNo:'',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       warehouseList: [],
@@ -234,9 +228,6 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
     this.getList()
     this.showType = this.isShow
   },
@@ -250,6 +241,8 @@ export default {
         contractType:this.contractType,
         tranTypeKey: this.tranTypeKey, 
         searchType:this.searchType,
+        contractNo:this.contractNo,
+        inOutTaskNo:this.inOutTaskNo,
 
       })
       .toPromise()
@@ -354,7 +347,7 @@ export default {
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
+      if (row.status == '待审核' || row.status == '已完成') {
         status = '执行中'
       } else if (row.status == '执行中') {
         status = '已完成'
@@ -390,26 +383,26 @@ export default {
         }
       }
     },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
+    // fujian(row) {
+    //   if (
+    //     row.receiveAttachmentPath === null ||
+    //     row.receiveAttachmentPath === ''
+    //   ) {
+    //     EventBus.$emit(
+    //       'warning',
+    //       this.$t('system.noticeCircular.NoInformation')
+    //     )
+    //   } else {
+    //     this.accessoryTFs = true
+    //   }
+    //   this.appendixIdss = row.receiveAttachmentPath
+    // },
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
         query: { id: row.id },
       })
-    },
+    }, 
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -421,6 +414,7 @@ export default {
           this.historyList = response
         })
     },
+    //查找
     find() {
       this.currentPage = 1
       this.getList()
@@ -492,6 +486,7 @@ export default {
 /deep/.findValue .el-input__inner {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
+  width: 385px;
 }
 .completed.el-button--default {
   border-color: #5878e8;
@@ -530,15 +525,12 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row{
-    height: 150px;
-}
+// .el-row{
+//     height: 150px;
+// }
 .base_header_layout .grid-content{
     margin-top: 80px;
 }
-.but{
-    margin-top: 150px;
-}
 .el-input--small .el-input__inner{
     margin-left: 20px;
 }
@@ -576,5 +568,87 @@ export default {
 }
 .container {
   overflow: scroll;
+  height: 93vh;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.bg-left {
+  padding-left: 30px;
 }
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+    // margin-left: 85%;
+    margin-top: 20px;
+}
+//导航条样式
+.el-col-12 {
+    width: 50%;
+    height: 60px;
+    background: #F6F7FC;
+    border-radius: 4px 4px 1px 1px;
+}
+.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 385px;
+    margin-top: 10px;
+}
+.bg-bottom{
+ margin-left: 85%;
+}
+.but {
+    margin-left: 30%;
+    /* margin-top: -32px; */
+    overflow: auto;
+    /* float: left; */
+    /* margin-left: 1px; */
+    margin-left: -10px;
+}
+.el-input--small {
+    font-size: 13px;
+    width: 390px;
+}
+
 </style>

src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -27,9 +27,9 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 任务编号 -->
           <el-form-item label="任务编号">
-            <el-select
+            <el-input
               disabled
-              v-model="dataList.warehouseName"
+              v-model="dataList.inOutTaskNo"
               class="typeselect"
             >
               <el-option
@@ -38,15 +38,13 @@
                 :label="item.warehouseName"
                 :value="item.warehouseName"
               />
-            </el-select>
+            </el-input>
           </el-form-item>
-          
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <el-select
+            <el-input
               disabled
               v-model="dataList.contractNo"
-              placeholder="请输入合同编号"
               class="typeselect"
             >
               <el-option
@@ -55,14 +53,13 @@
                 :label="item.contractNo"
                 :value="item.contractNo"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 库房名 -->
           <el-form-item label="库房名">
-            <el-select
+            <el-input
               disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
+              v-model="dataList.warehouseName"
               class="typeselect"
             >
               <el-option
@@ -71,14 +68,13 @@
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 类型-->
           <el-form-item label="类型">
-            <el-select
+            <el-input
               disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
+              v-model="dataList. inOutType"
               class="typeselect"
             >
               <el-option
@@ -87,11 +83,11 @@
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名">
-            <el-select
+            <el-input
               disabled
               v-model="dataList.goodsName"
               placeholder="货名"
@@ -103,14 +99,13 @@
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）">
             <el-input
               disabled
               v-model="dataList.weight"
-              placeholder="请输入重量"
               maxlength="120"
               size="small"
             />
@@ -126,16 +121,14 @@
               disabled
               v-model="dataList.predictDate"
               type="date"
-              placeholder="请选择预计出库日期"
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
           <!--经办人-->
           <el-form-item label="经办人">
-            <el-select
+            <el-input
               disabled
               v-model="dataList.agent"
-              placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
             >
@@ -145,13 +138,12 @@
                 :label="item.staffName"
                 :value="item.staffName"
               />
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
+            <el-input
               v-model="dataList.grade"
-              placeholder=""
               class="typeselect"
               disabled
             >
@@ -161,14 +153,13 @@
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+            </el-input>
           </el-form-item>
           <!--容重（克/升）>=-->
           <el-form-item label="容重（克/升）>=">
             <el-input
               disabled
               v-model="dataList.bulkDensity"
-              placeholder="请输入容重"
               maxlength="120"
               size="small"
             />
@@ -178,7 +169,6 @@
             <el-input
               disabled
               v-model="dataList.waterContent"
-              placeholder="请输入水分占比"
               maxlength="120"
               size="small"
             />
@@ -188,7 +178,6 @@
             <el-input
               disabled
               v-model="dataList.unitPrice"
-              placeholder="请输入单价"
               maxlength="120"
               size="small"
             />
@@ -197,7 +186,7 @@
           <el-form-item label="发布人">
             <el-input
               disabled
-              v-model="dataList.unitPrice"
+              v-model="dataList.publisher"
               maxlength="120"
               size="small"
             />
@@ -215,7 +204,7 @@
           <el-form-item label="仓位">
             <el-input
               disabled
-              v-model="dataList.unitPrice"
+              v-model="dataList.positionId"
               maxlength="120"
               size="small"
             />
@@ -233,19 +222,19 @@
         </el-form>
       </div>
       
-    <!-- 提交 -->
+    <!-- 关闭 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
-        >提交</el-button
+      <el-button class="bg-bottom" type="primary" size="small" @click="close()"
+        >关闭</el-button
       >
     </div>
   </div>
 </template>
 <script>
 import {
-  getwarehousename,
-  xialaNo,
-  addoreditoutput,
+  // getwarehousename,
+  // xialaNo,
+  // addoreditoutput,
   outexamine,
 } from '@/model/tasksport/index'
 import { packList } from '@/model/contarct/index'
@@ -358,10 +347,12 @@ export default {
     //返回按钮
     revert() {
       this.$router.go(-1)
+      
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+      this.$router.push({ path: 'warehouseManagementPutOut' })
     },
+
     // 获取当前年月日
     getdate() {
       var date = new Date()
@@ -442,26 +433,32 @@ export default {
         }
       })
     },
-    //提交按钮
-    submit() {
-      if (this.dataList.taskTypeKey == 1) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.requestadd(this.dataList)
-      } else if (this.dataList.taskTypeKey == 2) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo1
-        this.requestadd(this.dataList)
-      } else if (
-        this.dataList.taskTypeKey == 3 ||
-        this.dataList.taskTypeKey == 4
-      ) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-        this.requestadd(this.dataList, 'repetition')
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
-        this.dataList1.relevanceId = this.dataList.relevanceId
-        this.requestadd(this.dataList1, 'repetition')
-      }
+    // 关闭
+    close(){
+        this.$router.push({ 
+        path: 'warehouseManagementPutOut',
+        })
     },
+    //提交按钮
+    // submit() {
+    //   if (this.dataList.taskTypeKey == 1) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.requestadd(this.dataList)
+    //   } else if (this.dataList.taskTypeKey == 2) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo1
+    //     this.requestadd(this.dataList)
+    //   } else if (
+    //     this.dataList.taskTypeKey == 3 ||
+    //     this.dataList.taskTypeKey == 4
+    //   ) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
+    //     this.requestadd(this.dataList, 'repetition')
+    //     this.dataList1.inOutTaskNo = this.inOutTaskNo1
+    //     this.dataList1.relevanceId = this.dataList.relevanceId
+    //     this.requestadd(this.dataList1, 'repetition')
+    //   }
+    // },
     selectwarehouseName() {},
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
@@ -531,7 +528,6 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
-      console.log(11111)
       outexamine({ relevanceId: this.$route.query.relevanceId })
         .toPromise()
         .then((response) => {
@@ -542,8 +538,8 @@ export default {
             this.dataList = response[0]
           }
         })
-    },
 
+    },
     // deletecontract(){},
     //删除
     approve() {},

vue.config.js

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