前端gjy

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -299,6 +299,7 @@ export default {
             if (this.moveLookData[i].inOutType == '移库出库') {
               this.weightOut = this.moveLookData[i].weight
               this.retreat = this.moveLookData[i].stockReturnCount
+                 this.businessDescribe = this.moveLookData[i].businessDescribe
             } else {
               this.weightIn = this.moveLookData[i].weight
             }
@@ -309,7 +310,6 @@ export default {
             this.waterContent = this.moveLookData[0].waterContent
             this.weight = this.moveLookData[0].weight
             this.unitPrice = this.moveLookData[0].unitPrice
-            this.businessDescribe = this.moveLookData[0].businessDescribe
           }
         })
     },

src/views/taskManagement/tranManagementTransport.vue

@@ -177,17 +177,14 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block">
-            <el-pagination
+      <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
-      >
-      </el-pagination>
-        </div>
+      ></el-pagination>
     </div>
   </div>
 </template>
@@ -226,6 +223,7 @@ export default {
       gainList: [],
       currentPage: 1,
       primary: 1,
+      deptBudgetTotal:0,
       pageSize: 10,
       deptBudgetTotal:0,
       searchType: 1,
@@ -294,14 +292,16 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        start:this.start,
-        end:this.end,
-        searchKeyWord: this.searchKeyWord
+        searchKeyWord: this.searchKeyWord,
+        
       })
         .toPromise()
