Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

.env.test

@@ -1,20 +1,34 @@
-NODE_ENV = production
+#
+# 生产环境 环境变量
+#
 
+NODE_ENV = 'production'
 # base api
-VUE_APP_BASE_API = 'https://product-dev.winsea.com/pb/'
-## 明宇测试环境
-#VUE_APP_BASE_API = 'http://standard-dev.winsea.com/pb'
+VUE_APP_BASE_API = 'http://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
+## 任务消息
 VUE_APP_API_NOTICE= ''
+## 新闻
 VUE_APP_API_NEWS= 'news-se'
+## 证书
 VUE_APP_API_CERTIFICATE= 'certificate-se'
+## 云盘
 VUE_APP_API_CLOUDDISK= 'clouddisk-se'
+## 运营后台
 VUE_APP_API_OPERATION= 'operation-se'
+## 维修保养
 VUE_APP_API_MAINTAIN= 'maintain-se'
+## 备件/物料/采购
 VUE_APP_API_SUPPLY = 'purchase-se'
+## 服务商
 VUE_APP_API_SERVICER = 'servicer-se'
+## 船员
 VUE_APP_API_CREW = 'crew-se'
+## 财务
+VUE_APP_API_FINANCE = 'finance-se'
+
+## NEW 产品
 VUE_APP_API_ISM= 'ism-se'
+
 VUE_APP_API_HELP = 'help-se'
-VUE_APP_API_FINANCE = 'finance-se'

package.json

@@ -64,6 +64,7 @@
     "register-service-worker": "^1.0.0",
     "sass-loader": "^7.1.0",
     "script-loader": "^0.7.2",
+    "serialport": "^9.2.1",
     "sortablejs": "^1.8.4",
     "tinymce": "4.9.2",
     "url-loader": "^4.1.0",
@@ -99,6 +100,7 @@
     "cz-conventional-changelog": "^2.1.0",
     "electron": "^12.0.5",
     "electron-builder": "^22.10.5",
+    "electron-rebuild": "^3.2.3",
     "jquery": "^3.6.0",
     "lint-staged": "^10.2.13",
     "mockjs": "^1.0.1-beta3",

src/views/home/index.vue

@@ -7,7 +7,10 @@
         <!-- 任务、消息、提醒、超期 -->
         <Panel :data-list="panelList"
                @click="gotoNewRw"></Panel>
-               <img style='width:100%;margin-top:10px;' src="../../../public/img/tmt.gif" alt="">
+        <button @click="openPort">测试</button>
+        <button @click="closePort">关闭</button>
+        <div>{{text}}</div>
+               <!-- <img style='width:100%;margin-top:10px;' src="../../../public/img/tmt.gif" alt=""> -->
       </div>
     </div>
     <div id="mapXY"></div>
@@ -29,6 +32,7 @@
 </template>
 
 <script>
+// import serialport from 'serialport' 
 // 统计图start
 import maintenance from './components/maintenance'
 import shipCertificate from './components/shipCertificate'
@@ -110,7 +114,8 @@ export default {
         news: 0
       },
       vesselBankFlag: sessionStorage.getItem('ws-pf_vesselBankFlag'),
-      shezhiVal: ''
+      shezhiVal: '',
+      text:"数据"
     }
   },
   computed: {
@@ -525,6 +530,43 @@ export default {
       } else {
         this.$router.push({ name: 'workNotification', query: { types: data } })
       }
+    },
+    async openPort(){
+      if ("serial" in navigator) {
+      // The Web Serial API is supported.
+      console.log("the Web Serial API is supported.");
+      const port = await navigator.serial.requestPort();
+      await port.open({ baudRate: 9600 }); // set baud rate
+      const reader = port.readable.getReader();
+      // 监听来自串行设备的数据
+      while (true) {
+        const { value, done } = await reader.read();
+        console.log(value,done);
+        if (done) {
+          // 允许稍后关闭串口。
+          reader.releaseLock();
+          break;
+        }
+        var result="";
+        if(value.length < 5){
+          debugger
+        }
+        for(var i=0;i<value.length;i++){
+          result += String.fromCharCode(value[i])
+        }
+        this.text = result
+        // value 是一个 Uint8Array
+      }
+     
+    }
+    },
+    async closePort(){
+      
+      const port = await navigator.serial.requestPort();
+      await port.open({ baudRate: 9600 }); // set baud rate
+      const reader = port.readable.getReader();
+      reader.cancel()
+      port.close();
     }
   }
 }

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -191,6 +191,16 @@
             <!--装车日期-->
             <el-form-item label="装车日期:" span="1" prop="loadingDate">
               <ws-date-picker
