前端孟祥旭

src/views/taskManagement/tranManagementTransport.vue

@@ -157,6 +157,14 @@
           </template>
         </el-table-column>
       </el-table>
+      <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>
   </div>
 </template>
@@ -197,6 +205,7 @@ export default {
       gainList: [],
       currentPage: 1,
       primary: 1,
+      deptBudgetTotal:0,
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
@@ -259,11 +268,16 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord
+        searchKeyWord: this.searchKeyWord,
+        
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
+          console.log(response)
           this.gainList = response
+          this.currentPage = response.current
+          this.pageSize = response.size
+          this.deptBudgetTotal = response.total
         })
     },
     handlestatus(status) {
@@ -578,4 +592,11 @@ export default {
     border-color: #5878e8;
     margin-left: 6px;
 }
+.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
@@ -51,11 +43,7 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="contractNo" label="合同编号" span="1">
-          <el-select
-            v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            class="typeselect"
-          >
+          <el-select v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" class="typeselect">
             <el-option
               v-for="item in contractNoList"
               :key="item.constKey"
@@ -80,27 +68,14 @@
           </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 v-model="deptBudgetList.weight" placeholder="请输入重量" 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-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-option
               v-for="item in warehouseList"
               :key="item.constKey"
@@ -154,12 +129,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 +169,14 @@
         :key="index"
       >
         <div class="driver">
-          <span >运输阶段{{ index + 1 }} {{ item.processNo }}</span>
+          <span>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
           <img
             width="22"
             height="22"
             class="add"
             @click="add"
             src="../../../public/img/add.png"
-            alt=""
+            alt
           />
           <img
             width="22"
@@ -214,21 +184,22 @@
             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>
+          <span
+            style="margin-left : 20px;font-size : 14px"
+            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
+          >最终阶段</span>
           <el-checkbox
             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
-          >        
+          ></el-checkbox>
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
@@ -267,16 +238,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>
@@ -304,20 +267,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>
@@ -345,12 +298,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
@@ -365,13 +313,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>
@@ -385,7 +327,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    mapDrag,
+    mapDrag
   },
   watch: {
     vesselId(val) {
@@ -393,7 +335,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     let self = this
@@ -427,9 +369,9 @@ export default {
             receiver: '',
             senderPhone: '',
             receiverPhone: '',
-            endFlag: '0',
-          },
-        ],
+            endFlag: '0'
+          }
+        ]
       },
       radio: '1',
       options_: regionData,
@@ -453,7 +395,7 @@ export default {
       value1: '',
       unitList: [],
       name: '',
-      age: '',
+      age: ''
     }
   },
   activated() {
@@ -461,14 +403,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 == '贸易服务出库' ||
@@ -478,7 +420,7 @@ export default {
       } else {
         return false
       }
-    },
+    }
   },
   methods: {
     // 获取当前年月日
@@ -503,7 +445,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
@@ -515,35 +457,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,
+        compId: this.compId
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.contractNoList = response
         })
     },
@@ -576,7 +518,7 @@ export default {
         receiver: '',
         senderPhone: '',
         receiverPhone: '',
-        endFlag: '0',
+        endFlag: '0'
       })
     },
     del(index) {
@@ -625,8 +567,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
         }
       }
     },
@@ -639,13 +582,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;
@@ -654,12 +597,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: '',
@@ -688,8 +721,11 @@ export default {
                     receiver: '',
                     senderPhone: '',
                     receiverPhone: '',
-                  },
-                ],
+                    contractNo:'',
+                    receiveWarehouse:''
+                   
+                  }
+                ]
               }
               this.$router.push({ path: 'tranManagementTransport' })
             })
@@ -701,8 +737,8 @@ export default {
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
-    },
-  },
+    }
+  }
 }
 </script>
 
@@ -738,15 +774,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%;
@@ -805,7 +840,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

@@ -91,12 +91,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"
         ></el-table-column>
-        <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
         <el-table-column
           prop="warehouseName"
           class="table_td"

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"
@@ -1355,7 +1355,7 @@ export default {
   display: inline-block;
 }
 .center1 .small-title {
-  margin-left: 150px;
+  margin-left: 323px;
 }
 .center1 {
   width: 90%;
@@ -1399,7 +1399,7 @@ export default {
   margin-left: -32px;
 }
  .el-radio-group {
-    margin-left: 80px;
+    margin-left: 251px;
 }
 .ding{
   height: 23px;
@@ -1417,4 +1417,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

@@ -138,7 +138,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>

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

@@ -72,13 +72,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>
@@ -138,7 +138,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column class="table_td" label="接单日期" prop="receivingDate">
+      <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

@@ -57,7 +57,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>
@@ -131,7 +131,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="接单日期" prop="receivingDate">
+        <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

@@ -69,13 +69,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>
@@ -139,7 +139,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" 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

@@ -81,15 +81,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>
@@ -153,7 +153,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" 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

@@ -12,7 +12,7 @@
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 60px;color: #8890B1;">接单时间</span>
         </div>
         <el-date-picker
           v-model="inOutDate"

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/warehouseManagementPerfectDelivery.vue

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

vue.config.js

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