-        .then(response => {
-          this.deptBudgetTotal=response.total
+        .then((response) => {
+          console.log(response)
           this.gainList = response
+          this.currentPage = response.current
+          this.pageSize = response.size
+          this.deptBudgetTotal = response.total
         })
     },
     handlestatus(status) {
@@ -485,10 +485,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
 .vertical-text-left {
   width: 62px;
   text-align: right;
@@ -515,17 +511,6 @@ export default {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-// .completed.el-button--default {
-//   border-color: #5878e8;
-//   background-color: #f6f7fc;
-//   color: #5878e8;
-// }
-// .putstorage.el-button--default,
-// .deliverystorage.el-button--default {
-//   border-color: #8890b1;
-//   background-color: #fff;
-//   color: #8890b1;
-// }
 /deep/.el-table tr td:first-child,
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
@@ -547,9 +532,6 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-/deep/.base_header_layout .grid-content {
-  margin-bottom: 60px;
-}
 /deep/.el-table td,
 /deep/.el-table th.is-leaf {
   border-right: 1px solid #E9ECF7;
@@ -620,12 +602,11 @@ export default {
     border-color: #5878e8;
     margin-left: 6px;
 }
-.el-select{
-  width: 30%;
-    margin-right: 10px;
-}
-
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+.el-pagination {
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-left: 353px;
 }
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

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

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -68,7 +68,7 @@
       <el-table
         class="wenzi"
         :data="gainList.records"
-        style="width: 100%; margin-top: 20px"
+        style="width: 100%;"
         height="780"
       >
         <el-table-column type="index" label="序号">
@@ -77,18 +77,12 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
+         <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
         <el-table-column
           prop="contractNo"
           label="合同编号"
           width="80"
-        >
-         <template scope="scope">
-             <span v-if="scope.row.taskTypeKey!=3">{{ scope.row.contractNo }}</span>
-            <span v-else>{{ scope.row.moveTaskNo }}</span>
-            </template>
-        </el-table-column>
-        <el-table-column prop="inOutTaskNo" label="任务编号">
-        </el-table-column>
+        ></el-table-column>
         <el-table-column
           prop="warehouseName"
           class="table_td"
@@ -564,10 +558,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
 .vertical-text-left {
   width: 62px;
   text-align: right;
@@ -630,7 +620,6 @@ export default {
 .el-row {
   height: 50px;
 }
-
 .findValue {
   width: 0%;
   margin-left: 25%;
@@ -650,26 +639,6 @@ export default {
   background: #e8ecf6;
   box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-// .nav {
-//   background: white;
-//   height: 60px;
-//   margin-top: -20px;
-// }
-.navv {
-  background: #ffffff;
-  border-radius: 4px;
-  margin-top: -8px;
-}
-// .nav2{
-//   width: auto;
-//   height: 5px;
-//   background-color: #e8eaf1;
-// }
-.nav2 {
-  height: 25px;
-  background: #e8ecf6;
-  margin-top: 15px;
-}
 .spans {
   display: table-caption;
   width: 17px;

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -33,7 +33,7 @@
       <div class="ding"></div>
        <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
           <img
-            style="position: relative; top: 40px; left: 128px;" 
+            style="position: relative; top: 40px; left: 300px;" 
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
@@ -1379,7 +1379,7 @@ export default {
   display: inline-block;
 }
 .center1 .small-title {
-  margin-left: 150px;
+  margin-left: 323px;
 }
 .center1 {
   width: 90%;
@@ -1423,7 +1423,7 @@ export default {
   margin-left: -32px;
 }
  .el-radio-group {
-    margin-left: 80px;
+    margin-left: 251px;
 }
 .ding{
   height: 23px;
@@ -1441,4 +1441,15 @@ export default {
     font-size: 0;
     margin-top: 20px;
 }
+/deep/.el-form {
+    padding: 0 15%;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -ms-flex-wrap: wrap;
+    flex-wrap: wrap;
+    margin-left: 130px;
+    margin-top: 15px;
+    width: 110%;
+}
 </style>

src/views/tranManagement/tranManagementDriver.vue

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

src/views/tranManagement/tranManagementDriverEdit.vue

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

src/views/tranManagement/tranManagementDriverLook.vue

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

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -28,7 +28,7 @@
           />
         </ws-select>
        <div>
-          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 70px;color: #8890B1;">接单日期：</span>
         </div>
         <el-date-picker
           v-model="inOutDate"
@@ -88,13 +88,13 @@
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
          
         </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send" width="240">
+        <el-table-column class="table_td" label="发货" prop="send" width="">
           
         </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive" width="240">
+        <el-table-column class="table_td" label="收货" prop="receive" width="">
           
         </el-table-column>
-        <el-table-column class="table_td" label="运输周期" prop="tranCycle">
+        <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
          <template scope="scope">
                {{scope.row.deliveryDateStart}} ~ {{scope.row.deliveryDateEnd}}
              </template>
@@ -154,7 +154,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column class="table_td" label="接单日期" prop="createDate">
+      <el-table-column class="table_td" label="接单时间" prop="receivingDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
             <template slot-scope="scope">

src/views/tranManagement/tranManagementShipping.vue

@@ -23,8 +23,8 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px; color: #8890b1"
-            >接单日期</span
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
           >
         </div>
         <el-date-picker
@@ -70,7 +70,7 @@
       >
         <el-table-column type="index" label="序号" width="80">
         </el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务编号">
+        <el-table-column class="table_td" prop="processNo" label="运输任务编号" width="120">
         </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
         </el-table-column>
@@ -144,7 +144,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="接单日期" prop="createDate">
+        <el-table-column class="table_td" label="接单时间" prop="receivingDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -28,8 +28,8 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px; color: #8890b1"
-            >接单日期</span
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
           >
         </div>
         <el-date-picker
@@ -85,13 +85,13 @@
         </el-table-column>
         <el-table-column prop="goodsName" label="货名" >
         </el-table-column>
-        <el-table-column prop="weight" label="重量（吨）" width="120">
+        <el-table-column prop="weight" label="重量（吨）" >
         </el-table-column>
-        <el-table-column prop="send" label="发货" width="240">
+        <el-table-column prop="send" label="发货" >
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="240">
+        <el-table-column prop="receive" label="收货" >
         </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期" width="160">
+        <el-table-column prop="tranCycle" label="运输周期" width="160" >
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
@@ -155,7 +155,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" class="table_td" label="接单日期">
+        <el-table-column prop="receivingDate" class="table_td" label="接单时间">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template  slot-scope="scope">

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -23,8 +23,8 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px; color: #8890b1"
-            >接单日期</span
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
           >
         </div>
         <el-date-picker
@@ -77,15 +77,15 @@
         </el-table-column>
         <el-table-column prop="processNo" label="运输任务编号" width="120">
         </el-table-column>
-        <el-table-column prop="goodsName" label="货名" width="80">
+        <el-table-column prop="goodsName" label="货名" >
         </el-table-column>
-        <el-table-column prop="weight" label="重量（吨）" width="120">
+        <el-table-column prop="weight" label="重量（吨）">
         </el-table-column>
-        <el-table-column prop="send" label="发货" width="200">
+        <el-table-column prop="send" label="发货">
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="200">
+        <el-table-column prop="receive" label="收货">
         </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期" width="160">
+        <el-table-column prop="tranCycle" label="运输周期" >
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
@@ -149,7 +149,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" class="table_td" label="接单日期">
+        <el-table-column prop="receivingDate" class="table_td" label="接单时间">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">

src/views/tranManagement/tranManagementVehicle.vue

@@ -29,7 +29,7 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 70px;color: #8890B1;">接单日期：</span>
         </div>
         <el-date-picker
           v-model="inOutDate"

src/views/tranManagement/tranManagementVehicleDispatching.vue

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

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -6,37 +6,27 @@
         <h2 class="bg-left title">查看派车详情</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="revert()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </el-row>
 
     <ws-form ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
-        <div class="small-title" style="font-size: 16px;">任务详情</div>
+      <div class="small-title" style="font-size: 16px;">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
-        <ws-form-item label="任务编号" span="1" prop="processNo">
-          {{ deptBudgetList.processNo }}
-        </ws-form-item>
+        <ws-form-item label="任务编号" span="1" prop="processNo">{{ deptBudgetList.processNo }}</ws-form-item>
         <!--货名-->
-        <ws-form-item label="货名" span="1" prop="goodsName">
-          {{ deptBudgetList.goodsName }}
-        </ws-form-item>
+        <ws-form-item label="货名" span="1" prop="goodsName">{{ deptBudgetList.goodsName }}</ws-form-item>
         <!--重量（吨）-->
-        <ws-form-item label="重量（吨）" span="1" prop="weight">
-          {{ deptBudgetList.weight }}
-        </ws-form-item>
+        <ws-form-item label="重量（吨）" span="1" prop="weight">{{ deptBudgetList.weight }}</ws-form-item>
 
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
@@ -45,9 +35,12 @@
         </ws-form-item>
 
         <!--发货人-->
-        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
-          {{ deptBudgetList.sender }}
-        </ws-form-item>
+        <ws-form-item
+          label="发货人"
+          span="1"
+          prop="sender"
+          class="readonly"
+        >{{ deptBudgetList.sender }}</ws-form-item>
 
         <!--发货人电话-->
         <ws-form-item
@@ -55,90 +48,71 @@
           span="1"
           prop="senderPhone"
           class="readonly"
-        >
-          {{ deptBudgetList.senderPhone }}
-        </ws-form-item>
+        >{{ deptBudgetList.senderPhone }}</ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
         <!--收货人-->
-        <ws-form-item label="收货人" span="1" prop="receiver">
-          {{ deptBudgetList.receiver }}
-        </ws-form-item>
+        <ws-form-item label="收货人" span="1" prop="receiver">{{ deptBudgetList.receiver }}</ws-form-item>
         <!--收货人电话-->
-        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-          {{ deptBudgetList.receiverPhone }}
-        </ws-form-item>
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{ deptBudgetList.receiverPhone }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-          {{ deptBudgetList.deliveryDateStart }}
-        </ws-form-item>
+        <ws-form-item
+          label="发货日期"
+          span="1"
+          prop="deliveryDateStart"
+        >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
         <!--最晚到货日期-->
-        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          {{ deptBudgetList.deliveryDateEnd }}
-        </ws-form-item>
+        <ws-form-item
+          label="最晚到货日期"
+          span="1"
+          prop="deliveryDateEnd"
+        >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
-        </ws-form-item>
+        <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
       </ws-info-table>
-        <div class="small-title" style="font-size: 16px;">派车</div>
+      <div class="small-title" style="font-size: 16px;">派车</div>
       <div
         style="width: 100%"
         class="driver"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
-        :key='index'
+        :key="index"
       >
         <ws-info-table>
           <div class="catNos">
             司机-{{ index + 1 }}
-            <span class="noservice" v-show="item.status == '未送达'">{{
+            <span class="noservice" v-show="item.status == '未送达'">
+              {{
               item.status
-            }}</span>
-            <span class="service" v-show="item.status == '已送达'">{{
+              }}
+            </span>
+            <span class="service" v-show="item.status == '已送达'">
+              {{
               item.status
-            }}</span>
+              }}
+            </span>
           </div>
           <!--姓名-->
-          <ws-form-item label="姓名" span="1" prop="driver">
-            {{ item.driver }}
-          </ws-form-item>
-           <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item class="phone" label="电话" span="1" prop="driverPhone">
-            {{ item.driverPhone }}
-          </ws-form-item>
-           <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="车牌号" span="1" prop="carNo">
-            {{ item.carNo }}
-          </ws-form-item>
-            <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">
-            {{ item.loadNetWeight }}
-          </ws-form-item>
-            <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="卸车（吨）" span="1" prop="unloadNetWeight">
-            {{ item.unloadNetWeight }}
-          </ws-form-item>
-            <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="损耗（吨）" span="1" prop="loss">
-            {{ item.loss }}
-          </ws-form-item>
-            <el-divider direction="vertical" class="line"></el-divider>
-          <ws-form-item label="合同" span="1" prop="unloadNetWeight" class="hetong">
-          </ws-form-item>
+          <ws-form-item label="姓名" span="1" prop="driver">{{ item.driver }}</ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <ws-form-item class="phone" label="电话" span="1" prop="driverPhone">{{ item.driverPhone }}</ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <ws-form-item label="车牌号" span="1" prop="carNo">{{ item.carNo }}</ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">{{ item.loadNetWeight }}</ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <ws-form-item label="卸车（吨）" span="1" prop="unloadNetWeight">{{ item.unloadNetWeight }}</ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <ws-form-item label="损耗（吨）" span="1" prop="loss">{{ item.loss }}</ws-form-item>
+          <el-divider direction="vertical" class="line"></el-divider>
+          <ws-form-item label="合同" span="1" prop="unloadNetWeight" class="hetong"></ws-form-item>
         </ws-info-table>
       </div>
     </ws-form>
     <div style="text-align: right; padding: 10px">
-      <el-button
-        class="bg-bottom-up"
-        type="primary"
-        size="small"
-        @click="revert()"
-        >关闭</el-button
-      >
+      <el-button class="bg-bottom-up" type="primary" size="small" @click="revert()">关闭</el-button>
     </div>
   </div>
 </template>
@@ -152,7 +126,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     // vesselId(val) {
@@ -160,7 +134,7 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -199,9 +173,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -209,20 +183,20 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+        month: dayjs().format('MM')
       },
       contractList: [],
       deptBudgetList: {
-        warehouseInOutDetail: {},
+        warehouseInOutDetail: {}
       },
       historyList: [],
 
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   activated() {
@@ -241,7 +215,7 @@ export default {
     getList() {
       seeCat({ id: this.$route.query.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           for (var i = 0; i < response.tranCarInfoList.length; i++) {
             if (
               response.tranCarInfoList[i].loadNetWeight &&
@@ -263,7 +237,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id }
       })
     },
 
@@ -281,8 +255,8 @@ export default {
     // deletecontract(){},
     //删除
     approve() {},
-    listQuery() {},
-  },
+    listQuery() {}
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -409,7 +383,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
-    color: #8890B1;
+  color: #8890b1;
   font-size: 14px;
 }
 .driver {
@@ -427,7 +401,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background: #fff;
-  color: #8890B1;
+  color: #8890b1;
   font-size: 14px;
 }
 /deep/.driver .ws-info-table .el-form-item {
@@ -455,7 +429,7 @@ export default {
   font-size: 14px;
   color: #8890b1;
 }
-/deep/.hetong .ws-info-table .el-form-item .el-form-item__content{
+/deep/.hetong .ws-info-table .el-form-item .el-form-item__content {
   border: none;
 }
 //送达/未送达
@@ -475,12 +449,12 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
-/deep/.driver.ws-info-table .el-form-item .el-form-item__content{
-  border:none
+/deep/.driver.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
 }
-.line{
- height: 26px;
- margin-top: 6px;
-left: -36px;
+.line {
+  height: 26px;
+  margin-top: 6px;
+  left: -14px;
 }
 </style>

src/views/warehouse/warehouseManagementNoComplete.vue

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

src/views/warehouse/warehouseManagementPerfectDelivery.vue

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

src/views/warehouse/warehouseManagementPerfectput.vue

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

src/views/warehouse/warehouseManagementPut.vue

@@ -189,9 +189,10 @@
             v-show="checked == true && this.deptBudgetList.createType == 2"
           >
             <!-- 出库类型 -->
-            <ws-form-item label="出库类型" span="1">
+            <ws-form-item label="出库类型" span="1" prop="temporaryOutType">
+               <!-- v-model="deptBudgetList.deliveryType" -->
               <ws-select
-                v-model="deptBudgetList.deliveryType"
+                v-model="deptBudgetList.temporaryOutType"
                 placeholder=""
                 class="typeselect"
               >
@@ -425,6 +426,7 @@ export default {
     this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
     this.deptBudgetList.createType = this.$route.query.createType
+ 
     this.getList()
     this.deptBudgetList.goodsName = '玉米'
     this.deptBudgetList.goodsNameKey = '1'
@@ -588,14 +590,6 @@ export default {
         })
         return
       }
-
-      // if (this.deptBudgetList.netWeight > this.$route.query.capacity) {
-      //   this.$message({
-      //     message: '入库量大于该仓库容量！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
       //自检员
       if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
         if (
@@ -1269,22 +1263,6 @@ export default {
         query: { id: row.id },
       })
     },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    // handleCloe() {
-    //   this.dialogViewSpareMoney = false
-    // },
-    // history(row) {
-    //   billoperatehis({ id: row.id })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.historyList = response
-    //     })
-    // },
-    // deletecontract(){},
-    //删除
-    approve() {},
-    listQuery() {},
   },
 }
 </script>

vue.config.js

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