+                 v-if="item.status == '已装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.loadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+              <ws-date-picker
+                v-else
                 v-model="item.loadingDate"
                 type="date"
                 style="width: 150px"
@@ -200,7 +210,11 @@
             </el-form-item>
 
             <!-- 提交 -->
-            <span class="servicein" v-show="item.status == '已装车' || item.status == '已送达'">已装车</span>
+            <span
+              class="servicein"
+              v-show="item.status == '已装车' || item.status == '已送达'"
+              >已装车</span
+            >
             <span
               style="text-align: right; padding: 10px"
               class="center"
@@ -263,16 +277,15 @@
         class="bg-bottom"
         type="primary"
         size="small"
-        @click="submit(deptBudgetList)"
+        @click="finished(deptBudgetList)"
         >完货</el-button
       >
     </div>
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback, getbank } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
+import { regionData } from 'element-china-area-data'
+import { seeCat, feedback, state } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -419,6 +432,38 @@ export default {
     revert() {
       this.$router.push({ path: 'tranManagementTransporHairRespond' })
     },
+    //完货
+    finished() {
+      this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              state(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('完货成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementTransporHairRespond',
+                  })
+                })
+            } else {
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+    },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
         if (this.freightspace[i].temporaryDriverFlag != 0) {
@@ -466,6 +511,7 @@ export default {
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
               this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
               this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
               this.tranCarInfoList.loadNetWeight =
                 this.deptBudgetList.loadNetWeight
               this.tranCarInfoList.tranType = this.tranType
@@ -516,8 +562,7 @@ export default {
           this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.deptBudgetList.sendDateStart =
-            response.tranCarInfoList[0].sendDateStart
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -141,7 +141,7 @@
             <!--卸车净重-->
             <ws-form-item label="卸车净重：" span="1" prop="unloadNetWeight">
               <ws-input
-                v-if="item.status == '已卸车' || item.status == '已送达'"
+                v-if="item.status == '未装车' || item.status == '已送达'"
                 :disabled="readonly"
                 v-model="item.unloadNetWeight"
                 placeholder="请输入卸车净重"
@@ -195,6 +195,16 @@
             <!--卸车日期-->
             <el-form-item label="卸车日期:" span="1" prop="unloadingDate">
               <ws-date-picker
+                v-if="item.status == '未装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.unloadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+             <ws-date-picker
+                v-else
                 v-model="item.unloadingDate"
                 type="date"
                 style="width: 150px"
@@ -273,16 +283,15 @@
         class="bg-bottom"
         type="primary"
         size="small"
-        @click="submit(deptBudgetList)"
+        @click="finished(deptBudgetList)"
         >完货</el-button
       >
     </div>
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback, getbank } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
+import { regionData } from 'element-china-area-data'
+import { seeCat, feedback, stateRec } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -426,6 +435,38 @@ export default {
         this.freightspace.splice(index, 1)
       }
     },
+    //完货
+    finished() {
+      this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              stateRec(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('完货成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementReceivingFeedback',
+                  })
+                })
+            } else {
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+    },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
         if (this.freightspace[i].temporaryDriverFlag != 0) {
@@ -470,7 +511,9 @@ export default {
               // this.deptBudgetList.totalStorage = this.totalStorage
               this.tranCarInfoList = this.freightspace
               this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.unloadingDate = this.deptBudgetList.unloadingDate
+              this.tranCarInfoList.unloadingDate =
+                this.deptBudgetList.unloadingDate
+              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
               this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
               this.tranCarInfoList.carNo = this.deptBudgetList.carNo
@@ -527,8 +570,7 @@ export default {
           this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.deptBudgetList.sendDateStart =
-            response.tranCarInfoList[0].sendDateStart
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -313,6 +313,18 @@
                 ></ws-input>
               </ws-form-item>
             </div>
+            <span
+              v-if="(item.status == '未装车'&& item.shipType == '散船') || item.status == null" 
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index, item)"
+              src="../../../public/img/del.png"
+              alt=""
+              >×</span>
+          </div>
+          <div style="text-align: right; color: #8890b1; font-size: 16px; margin-right: -40%" v-show="deptBudgetList.tranCarInfoList[0].shipType == '散船'">
+            共{{ total }}/{{ deptBudgetList.weight }}         
           </div>
           <el-button
             class="add bg-bottom"
@@ -340,7 +352,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { shippingLook, packList, dispatchCat } from '@/model/transport/index'
+import { shippingLook, packList, dispatchCat ,delhaulagestage} from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -450,6 +462,17 @@ export default {
       }
       return maxStorage
     },
+    total: function () {
+      if (this.deptBudgetList.tranCarInfoList.length > 0) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].positionWeight
+          )
+        }
+        return maxStorage
+      }
+    },
   },
   methods: {
     getList() {
@@ -542,9 +565,26 @@ export default {
       this.freightspace = []
       this.$router.go(-1)
     },
-    del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
+    del(index, row) {
+      if(row.status == null){
+        if (this.deptBudgetList.tranCarInfoList.length > 1) {
+                  this.deptBudgetList.tranCarInfoList.splice(index, 1)
+               }
+      }else{
+        this.$confirm('船次信息删除后不可恢复，是否确定删除？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          delhaulagestage({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$message.success('删除成功')
+              if (this.deptBudgetList.tranCarInfoList.length > 1) {
+                  this.deptBudgetList.tranCarInfoList.splice(index, 1)
+               }
+            })
+        })
       }
     },
     add() {
@@ -1297,4 +1337,17 @@ export default {
 /deep/.el-form-item__content .el-select {
   width: 42%;
 }
+//减号
+.del {
+  position: absolute;
+  // right: -38px;
+  top: 0px;
+  cursor: pointer;
+  right: -1%;
+  display: inline-block;
+  font-size: 20px;
+  width: 20px;
+  height: 10px;
+  line-height: 0px;
+}
 </style>

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -377,6 +377,7 @@ export default {
     return {
       deptBudgetList: {
         totalStorage: 0,
+        sendDateStart:''
       },
       tranCarInfoList: {
         loadPoundImg: '',
@@ -639,14 +640,7 @@ export default {
             if (valid) {
               // this.deptBudgetList.totalStorage = this.totalStorage
               this.tranCarInfoList = this.freightspace
-              this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.sendDateStart = this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.receiveDateEnd
-              this.tranCarInfoList.shipName = this.deptBudgetList.shipName  
-              this.tranCarInfoList.shipNo = this.shipNo
-              this.tranCarInfoList.shipType = this.deptBudgetList.shipType
-              this.tranCarInfoList.boxNumber = this.deptBudgetList.boxNumber
+              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
               // this.tranCarInfoList.boxNo = this.arr.toString()
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
@@ -689,8 +683,7 @@ export default {
           this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.deptBudgetList.sendDateStart =
-            response.tranCarInfoList[0].sendDateStart
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -44,7 +44,8 @@
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
-          }}{{ deptBudgetList.sendArea }}{{ deptBudgetList.sendDetailedAddress }}
+          }}{{ deptBudgetList.sendArea
+          }}{{ deptBudgetList.sendDetailedAddress }}
         </ws-form-item>
         <!--发货人-->
         <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
@@ -62,7 +63,8 @@
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
-          }}{{ deptBudgetList.receiveArea }}{{ deptBudgetList.receiveDetailedAddress }}
+          }}{{ deptBudgetList.receiveArea
+          }}{{ deptBudgetList.receiveDetailedAddress }}
         </ws-form-item>
         <!--收货人-->
         <ws-form-item label="收货人" span="1" prop="receiver">
