前端sdy

src/views/contractManagement/purchaseContractEdit.vue

@@ -349,20 +349,8 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="品级" span="1" prop="grade">
-            <ws-select
-              v-model="deptBudgetList.contractGoodsInfo.grade"
-              placeholder=""
-              class="typeselect"
-              @change="selectgrade"
-            >
-              <ws-option
-                v-for="item in gradeList"
-                :key="item.constValue"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
+          <ws-form-item label="品级" span="1" prop="grade" class="readonly">        
+              {{ deptBudgetList.contractGoodsInfo.grade}}
           </ws-form-item>
           <ws-form-item label="杂质（%）<=" span="1" prop="impurity">
             <ws-input
@@ -1376,6 +1364,10 @@ export default {
   padding: 0 25px;
   border-left: 1px solid #cdd2dc;
   background: #fafbfc;
+  color: #8890B1;
+}
+/deep/.el-form-item.is-success .el-input__inner , /deep/.el-cascader .el-input .el-input__inner, /deep/.el-textarea__inner{
+  color: #8890B1;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 140px;
@@ -1541,7 +1533,7 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
+/deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 130px;
 }
 .el-textarea{

src/views/contractManagement/purchaseContractExamine.vue

@@ -186,8 +186,10 @@
       <div class="remark">
         <h3>备注信息</h3>
       </div>
+      <div style=" color: #afb5cb;margin-left: 20px;">
       {{ deptBudgetList.remarks }}
-      <img :src="deptBudgetList.addressUrl" alt="" />
+      </div>
+      <!-- <img :src="deptBudgetList.addressUrl" alt="" /> -->
     </ws-form>
     <div style="text-align: right; padding: 10px">
       <el-button
@@ -387,6 +389,7 @@ export default {
   padding: 0 25px;
   border-left: 1px solid #cdd2dc;
   background: #fafbfc;
+  color: #afb5cb;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 140px;

src/views/contractManagement/salesContract.vue

@@ -576,7 +576,6 @@ export default {
       this.dialogViewSpareMoney = false
     },
     history(row) {
-      console.log(row)
       billoperatehis({ id: row.id })
         .toPromise()
         .then((response) => {
@@ -617,20 +616,12 @@ export default {
         type: 'xls',
       })
     },
-    // deletecontract(){},
-    //删除
-
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
 
     handleDelete(row) {
       var handleDelete = ' '
       if (row.handleDelete == '') {
       }
-      this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
+      this.$confirm(`删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         type: 'warning',

src/views/contractManagement/salesContractAdd.vue

@@ -94,10 +94,10 @@
             class="readonly"
           >
             <el-radio v-model="deptBudgetList.deliverType" label="1"
-              >我方自提</el-radio
+              >我方送货</el-radio
             >
             <el-radio v-model="deptBudgetList.deliverType" label="2"
-              >对方送货</el-radio
+              >对方自提</el-radio
             >
           </ws-form-item>
 

src/views/contractManagement/salesContractEdit.vue

@@ -337,19 +337,6 @@
         <ws-info-table>
           <!--货名-->
           <ws-form-item label="货名" span="1" prop="goodsName">
-            <!-- <ws-select
-                v-model="deptBudgetList.contractGoodsInfo.goodsName"
-                placeholder=""
-                class="typeselect"
-                @change="selectpackingMethod"
-              >
-                <ws-option
-                  v-for="item in goodnameList"
-                  :key="item.constKey"
-                  :label="item.constValue"
-                  :value="item.constValue"
-                />
-              </ws-select> -->
             <div class="unchanged">
               {{ deptBudgetList.contractGoodsInfo.goodsName }}
             </div>
@@ -368,19 +355,10 @@
 
           <!--品级-->
           <ws-form-item label="品级" span="1" prop="grade">
-            <ws-select
-              v-model="deptBudgetList.contractGoodsInfo.grade"
-              placeholder=""
-              class="typeselect"
-              @change="selectgrade"
-            >
-              <ws-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
+            <div class="unchanged">
+              {{ deptBudgetList.contractGoodsInfo.grade }}
+            </div>
+            <span class="unchangeable">*</span>
           </ws-form-item>
 
           <!--杂质（%）<=-->
@@ -705,6 +683,11 @@ export default {
 
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
+          if (this.deptBudgetList.deliverType == 1) {
+            this.deptBudgetList.deliverType1 = '我方自提'
+          } else if (this.deptBudgetList.deliverType == 2) {
+            this.deptBudgetList.deliverType1 = '对方送货'
+          }
         })
       // 包装方式
       packList({ constId: 'CON1' })
@@ -741,11 +724,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          if (this.deptBudgetList.deliverType == 1) {
-            this.deptBudgetList.deliverType1 = '我方自提'
-          } else if (this.deptBudgetList.deliverType == 2) {
-            this.deptBudgetList.deliverType1 = '对方送货'
-          }
           this.unitList = response
           let currItem
           this.unitList.forEach((item, index, arr) => {
@@ -754,7 +732,6 @@ export default {
               currItem = item
             }
           })
-          //
           if (currItem) {
             this.selectContract(currItem.constValue)
           }
@@ -1598,5 +1575,9 @@ export default {
   height: 32px;
   line-height: 32px;
 }
-
+/deep/.el-form-item.is-success .el-input__inner,
+/deep/.el-cascader .el-input .el-input__inner,
+/deep/.el-textarea__inner {
+  color: #8890b1;
+}
 </style>

src/views/contractManagement/salesContractExamine.vue

@@ -27,7 +27,37 @@
     <div class="state">
       <h2>销售合同</h2>
       <p>【编号：{{ deptBudgetList.contractNo }}】</p>
-      <span class="icon">&nbsp;&nbsp;{{ deptBudgetList.status }}</span>
+      <div class="icon">
+        &nbsp;&nbsp;{{ deptBudgetList.status }}
+        <!-- <template slot-scope="scope">
+          <el-popover
+            placement="left"
+            :width="285"
+            trigger="click"
+            visible-arrow="false"
+            @show="history(scope.row)"
+          >
+            <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="center">
       <ws-form
@@ -43,7 +73,7 @@
             <div class="unchanged">
               {{ deptBudgetList.contractNo }}
             </div>
-            <span class="unchangeable">*</span>
+            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
           <ws-form-item label="运输方式" span="1" prop="shippingType">
             <div class="unchanged">
@@ -54,7 +84,7 @@
             <div class="unchanged">
               {{ deptBudgetList.buyer }}
             </div>
-            <span class="unchangeable">*</span>
+            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
           <ws-form-item label="结算方式" span="1" prop="settlementMethod">
             <div class="unchanged">
@@ -65,7 +95,7 @@
             <div class="unchanged">
               {{ deptBudgetList.seller }}
             </div>
-            <span class="unchangeable">*</span>
+            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
           <ws-form-item label="交货方式" span="1" prop="deliverType">
             <div class="unchanged">
@@ -97,7 +127,7 @@
               {{ deptBudgetList.weight }}
             </div>
           </ws-form-item>
-         <ws-form-item
+          <ws-form-item
             label="交货日期（起）"
             span="1"
             prop="deliveryDateStart"
@@ -111,7 +141,7 @@
               {{ deptBudgetList.overShort }}
             </div>
           </ws-form-item>
-         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
+          <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
             <div class="unchanged">
               {{ deptBudgetList.deliveryDateEnd }}
             </div>
@@ -124,9 +154,9 @@
             <div class="unchanged">
               {{ deptBudgetList.unitContractPrice }}
             </div>
-            <span class="unchangeable">*</span>
+            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
-          
+
           <ws-form-item
             label="合同总价（元）"
             span="1"
@@ -136,33 +166,32 @@
               {{ deptBudgetList.totalContractPrice }}
             </div>
           </ws-form-item>
-          
-          <ws-form-item label="货源所在地区" span="1" >
-            <div class="unchanged">
-                {{deptBudgetList. sourceProvince}}
-                {{deptBudgetList. sourceCity}}
-                {{deptBudgetList. sourceArea}}
 
+          <ws-form-item label="货源所在地区" span="1">
+            <div class="unchanged">
+              {{ deptBudgetList.sourceProvince }}
+              {{ deptBudgetList.sourceCity }}
+              {{ deptBudgetList.sourceArea }}
             </div>
           </ws-form-item>
-          
-          <ws-form-item label="货源详细地址" span ="1" prop = "sourceGoods">
-            <div class = "unchanged">
-                {{deptBudgetList.sourceGoods}}
+
+          <ws-form-item label="货源详细地址" span="1" prop="sourceGoods">
+            <div class="unchanged">
+              {{ deptBudgetList.sourceGoods }}
             </div>
           </ws-form-item>
-          
-          <ws-form-item label="交货地所在地区" span="1" >
-              <div class="unchanged">
-                  {{deptBudgetList. deliveryProvince}}
-                  {{deptBudgetList.deliveryCity}}
-                  {{deptBudgetList.deliveryArea}}
-              </div>
+
+          <ws-form-item label="交货地所在地区" span="1">
+            <div class="unchanged">
+              {{ deptBudgetList.deliveryProvince }}
+              {{ deptBudgetList.deliveryCity }}
+              {{ deptBudgetList.deliveryArea }}
+            </div>
           </ws-form-item>
-          
+
           <ws-form-item label="交货地详细地址" span="1" prop="placeDelivery">
-            <div class = "unchanged">
-                {{deptBudgetList.placeDelivery}}
+            <div class="unchanged">
+              {{ deptBudgetList.placeDelivery }}
             </div>
           </ws-form-item>
           <ws-form-item label="签订日期" span="1" prop="signingDate">
@@ -170,10 +199,14 @@
               {{ deptBudgetList.signingDate }}
             </div>
           </ws-form-item>
-          
-          <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
+
+          <ws-form-item
+            label="最终实际交易量 (吨)"
+            span="1"
+            prop="finalTradingVolume"
+          >
             <div class="unchanged">
-              {{deptBudgetList.finalTradingVolume}}
+              {{ deptBudgetList.finalTradingVolume }}
             </div>
           </ws-form-item>
         </ws-info-table>
@@ -189,7 +222,7 @@
             <div class="unchanged">
               {{ deptBudgetList.contractGoodsInfo.goodsName }}
             </div>
-            <span class="unchangeable">*</span>
+            <!-- <span class="unchangeable">*</span> -->
           </ws-form-item>
           <ws-form-item label="水分（%）<=" span="1" prop="intendedShipId">
             <div class="unchanged">
@@ -291,13 +324,11 @@
         </ws-info-table>
         <div class="remark">
           <h3>备注信息</h3>
-          <div class=" beizhu">
-          {{ deptBudgetList.remarks }}
-        </div>
-
+          <div class="beizhu">
+            {{ deptBudgetList.remarks }}
+          </div>
         </div>
 
-        
         <img :src="deptBudgetList.addressUrl" alt="" />
 
         <!-- </base-card> -->
@@ -320,6 +351,7 @@ import {
   packList,
   xiala,
   examineList,
+  billoperatehis,
 } from '@/model/contarct/index'
 import { dayjs } from 'base-core-lib'
 import WsUpload from '@/components/WsUpload'
@@ -359,7 +391,7 @@ export default {
       },
       mainReportAdd: {},
       list: {},
-      
+      historyList: [],
     }
   },
 
@@ -376,10 +408,10 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          if(this.deptBudgetList.deliverType == 1){
-            this.deptBudgetList.deliverType1 = "我方自提"
-          }else if(this.deptBudgetList.deliverType == 2){
-            this.deptBudgetList.deliverType1 = "对方送货" 
+          if (this.deptBudgetList.deliverType == 1) {
+            this.deptBudgetList.deliverType1 = '我方送货'
+          } else if (this.deptBudgetList.deliverType == 2) {
+            this.deptBudgetList.deliverType1 = '对方自提'
           }
         })
       // 包装方式
@@ -434,8 +466,15 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    handleExamine() {},
-    approve() {},
+    history(row) {
+      console.log(row, '查看')
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+
     returnsales() {
       this.$router.push({ path: 'salesContract' })
     },
@@ -680,18 +719,18 @@ export default {
 }
 
 //*号
-.unchangeable {
-  position: absolute;
-  width: 9px;
-  height: 22px;
-  font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
-  color: #ff2727;
-  line-height: 22px;
-  display: inline-block;
-  right: 14px;
-}
+// .unchangeable {
+//   position: absolute;
+//   width: 9px;
+//   height: 22px;
+//   font-size: 16px;
+//   font-family: PingFangSC-Medium, PingFang SC;
+//   font-weight: 500;
+//   color: #ff2727;
+//   line-height: 22px;
+//   display: inline-block;
+//   right: 14px;
+// }
 /deep/.el-input,
 /deep/.el-date-editor {
   font-size: 13px;

src/views/taskManagement/moveWarehouseTask.vue

@@ -36,7 +36,7 @@
               vertical-align: text-top;
               position: relative;
               top: 0px;
-              left: -1px;
+              left: -5px;
             "
             src="../../../public/img/sousuo.png"
             alt=""
@@ -71,6 +71,27 @@
         <el-table-column prop="weightIn" label="入库量（吨）">
         </el-table-column>
         <el-table-column prop="stockReturnCount" label="退库量（吨）">
+           <template slot-scope="scope">
+              <el-popover
+                placement="top"
+                :width="160"
+                trigger="hover"
+                visible-arrow="false"
+             
+              >
+                <template>
+                  <span slot="reference">
+                     <!-- <span class="executory"> -->
+                      {{ scope.row.stockReturnCount }}
+                    <!-- </span>  -->
+                  </span>
+                </template>
+                <div v-for="(item,index) in scope.row.inOutWarehouseTaskList" :key="index">
+                  <span style="margin-left:6px;">{{ item.warehouseName }}</span>
+                  <span style="margin-left:20px;">{{ item.weight }}吨</span>
+                </div>
+              </el-popover>
+            </template>
         </el-table-column>
         <el-table-column prop="transportLoss" label="运输损耗（吨）">
            <template scope="scope">
@@ -135,9 +156,9 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="establishDate" label="发布时间">
+        <el-table-column prop="establishDate" label="发布时间" width="150">
         </el-table-column>
-        <el-table-column prop="seller" label="详情" width="200">
+        <el-table-column prop="seller" label="详情" >
           <template slot-scope="scope">
              <div
               class="record"

src/views/taskManagement/tranManagementTransport.vue

@@ -41,9 +41,9 @@
           />
         </ws-select>
         <span style="width: 142px; display: inline-block;color: #8890B1;">起点：</span>
-        <el-input label="起点" placeholder="请输入起点" clearable maxlength="200" type="input"></el-input>
+        <el-input label="起点" placeholder="请输入起点" clearable maxlength="200" type="input" v-model="start"></el-input>
         <span style="width: 142px; display: inline-block;color: #8890B1;">终点：</span>
-        <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input"></el-input>
+        <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input" v-model="end"></el-input>
         <el-input
           v-model="searchKeyWord"
           placeholder="可按合同编号或运输任务编号查找"
@@ -96,7 +96,8 @@
             }}{{ scope.row.startArea }}{{ scope.row.startDetailedAddress }}
           </template>
         </el-table-column>
-        <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转"></el-table-column>
+        <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转">
+        </el-table-column>
         <el-table-column prop="end" class="table_td" label="终点">
           <template slot-scope="scope">
             {{ scope.row.endPrivate }}{{ scope.row.endCity
@@ -245,6 +246,8 @@ export default {
         { value: '已完成', type: 2 },
         { value: '全部任务', type: 3 },
       ],
+      start:'',
+      end:'',
     }
   },
   activated() {
@@ -288,6 +291,8 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
+        start:this.start,
+        end:this.end,
         searchKeyWord: this.searchKeyWord,
         
       })

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -118,7 +118,7 @@
           label="始发地详细地址"
           span="1"
           prop="startDetailedAddress"
-          class="bg-right start-address"
+         
         >
           <el-input
             v-model="deptBudgetList.startDetailedAddress"
@@ -175,7 +175,7 @@
         <div class="check-box">
           <span class="check-box">运输方式</span>
           <el-checkbox-group v-model="checkList" prop="tranType">
-            <el-checkbox label="汽运"></el-checkbox>
+            <el-checkbox label="汽运" checked></el-checkbox>
             <el-checkbox label="火运"></el-checkbox>
             <el-checkbox label="船运"></el-checkbox>
           </el-checkbox-group>
@@ -416,7 +416,8 @@ export default {
       value1: '',
       unitList: [],
       name: '',
-      age: ''
+      age: '',
+      number:2,
     }
   },
   activated() {
@@ -485,6 +486,13 @@ export default {
     },
     engflagchange(e){
       this.endflag=e
+      if(this.endflag){
+        this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length - 1].selectedOptions1 = this.selectedOptions1
+        this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length - 1].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
+      }else{
+         this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length - 1].selectedOptions1 = []
+         this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length - 1].receiveDetailedAddress = ''
+      }
     },
     // 获取当前年月日
     getdate() {
@@ -571,7 +579,7 @@ export default {
     },
     add(index) {
       this.deptBudgetList.tranProcessInfoList.push({
-        processNo: this.deptBudgetList.taskNo+'-'+(index+2),
+        processNo: this.deptBudgetList.taskNo+'-'+(this.number),
         tranType: '汽运',
         tranTypeKey: '1',
         deliveryDateStart: '',
@@ -593,6 +601,7 @@ export default {
         receiverPhone: '',
         endFlag: '0'
       })
+      this.number++
     },
     del(index) {
       if (this.deptBudgetList.tranProcessInfoList.length > 1) {
@@ -692,6 +701,84 @@ 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;
@@ -708,56 +795,56 @@ export default {
               ).getTime()
             ) {
               this.$message({
-                message: '发货日期不能大于最晚到货日期',
+                message: '发货日期不能大于最晚到货日期！',
                 type: 'warning'
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
               this.$message({
-                message:'发货日期不能为空',
+                message:'发货日期不能为空！',
                 type:'warning'
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
               this.$message({
-                message:'最晚到货日期不能为空',
+                message:'最晚到货日期不能为空！',
                 type:'warning'
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
               this.$message({
-                message: '重量不能为空',
+                message: '重量不能为空！',
                 type: 'warning'
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
               this.$message({
-                message: '发货人不能为空',
+                message: '发货人不能为空！',
                 type: 'warning'
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
               this.$message({
-                message: '发货人电话不能为空',
+                message: '发货人电话不能为空！',
                 type: 'warning'
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
               this.$message({
-                message: '收货人不能为空',
+                message: '收货人不能为空！',
                 type: 'warning'
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
               this.$message({
-                message: '收货人电话不能为空',
+                message: '收货人电话不能为空！',
                 type: 'warning'
               })
               return
@@ -766,7 +853,7 @@ export default {
               !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress
             ) {
               this.$message({
-                message: '收获详细地址不能为空',
+                message: '收获详细地址不能为空！',
                 type: 'warning'
               })
               return
@@ -775,7 +862,7 @@ export default {
               !this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress
             ) {
               this.$message({
-                message: '发货详细地址不能为空',
+                message: '发货详细地址不能为空！',
                 type: 'warning'
               })
               return
@@ -785,10 +872,23 @@ export default {
 
           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]]
+          
           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,"添加对象")
+         
           addtrantask(this.deptBudgetList)
             .toPromise()
             .then(response => {

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -99,6 +99,7 @@
             v-model="deptBudgetList.sendWarehouse"
             placeholder="选择仓库"
             class="typeselect"
+            @change="sendWarehousechange"
           >
             <el-option
               v-for="item in warehouseList"
@@ -183,7 +184,7 @@
         <div class="check-box">
           <span class="check-box">运输方式</span>
           <el-checkbox-group v-model="checkList" prop="tranType">
-            <el-checkbox label="汽运"></el-checkbox>
+            <el-checkbox label="汽运" checked></el-checkbox>
             <el-checkbox label="火运"></el-checkbox>
             <el-checkbox label="船运"></el-checkbox>
           </el-checkbox-group>
@@ -419,10 +420,13 @@ export default {
       taskwayList: [],
       name: '',
       age: '',
+      weight: 0,
+      number:2,
     }
   },
   activated() {
     this.loaddata()
+    
     this.showType = this.isShow
   },
   computed: {
@@ -439,6 +443,29 @@ export default {
     },
   },
   methods: {
+    sendWarehousechange(e) {
+      for (let i = 0; i < this.warehouseList.length; i++) {
+        if (this.warehouseList[i].warehouseName == e) {
+          var tmp = []
+          tmp[0] = TextToCode[this.warehouseList[i].warehousePrivate].code
+          tmp[1] =
+            TextToCode[this.warehouseList[i].warehousePrivate][
+              this.warehouseList[i].warehouseCity
+            ].code
+          tmp[2] =
+            TextToCode[this.warehouseList[i].warehousePrivate][
+              this.warehouseList[i].warehouseCity
+            ][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
+        }
+      }
+    },
+
     warehouseTypechange() {
       getwarehousename({
         compId: this.compId,
@@ -454,11 +481,28 @@ export default {
     },
     engflagchange(e) {
       this.endflag = e
+      if (this.endflag) {
+        this.deptBudgetList.tranProcessInfoList[
+          this.deptBudgetList.tranProcessInfoList.length - 1
+        ].selectedOptions1 = this.selectedOptions1
+        this.deptBudgetList.tranProcessInfoList[
+          this.deptBudgetList.tranProcessInfoList.length - 1
+        ].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
+      } else {
+        this.deptBudgetList.tranProcessInfoList[
+          this.deptBudgetList.tranProcessInfoList.length - 1
+        ].selectedOptions1 = []
+        this.deptBudgetList.tranProcessInfoList[
+          this.deptBudgetList.tranProcessInfoList.length - 1
+        ].receiveDetailedAddress = ''
+      }
     },
     loaddata() {
       examinetran({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
+          this.deptBudgetList = response
+          this.number = response.tranProcessInfoList.length+1
           if (
             response.startPrivate != null &&
             response.startCity != null &&
@@ -525,9 +569,9 @@ export default {
                 ][response.tranProcessInfoList[i].receiveArea].code
               response.tranProcessInfoList[i].selectedOptions1 = tmp3
             }
+            this.weight = response.weight
           }
           this.checkList = response.tranType.split(',')
-          this.deptBudgetList = response
         })
       // 货名
       packList({ constId: 'CON2' })
@@ -591,11 +635,13 @@ export default {
     },
     add() {
       this.deptBudgetList.tranProcessInfoList.push({
+          processNo: this.deptBudgetList.taskNo+(this.number),
+        sort:0,
         tranType: '汽运',
         tranTypeKey: '1',
         deliveryDateStart: '',
         deliveryDateEnd: '',
-        weight: '13',
+        weight: this.weight,
         selectedOptions: [],
         selectedOptions1: [],
         sendPrivate: '',
@@ -611,6 +657,7 @@ export default {
         senderPhone: '',
         receiverPhone: '',
       })
+      this.number++
     },
     del(index) {
       if (this.deptBudgetList.tranProcessInfoList.length > 1) {
@@ -651,6 +698,84 @@ 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;
@@ -667,56 +792,56 @@ export default {
               ).getTime()
             ) {
               this.$message({
-                message: '发货日期不能大于最晚到货日期',
+                message: '发货日期不能大于最晚到货日期！',
                 type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
               this.$message({
-                message: '发货日期不能为空',
+                message: '发货日期不能为空！',
                 type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
               this.$message({
-                message: '最晚到货日期不能为空',
+                message: '最晚到货日期不能为空！',
                 type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
               this.$message({
-                message: '重量不能为空',
+                message: '重量不能为空！',
                 type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
               this.$message({
-                message: '发货人不能为空',
+                message: '发货人不能为空！',
                 type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
               this.$message({
-                message: '发货人电话不能为空',
+                message: '发货人电话不能为空！',
                 type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
               this.$message({
-                message: '收货人不能为空',
+                message: '收货人不能为空！',
                 type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
               this.$message({
-                message: '收货人电话不能为空',
+                message: '收货人电话不能为空！',
                 type: 'warning',
               })
               return
@@ -725,7 +850,7 @@ export default {
               !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress
             ) {
               this.$message({
-                message: '收获详细地址不能为空',
+                message: '收获详细地址不能为空！',
                 type: 'warning',
               })
               return
@@ -734,7 +859,7 @@ export default {
               !this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress
             ) {
               this.$message({
-                message: '发货详细地址不能为空',
+                message: '发货详细地址不能为空！',
                 type: 'warning',
               })
               return
@@ -742,6 +867,18 @@ export default {
           }
           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]]
+        //  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]]
+        //  }
           edittran(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -915,7 +1052,7 @@ export default {
   height: 73vh;
   overflow: scroll;
 }
-.el-cascader{
+.el-cascader {
   width: 100%;
 }
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -632,8 +632,7 @@ export default {
   margin-left: 766px;
 }
 .el-pagination {
-  margin-bottom: 20px;
-  margin-left: 40%;
+ text-align: center;
 }
 .winseaview-main {
   background: #e8ecf6;

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -463,6 +463,9 @@ export default {
         })
     },
     find() {
+      if(this.inOutDate != null){
+
+      
      if (this.inOutDate.length > 0) {
         this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
         this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
@@ -470,6 +473,7 @@ export default {
         this.startDate = ''
         this.endDate = ''
       }
+      }
       this.currentPage = 1
       this.getList()
     },

src/views/tranManagement/tranManagementShipping.vue

@@ -423,6 +423,9 @@ export default {
         })
     },
     find() {
+      if(this.inOutDate != null){
+
+ 
       if (this.inOutDate.length > 0) {
         this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
         this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
@@ -430,6 +433,7 @@ export default {
         this.startDate = ''
         this.endDate = ''
       }
+           }
       this.currentPage = 1
       this.getList()
     },

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -410,6 +410,9 @@ export default {
       }
     },
     find() {
+      if(this.inOutDate != null){
+
+      
      if (this.inOutDate.length > 0) {
         this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
         this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
@@ -417,6 +420,7 @@ export default {
         this.startDate = ''
         this.endDate = ''
       }
+      }
       this.currentPage = 1
       this.getList()
     }

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -45,8 +45,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
@@ -426,13 +424,15 @@ export default {
         })
     },
     find() {
-      if (this.inOutDate.length > 0) {
+      if(this.inOutDate != null){
+      if (this.inOutDate.length !=0) {
         this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
         this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
       } else {
         this.startDate = ''
         this.endDate = ''
       }
+      }
       this.currentPage = 1
       this.getList()
     },

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -815,7 +815,7 @@ export default {
   width: 20%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
+  width: 40%;
   border: 0px solid #d8dce6;
   background: #f5f7fa;
 }
@@ -874,4 +874,7 @@ export default {
   padding: 0 25px;
   background: #f6f7fc;
 }
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content{
+  padding: 0px;
+}
 </style>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -223,7 +223,7 @@
               </ws-form-item>
               <!--载重吨-->
               <ws-form-item
-                label="载重（吨）："
+                label="载重(吨):"
                 span="1"
                 prop="loadWeight"
                 class="siji zaizhong"
@@ -634,6 +634,7 @@ export default {
   border-radius: 4px;
   color: #8890b1;
   font-size: 14px;
+  padding: 0 25px;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
   width: 72px;
@@ -648,7 +649,7 @@ export default {
   height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 40%;
+  width: 50%;
   border: 0px solid #d8dce6;
   background: #f5f7fa;
   text-align: center;
@@ -661,6 +662,7 @@ export default {
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   border: none;
   background: #f5f7fa;
+  padding: 0px;
 }
 .catNos {
   width: 100%;

src/views/warehouse/warehouseManagementList.vue

@@ -74,9 +74,9 @@
         style="width: 100%; margin-top: 20px"
         height="780"
       >
-        <el-table-column prop="warehouseName" label="仓库名" width="80">
+        <el-table-column prop="warehouseName" label="仓库名" >
         </el-table-column>
-        <el-table-column prop="binNumber" label="仓位编号" width="80">
+        <el-table-column prop="binNumber" label="仓位编号" >
         </el-table-column>
         <el-table-column prop="capacity" label="容量（吨）">
           <template slot-scope="scope">
@@ -722,4 +722,5 @@ export default {
     font-weight: 700;
     margin-bottom: 20px;
 }
+
 </style>

src/views/warehouse/warehouseManagementLook.vue

@@ -89,7 +89,10 @@
           </ws-form-item>
         </ws-info-table>
 
-        <div v-for="item in deptBudgetList.warehousePositionInfoList">
+        <div
+          v-for="(item, index) in deptBudgetList.warehousePositionInfoList"
+          :key="index"
+        >
           <ws-info-table>
             <!--仓位编号-->
             <ws-form-item
@@ -231,6 +234,7 @@ export default {
       this.deptBudgetList = {}
     },
     warehouseTypechange() {
+      this.deptBudgetList = {}
       this.loaddata()
     },
     dateFormat(fmt, date) {
@@ -339,12 +343,23 @@ 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%;
 }
 .forlist {
   width: 16.67%;
 }
+/deep/.forlist .el-form-item__label {
+  width: 60% !important;
+}
+
 //文字基本信息
 .center h3 {
   margin-left: 42px;
@@ -385,10 +400,11 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
+  width: 30%;
+  text-align: center;
 }
 //多选框
 /deep/.el-input__inner {