前端sdy

src/views/contractManagement/purchaseContractExamine.vue

@@ -27,11 +27,47 @@
       ><div style="margin-top: 20px; font-size: 24px">
         采购合同<span style="font-size: 16px"
           >【编号:{{ deptBudgetList.contractNo }}】</span
-        ><span v-if="status == '待执行'" class="status-orange">{{
+        >
+        
+        
+        <!-- <span v-if="status == '待执行'" class="status-orange">{{
           status
         }}</span>
         <span v-if="status == '执行中'" class="status-bule">{{ status }}</span>
-        <span v-if="status == '已完成'" class="status-green">{{ status }}</span>
+        <span v-if="status == '已完成'" class="status-green">{{ status }}</span> -->
+         <div class="icon">
+        <template>
+          <el-popover
+            placement="right"
+            :width="285"
+            trigger="click"
+            visible-arrow="false"
+            @show="history(deptBudgetList.id)"
+          >
+          <template>
+            <div slot="reference"> {{deptBudgetList.status }}</div>
+          </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
+              <div v-for="(item, index) in historyList" class="flex">
+                <div class="vertical-text vertical-text-left">
+                  {{ item.updateDate }}
+                </div>
+                <div>
+                  <div class="vertical-circle"></div>
+                  <div
+                    v-if="index != historyList.length - 1"
+                    class="vertical-line"
+                  ></div>
+                </div>
+                <div class="vertical-text">
+                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+                </div>
+              </div>
+            </div>
+          </el-popover>
+        </template>
+      </div>
       </div>
       <div class="remark">
         <h3>基本信息</h3>
@@ -207,6 +243,7 @@ import {
   packList,
   xiala,
   examineList,
+  billoperatehis,
 } from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
@@ -234,6 +271,7 @@ export default {
       status: '',
       // 提交类型
       submitType: true,
+      historyList:[],
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
       ruleDeptBudget: [],
       deptBudgetList: {
@@ -310,13 +348,18 @@ export default {
             this.selectContract(currItem.constValue)
           }
         })
+    },
+      history(id1) {
+      billoperatehis({ id: id1 })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    handleExamine() {},
-    approve() {},
     returnsales() {
       this.$router.push({ path: 'buyContract' })
     },
@@ -558,4 +601,43 @@ export default {
 /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
   width: 130px;
 }
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+.vertical-text {
+  margin: 0 10px;
+  color: #8890b1;
+  font-size: 12px;
+  margin-top: -4px;
+}
+.vertical-line {
+  height: 100px;
+  border-left: 2px solid #e9ecf7;
+  margin-left: 4px;
+  padding: 0 3px;
+}
+.vertical-circle {
+  width: 10px;
+  height: 10px;
+  border: 2px solid #5878e8;
+  background-color: #ffffff;
+  -webkit-border-radius: 100px;
+}
+.vertical-circle:first-child {
+  color: red;
+}
+.icon {
+  display: inline-block;
+  width: 60px;
+  height: 24px;
+  background: #ecfeff;
+  border-radius: 12px;
+  border: 1px solid #50cad4;
+  position: relative;
+  font-size: 14px;
+  color: #50cad4;
+  line-height: 24px;
+  padding: 1px 7px;
+}
 </style>

src/views/contractManagement/salesContractExamine.vue

@@ -1,7 +1,6 @@
 
 <!--销售合同-->
 <!--2019年5月30日 20:25:16 by jlx-->
-
 <template>
   <div class="container">
     <el-row>
@@ -28,15 +27,17 @@
       <h2>销售合同</h2>
       <p>【编号：{{ deptBudgetList.contractNo }}】</p>
       <div class="icon">
-        &nbsp;&nbsp;{{ deptBudgetList.status }}
-        <!-- <template slot-scope="scope">
+        <template>
           <el-popover
-            placement="left"
+            placement="right"
             :width="285"
             trigger="click"
             visible-arrow="false"
-            @show="history(scope.row)"
+            @show="history(deptBudgetList.id)"
           >
+          <template>
+            <div slot="reference"> {{deptBudgetList.status }}</div>
+          </template>
             <div>
               <p style="margin-top: 0; padding-left: 10px">操作历史</p>
               <div v-for="(item, index) in historyList" class="flex">
@@ -56,7 +57,7 @@
               </div>
             </div>
           </el-popover>
-        </template>  -->
+        </template>
       </div>
     </div>
     <div class="center">
@@ -73,7 +74,6 @@
             <div class="unchanged">
               {{ deptBudgetList.contractNo }}
             </div>
-            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
           <ws-form-item label="运输方式" span="1" prop="shippingType">
             <div class="unchanged">
@@ -84,7 +84,6 @@
             <div class="unchanged">
               {{ deptBudgetList.buyer }}
             </div>
-            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
           <ws-form-item label="结算方式" span="1" prop="settlementMethod">
             <div class="unchanged">
@@ -95,7 +94,6 @@
             <div class="unchanged">
               {{ deptBudgetList.seller }}
             </div>
-            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
           <ws-form-item label="交货方式" span="1" prop="deliverType">
             <div class="unchanged">
@@ -154,7 +152,6 @@
             <div class="unchanged">
               {{ deptBudgetList.unitContractPrice }}
             </div>
-            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
 
           <ws-form-item
@@ -211,8 +208,6 @@
           </ws-form-item>
         </ws-info-table>
 
-        <!-- </base-card> -->
-
         <!--面试信息-->
         <div class="remark">
           <h3>货物信息</h3>
@@ -222,7 +217,6 @@
             <div class="unchanged">
               {{ deptBudgetList.contractGoodsInfo.goodsName }}
             </div>
-            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
           <ws-form-item label="水分（%）<=" span="1" prop="intendedShipId">
             <div class="unchanged">
@@ -309,13 +303,6 @@
               {{ deptBudgetList.contractProcessInfo.imperfectGrain }}
             </div>
           </ws-form-item>
-          <!-- <ws-form-item label="双章原件回收情况" span="1" prop="grade">
-          <div class="unchanged">
-            {{ deptBudgetList.contractProcessInfo.grade }}
-          </div>
-
-          >{{ deptBudgetList.contractProcessInfo.imperfectGrain }}
-        </ws-form-item> -->
           <ws-form-item label="双章原件回收情况" span="1" prop="grade">
             <div class="unchanged">
               {{ deptBudgetList.contractProcessInfo.grade }}
@@ -330,8 +317,6 @@
         </div>
 
         <img :src="deptBudgetList.addressUrl" alt="" />
-
-        <!-- </base-card> -->
       </ws-form>
       <div style="text-align: right; padding: 10px">
         <el-button
@@ -466,9 +451,8 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    history(row) {
-      console.log(row, '查看')
-      billoperatehis({ id: row.id })
+    history(id1) {
+      billoperatehis({ id: id1 })
         .toPromise()
         .then((response) => {
           this.historyList = response
@@ -712,10 +696,10 @@ export default {
   border-radius: 12px;
   border: 1px solid #50cad4;
   position: relative;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-size: 14px;
   color: #50cad4;
   line-height: 24px;
+  padding: 1px 7px;
 }
 
 //*号
@@ -769,4 +753,30 @@ export default {
   line-height: 32px;
   width: 232px;
 }
+.vertical-text-left {
+  width: 62px;
+  text-align: right;
+}
+.vertical-text {
+  margin: 0 10px;
+  color: #8890b1;
+  font-size: 12px;
+  margin-top: -4px;
+}
+.vertical-line {
+  height: 100px;
+  border-left: 2px solid #e9ecf7;
+  margin-left: 4px;
+  padding: 0 3px;
+}
+.vertical-circle {
+  width: 10px;
+  height: 10px;
+  border: 2px solid #5878e8;
+  background-color: #ffffff;
+  -webkit-border-radius: 100px;
+}
+.vertical-circle:first-child {
+  color: red;
+}
 </style>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -18,16 +18,12 @@
       </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>-->
-      </el-radio-group>
       <div class="nav">
         <span class="ziti">
           任务类型：
-          <h1 class="ziti1">{{dataList.inOutType}}</h1>
+          <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
+          <h1 class="ziti1" v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"> 出库任务</h1>
+          <h1 class="ziti1" v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"> 入库任务</h1>
         </span>
       </div>
       <div class="nav2"></div>
@@ -46,12 +42,6 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <!-- <el-select
-              disabled
-              v-model="dataList.warehouseName"
-              placeholder="请选择仓库名"
-              class="typeselect"
-            >-->
             <el-option
               v-for="item in warehouseNameList"
               :key="item.constKey"
@@ -63,12 +53,6 @@
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <!-- <el-select
-              disabled
-              v-model="dataList.inOutType"
-              placeholder="请选择出库类型"
-              class="typeselect"
-            >-->
             <el-option
               v-for="item in storageType"
               :key="item.constKey"
@@ -87,12 +71,6 @@
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <!-- <el-select
-              disabled
-              v-model="dataList.contractNo"
-              placeholder="请输入合同编号"
-              class="typeselect"
-            >-->
             <el-option
               v-for="item in contractNoList"
               :key="item.constKey"
@@ -104,12 +82,6 @@
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
-            <!-- <el-select
-              disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
-              class="huom"
-            >-->
             <el-option
               v-for="item in goodnameList"
               :key="item.constKey"
@@ -121,23 +93,10 @@
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
-            <!-- <el-input
-              disabled
-              v-model="dataList.weight"
-              placeholder="请输入重量"
-              maxlength="120"
-               class="huom"
-            />-->
             {{dataList.weight}}
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <!-- <el-select
-              v-model="dataList.grade"
-              placeholder=""
-              class="typeselect"
-              disabled
-            >-->
             <el-option
               v-for="item in gradeList"
               :key="item.constKey"
@@ -149,60 +108,22 @@
           </el-form-item>
           <!--容重（克/升）>=-->
           <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="水分（%）<=" 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="单价(元/吨)" 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 label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
-            <!-- <el-date-picker
-              disabled
-              v-model="dataList.predictDate"
-              type="date"
-              placeholder="请选择预计出库日期"
-              value-format="yyyy-MM-dd"
-            />-->
             {{dataList.predictDate}}
           </el-form-item>
           <!--经办人-->
           <el-form-item label="出库经办人">
-            <!-- <el-select
-              disabled
-              v-model="dataList.agent"
-              placeholder="请选择经办人"
-              filterable
-              :filter-method="dataFilter"
-            >-->
             {{dataList.agent}}
             <el-option
               v-for="item in options"
@@ -210,17 +131,9 @@
               :label="item.staffName"
               :value="item.staffName"
             />
-            <!-- </el-select> -->
           </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <!-- <el-input
-              disabled
-              v-model="dataList.businessDescribe"
-              placeholder="请输入业务描述，不超过150字"
-              maxlength="150"
-              size="small"
-            />-->
             {{dataList.businessDescribe}}
           </el-form-item>
         </el-form>
@@ -234,17 +147,11 @@
             src="../../../public/img/cangku.png"
             alt
           />
-          <h3>入库任务({{dataList.inOutTaskNo }} )</h3>
+          <h3>入库任务({{dataList1.inOutTaskNo }} )</h3>
         </div>
         <el-form ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <!-- <el-select
-              v-model="dataList1.warehouseName"
-              placeholder="请选择仓库名"
-              class="typeselect"
-              disabled
-            >-->
             {{dataList1.warehouseName}}
             <el-option
               v-for="item in warehouseNameList"
@@ -252,16 +159,9 @@
               :label="item.warehouseName"
               :value="item.warehouseName"
             />
-            <!-- </el-select> -->
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="入库类型">
-            <!-- <el-select
-              v-model="dataList1.inOutType"
-              placeholder="请选择入库类型"
-              class="typeselect"
-              disabled
-            >-->
             <el-option
               v-for="item in storageType1"
               :key="item.constKey"
@@ -280,12 +180,6 @@
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <!-- <el-select
-              disabled
-              v-model="dataList1.contractNo"
-              placeholder="请输入合同编号"
-              class="typeselect"
-            >-->
             <el-option
               v-for="item in contractNoList"
               :key="item.constKey"
@@ -293,16 +187,9 @@
               :value="item.contractNo"
             ></el-option>
             {{dataList1.contractNo}}
-            <!-- </el-select> -->
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
-            <!-- <el-select
-              disabled
-              v-model="dataList1.goodsName"
-              placeholder="货名"
-               class="huom"
-            >-->
             <el-option
               v-for="item in goodnameList"
               :key="item.constKey"
@@ -310,28 +197,13 @@
               :value="item.constValue"
             ></el-option>
             {{dataList1.goodsName}}
-            <!-- </el-select> -->
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
-            <!-- <el-input
-              disabled
-              v-model="dataList1.weight"
-              placeholder="请输入重量"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />-->
             {{dataList1.weight}}
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <!-- <el-select
-              disabled
-              v-model="dataList1.grade"
-              placeholder=""
-              class="typeselect"
-            >-->
             <el-option
               v-for="item in gradeList"
               :key="item.constKey"
@@ -339,64 +211,25 @@
               :value="item.constValue"
             />
             {{dataList1.grade}}
-            <!-- </el-select> -->
           </el-form-item>
           <!--容重（克/升）>=-->
           <el-form-item label="容重（克/升）>=">
-            <!-- <el-input
-              disabled
-              v-model="dataList1.bulkDensity"
-              placeholder="请输入容重"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />-->
             {{dataList1.bulkDensity}}
           </el-form-item>
           <!--水分（%）<=-->
           <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="单价(元/吨)" 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 label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
-            <!-- <el-date-picker
-              disabled
-              v-model="dataList1.predictDate"
-              type="date"
-              placeholder="请选择预计入库日期"
-              value-format="yyyy-MM-dd"
-            />-->
             {{dataList1.predictDate}}
           </el-form-item>
           <!--经办人-->
           <el-form-item label="入库经办人">
-            <!-- <el-select
-              disabled
-              v-model="dataList1.agent"
-              placeholder="请选择经办人"
-              filterable
-              :filter-method="dataFilter"
-            >-->
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -404,17 +237,9 @@
               :value="item.staffName"
             />
             {{dataList1.agent}}
-            <!-- </el-select> -->
           </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <!-- <el-input
-              disabled
-              v-model="dataList1.businessDescribe"
-              placeholder="请输入业务描述，不超过150字"
-              maxlength="150"
-              size="small"
-            />-->
             {{dataList1.businessDescribe}}
           </el-form-item>
         </el-form>
@@ -434,12 +259,6 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <!-- <el-select
-              disabled
-              v-model="dataList.warehouseName"
-              placeholder="请选择仓库名"
-              class="typeselect"
-            >-->
             <el-option
               v-for="item in warehouseNameList"
               :key="item.constKey"
@@ -447,16 +266,9 @@
               :value="item.warehouseName"
             />
             {{dataList.warehouseName}}
-            <!-- </el-select> -->
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <!-- <el-select
-              disabled
-              v-model="dataList.inOutType"
-              placeholder="请选择出库类型"
-              class="typeselect"
-            >-->
             <el-option
               v-for="item in storageType"
               :key="item.constKey"
@@ -475,12 +287,6 @@
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <!-- <el-select
-              disabled
-              v-model="dataList.contractNo"
-              placeholder="请输入合同编号"
-              class="typeselect"
-            >-->
             <el-option
               v-for="item in contractNoList"
               :key="item.constKey"
@@ -492,12 +298,6 @@
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
-            <!-- <el-select
-              disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
-              class="huom"
-            >-->
             <el-option
               v-for="item in goodnameList"
               :key="item.constKey"
@@ -509,23 +309,10 @@
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
-            <!-- <el-input
-              disabled
-              v-model="dataList.weight"
-              placeholder="请输入重量"
-              maxlength="120"
-               class="huom"
-            />-->
             {{dataList.weight}}
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <!-- <el-select
-              v-model="dataList.grade"
-              placeholder=""
-              class="typeselect"
-              disabled
-            >-->
             <el-option
               v-for="item in gradeList"
               :key="item.constKey"
@@ -537,60 +324,22 @@
           </el-form-item>
           <!--容重（克/升）>=-->
           <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="水分（%）<=" 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="单价(元/吨)" 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 label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
-            <!-- <el-date-picker
-              disabled
-              v-model="dataList.predictDate"
-              type="date"
-              placeholder="请选择预计出库日期"
-              value-format="yyyy-MM-dd"
-            />-->
             {{dataList.predictDate}}
           </el-form-item>
           <!--经办人-->
           <el-form-item label="出库经办人">
-            <!-- <el-select
-              disabled
-              v-model="dataList.agent"
-              placeholder="请选择经办人"
-              filterable
-              :filter-method="dataFilter"
-            >-->
             {{dataList.agent}}
             <el-option
               v-for="item in options"
@@ -602,13 +351,6 @@
           </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <!-- <el-input
-              disabled
-              v-model="dataList.businessDescribe"
-              placeholder="请输入业务描述，不超过150字"
-              maxlength="150"
-              size="small"
-            />-->
             {{dataList.businessDescribe}}
           </el-form-item>
         </el-form>
@@ -627,13 +369,9 @@ import {
   addoreditoutput,
   outexamine
 } 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',
@@ -642,9 +380,6 @@ export default {
     Pagination
   },
   watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
     isShow(val) {
       this.showType = val
     }
@@ -825,27 +560,6 @@ export default {
     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) {
         this.dataList.netWeight = Number(
@@ -925,20 +639,13 @@ export default {
             if(response[0].taskTypeKey==2){
               
               this.dataList1 = response[0]
+              this.dataList = response[0]
             }else{
               this.dataList = response[0]
             }
           }
         })
     },
-
-    // deletecontract(){},
-    //删除
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {}
   }
 }
 </script>
@@ -955,7 +662,6 @@ export default {
     .el-form-item__label {
       text-align: left;
       font-size: 14px;
-      font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
       color: #8890b1;
     }

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -68,10 +68,8 @@
         <!--预计出库日期-->
         <ws-form-item label="预计出库日期：" span="1" prop="predictDate">
           {{ shipment1.predictDate }}
-        </ws-form-item>
+        </ws-form-item>       
       </ws-info-table>
-      <!-- </div> -->
-      <!-- <div v-for="(items,index) in enter">  -->
       <ws-info-table class="inout">
         <div class="library">
           <span style="margin-left: 14px">
@@ -107,6 +105,7 @@
           {{ enter.predictDate }}
         </ws-form-item>
       </ws-info-table>
+        <div style="float: right; margin-top: -61px;color:red;" v-show="this.moveLookData.length == 1">已删除</div>
       <!-- </div> -->
       <ws-info-table class="goods">
         <!--货物信息-->
@@ -357,6 +356,8 @@ export default {
           }
           this.count = ""+num
         })
+        console.log(this.shipment,"入库对象")
+        console.log(this.shipment == null)
     },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
@@ -648,6 +649,7 @@ export default {
   color: #232323;
   line-height: 50px;
 }
+
 .line {
   height: 50px;
   // left: -80px;
@@ -665,11 +667,13 @@ export default {
   margin-top: 20px;
 }
 .inout {
+  width: 95%;
   border-radius: 4px;
   border: 1px solid #d8dce6;
   margin-top: 20px;
 }
 .goods {
+  width: 95%;
   border-radius: 4px;
   border: 1px solid #d8dce6;
   margin-top: 20px;
@@ -696,6 +700,9 @@ export default {
   background: #fff;
   display: contents;
 }
+.flow{
+  width: 95%;
+}
 .flow1 {
   width: 33.333%;
 }

src/views/taskManagement/tranManagementLook.vue

@@ -323,6 +323,8 @@ export default {
   color: #8890b1;
   line-height: 16px;
   border: none;
+  width: -webkit-min-content;
+
 }
 
 .inspector {

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -202,7 +202,7 @@
         <div class="driver">
           <span>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
           <img
-            v-if="!endflag "
+            v-if="!endflag"
             width="22"
             height="22"
             class="add"
@@ -768,242 +768,257 @@ export default {
     },
 
     submit() {
-      this.$refs.deptBudgetList.validate((valid) => {
-        if (valid) {
-          if (!this.deptBudgetList.taskNo) {
-            this.$message({
-              message: '任务编号不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.taskType) {
-            this.$message({
-              message: '任务类型不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.contractNo) {
-            this.$message({
-              message: '合同编号/移库任务编号不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.goodsName) {
-            this.$message({
-              message: '货名不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.weight) {
-            this.$message({
-              message: '重量（吨）不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.sendWarehouse) {
-            this.$message({
-              message: '发货仓库不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (this.selectedOptions.length <= 0) {
-            this.$message({
-              message: '始发地不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-
-          if (!this.deptBudgetList.startDetailedAddress) {
-            this.$message({
-              message: '始发地详细地址不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (this.selectedOptions1.length <= 0) {
-            this.$message({
-              message: '终到地不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.endDetailedAddress) {
-            this.$message({
-              message: '终到地详细地址不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (this.checkList.length <= 0) {
-            this.$message({
-              message: '运输方式多选框不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          for (
-            var i = 0;
-            i < this.deptBudgetList.tranProcessInfoList.length;
-            i++
-          ) {
-            this.deptBudgetList.tranProcessInfoList[i].processNo =
-              this.deptBudgetList.taskNo + (i + 1)
-            if (
-              new Date(
-                this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart
-              ).getTime() >
-              new Date(
-                this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd
-              ).getTime()
-            ) {
-              this.$message({
-                message: '发货日期不能大于最晚到货日期！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
-              this.$message({
-                message: '发货日期不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
-              this.$message({
-                message: '最晚到货日期不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
-              this.$message({
-                message: '重量不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
-              this.$message({
-                message: '发货人不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
-              this.$message({
-                message: '发货人电话不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
-              this.$message({
-                message: '收货人不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
-              this.$message({
-                message: '收货人电话不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (
-              !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress
-            ) {
-              this.$message({
-                message: '收获详细地址不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (
-              !this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress
-            ) {
-              this.$message({
-                message: '发货详细地址不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-          }
-          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.tranType = this.checkList.toString()
-          this.deptBudgetList.startPrivate = CodeToText[this.selectedOptions[0]]
-          this.deptBudgetList.startCity = CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.startArea = CodeToText[this.selectedOptions[2]]
-             this.deptBudgetList.tranProcessInfoList[0].sendPrivate = CodeToText[this.selectedOptions[0]]
-             this.deptBudgetList.tranProcessInfoList[0].sendCity = CodeToText[this.selectedOptions[1]]
-              this.deptBudgetList.tranProcessInfoList[0].sendArea = CodeToText[this.selectedOptions[2]]
+      if (!this.deptBudgetList.taskNo) {
+        this.$message({
+          message: '任务编号不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.taskType) {
+        this.$message({
+          message: '任务类型不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.contractNo) {
+        this.$message({
+          message: '合同编号/移库任务编号不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.goodsName) {
+        this.$message({
+          message: '货名不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.weight) {
+        this.$message({
+          message: '重量（吨）不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.sendWarehouse) {
+        this.$message({
+          message: '发货仓库不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.selectedOptions.length <= 0) {
+        this.$message({
+          message: '始发地不能为空！',
+          type: 'warning',
+        })
+        return
+      }
 
-          for (
-            var i = 0;
-            i < this.deptBudgetList.tranProcessInfoList.length;
-            i++
-          ) {
-            this.deptBudgetList.tranProcessInfoList[i].sort = i
-            //  this.deptBudgetList.tranProcessInfoList[i].sendPrivate = CodeToText[this.selectedOptions[0]]
-            // this.deptBudgetList.tranProcessInfoList[i].sendCity = CodeToText[this.selectedOptions[1]]
-            //  this.deptBudgetList.tranProcessInfoList[i].sendArea = CodeToText[this.selectedOptions[2]]
-            // this.deptBudgetList.tranProcessInfoList[i].receivePrivate = CodeToText[this.selectedOptions1[0]]
-            // this.deptBudgetList.tranProcessInfoList[i].receiveCity = CodeToText[this.selectedOptions1[1]]
-            //  this.deptBudgetList.tranProcessInfoList[i].receiveArea = CodeToText[this.selectedOptions1[2]]
-          }
-          console.log(this.deptBudgetList, '添加对象')
+      if (!this.deptBudgetList.startDetailedAddress) {
+        this.$message({
+          message: '始发地详细地址不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.selectedOptions1.length <= 0) {
+        this.$message({
+          message: '终到地不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.endDetailedAddress) {
+        this.$message({
+          message: '终到地详细地址不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.checkList.length <= 0) {
+        this.$message({
+          message: '运输方式多选框不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      for (var i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
+        this.deptBudgetList.tranProcessInfoList[i].processNo =
+          this.deptBudgetList.taskNo + (i + 1)
+        if (
+          new Date(
+            this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart
+          ).getTime() >
+          new Date(
+            this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd
+          ).getTime()
+        ) {
+          this.$message({
+            message: '发货日期不能大于最晚到货日期！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
+          this.$message({
+            message: '发货日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
+          this.$message({
+            message: '最晚到货日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
+          this.$message({
+            message: '重量不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
+          this.$message({
+            message: '发货人不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
+          this.$message({
+            message: '发货人电话不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
+          this.$message({
+            message: '收货人不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
+          this.$message({
+            message: '收货人电话不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress
+        ) {
+          this.$message({
+            message: '收获详细地址不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress) {
+          this.$message({
+            message: '发货详细地址不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      this.$confirm(`运输任务提交成功后将派发到物流部门，是否确定提交？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              this.deptBudgetList.compId =
+                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.tranType = this.checkList.toString()
+              this.deptBudgetList.startPrivate =
+                CodeToText[this.selectedOptions[0]]
+              this.deptBudgetList.startCity =
+                CodeToText[this.selectedOptions[1]]
+              this.deptBudgetList.startArea =
+                CodeToText[this.selectedOptions[2]]
+              this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
+                CodeToText[this.selectedOptions[0]]
+              this.deptBudgetList.tranProcessInfoList[0].sendCity =
+                CodeToText[this.selectedOptions[1]]
+              this.deptBudgetList.tranProcessInfoList[0].sendArea =
+                CodeToText[this.selectedOptions[2]]
+              if (this.endflag) {
+                this.deptBudgetList.tranProcessInfoList[
+                  this.deptBudgetList.tranProcessInfoList.length - 1
+                ].receivePrivate = CodeToText[this.selectedOptions1[0]]
+                this.deptBudgetList.tranProcessInfoList[
+                  this.deptBudgetList.tranProcessInfoList.length - 1
+                ].receiveCity = CodeToText[this.selectedOptions1[1]]
+                this.deptBudgetList.tranProcessInfoList[
+                  this.deptBudgetList.tranProcessInfoList.length - 1
+                ].receiveArea = CodeToText[this.selectedOptions1[2]]
+              }
 
-          addtrantask(this.deptBudgetList)
-            .toPromise()
-            .then((response) => {
-              this.$message.success('添加成功')
-              this.deptBudgetList = {
-                taskNo: '',
-                totalStorage: 0,
-                goodsName: '玉米',
-                goodsNameKey: 1,
-                warehouseType: '1',
-                tranProcessInfoList: [
-                  {
-                    processNo: '',
-                    tranType: '汽运',
-                    deliveryDateStart: '',
-                    deliveryDateEnd: '',
-                    weight: '',
-                    selectedOptions: [],
-                    selectedOptions1: [],
-                    sendPrivate: '',
-                    sendCity: '',
-                    sendArea: '',
-                    receivePrivate: '',
-                    receiveCity: '',
-                    receiveArea: '',
-                    sendDetailedAddress: '',
-                    receiveDetailedAddress: '',
-                    sender: '',
-                    receiver: '',
-                    senderPhone: '',
-                    receiverPhone: '',
-                    contractNo: '',
-                    receiveWarehouse: '',
-                  },
-                ],
+              for (
+                var i = 0;
+                i < this.deptBudgetList.tranProcessInfoList.length;
+                i++
+              ) {
+                this.deptBudgetList.tranProcessInfoList[i].sort = i
               }
-              this.$router.push({ path: 'tranManagementTransport' })
-            })
-        } else {
-          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+
+              addtrantask(this.deptBudgetList)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('添加成功')
+                  this.deptBudgetList = {
+                    taskNo: '',
+                    totalStorage: 0,
+                    goodsName: '玉米',
+                    goodsNameKey: 1,
+                    warehouseType: '1',
+                    tranProcessInfoList: [
+                      {
+                        processNo: '',
+                        tranType: '汽运',
+                        deliveryDateStart: '',
+                        deliveryDateEnd: '',
+                        weight: '',
+                        selectedOptions: [],
+                        selectedOptions1: [],
+                        sendPrivate: '',
+                        sendCity: '',
+                        sendArea: '',
+                        receivePrivate: '',
+                        receiveCity: '',
+                        receiveArea: '',
+                        sendDetailedAddress: '',
+                        receiveDetailedAddress: '',
+                        sender: '',
+                        receiver: '',
+                        senderPhone: '',
+                        receiverPhone: '',
+                        contractNo: '',
+                        receiveWarehouse: '',
+                      },
+                    ],
+                  }
+                  this.$router.push({ path: 'tranManagementTransport' })
+                })
+            } else {
+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
           return false
-        }
-      })
+        })
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -214,13 +214,14 @@
             width="22"
             height="22"
             class="del"
-            @click="del(index,item)"
+            @click="del(index, item)"
             src="../../../public/img/del.png"
             alt=""
           />
           <el-checkbox
             @change="engflagchange"
             class="endflag"
+            v-bind:checked="endflag"
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             :label="1"
@@ -378,7 +379,7 @@ import {
   getwarehousename,
   xialaNo,
   examinetran,
-  delhaulagestage
+  delhaulagestage,
 } from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -422,12 +423,12 @@ export default {
       name: '',
       age: '',
       weight: 0,
-      number:2,
+      number: 2,
     }
   },
   activated() {
     this.loaddata()
-    
+
     this.showType = this.isShow
   },
   computed: {
@@ -459,12 +460,16 @@ export default {
             ][this.warehouseList[i].warehouseArea].code
           this.selectedOptions = tmp
           this.deptBudgetList.tranProcessInfoList[0].selectedOptions = tmp
-          // this.deptBudgetList.startDetailedAddress =
-          //   this.warehouseList[i].detailedAddress
-          // this.deptBudgetList.tranProcessInfoList[0].sendDetailedAddress =
-          //   this.warehouseList[i].detailedAddress
-           this.$set(this.deptBudgetList,'startDetailedAddress',this.warehouseList[i].detailedAddress)
-          this.$set(this.deptBudgetList.tranProcessInfoList[0],'sendDetailedAddress',this.deptBudgetList.startDetailedAddress)
+          this.$set(
+            this.deptBudgetList,
+            'startDetailedAddress',
+            this.warehouseList[i].detailedAddress
+          )
+          this.$set(
+            this.deptBudgetList.tranProcessInfoList[0],
+            'sendDetailedAddress',
+            this.deptBudgetList.startDetailedAddress
+          )
         }
       }
     },
@@ -504,8 +509,13 @@ export default {
       examinetran({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
+          for (var j = 0; j < response.tranProcessInfoList.length; j++) {
+            if (response.tranProcessInfoList[j].endFlag == 'true') {
+              this.endflag = true
+            }
+          }
           this.deptBudgetList = response
-          this.number = response.tranProcessInfoList.length+1
+          this.number = response.tranProcessInfoList.length + 1
           if (
             response.startPrivate != null &&
             response.startCity != null &&
@@ -534,7 +544,6 @@ export default {
               ].code
             this.selectedOptions1 = tmp1
           }
-
           for (var i = 0; i < response.tranProcessInfoList.length; i++) {
             if (
               response.tranProcessInfoList[i].sendPrivate != '' &&
@@ -638,8 +647,8 @@ export default {
     },
     add(index) {
       this.deptBudgetList.tranProcessInfoList.push({
-          processNo: this.deptBudgetList.taskNo+(this.number),
-        sort:0,
+        processNo: this.deptBudgetList.taskNo + this.number,
+        sort: 0,
         tranType: '汽运',
         tranTypeKey: '1',
         deliveryDateStart: '',
@@ -662,16 +671,15 @@ export default {
       })
       this.number++
     },
-    del(index,row) {
-      console.log(row)
-      if(row.id){
+    del(index, row) {
+      if (row.id) {
         this.$confirm('任务阶段删除后不可恢复，是否确定删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-        delhaulagestage({id:row.id}).toPromise()
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          delhaulagestage({ id: row.id })
+            .toPromise()
             .then((response) => {
               this.$message.success('删除成功')
               if (this.deptBudgetList.tranProcessInfoList.length > 1) {
@@ -679,7 +687,7 @@ export default {
               }
             })
         })
-      }else{
+      } else {
         if (this.deptBudgetList.tranProcessInfoList.length > 1) {
           this.deptBudgetList.tranProcessInfoList.splice(index, 1)
         }
@@ -718,207 +726,282 @@ export default {
       this.$router.push({ path: 'tranManagementTransport' })
     },
     submit() {
-      this.$refs.deptBudgetList.validate((valid) => {
-        if (valid) {
-          if (!this.deptBudgetList.taskNo) {
+      if (!this.deptBudgetList.taskNo) {
+        this.$message({
+          message: '任务编号不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.taskType) {
+        this.$message({
+          message: '任务类型不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.contractNo) {
+        this.$message({
+          message: '合同编号/移库任务编号不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.goodsName) {
+        this.$message({
+          message: '货名不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.weight) {
+        this.$message({
+          message: '重量（吨）不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.sendWarehouse) {
+        this.$message({
+          message: '发货仓库不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.selectedOptions.length <= 0) {
+        this.$message({
+          message: '始发地不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+
+      if (!this.deptBudgetList.startDetailedAddress) {
+        this.$message({
+          message: '始发地详细地址不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.selectedOptions1.length <= 0) {
+        this.$message({
+          message: '终到地不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (!this.deptBudgetList.endDetailedAddress) {
+        this.$message({
+          message: '终到地详细地址不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.checkList.length <= 0) {
+        this.$message({
+          message: '运输方式多选框不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      for (var i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
+        this.deptBudgetList.tranProcessInfoList[i].processNo =
+          this.deptBudgetList.taskNo + (i + 1)
+        if (
+          new Date(
+            this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart
+          ).getTime() >
+          new Date(
+            this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd
+          ).getTime()
+        ) {
           this.$message({
-            message: '任务编号不能为空！',
+            message: '发货日期不能大于最晚到货日期！',
             type: 'warning',
           })
           return
         }
-          if (!this.deptBudgetList.taskType) {
+        if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
           this.$message({
-            message: '任务类型不能为空！',
+            message: '发货日期不能为空！',
             type: 'warning',
           })
           return
         }
-         if (!this.deptBudgetList.contractNo) {
+        if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
           this.$message({
-            message: '合同编号/移库任务编号不能为空！',
+            message: '最晚到货日期不能为空！',
             type: 'warning',
           })
           return
         }
-         if (!this.deptBudgetList.goodsName) {
+        if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
           this.$message({
-            message: '货名不能为空！',
+            message: '重量不能为空！',
             type: 'warning',
           })
           return
         }
-           if (!this.deptBudgetList.weight) {
+        if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
           this.$message({
-            message: '重量（吨）不能为空！',
+            message: '发货人不能为空！',
             type: 'warning',
           })
           return
         }
-         if (!this.deptBudgetList.sendWarehouse) {
+        if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
           this.$message({
-            message: '发货仓库不能为空！',
+            message: '发货人电话不能为空！',
             type: 'warning',
           })
           return
         }
-        if (this.selectedOptions.length <= 0) {
+        if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
           this.$message({
-            message: '始发地不能为空！',
+            message: '收货人不能为空！',
             type: 'warning',
           })
           return
         }
-      
-         if (!this.deptBudgetList.startDetailedAddress) {
+        if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
           this.$message({
-            message: '始发地详细地址不能为空！',
+            message: '收货人电话不能为空！',
             type: 'warning',
           })
           return
         }
-        if (this.selectedOptions1.length <= 0) {
+        if (
+          !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress
+        ) {
           this.$message({
-            message: '终到地不能为空！',
+            message: '收获详细地址不能为空！',
             type: 'warning',
           })
           return
         }
-         if (!this.deptBudgetList.endDetailedAddress) {
+        if (!this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress) {
           this.$message({
-            message: '终到地详细地址不能为空！',
+            message: '发货详细地址不能为空！',
             type: 'warning',
           })
           return
         }
-          if (this.checkList.length <= 0) {
-            this.$message({
-              message: '运输方式多选框不能为空！',
-              type: 'warning',
+      }
+      if (this.endflag == false) {
+        this.$confirm('您还未选择最终阶段，是否确定提交？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            this.$refs.deptBudgetList.validate((valid) => {
+              if (valid) {
+                this.deptBudgetList.compId =
+                  sessionStorage.getItem('ws-pf_compId')
+                this.deptBudgetList.tranType = this.checkList.toString()
+                this.deptBudgetList.startPrivate =
+                  CodeToText[this.selectedOptions[0]]
+                this.deptBudgetList.startCity =
+                  CodeToText[this.selectedOptions[1]]
+                this.deptBudgetList.startArea =
+                  CodeToText[this.selectedOptions[2]]
+                this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
+                  CodeToText[this.selectedOptions[0]]
+                this.deptBudgetList.tranProcessInfoList[0].sendCity =
+                  CodeToText[this.selectedOptions[1]]
+                this.deptBudgetList.tranProcessInfoList[0].sendArea =
+                  CodeToText[this.selectedOptions[2]]
+                for (
+                  var i = 0;
+                  i < this.deptBudgetList.tranProcessInfoList.length;
+                  i++
+                ) {
+                  this.deptBudgetList.tranProcessInfoList[i].sort = i
+                }
+
+                edittran(this.deptBudgetList)
+                  .toPromise()
+                  .then((response) => {
+                    this.$message.success('编辑成功')
+                    this.deptBudgetList = {}
+                    this.$router.push({ path: 'tranManagementTransport' })
+                  })
+              } else {
+                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                return false
+              }
             })
-            return
-          }
-          for (
-            var i = 0;
-            i < this.deptBudgetList.tranProcessInfoList.length;
-            i++
-          ) {
-            this.deptBudgetList.tranProcessInfoList[i].processNo =
-              this.deptBudgetList.taskNo + (i + 1)
-            if (
-              new Date(
-                this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart
-              ).getTime() >
-              new Date(
-                this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd
-              ).getTime()
-            ) {
-              this.$message({
-                message: '发货日期不能大于最晚到货日期！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
-              this.$message({
-                message: '发货日期不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
-              this.$message({
-                message: '最晚到货日期不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
-              this.$message({
-                message: '重量不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
-              this.$message({
-                message: '发货人不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
-              this.$message({
-                message: '发货人电话不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
-              this.$message({
-                message: '收货人不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
-              this.$message({
-                message: '收货人电话不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (
-              !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress
-            ) {
-              this.$message({
-                message: '收获详细地址不能为空！',
-                type: 'warning',
-              })
-              return
-            }
-            if (
-              !this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress
-            ) {
-              this.$message({
-                message: '发货详细地址不能为空！',
-                type: 'warning',
-              })
-              return
-            }
+          })
+          .catch(() => {
+            return false
+          })
+      } else {
+        this.$confirm(
+          '运输任务提交成功后将派发到物流部门，是否确定提交？',
+          '提示',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
           }
-          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.tranType = this.checkList.toString()
-          this.deptBudgetList.startPrivate = CodeToText[this.selectedOptions[0]]
-        this.deptBudgetList.startCity = CodeToText[this.selectedOptions[1]]
-         this.deptBudgetList.startArea = CodeToText[this.selectedOptions[2]]
-            this.deptBudgetList.tranProcessInfoList[0].sendPrivate = CodeToText[this.selectedOptions[0]]
-             this.deptBudgetList.tranProcessInfoList[0].sendCity = CodeToText[this.selectedOptions[1]]
-              this.deptBudgetList.tranProcessInfoList[0].sendArea = CodeToText[this.selectedOptions[2]]
-         for(var i = 0; i< this.deptBudgetList.tranProcessInfoList.length ; i++){
-            this.deptBudgetList.tranProcessInfoList[i].sort = i
-        //    this.deptBudgetList.tranProcessInfoList[i].sendPrivate = CodeToText[this.selectedOptions[0]]
-        //     this.deptBudgetList.tranProcessInfoList[i].sendCity = CodeToText[this.selectedOptions[1]]
-        //      this.deptBudgetList.tranProcessInfoList[i].sendArea = CodeToText[this.selectedOptions[2]]
-        //     this.deptBudgetList.tranProcessInfoList[i].receivePrivate = CodeToText[this.selectedOptions1[0]]
-        //     this.deptBudgetList.tranProcessInfoList[i].receiveCity = CodeToText[this.selectedOptions1[1]]
-        //      this.deptBudgetList.tranProcessInfoList[i].receiveArea = CodeToText[this.selectedOptions1[2]]
-        // console.log(CodeToText[this.selectedOptions1[0]],"省")
-        // console.log(CodeToText[this.selectedOptions1[1]],"市")
-        // console.log(CodeToText[this.selectedOptions1[2]],"区")
-         }
-          edittran(this.deptBudgetList)
-            .toPromise()
-            .then((response) => {
-              this.$message.success('编辑成功')
-              this.deptBudgetList = {}
-              this.$router.push({ path: 'tranManagementTransport' })
+        )
+          .then(() => {
+            this.$refs.deptBudgetList.validate((valid) => {
+              if (valid) {
+                this.deptBudgetList.compId =
+                  sessionStorage.getItem('ws-pf_compId')
+                this.deptBudgetList.tranType = this.checkList.toString()
+
+                this.deptBudgetList.startPrivate =
+                  CodeToText[this.selectedOptions[0]]
+                this.deptBudgetList.startCity =
+                  CodeToText[this.selectedOptions[1]]
+                this.deptBudgetList.startArea =
+                  CodeToText[this.selectedOptions[2]]
+
+                this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
+                  CodeToText[this.selectedOptions[0]]
+                this.deptBudgetList.tranProcessInfoList[0].sendCity =
+                  CodeToText[this.selectedOptions[1]]
+                this.deptBudgetList.tranProcessInfoList[0].sendArea =
+                  CodeToText[this.selectedOptions[2]]
+
+                this.deptBudgetList.tranProcessInfoList[
+                  this.deptBudgetList.tranProcessInfoList.length - 1
+                ].receivePrivate = CodeToText[this.selectedOptions1[0]]
+                this.deptBudgetList.tranProcessInfoList[
+                  this.deptBudgetList.tranProcessInfoList.length - 1
+                ].receiveCity = CodeToText[this.selectedOptions1[1]]
+                this.deptBudgetList.tranProcessInfoList[
+                  this.deptBudgetList.tranProcessInfoList.length - 1
+                ].receiveArea = CodeToText[this.selectedOptions1[2]]
+
+                for (
+                  var i = 0;
+                  i < this.deptBudgetList.tranProcessInfoList.length;
+                  i++
+                ) {
+                  this.deptBudgetList.tranProcessInfoList[i].sort = i
+                }
+                edittran(this.deptBudgetList)
+                  .toPromise()
+                  .then((response) => {
+                    this.$message.success('编辑成功')
+                    this.deptBudgetList = {}
+                    this.$router.push({ path: 'tranManagementTransport' })
+                  })
+              } else {
+                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                alert('失败1')
+                return false
+              }
             })
-        } else {
-          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          return false
-        }
-      })
+          })
+          .catch(() => {
+            alert('失败2')
+            return false
+          })
+      }
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
@@ -1056,6 +1139,7 @@ export default {
   text-align: center;
   color: #8890b1;
   font-size: 14px;
+  width: -webkit-min-content;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   border: none;

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -158,8 +158,7 @@
               "
               v-if="
                 scope.row.taskId==null
-              "
-              
+              "       
               class="adjustment"
               @click="deleteclick(scope.row)"
             >删除</div>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -147,6 +147,7 @@
             style="margin-left: 350px; margin-top: -40px"
           >
             <el-input
+              @input="weightchange1"
               v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
@@ -347,7 +348,7 @@
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
             <el-select
-            :disabled='dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3'
+              :disabled="dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3"
               v-model="dataList.goodsName"
               placeholder="货名"
               class="huom"
@@ -905,6 +906,11 @@ export default {
         this.$set(this.dataList, 'weight', e)
       }
     },
+    weightchange1(e) {
+      if (this.dataList.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'weight', e)
+      }
+    },
     bulkDensitychange(e) {
       if (this.dataList.taskTypeKey == 4) {
         this.$set(this.dataList, 'bulkDensity', e)
@@ -926,8 +932,8 @@ export default {
         this.$set(this.dataList1, 'unitPrice', e)
       }
     },
-    changecontract(e){
-      if(this.dataList.taskTypeKey != 3 ){
+    changecontract(e) {
+      if (this.dataList.taskTypeKey != 3) {
         for (let i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
@@ -953,8 +959,9 @@ export default {
         }
       }
     },
-    changecontract1(e){
-      if(this.dataList1.taskTypeKey != 3 ){
+    selectwarehouseName() {},
+    changecontract1(e) {
+      if (this.dataList1.taskTypeKey != 3) {
         for (let i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
@@ -1008,6 +1015,381 @@ export default {
     },
     //提交按钮
     submit() {
+      if (this.dataList.taskTypeKey == 1) {
+        if (!this.dataList.warehouseName) {
+          this.$message({
+            message: '仓库名不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.contractNo) {
+          this.$message({
+            message: '合同编号不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.weight) {
+          this.$message({
+            message: '重量（吨）不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          isNaN(this.dataList.weight) ||
+          (String(this.dataList.weight).indexOf('.') != -1 &&
+            String(this.dataList.weight).length -
+              (String(this.dataList.weight).indexOf('.') + 1) >
+              2) ||
+          this.dataList.weight < 0 ||
+          this.dataList.weight > 200000
+        ) {
+          this.$message({
+            message: '重量输入有误！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.bulkDensity) {
+          this.$message({
+            message: '容重（克/升）>=不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.waterContent) {
+          this.$message({
+            message: '水份（%）<=不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.unitPrice) {
+          this.$message({
+            message: '单价（元/吨）不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.predictDate) {
+          this.$message({
+            message: '预计出库日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.agent) {
+          this.$message({
+            message: '出库经办人不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.businessDescribe) {
+          this.$message({
+            message: '业务描述不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+      }
+
+     
+       if (this.dataList.taskTypeKey == 2) {
+        if (!this.dataList1.warehouseName) {
+          this.$message({
+            message: '仓库名不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.contractNo) {
+          this.$message({
+            message: '合同编号不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.weight) {
+          this.$message({
+            message: '重量（吨）不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          isNaN(this.dataList1.weight) ||
+          (String(this.dataList1.weight).indexOf('.') != -1 &&
+            String(this.dataList1.weight).length -
+              (String(this.dataList1.weight).indexOf('.') + 1) >
+              2) ||
+          this.dataList1.weight < 0 ||
+          this.dataList1.weight > 200000
+        ) {
+          this.$message({
+            message: '重量输入有误！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.bulkDensity) {
+          this.$message({
+            message: '容重（克/升）>=不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.waterContent) {
+          this.$message({
+            message: '水份（%）<=不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.unitPrice) {
+          this.$message({
+            message: '单价（元/吨）不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.predictDate) {
+          this.$message({
+            message: '预计入库日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.agent) {
+          this.$message({
+            message: '入库经办人不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.businessDescribe) {
+          this.$message({
+            message: '业务描述不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+      }
+       if (this.dataList.taskTypeKey == 3) {
+          if (!this.dataList.warehouseName) {
+          this.$message({
+            message: '出库仓库名不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.warehouseName) {
+          this.$message({
+            message: '入库仓库名不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.moveTaskNo) {
+          this.$message({
+            message: '移库任务编号不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.weight) {
+          this.$message({
+            message: '重量（吨）不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          isNaN(this.dataList1.weight) ||
+          (String(this.dataList1.weight).indexOf('.') != -1 &&
+            String(this.dataList1.weight).length -
+              (String(this.dataList1.weight).indexOf('.') + 1) >
+              2) ||
+          this.dataList1.weight < 0 ||
+          this.dataList1.weight > 200000
+        ) {
+          this.$message({
+            message: '重量输入有误！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.bulkDensity) {
+          this.$message({
+            message: '容重（克/升）>=不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.waterContent) {
+          this.$message({
+            message: '水份（%）<=不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.unitPrice) {
+          this.$message({
+            message: '单价（元/吨）不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.predictDate) {
+          this.$message({
+            message: '预计出库日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.predictDate) {
+          this.$message({
+            message: '预计入库日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+          if (!this.dataList.agent) {
+          this.$message({
+            message: '出库经办人不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.agent) {
+          this.$message({
+            message: '入库经办人不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.businessDescribe) {
+          this.$message({
+            message: '业务描述不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+      }
+
+
+
+       if (this.dataList1.taskTypeKey == 4) {
+
+          if (!this.dataList.warehouseName) {
+          this.$message({
+            message: '出库仓库名不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.warehouseName) {
+          this.$message({
+            message: '入库仓库名不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.contractNo) {
+          this.$message({
+            message: '合同编号不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+         if (!this.dataList.contractNo) {
+          this.$message({
+            message: '合同编号不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.weight) {
+          this.$message({
+            message: '重量（吨）不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          isNaN(this.dataList1.weight) ||
+          (String(this.dataList1.weight).indexOf('.') != -1 &&
+            String(this.dataList1.weight).length -
+              (String(this.dataList1.weight).indexOf('.') + 1) >
+              2) ||
+          this.dataList1.weight < 0 ||
+          this.dataList1.weight > 200000
+        ) {
+          this.$message({
+            message: '重量输入有误！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.bulkDensity) {
+          this.$message({
+            message: '容重（克/升）>=不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.waterContent) {
+          this.$message({
+            message: '水份（%）<=不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.unitPrice) {
+          this.$message({
+            message: '单价（元/吨）不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.predictDate) {
+          this.$message({
+            message: '预计出库日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.predictDate) {
+          this.$message({
+            message: '预计入库日期不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+          if (!this.dataList.agent) {
+          this.$message({
+            message: '出库经办人不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList1.agent) {
+          this.$message({
+            message: '入库经办人不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.dataList.businessDescribe) {
+          this.$message({
+            message: '业务描述不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+      }
       this.dataList.inOutFlag = 1
       this.dataList1.inOutFlag = 2
       if (this.dataList.taskTypeKey == 1) {
@@ -1030,10 +1412,10 @@ export default {
         this.requestadd(this.dataList, 'repetition')
         this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.relevanceId = this.dataList.relevanceId
+        this.dataList1.goodsName = this.dataList.goodsName
         this.requestadd(this.dataList1, 'repetition')
       }
     },
-    selectwarehouseName() {},
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
         this.dataList.netWeight = Number(
@@ -1300,29 +1682,6 @@ export default {
           this.historyList = response
         })
     },
-    // async exportlist() {
-    //   const { data } = await export1(
-    //     {
-    //       compId: sessionStorage.getItem('ws-pf_compId'),
-    //       contractType: this.contractType,
-    //       currentPage: this.currentPage,
-    //       pageSize: this.pageSize,
-    //       searchType: this.searchType,
-    //       searchKeyWord: this.searchKeyWord,
-    //       startDate: this.startDate,
-    //       endDate: this.endDate,
-    //     },
-    //     {},
-    //     { responseType: 'blob' }
-    //   ).toPromise()
-    //   downloadFile({
-    //     res: data,
-    //     fileName: `${
-    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-    //     }_采购合同`,
-    //     type: 'xls',
-    //   })
-    // },
   },
 }
 </script>

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -1025,6 +1025,13 @@ export default {
     disableReasons(){
       this.dataList.inOutFlag=1
       this.dataList1.inOutFlag=2
+      if(!this.auditMind){
+          this.$message({
+          message: '驳回原因不能为空！',
+          type: 'warning',
+        })
+        return
+      }
       if (this.dataList.taskTypeKey == 1) {
         
         this.dataList.inOutTaskNo = this.inOutTaskNo

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -100,7 +100,7 @@
               class="typeselect"
             >
               <el-option
-                v-for="item in contractNoList"
+                v-for="item in moveTaskNo"
                 :key="item.constKey"
                 :label="item.contractNo"
                 :value="item.contractNo"
@@ -1093,8 +1093,8 @@ export default {
             if (response.length > 1) {
               this.dataList = response[0]
               this.dataList1 = response[1]
+                console.log(this.dataList1.inOutTaskNo,"入库任务")
             } else {
-              console.log(response[0].taskTypeKey)
                if(response[0].taskTypeKey==3){
                 this.deletetask=true
                 this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf("C") + 1,response[0].inOutTaskNo.length)
@@ -1119,7 +1119,7 @@ export default {
         this.$set(this.dataList1,'grade','一等品')
         this.$set(this.dataList1,'gradeKey','1')
       }
-      
+    
       // 货名
       pullDown({ constId: 'CON2' })
         .toPromise()
@@ -1220,7 +1220,6 @@ export default {
       this.dialogViewSpareMoney = false
     },
     history(row) {
-      console.log(row)
       billoperatehis({ id: row.id })
         .toPromise()
         .then((response) => {

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -409,9 +409,10 @@
       :rules="mainReportAdd"
       :model="deptBudgetList"
     >
-     <div class="small-title">相关附件</div>
+      <div class="small-title">相关附件</div>
       <div class="flex">
-        <div >
+        <!-- <div v-for="(item,index) in deptBudgetList.addressUrlArray"> -->
+        <div>
           <el-upload
             action="https://www.zthymaoyi.com/upload/admin"
             :show-file-list="false"
@@ -531,9 +532,11 @@
             alt
           />
         </div>
+        <!-- <img width="100" height="100" :src="item" alt="" />  -->
+        <!-- </div>  -->
       </div>
     </ws-form>
-  
+
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
@@ -586,6 +589,7 @@ export default {
           goodsName: '',
         },
         driverPayeeInfo: {},
+        addressUrlArray: [],
       },
       radio: '1',
       carModelList: [],
@@ -625,6 +629,7 @@ export default {
           payeeNumberCard: '',
           compName: '',
           bankDeposit: '',
+          addressUrlArray: [],
           bankCard: '',
         },
       ],
@@ -662,6 +667,15 @@ export default {
         .toPromise()
         .then((response) => {
           // this.selectedOptions.push()
+          this.deptBudgetList.addressUrlArray = response.addressUrl.split(',')
+          this.addressUrls.travel = this.deptBudgetList.addressUrlArray[0]
+          this.addressUrls.drive = this.deptBudgetList.addressUrlArray[1]
+          this.addressUrls.way = this.deptBudgetList.addressUrlArray[2]
+          this.addressUrls.qualification =
+            this.deptBudgetList.addressUrlArray[3]
+          this.addressUrls.identityjust = this.deptBudgetList.addressUrlArray[4]
+          this.addressUrls.identityagainst =
+            this.deptBudgetList.addressUrlArray[5]
 
           for (var i = 0; i < response.driverPayeeInfoList.length; i++) {
             if (response.driverPayeeInfoList[i].cardAddressUrl != null) {
@@ -672,7 +686,6 @@ export default {
             }
           }
           this.IdCard(response.numberCard)
-          console.log(this.age)
           this.deptBudgetList = Object.assign({}, response)
           var tmp = []
           tmp[0] = TextToCode[this.deptBudgetList.residentCityProvincial].code
@@ -701,7 +714,6 @@ export default {
       this.listDate.country = this.name
     },
     uploadSuccessHandle(index, e, fileList) {
-      console.log(index, e, fileList)
       const that = this
 
       getidentity({ personImg: e.url })
@@ -723,7 +735,6 @@ export default {
         })
     },
     uploadSuccessHandle1(index, e, fileList) {
-      console.log(index, e, fileList)
       const that = this
       // this.deptBudgetList.cardAddressUrl = e.url
       getbank({ bankImg: e.url })
@@ -819,7 +830,6 @@ export default {
     identitycardfujian(item) {},
     handleChange(value) {
       this.selectedOptions = value
-      console.log(this.selectedOptions)
     },
     returnsales() {
       this.$router.go(-1)
@@ -828,15 +838,7 @@ export default {
     //   this.draggable = false
     // },
     // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
-    },
+
     selectcarModel(e, index) {
       for (var i = 0; i < this.carModelList.length; i++) {
         if (this.carModelList[i].constValue == e) {
@@ -854,13 +856,11 @@ export default {
       }
     },
     selectbankDepositBranch(e, index) {
-      console.log(e, index)
       this.deptBudgetList.driverPayeeInfoList[index].bankDepositBranch = e
     },
     onChange(files) {
       this.fileNum = files
       this.$refs.upload.handleSaveBill().then((res) => {
-        console.log(files)
       })
     },
 
@@ -1096,6 +1096,7 @@ export default {
 }
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label {
   color: #8890b1;
+  width: 40%;
 }
 /deep/.trucks .el-table:before {
   height: 0;

src/views/tranManagement/tranManagementDriverLook.vue

@@ -308,18 +308,6 @@ export default {
           response.addressUrlArray = response.addressUrl.split(',')
           this.deptBudgetList = response
         })
-      //   // 车型
-      //   packList({ constId: 'TRAN1' })
-      //     .toPromise()
-      //     .then((response) => {
-      //       this.carModelList = response
-      //     })
-      //   // 车长
-      //   packList({ constId: 'TRAN2' })
-      //     .toPromise()
-      //     .then((response) => {
-      //       this.carLengthList = response
-      //     })
     },
     confirmPositioncity() {
       this.listDate.level = 'city'
@@ -330,14 +318,6 @@ export default {
       this.upForm.personNoImg = e.url
       this.upForm.type = 'driver'
       this.submiting = true
-      // personShibie(this.upForm).then((response) => {
-      //   this.list.unshift(response.data.data)
-      //   this.upForm.driver = response.data.data.driver
-      //   this.upForm.driverNo = response.data.data.driverNo
-      //   this.upForm.driverAddress = response.data.data.driverAddress
-      //   this.upFormVisible = true
-      //   this.submiting = false
-      // })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -104,43 +104,17 @@
                 prop="driver"
                 v-show="item.temporaryDriverFlag != 0"
               >
-                <!-- <el-input
-                  v-show="item.temporaryDriverFlag != 0"
-                  v-model="item.driver"
-                  filterable
-                  :filter-method="dataFilter"
-                  @change="selectstaff"
-                >
-                  <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.staffName"
-                    :value="item.staffName"
-                  />
-                </el-input>-->
                 <span v-show="item.temporaryDriverFlag != 0">{{item.driver}}</span>
               </ws-form-item>
               <el-divider direction="vertical" class="line"></el-divider>
               <!-- 电话 -->
               <ws-form-item label="司机电话：" span="1" prop="driverPhone">
-                <!-- <ws-input
-                  v-show="item.temporaryDriverFlag != 0"
-                  v-model="item.driverPhone"
-                  maxlength="20"
-                  size="small"
-                />-->
                 <span v-show="item.temporaryDriverFlag != 0">{{ item.driverPhone }}</span>
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
               </ws-form-item>
               <el-divider direction="vertical" class="line"></el-divider>
               <!--车牌号-->
               <ws-form-item label="车牌号：" span="1" prop="carNo">
-                <!-- <ws-input
-                  v-show="item.temporaryDriverFlag != 0"
-                  v-model="item.carNo"
-                  maxlength="20"
-                  size="small"
-                />-->
                 <span v-show="item.temporaryDriverFlag != 0">{{ item.carNo }}</span>
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
               </ws-form-item>
@@ -160,14 +134,14 @@
               </ws-form-item>
               <el-divider direction="vertical" class="line"></el-divider>
               <!--磅单-->
-              <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
-                <template slot-scope="scope">
+              <ws-form-item label="磅单：" span="1" prop="unloadPoundImg">
+                <template >
                   <el-upload
                     action="https://www.zthymaoyi.com/upload/admin"
                     :show-file-list="false"
                     :on-success="
-                    (res, file) => {
-                      uploadSuccessHandle1(index, res, file)
+                    (res) => {
+                      uploadSuccessHandle1(res,index)
                     }
                   "
                     class="avatar-uploader"
@@ -184,6 +158,12 @@
                       alt
                     />
                   </el-upload>
+                  <span v-if="deptBudgetList.tranCarInfoList[index].unloadPoundImg != null " >1</span>
+                 <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].unloadPoundImg == null
+                  "
+                  >未上传</span>
                 </template>
               </ws-form-item>
             </ws-info-table>
@@ -252,7 +232,11 @@ export default {
       },
       contractList: [],
       deptBudgetList: {
-        tranCarInfoList: []
+        tranCarInfoList: [
+          {
+            unloadPoundImg:"",
+          }
+        ]
       },
       historyList: [],
       pickerBeginDateBefore: {
@@ -292,21 +276,8 @@ export default {
         this.deptBudgetList.tranCarInfoList.splice(index, 1)
       }
     },
-    uploadSuccessHandle1(index, e, fileList) {
-      const that = this
-      getbank({ bankImg: e.url })
-        .toPromise()
-        .then(response => {
-          for (var i = 0; i < this.freightspace1.length; i++) {
-            if (i == index) {
-              this.freightspace1[i].payeeAddressUrl = e.url
-              this.freightspace1[i].bankCard = response.bankNo
-              this.freightspace1[i].bankDeposit = response.bankName
-              this.freightspace1[i].bankDepositBranchList =
-                response.bankNameZhihang
-            }
-          }
-        })
+    uploadSuccessHandle1(e,index) {
+      this.deptBudgetList.tranCarInfoList[index].unloadPoundImg = e.url
     },
     selectwaterContent() {},
     //提交按钮
@@ -331,13 +302,15 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
-              this.tranCarInfoList = this.freightspace
+              // this.tranCarInfoList = this.freightspace
+                   this.tranCarInfoList = this.deptBudgetList.tranCarInfoList
               this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
               this.tranCarInfoList.carNo = this.deptBudgetList.carNo
               this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
               this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+              // this.tranCarInfoList.unloadPoundImg = this.deptBudgetList.tranCarInfoList.unloadPoundImg
+              console.log( this.deptBudgetList.tranCarInfoList[0].unloadPoundImg,"图片")
               this.tranCarInfoList.unloadNetWeight = this.deptBudgetList.unloadNetWeight
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
@@ -346,6 +319,7 @@ export default {
                   this.tranCarInfoList[i].tranType = this.tranType
                 }
               }
+              console.log(this.tranCarInfoList,"12121212")
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
@@ -398,7 +372,6 @@ export default {
           arrange({ id: this.carList[i].id })
             .toPromise()
             .then(response => {
-              console.log(this, response)
               this.deptBudgetList.tranCarInfoList[index].carNo =
                 response.carNumber
               if (response.carLoad != null) {
@@ -429,7 +402,6 @@ export default {
         arrange({ id: this.carList[i].id })
           .toPromise()
           .then(response => {
-            console.log(this, response)
             this.deptBudgetList.tranCarInfoList[index].carNo =
               response.carNumber
             if (response.carLoad != null) {
@@ -457,8 +429,6 @@ export default {
       }
     }
   },
-  approve() {},
-  listQuery() {}
 }
 </script>
 <style lang="scss" scoped>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -1,4 +1,4 @@
-//反馈查看
+//卸车反馈查看
 <template>
   <div class="container">
     <el-row>
@@ -130,8 +130,8 @@
             </ws-form-item>
              <el-divider direction="vertical" class="line"></el-divider>
             <!--磅单-->
-            <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
-              <template slot-scope="scope">
+            <ws-form-item label="磅单:" span="1" prop="unloadPoundImg">
+              <template >
                 <img
                   width="18"
                   height="20"
@@ -141,9 +141,24 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  @click="fujian(scope.row)"
+                  @click="fujian(index)"
                   alt=""
                 />
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+                      .length > 0
+                  "
+                  >{{
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr.length
+                  }}</span
+                >
+                 <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+                      .length == 0
+                  "
+                  >无</span>
                 <!-- <div v-show="item.temporaryDriverFlag == 0">
                   {{ item.signStatus }}
                 </div> -->
@@ -167,25 +182,28 @@
         >关闭</el-button
       >
     </div>
-    <!-- <WinseaContentModal
+       <!-- 附件弹框 -->
+    <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
     >
-      <p>上传附件</p>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :file-list="fileList"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.loadPoundImg"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
-    </WinseaContentModal> -->
+      <p>查看附件</p>
+      <div
+        style="display: inline-block; margin: 5px"
+        v-for="item in appendixIdss"
+      >
+        <img width="100" height="100" :src="item" alt="" />
+      </div>
+    </WinseaContentModal>
+    <WinseaContentModal
+      v-model="accesscard"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose1"
+    >
+      <p>查看附件</p>
+      <img width="100" height="100" :src="accessurl" alt="" />
+    </WinseaContentModal>
   </div>
 </template>
 <script>
@@ -244,16 +262,13 @@ export default {
           },
         ],
       },
-      accessoryTFs:[],
+      accessoryTFs: false,
       fileList:[],
       appendixIdsAdd: '',
       size: 10,
       value1: '',
       unitList: [],
       freightspace: [
-        // {
-        //   trainNo: '',
-        // },
       ],
       name: '',
       list: [],
@@ -262,12 +277,12 @@ export default {
       carModel: [],
       tranCarInfoList: {},
       arr: [],
+      accessurl:'',
+         //附件
+      appendixIdss: [],
+      accesscard: false,
     }
   },
-  // mounted() {
-   
-  //   this.getList()
-  // },
 activated(){
    this.deptBudgetList.id = this.$route.query.id
   this.getList()
@@ -305,28 +320,11 @@ activated(){
     },
   },
   methods: {
-    // dataFilter(val) {
-    //   this.deptBudgetList.personCharge = val
-    //   if (val) {
-    //     this.options = this.staffList.filter((item) => {
-    //       if (
-    //         !!~item.staffName.indexOf(val) ||
-    //         !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-    //       ) {
-    //         return true
-    //       }
-    //     })
-    //   } else {
-    //     this.options = this.staffList
-    //   }
-    // },
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
         if (this.staffList[i].staffName == e) {
           this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
           this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
-          // this.deptBudgetList.tranCarInfoList[i].driverPhone = this.staffList[i].staffMobilePhone
-          console.log(this.freightspace[i].driverPhone, 'dianhu')
           this.deptBudgetList.personChargeKey = this.staffList[i].staffId
         }
       }
@@ -347,12 +345,15 @@ activated(){
     handleClose() {
       this.dialogViewSpareMoney = false
     },
+     handleClose1() {
+      this.accesscard = false
+    },
 
     // //下拉司机姓名改变事件
     // selectdriver() {},
-    // handleChange(value) {
-    //   this.selectedOptions = value
-    // },
+    handleChange(value) {
+      this.selectedOptions = value
+    },
     returnsales() {
       this.deptBudgetList = {}
       this.freightspace = {}
@@ -383,6 +384,14 @@ activated(){
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
             }
+            if (this.deptBudgetList.tranCarInfoList[i].unloadPoundImg != null) {
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr =
+                this.deptBudgetList.tranCarInfoList[i].unloadPoundImg.split(',')
+              this.fileList[i] =
+                this.deptBudgetList.tranCarInfoList[i].unloadPoundImg.split(',')
+            } else {
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
+            }
           }
         })
       // //司机姓名下拉
@@ -440,19 +449,20 @@ activated(){
       }
     },
     //上传
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
+    fujian(index) {
+       if (
+        this.deptBudgetList.tranCarInfoList[index].unloadPoundImg === null ||
+        this.deptBudgetList.tranCarInfoList[index].unloadPoundImg === ''
       ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
+        this.$message({
+          message: '暂无附件！',
+          type: 'warning',
+        })
+        return
       } else {
         this.accessoryTFs = true
       }
-      this.appendixIdss = row.receiveAttachmentPath
+      this.appendixIdss = this.deptBudgetList.tranCarInfoList[index].loadPoundImgArr
     },
   },
 }

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -1,4 +1,4 @@
-//反馈
+//装车反馈
 <template>
   <div class="container">
     <el-row>
@@ -179,15 +179,12 @@
             </ws-form-item>
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
-              <template slot-scope="scope">
+              <!-- slot-scope="scope" -->
+              <template >
                 <el-upload
                   action="https://www.zthymaoyi.com/upload/admin"
                   :show-file-list="false"
-                  :on-success="
-                    (res, file) => {
-                      uploadSuccessHandle1(index, res, file)
-                    }
-                  "
+                  :on-success=" (res) => { uploadSuccessHandle1(res,index)}"
                   class="avatar-uploader"
                   accept=".jpg, .jpeg, .png, .gif"
                   ><img
@@ -201,6 +198,12 @@
                     alt=""
                   />
                 </el-upload>
+                 <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg != null " >1</span>
+                 <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                  "
+                  >未上传</span>
                 <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
                   {{ item.signStatus }}
                 </div>
@@ -241,25 +244,6 @@
         >提交</el-button
       >
     </div>
-    <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
-      <p>上传附件</p>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :file-list="fileList"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.loadPoundImg"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
-    </WinseaContentModal>
   </div>
 </template>
 <script>
@@ -286,6 +270,7 @@ export default {
     return {
       deptBudgetList: {
         totalStorage: 0,
+        
       },
       options_: regionData,
       heightData: '600px',
@@ -319,6 +304,7 @@ export default {
       size: 10,
       value1: '',
       unitList: [],
+    
       freightspace1: [
         {
           accountTypeFlag: '1',
@@ -336,13 +322,18 @@ export default {
           driverPhone: '',
           carNo: '',
           loadNetWeight: '',
+          loadPoundImg:""
         },
+        // {loadPoundImg:{}},
+          
       ],
       name: '',
       staffList: [],
       options: [],
       carModel: [],
-      tranCarInfoList: {},
+      tranCarInfoList: {
+        loadPoundImg:''
+      },
       //上传
       accessoryTFs: false,
       fileList: [],
@@ -396,8 +387,6 @@ export default {
         if (this.staffList[i].staffName == e) {
           this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
           this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
-          // this.deptBudgetList.tranCarInfoList[i].driverPhone = this.staffList[i].staffMobilePhone
-          console.log(this.freightspace[i].driverPhone, 'dianhu')
           this.deptBudgetList.personChargeKey = this.staffList[i].staffId
         }
       }
@@ -443,9 +432,6 @@ export default {
       this.deptBudgetList.tranCarInfoList = []
       this.$router.push({ path: 'tranManagementTransporHairRespond' })
     },
-    // confirmPosition() {
-    //   this.draggable = false
-    // },
     // 上传附件
     uploadSuccess(data, files, url) {
       console.log(data, files, url)
@@ -503,7 +489,7 @@ export default {
                 this.deptBudgetList.loadNetWeight
               this.tranCarInfoList.tranType = this.tranType
               this.tranCarInfoList.loadPoundImg =
-                this.deptBudgetList.loadPoundImg
+                this.deptBudgetList.loadPoundImg 
               // this.tranCarInfoList.boxNo = this.arr.toString()
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
@@ -608,39 +594,10 @@ export default {
         }
       }
     },
-    uploadSuccessHandle1(index, e, fileList) {
-      console.log(index, e, fileList)
-      const that = this
-      // this.deptBudgetList.cardAddressUrl = e.url
-      getbank({ bankImg: e.url })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < this.freightspace1.length; i++) {
-            if (i == index) {
-              this.freightspace1[i].payeeAddressUrl = e.url
-              this.freightspace1[i].bankCard = response.bankNo
-              this.freightspace1[i].bankDeposit = response.bankName
-              this.freightspace1[i].bankDepositBranchList =
-                response.bankNameZhihang
-            }
-          }
-        })
+    uploadSuccessHandle1(e,index) {
+
+      this.freightspace[index].loadPoundImg = e.url
     },
-    //上传
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
   },
 }
 </script>

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -1,4 +1,4 @@
-//反馈查看
+//装车反馈查看
 <template>
   <div class="container">
     <el-row>
@@ -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.tranType }}
         </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="姓名:" span="1" prop="driver">
               <span>{{ item.driver }} </span>
@@ -120,7 +127,7 @@
             </ws-form-item>
             <!--磅单-->
             <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
-              <template slot-scope="scope">
+              <template>
                 <img
                   width="18"
                   height="20"
@@ -130,22 +137,49 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  @click="fujian(scope.row)"
+                  @click="fujian(index)"
                   alt=""
                 />
-                 <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+                      .length > 0
+                  "
+                  >{{
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr.length
+                  }}</span
+                >
+                 <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+                      .length == 0
+                  "
+                  >无</span>
+                <div
+                  v-show="
+                    item.temporaryDriverFlag == 0 &&
+                    item.signStatus == '未签合同'
+                  "
+                  class="signStatus"
+                >
                   {{ item.signStatus }}
                 </div>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+                <div
+                  v-show="
+                    item.temporaryDriverFlag == 0 &&
+                    item.signStatus == '已签合同'
+                  "
+                  class="signStatus1"
+                >
                   {{ item.signStatus }}
                 </div>
               </template>
             </ws-form-item>
-           
           </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>
     </ws-form>
@@ -159,7 +193,7 @@
         >关闭</el-button
       >
     </div>
- <!-- 附件弹框 -->
+    <!-- 附件弹框 -->
     <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
@@ -255,12 +289,12 @@ export default {
       tranCarInfoList: {},
       //上传
       accessoryTFs: false,
-      accesscard : false,
+      accesscard: false,
       accessurl: '',
-      // fileList: [],
+      fileList: [],
       // appendixIdsAdd: '',
       //附件
-      appendixIdss:[],
+      appendixIdss: [],
     }
   },
   mounted() {
@@ -278,14 +312,14 @@ export default {
     },
     total: function () {
       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{
+        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
       }
     },
@@ -299,7 +333,7 @@ export default {
       //     return '司机名称（临）'
       //   }
       //  }
-      return "(临)"
+      return '(临)'
 
       // item.temporaryDriverFlag == 0
     },
@@ -321,7 +355,7 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-      handleClose1() {
+    handleClose1() {
       this.accesscard = false
     },
     handleChange(value) {
@@ -357,15 +391,15 @@ export default {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
             }
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray =
-                response.records[i].addressUrl.split(',')
-              this.fileList[i] = response.records[i].addressUrl.split(',')
+            if (this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr =
+                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+              this.fileList[i] =
+                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
             } else {
-              response.records[i].addressUrlArray = []
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
             }
           }
-          
         })
     },
     selectChapterTwo(e) {
@@ -404,21 +438,22 @@ export default {
       }
     },
     //上传
-    fujian(row) {
+    fujian(index) {
       if (
-        row.addressUrl === null ||
-        row.addressUrl === ''
+        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === null ||
+        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === ''
       ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
+        this.$message({
+          message: '暂无附件！',
+          type: 'warning',
+        })
+        return
       } else {
         this.accessoryTFs = true
       }
-      this.appendixIdss = row.receiveAttachmentPath
+      this.appendixIdss =
+        this.deptBudgetList.tranCarInfoList[index].loadPoundImgArr
     },
-
   },
 }
 </script>
@@ -681,11 +716,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;
@@ -715,7 +750,7 @@ height: 50px;
 }
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
-  border-right: 1px solid #D8DCE6;
+  border-right: 1px solid #d8dce6;
   border-radius: 0px;
   padding: 0px;
 }
@@ -725,26 +760,26 @@ height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 50%;
-  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;
 }
 .signStatus {
   height: 25px;
@@ -763,7 +798,7 @@ margin-top: 20px;
   border: 1px solid #5473e8;
   padding: 0 3px;
   margin-left: 30px;
-  color: #5473E8;
+  color: #5473e8;
   line-height: 24px;
 }
 </style>

src/views/warehouse/warehouseManagementAdd.vue

@@ -1,4 +1,4 @@
-
+//添加仓库
 <template>
   <div class="container">
     <el-row>
@@ -118,6 +118,7 @@
           style="width: 100%"
           class="flex position"
           v-for="(item, index) in freightspace"
+          :key="index"
           v-show="radio == 1"
         >
           <ws-form-item
@@ -171,19 +172,32 @@
     </ws-form>
     <ws-form ref="deptBudgetList" :model="deptBudgetList">
       <div class="small-title" v-show="radio == 1">上传仓库照片</div>
-      <ws-upload
-        v-show="radio == 1"
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      <el-upload
+        action="https://www.zthymaoyi.com/upload/admin"
+        :show-file-list="false"
+        :on-success="
+          (res, file) => {
+            uploadSuccessHandle(res)
+          }
+        "
+        :on-remove="(value) => {handleRemove(value)}"
+        class="avatar-uploader"
+        accept=".jpg, .jpeg, .png, .gif"
+        >
+        <el-button  v-show="radio == 1">上传附件</el-button>   
+      </el-upload>
+      <div class="addressUrls" v-if="addressUrls != null">
+         <div v-for="(item , index) in addressUrls" class="addressUrl" :key="index">
+          <img
+            v-if="addressUrls != null"
+            width="100"
+            height="100"
+            :src="item"
+            alt=""
+          /> 
+       
+          </div> 
+          </div>
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
       <map-drag @marker="marker" @selectedAddress="selectedAddress"></map-drag>
     </ws-form>
@@ -200,8 +214,6 @@
   </div>
 </template>
 <script>
-//  import { getVesselOne } from '@/model/procurement/basic'
-//  import { dayjs } from 'base-core-lib'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import {
   addList,
@@ -232,6 +244,7 @@ export default {
     return {
       deptBudgetList: {
         totalStorage: 0,
+        addressUrl:"",
       },
       options_: regionData,
       heightData: '600px',
@@ -289,6 +302,7 @@ export default {
       freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
       name: '',
       list: [],
+      addressUrls:[],
     }
   },
   mounted() {
@@ -365,19 +379,10 @@ export default {
       this.selectedOptions = ''
       this.$router.push({ path: 'warehouseManagementList' })
     },
-    // confirmPosition() {
-    //   this.draggable = false
-    // },
     // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
+    uploadSuccessHandle(e) {
+      this.deptBudgetList.addressUrl += e.url+","
+      this.addressUrls.push(e.url)
     },
     onChange(files) {
       this.fileNum = files
@@ -434,13 +439,6 @@ export default {
           })
           return
         }
-        //  if(!this.deptBudgetList.warehousePrivate){
-        //   this.$message({
-        //     message: '仓库所在地不能为空！',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
         if (!this.deptBudgetList.detailedAddress) {
           this.$message({
             message: '详细地址不能为空！',
@@ -570,13 +568,6 @@ export default {
           })
           return
         }
-        //  if(!this.deptBudgetList.warehousePrivate){
-        //   this.$message({
-        //     message: '仓库所在地不能为空！',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
         if (!this.deptBudgetList.detailedAddress) {
           this.$message({
             message: '详细地址不能为空！',
@@ -670,10 +661,6 @@ export default {
           })
       }
     },
-    // selectContract(val) {
-    //   let key = this.unitList.find((item) => item.constValue === val).constKey
-    //   this.pleaseChoose = val
-    // },
     getList() {
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
@@ -684,11 +671,6 @@ export default {
           this.personCharge = response
         })
     },
-    handleExamine() {},
-    approve() {},
-    // returnsales() {
-    //   this.$router.push({ path: 'purchaseContract' })
-    // },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
         if (this.ChapterTwoList[i].constValue == e) {
@@ -1069,8 +1051,15 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
-//地图
-// .position{
-//   margin: 0 auto;
-// }
+.avatar-uploader {
+  margin: 0 5px;
+}
+.addressUrls{
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrl{
+  margin: 0px 10px;
+  border-radius: 3px;
+}
 </style>

src/views/warehouse/warehouseManagementEdit.vue

@@ -1,3 +1,4 @@
+//编辑仓库
 <template>
   <div class="container">
     <el-row>
@@ -78,12 +79,6 @@
           </ws-form-item>
           <!--仓库所在地-->
           <ws-form-item label="仓库所在地" span="1" prop="warehouseCity">
-            <!-- <ws-input
-              v-model="deptBudgetList.warehouseCity"
-              placeholder="请输入仓库所在地"
-              maxlength="120"
-              size="small"
-            /> -->
             <el-cascader
               :options="options_"
               v-model="selectedOptions"
@@ -115,12 +110,6 @@
             span="1"
             prop="totalStorage"
           >
-            <!-- <ws-input
-              v-model="deptBudgetList.totalStorage"
-              placeholder="请输入总储量（吨)"
-              maxlength="20"
-              size="small"
-            /> -->
             {{ totalStorage }}
           </ws-form-item>
         </ws-info-table>
@@ -174,26 +163,42 @@
       </ws-form>
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <div v-if="warehouseType == 1" class="small-title">上传仓库照片</div>
-        <ws-upload
-          v-if="warehouseType == 1"
-          ref="upload"
-          table-name="warehouseEdit"
-          oss-key="mainPlan"
-          :file-list="fileList"
-          :comp-id="compId"
-          :appendix-ids="appendixIdsAdd"
-          :vesselId="deptBudgetList.addressUrl"
-          :size-limit="size"
-          @uploadSuccess="uploadSuccess"
-          @onChange="onChange"
-          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-        />
+        <el-upload
+          action="https://www.zthymaoyi.com/upload/admin"
+          :show-file-list="false"
+          :on-success="
+            (res, file) => {
+              uploadSuccessHandle(res)
+            }
+          "
+          :on-remove="
+            (value) => {
+              handleRemove(value)
+            }
+          "
+          class="avatar-uploader"
+          accept=".jpg, .jpeg, .png, .gif"
+        >
+          <el-button  v-if="warehouseType == 1">上传附件</el-button>
+        </el-upload>
+        <div class="addressUrls">
+          <div v-for="(items, index) in addressUrls" class="addressUrl">
+            <img
+              v-show="addressUrls.length > 0"
+              width="100"
+              height="100"
+              :src="items"
+              alt=""
+            />
+          </div>
+        </div>
         <div class="small-title">仓库定位</div>
         <map-drag
           @marker="marker"
           @selectedAddress="selectedAddress"
         ></map-drag>
       </ws-form>
+
       <!-- <ws-button @click="exportlist()"></ws-button> -->
     </div>
     <div style="text-align: right; padding: 10px">
@@ -240,7 +245,6 @@ export default {
   },
   data() {
     return {
-      
       fileList: [],
       //弹出框
       dialogViewSpareMoney: false,
@@ -289,6 +293,7 @@ export default {
       options: [],
       value: '',
       accessoryTFs: false,
+      addressUrls: [],
     }
   },
   activated() {
@@ -346,13 +351,16 @@ export default {
     },
     //返回按钮
     returnWarehouse() {
+      this.addressUrls = []
       this.deptBudgetList = {}
+      this.selectedOptions = []
       this.$router.push({ path: 'warehouseManagementList' })
     },
     handleChange(value) {
       this.selectedOptions = value
     },
     warehouseTypechange() {
+      this.addressUrls = []
       this.deptBudgetList = {}
       this.selectedOptions = []
       this.loaddata()
@@ -367,7 +375,7 @@ export default {
     },
     uploadSuccess(data, files, url) {
       this.fileList = files
-      console.log('uploadSuccess ',data, files, url)
+      console.log('uploadSuccess ', data, files, url)
     },
     onChange(files) {
       this.fileNum = files
@@ -484,21 +492,27 @@ export default {
             ].code
           this.selectedOptions = tmp
           this.deptBudgetList = response
-          if(this.deptBudgetList.addressUrl){
-            this.fileList =  this._getFileList(this.deptBudgetList.addressUrl)
-          }
+          // if(this.deptBudgetList.addressUrl){
+          //   this.fileList =  this._getFileList(this.deptBudgetList.addressUrl)
+          // }
+          this.addressUrls = this.deptBudgetList.addressUrl.split(',')
+          this.addressUrls.pop()
         })
     },
     // 传入appendixIds 从服务器获取文件列表信息
-    _getFileList (appendixIds) {
-      return new Promise(async next => {
+    _getFileList(appendixIds) {
+      return new Promise(async (next) => {
         try {
-          next(await getFileList({ appendixIds }).toPromise() || [])
+          next((await getFileList({ appendixIds }).toPromise()) || [])
         } catch (error) {
           next()
         }
       })
     },
+    uploadSuccessHandle(e) {
+      this.deptBudgetList.addressUrl += e.url + ','
+      this.addressUrls.push(e.url)
+    },
     //提交
     submit() {
       if (!this.deptBudgetList.warehouseName) {
@@ -629,13 +643,13 @@ export default {
       })
       new Promise((resolve, reject) => {
         const newAppendixs = this.fileList
-        const params = { newAppendixs}
+        const params = { newAppendixs }
         saveFiles(params)
           .toPromise()
-          .then(res => {
+          .then((res) => {
             resolve(res.join())
           })
-          .catch(err => {
+          .catch((err) => {
             EventBus.$emit('error', this.$t('showMessage.saveFilesError'))
             reject()
           })
@@ -975,4 +989,13 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
+.addressUrls {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrl {
+  margin: 0 10px;
+  border-radius: 3px;
+}
 </style>

src/views/warehouse/warehouseManagementLook.vue

@@ -80,10 +80,11 @@
           </ws-form-item>
           <!--总储量（吨)-->
           <ws-form-item
-            v-show="warehouseType == 1"
+            v-show="warehouseType == '1'"
             label="总储量（吨)"
             span="1"
             prop="totalStorage"
+             
           >
             {{ totalStorage }}
           </ws-form-item>
@@ -126,7 +127,18 @@
             </ws-form-item>
           </ws-info-table>
         </div>
-        <div class="small-title">仓库照片</div>
+        <div class="small-title" v-show="warehouseType == '1'">仓库照片</div>
+        <div class="addressUrls">
+          <div v-for="(items, index) in addressUrls" class="addressUrl">
+            <img
+              v-show="addressUrls.length > 0"
+              width="100"
+              height="100"
+              :src="items"
+              alt=""
+            />
+          </div>
+        </div>
       </ws-form>
     </div>
     <div style="text-align: right; padding: 10px">
@@ -142,7 +154,6 @@
 </template>
 <script>
 import { xiala, billoperatehis, getLook } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -173,6 +184,7 @@ export default {
       showType: true,
       // 年
       year: '',
+      radio: 1,
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -203,10 +215,11 @@ export default {
         },
       },
       accessoryTFs: false,
+      addressUrls: [],
     }
   },
   activated() {
-    this.selectpackingMethod()
+    // this.selectpackingMethod()
     this.showType = this.isShow
     this.loaddata()
   },
@@ -230,10 +243,12 @@ export default {
   methods: {
     //返回按钮
     returnWarehouse() {
+       this.deptBudgetList = {}
+          this.addressUrls = []
       this.$router.push({ path: 'warehouseManagementList' })
-      this.deptBudgetList = {}
     },
     warehouseTypechange() {
+      this.addressUrls = []
       this.deptBudgetList = {}
       this.loaddata()
     },
@@ -298,7 +313,8 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          //  console.log(this.deptBudgetList)
+          this.addressUrls = this.deptBudgetList.addressUrl.split(',')
+          this.addressUrls.pop()
         })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -313,13 +329,6 @@ export default {
           this.historyList = response
         })
     },
-    //删除
-
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
   },
 }
 </script>
@@ -343,13 +352,6 @@ export default {
   width: 62px;
   text-align: right;
 }
-// /deep/.cangno{
-//    width: 16.67%;
-// }
-// /deep/.cangno  .el-form-item .el-form-item__label{
-//   width: 40%;
-// }
-
 /deep/.el-form-item {
   width: 33.33%;
 }
@@ -453,4 +455,13 @@ export default {
   left: 0px;
   top: 13px;
 }
+.addressUrls {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrl {
+  margin: 0 10px;
+  border-radius: 3px;
+}
 </style>

vue.config.js

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