@@ -153,19 +155,29 @@
               />
             </el-select>
           </ws-form-item>
-          <ws-form-item
-              :label="'车厢号' "
-              span="1"
-              prop="boxNo"
-            >
-              <ws-input
-                v-model="item.boxNo"
-                placeholder="请输入车厢号"
-                maxlength="20"
-                size="small"
-              />
-            </ws-form-item>
+          <ws-form-item :label="'车厢号'" span="1" prop="boxNo">
+            <ws-input
+              v-model="item.boxNo"
+              placeholder="请输入车厢号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <!--   -->
         </ws-info-table>
+        <!-- class="del" -->
+        <span
+          v-if="
+            item.status == '未装车' || item.status == '' || item.status == null
+          "
+          width="22"
+          height="22"
+          class="del"
+          @click="del(index, item)"
+          src="../../../public/img/del.png"
+          alt=""
+          >×</span
+        >
       </div>
       <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img width="22" height="22" src="../../../public/img/add.png" alt="" />
@@ -174,11 +186,7 @@
     </ws-form>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="submit()"
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
         >提交</el-button
       >
     </div>
@@ -186,7 +194,12 @@
 </template>
 <script>
 import { regionData } from 'element-china-area-data'
-import { seeCat, dispatchCat, packList } from '@/model/transport/index'
+import {
+  seeCat,
+  dispatchCat,
+  packList,
+  delhaulagestage,
+} from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -296,18 +309,35 @@ export default {
     // },
     add() {
       this.deptBudgetList.tranCarInfoList.push({
-        driver:this.deptBudgetList.tranCarInfoList[0].driver,
-        driverPhone:this.deptBudgetList.tranCarInfoList[0].driverPhone,
-        sendDateStart:this.deptBudgetList.tranCarInfoList[0].sendDateStart,
-        receiveDateEnd:this.deptBudgetList.tranCarInfoList[0].receiveDateEnd,
-        carModel:this.deptBudgetList.tranCarInfoList[0].carModel,
+        driver: this.deptBudgetList.tranCarInfoList[0].driver,
+        driverPhone: this.deptBudgetList.tranCarInfoList[0].driverPhone,
+        sendDateStart: this.deptBudgetList.tranCarInfoList[0].sendDateStart,
+        receiveDateEnd: this.deptBudgetList.tranCarInfoList[0].receiveDateEnd,
+        carModel: this.deptBudgetList.tranCarInfoList[0].carModel,
         boxNo: '',
-        tranType: '2'
+        tranType: '2',
       })
     },
-    del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
+    del(index, row) {
+      if (row.status == '未装车') {
+        this.$confirm('派车信息删除后不可恢复，是否确定删除？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          delhaulagestage({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$message.success('删除成功')
+              if (this.deptBudgetList.tranCarInfoList.length > 1) {
+                this.deptBudgetList.tranCarInfoList.splice(index, 1)
+              }
+            })
+        })
+      } else {
+        if (this.deptBudgetList.tranCarInfoList.length > 1) {
+          this.deptBudgetList.tranCarInfoList.splice(index, 1)
+        }
       }
     },
     //下拉司机姓名改变事件
