前端

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -37,7 +37,7 @@
             disabled
           ></el-input>
         </el-form-item>
-        <el-form-item prop="taskType" label="任务类型" span="1">
+        <el-form-item style="width: 18%" prop="taskType" label="任务类型" span="1">
           <el-select
             v-model="deptBudgetList.taskType"
             placeholder="请输入任务类型"
@@ -51,8 +51,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="contractNo" label="合同编号/移库任务编号" span="1">
+        <el-form-item prop="contractNo" label="合同编号/移库任务编号" span="1" class='contractNoselect'>
           <el-select
+          
             v-model="deptBudgetList.contractNo"
             placeholder="请选择编号"
             @change=" (val) => {
@@ -67,7 +68,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="goodsName" label="货名" span="1">
+        <el-form-item style="width: 18%" prop="goodsName" label="货名" span="1">
             <el-input
             disabled
             v-model="deptBudgetList.goodsName"
@@ -75,7 +76,7 @@
             size="small"
           ></el-input>
         </el-form-item>
-        <el-form-item label="重量（吨）" span="1" prop="weight">
+        <el-form-item style="width: 18%" label="重量（吨）" span="1" prop="weight">
           <el-input
             @input="weightchange"
             v-model="deptBudgetList.weight"
@@ -86,7 +87,7 @@
         </el-form-item>
       </ws-info-table>
       <ws-info-table class="el-table">
-        <div class="start-address" style="width: 36%">
+        <div class="start-address" style="width: 37.5%;display: flex;justify-content: space-between;">
           <el-radio-group
             @change="warehouseTypechange"
             v-model="deptBudgetList.warehouseType"
@@ -108,7 +109,7 @@
             ></el-option>
           </el-select>
         </div>
-        <el-form-item label="始发地" span="1" class="start-address">
+        <el-form-item style="width: 30.333%;margin-left:7px;" label="始发地" span="1" class="start-address">
           <el-cascader
             :options="options_"
             v-model="selectedOptions"
@@ -122,7 +123,7 @@
           label="始发地详细地址"
           span="1"
           prop="startDetailedAddress"
-          style="width: 31.333%"
+          style="width: 30.633%"
         >
           <el-input
             v-model="deptBudgetList.startDetailedAddress"
@@ -136,7 +137,7 @@
           span="1"
           prop="contractNo"
           class="start-address"
-          style="width: 36%"
+          style="width: 37.9%"
         >
           <el-select
             @change="sendWarehousechange1"
@@ -158,6 +159,7 @@
           span="1"
           prop="contractNo"
           class="start-address"
+          style="width: 30.333%"
         >
           <el-cascader
             :options="options_"
@@ -169,6 +171,7 @@
           />
         </el-form-item>
         <el-form-item
+        style="width: 31.633%"
           label="终到地详细地址"
           span="1"
           prop="endDetailedAddress"
@@ -1020,6 +1023,15 @@ export default {
           })
           return
         }
+        if (
+          !this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress.length>20||this.deptBudgetList.tranProcessInfoList[i].receiveDetailedAddress.length<2
+        ) {
+          this.$message({
+            message: '收获详细地址输入错误！',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress) {
           this.$message({
             message: '发货详细地址不能为空！',
@@ -1027,6 +1039,13 @@ export default {
           })
           return
         }
+        if (!this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress.length>20||this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress.length<2) {
+          this.$message({
+            message: '发货详细地址输入错误！',
+            type: 'warning',
+          })
+          return
+        }
       }
       // if (this.deptBudgetList.endFlag=='1') {
         this.$confirm(`运输任务提交成功后将派发到物流部门，是否确定提交？`, {
@@ -1399,4 +1418,7 @@ export default {
   height: 73vh;
   overflow: scroll;
 }
+.ws-info-table .contractNoselect{
+  width:25%;
+}
 </style>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -100,8 +100,14 @@
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
         </el-table-column>
         <el-table-column class="table_td" label="发货" prop="send" width="300">
+          <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+          </template>
         </el-table-column>
         <el-table-column class="table_td" label="收货" prop="receive" width="300">
+          <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+          </template>
         </el-table-column>
         <el-table-column
           class="table_td"

src/views/tranManagement/tranManagementShipping.vue

@@ -77,8 +77,14 @@
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
         </el-table-column>
         <el-table-column class="table_td" label="发货" prop="send" width="300">
+           <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+          </template>
         </el-table-column>
         <el-table-column class="table_td" label="收货" prop="receive" width="300">
+          <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+          </template>
         </el-table-column>
         <el-table-column class="table_td" label="运输周期" prop="tranCycle"  width="160">
           <template scope="scope">
@@ -257,6 +263,10 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          // for (let i = 0; i < response.records.length; i++) {
+          //   response.records[i].send=response.records[i].send.replace(/\n/g, '<br>')
+          //   response.records[i].receive=response.records[i].receive.replace(/\n/g, '<br>')
+          // }
           this.warehouseList = response
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -97,8 +97,16 @@
         <el-table-column prop="tranType" label="运输方式"> </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="send" label="发货" width="300"> </el-table-column>
-        <el-table-column prop="receive" label="收货" width="300"> </el-table-column>
+        <el-table-column prop="send" label="发货" width="300"> 
+          <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="receive" label="收货" width="300"> 
+          <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+          </template>
+        </el-table-column>
         <el-table-column prop="tranCycle" label="运输周期" width="160">
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -78,8 +78,16 @@
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="send" label="发货" width="300"> </el-table-column>
-        <el-table-column prop="receive" label="收货" width="300"> </el-table-column>
+        <el-table-column prop="send" label="发货" width="300">
+          <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+          </template>
+          </el-table-column>
+        <el-table-column prop="receive" label="收货" width="300"> 
+          <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+          </template>
+        </el-table-column>
         <el-table-column prop="tranCycle" label="运输周期"  width="160">
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}

src/views/tranManagement/tranManagementVehicle.vue

@@ -79,8 +79,16 @@
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="send" label="发货" width="300"> </el-table-column>
-        <el-table-column prop="receive" label="收货" width="300"> </el-table-column>
+        <el-table-column prop="send" label="发货" width="300"> 
+          <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="receive" label="收货" width="300"> 
+          <template scope="scope">
+             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+          </template>
+        </el-table-column>
         <el-table-column class="table_td" label="运输周期"  width="160">
           <template slot-scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}