@@ -374,7 +404,7 @@ export default {
             type: 'warning',
           })
           return
-        } 
+        }
         if (!this.deptBudgetList.tranCarInfoList[i].boxNo) {
           this.$message({
             message: '车厢号不能为空',
@@ -420,7 +450,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          if (response.tranCarInfoList.length == 0) 
+          if (response.tranCarInfoList.length == 0)
             this.deptBudgetList.tranCarInfoList = [
               {
                 driver: '',
@@ -429,7 +459,7 @@ export default {
                 receiveDateEnd: '',
                 carModel: '',
                 boxNo: '',
-                tranType :'2'
+                tranType: '2',
               },
             ]
         })
@@ -510,20 +540,6 @@ export default {
 .position {
   position: relative;
 }
-
-.del {
-  position: absolute;
-  // right: -38px;
-  top: 9px;
-  cursor: pointer;
-  right: 0;
-  display: inline-block;
-  font-size: 20px;
-  width: 16px;
-  height: 10px;
-  line-height: 0px;
-}
-
 .amap-page-container {
   width: 300px;
   height: 300px;
@@ -636,7 +652,14 @@ export default {
 .bg-bottom {
   margin: 15px 0px;
 }
-
+.el-input--small {
+  font-size: 13px;
+}
+.el-input {
+  position: relative;
+  display: inline-block;
+  width: 86%;
+}
 .center {
   width: 90%;
   margin: 0 auto;
@@ -709,6 +732,13 @@ export default {
     padding: 0 !important;
   }
 }
+//减号
+.del {
+  position: absolute;
+  cursor: pointer;
+  margin-left: 224px;
+  margin-top: -52px;
+}
 .winseaview-view {
   padding: 0 0 20px;
 }
@@ -821,7 +851,7 @@ export default {
   padding: 0 25px;
   background: #f6f7fc;
 }
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__content{
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   padding: 0px;
 }
 </style>

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -602,8 +602,7 @@ export default {
               this.tranCarInfoList = this.freightspace
               this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.sendDateStart =
-                this.deptBudgetList.sendDateStart
+              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
               this.tranCarInfoList.receiveDateEnd =
                 this.deptBudgetList.receiveDateEnd
               this.tranCarInfoList.shipName = this.deptBudgetList.shipName
@@ -653,8 +652,7 @@ export default {
           this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.deptBudgetList.sendDateStart =
-            response.tranCarInfoList[0].sendDateStart
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -488,6 +488,11 @@ export default {
       this.$router.go(-1)
     },
     del(index, row) {
+      if(row.status == null){
+        if (this.deptBudgetList.tranCarInfoList.length > 1) {
+                  this.deptBudgetList.tranCarInfoList.splice(index, 1)
+               }
+      }else{
       this.$confirm('派车信息删除后不可恢复，是否确定删除？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -502,6 +507,7 @@ export default {
                }
             })
         })
+      }
     },
     add() {
       if(!this.deptBudgetList.tranPrice){