更新

src/api/V2/taskspost/index.js

@@ -44,3 +44,5 @@ export const API_POST_OUT_MOVESTATES = '/inOutWarehouseTask/api/editStatus'
 export const API_POST_DEL_HAULAGE_STAGE= '/tranProcessInfo/api/deleteTranProcess'
 // 审核记录
 export const API_GET_TASKHISTORIES= '/workflowHistory/query/taskHistories'
+// 获取发货人
+export const API_GET_STAFF = '/staff/query/getStaffListByCompId'

src/api/V2/transport/index.js

@@ -46,4 +46,8 @@ export const API_POST_AUTOMOBILE_FEEDBACK = '/tranProcessInfo/api/insertTranCar'
 //更改反馈状态
 export const API_POST_AUTOMOBILE_STATE = '/tranProcessInfo/api/editFeedbackStatus'
 //状态
-export const API_POST_AUTOMOBILE_ALSOSTATE = '/tranProcessInfo/editStatus'
+export const API_POST_AUTOMOBILE_ALSOSTATE = '/tranProcessInfo/editStatus'
+//运输价格
+export const API_POST_AUTOMOBILE_TRANPRICE = '/tranProcessInfo/api/setUpTranPrice'
+// 删除运输车辆
+export const API_POST_DEL_HAULAGE_STAGE= '/tranCarInfo/api/deleteTranCar'

src/model/tasksport/index.js

@@ -23,6 +23,7 @@ import {
     API_POST_OUT_STATES,
     API_POST_OUT_MOVESTATES,
     API_POST_DEL_HAULAGE_STAGE,
+    API_GET_STAFF,
     API_GET_TASKHISTORIES
 } from '@/api/V2/taskspost'
 //运输任务列表
@@ -68,4 +69,6 @@ export const movestates = appRx.post(API_POST_OUT_MOVESTATES, errorCatcher, erro
 //删除运输阶段
 export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)
 //删除运输阶段
-export const gettaskhistories = appRx.get(API_GET_TASKHISTORIES, errorCatcher, errorHandle, filter)
+export const gettaskhistories = appRx.get(API_GET_TASKHISTORIES, errorCatcher, errorHandle, filter)
+//获取发货人
+export const getstaff = appRx.get(API_GET_STAFF, errorCatcher, errorHandle, filter)

src/model/transport/index.js

@@ -26,6 +26,8 @@ import {
     API_GET_AUTOMOBILE_NAME,
     API_POST_AUTOMOBILE_FEEDBACK,
     API_POST_AUTOMOBILE_STATE,
+    API_POST_AUTOMOBILE_TRANPRICE,
+    API_POST_DEL_HAULAGE_STAGE, 
     API_POST_AUTOMOBILE_ALSOSTATE
 
 } from '@/api/V2/transport'
@@ -77,4 +79,7 @@ export const feedback = appRx.post(API_POST_AUTOMOBILE_FEEDBACK, errorCatcher, e
 export const state = appRx.post(API_POST_AUTOMOBILE_STATE, errorCatcher, errorHandle, filter)
 //状态
 export const alsostate = appRx.post(API_POST_AUTOMOBILE_ALSOSTATE, errorCatcher, errorHandle, filter)
-
+//设置运输价格
+export const setUpTranPrice = appRx.post(API_POST_AUTOMOBILE_TRANPRICE, errorCatcher, errorHandle, filter)
+//删除车辆
+export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)

src/views/financialManagement/collectionManagementList.vue

@@ -774,6 +774,7 @@ export default {
             } else {
               response.records[i].addressUrlArray = []
             }
+            response.records[i].collectionNotPayable=response.records[i].collectionIngPayable-response.records[i].collectionEdPayable
           }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -305,13 +305,23 @@
               size="small"
             ></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-form-item label="发货人" span="1" prop="sender">
+            <el-select
+            v-model="item.sender"
+            placeholder="请选择发货人"
+            filterable
+            :filter-method="dataFilter"
+            @change=" (val) => {
+                  selectstaff(val, index)
+                }"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+          </el-select>
           </el-form-item>
           <el-form-item label="发货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -319,6 +329,7 @@
               placeholder="请输入发货人电话"
               maxlength="20"
               size="small"
+              disabled
             ></el-input>
           </el-form-item>
         </ws-info-table>
@@ -347,12 +358,22 @@
             ></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-select
+            v-model="item.receiver"
+            placeholder="请选择收货人"
+            filterable
+            :filter-method="dataFilter"
+            @change="(val) => {
+                  selectstaff1(val, index)
+                }"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+          </el-select>
           </el-form-item>
           <el-form-item label="收货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -360,6 +381,7 @@
               placeholder="请输入收货人电话"
               maxlength="20"
               size="small"
+              disabled
             ></el-input>
           </el-form-item>
         </ws-info-table>
@@ -380,7 +402,7 @@
 <script>
 import { packList } from '@/model/contarct/index'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { addtrantask, getwarehousename, xialaNo } from '@/model/tasksport/index'
+import { addtrantask, getwarehousename, xialaNo,getstaff} from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -440,6 +462,7 @@ export default {
       options_: regionData,
       heightData: '600px',
       zoom: 7,
+      options: [],
       endflag: false,
       selectedOptions: [],
       selectedOptions1: [],
@@ -510,6 +533,36 @@ export default {
         }
       }
     },
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        console.log(val)
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        this.options = this.staffList
+      }
+    },
+    selectstaff(val, index) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == val) {
+            this.deptBudgetList.tranProcessInfoList[index].senderPhone = this.staffList[i].staffMobilePhone
+        }
+      }
+    },
+    selectstaff1(val, index) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == val) {
+            this.deptBudgetList.tranProcessInfoList[index].receiverPhone = this.staffList[i].staffMobilePhone
+        }
+      }
+    },
     sendWarehousechange1(e) {
       for (let i = 0; i < this.warehouseList1.length; i++) {
         if (this.warehouseList1[i].warehouseName == e) {
@@ -631,6 +684,14 @@ export default {
         .then((response) => {
           this.warehouseList1 = response
         })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          // this.agent = response
+          this.options = response
+          this.staffList = response
+          this.sender = response
+        })
       xialaNo({
         compId: this.compId,
       })

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -301,12 +301,22 @@
             ></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-select
+            v-model="item.sender"
+            placeholder="请选择发货人"
+            filterable
+            :filter-method="dataFilter"
+            @change="(val) => {
+                  selectstaff(val, index)
+                }"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+          </el-select>
           </el-form-item>
           <el-form-item label="发货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -342,12 +352,22 @@
             ></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-select
+            v-model="item.receiver"
+            placeholder="请选择收货人"
+            filterable
+            :filter-method="dataFilter"
+            @change="(val) => {
+                  selectstaff1(val, index)
+                }"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+          </el-select>
           </el-form-item>
           <el-form-item label="收货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -381,6 +401,7 @@ import {
   xialaNo,
   examinetran,
   delhaulagestage,
+  getstaff
 } from '@/model/tasksport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -417,6 +438,7 @@ export default {
       warehouseList: [],
       warehouseList1:[],
       goodnameList: [],
+      options: [],
       taskType: [],
       size: 10,
       unitList: [],
@@ -511,6 +533,36 @@ export default {
     weightchange(e) {
       this.deptBudgetList.tranProcessInfoList[0].weight = e
     },
+    selectstaff(val, index) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == val) {
+           this.deptBudgetList.tranProcessInfoList[index].senderPhone = this.staffList[i].staffMobilePhone
+        }
+      }
+    },
+    selectstaff1(val, index) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == val) {
+            this.deptBudgetList.tranProcessInfoList[index].receiverPhone = this.staffList[i].staffMobilePhone
+        }
+      }
+    },
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        console.log(val)
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        this.options = this.staffList
+      }
+    },
     engflagchange(e,index) {
       this.endflag = e
       if (this.endflag) {
@@ -628,6 +680,14 @@ export default {
         .then((response) => {
           this.taskwayList = response
         })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          // this.agent = response
+          this.options = response
+          this.staffList = response
+          this.sender = response
+        })
       getwarehousename({
         compId: this.compId,
         warehouseType: this.deptBudgetList.warehouseType,

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -166,6 +166,14 @@
                   >未上传</span>
                 </template>
               </ws-form-item>
+               <!--箱号-->
+            <ws-form-item label="箱号:" span="1" prop="caseNo">
+             <span>{{ item.caseNo }}</span>
+            </ws-form-item>
+              <!--封号-->
+            <ws-form-item label="封号:" span="1" prop="titleNo">
+             <span>{{ item.titleNo }}</span>
+            </ws-form-item>
             </ws-info-table>
           </div>
           <div

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -164,7 +164,14 @@
                 </div> -->
               </template>
             </ws-form-item>
-           
+            <!--箱号-->
+            <ws-form-item label="箱号:" span="1" prop="caseNo">
+             <span>{{ item.caseNo }}</span>
+            </ws-form-item>
+              <!--封号-->
+            <ws-form-item label="封号:" span="1" prop="titleNo">
+             <span>{{ item.titleNo }}</span>
+            </ws-form-item>
           </ws-info-table>
         </div>
       </div>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -212,6 +212,14 @@
                 </div>
               </template>
             </ws-form-item>
+              <!--箱号-->
+            <ws-form-item label="箱号:" span="1" prop="caseNo">
+             <span>{{ item.caseNo }}</span>
+            </ws-form-item>
+              <!--封号-->
+            <ws-form-item label="封号:" span="1" prop="titleNo">
+             <span>{{ item.titleNo }}</span>
+            </ws-form-item>
 
             <span
               v-show="item.temporaryDriverFlag != 0"

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -176,6 +176,14 @@
                 </div>
               </template>
             </ws-form-item>
+             <!--箱号-->
+            <ws-form-item label="箱号:" span="1" prop="caseNo">
+             <span>{{ item.caseNo }}</span>
+            </ws-form-item>
+              <!--封号-->
+            <ws-form-item label="封号:" span="1" prop="titleNo">
+             <span>{{ item.titleNo }}</span>
+            </ws-form-item>
           </ws-info-table>
         </div>
       </div>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -99,7 +99,52 @@
           </ws-info-table>
 
           <div class="small-title" style="font-size: 16px">派车</div>
-
+          <div class="myTest">
+              <!--当前运输单价-->
+            <ws-form-item label="当前运输单价(元/吨):" span="1" prop="tranPrice">
+                <ws-input
+                  v-model="deptBudgetList.tranPrice"
+                  maxlength="70"
+                  :disabled="readonly"
+                  size="small"
+                  style="width:70px"
+                />
+            </ws-form-item>
+            <!--审核中的运输单价-->
+            <ws-form-item label="审核中的运输单价(元/吨):" span="1" prop="tranPriceIng">
+              <ws-input
+                  v-if="deptBudgetList.priceStatus=='审核中'"
+                  :disabled="readonly"
+                  v-model="deptBudgetList.tranPriceIng"
+                  maxlength="70"
+                  size="small"
+                  style="width:70px"
+                />
+                 <ws-input
+                  v-else
+                  v-model="deptBudgetList.tranPriceIng"
+                  maxlength="70"
+                  size="small"
+                  style="width:70px"
+                />
+            </ws-form-item>
+            <ws-form-item>
+             <el-button
+              v-if="deptBudgetList.priceStatus=='审核中'"
+              type="primary"
+              size="small"
+              @click="examine()"
+              >审核中</el-button
+            >
+             <el-button
+              v-else
+              type="primary"
+              size="small"
+              @click="priceSubmit()"
+              >提交</el-button
+            >
+            </ws-form-item>
+          </div>
           <div
             class="driver position liaison"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
@@ -108,10 +153,13 @@
             <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 == '已装车'">{{
                   item.status
                 }}</span>
-                <span class="service" v-show="item.status == '已送达'">{{
+                 <span class="serviced" v-show="item.status == '已送达'">{{
                   item.status
                 }}</span>
               </div>
@@ -191,6 +239,66 @@
                   size="small"
                 />
               </ws-form-item>
+             <!--派车编号-->
+              <ws-form-item
+                label="派车编号："
+                span="1"
+                prop="carModel"
+                class="siji"
+                style="width:245px"
+              >
+                <ws-input
+                  :disabled="readonly"
+                  v-model="item.tranCarNo"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--箱号-->
+              <ws-form-item
+                label="箱号："
+                span="1"
+                prop="carModel"
+                class="siji"
+              >
+                <ws-input
+                  v-if="item.status == '未装车'" 
+                  v-model="item.caseNo"
+                  placeholder="请输入箱号"
+                  maxlength="120"
+                  size="small"
+                />
+                <ws-input
+                  v-else
+                  :disabled="readonly"
+                  v-model="item.caseNo"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
+              <!--封号-->
+              <ws-form-item
+                label="封号："
+                span="1"
+                prop="carModel"
+                class="siji"
+              >
+                <ws-input
+                  v-model="item.titleNo"
+                  placeholder="请输入封号"
+                   v-if="item.status == '未装车'" 
+                  maxlength="120"
+                  size="small"
+                />
+                <ws-input
+                  v-model="item.titleNo"
+                  placeholder="请输入封号"
+                   v-else
+                    :disabled="readonly"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
               <!--车型-->
               <ws-form-item
                 label="车型："
@@ -236,13 +344,28 @@
                   size="small"
                 />
               </ws-form-item>
+               <!--运输单价-->
+              <ws-form-item
+                label="运输单价(元/吨):"
+                span="1"
+                prop="carModel"
+                class="siji"
+                style="width:250px"
+              >
+                <ws-input
+                  :disabled="readonly"
+                  v-model="item.tranPrice"
+                  maxlength="120"
+                  size="small"
+                />
+              </ws-form-item>
             </ws-info-table>
             <span
-              v-show="!item.temporaryDriverFlag"
+              v-if="item.status == '未装车'||item.temporaryDriverFlag!=0" 
               width="22"
               height="22"
               class="del"
-              @click="del(index)"
+              @click="del(index, item)"
               src="../../../public/img/del.png"
               alt=""
               >×</span
@@ -282,6 +405,8 @@ import {
   nameXiala,
   arrange,
   dispatchCat,
+  delhaulagestage,
+  setUpTranPrice
 } from '@/model/transport/index'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
@@ -361,24 +486,110 @@ export default {
     revert() {
       this.$router.go(-1)
     },
-    del(index) {
-      if (this.deptBudgetList.tranCarInfoList.length > 1) {
-        this.deptBudgetList.tranCarInfoList.splice(index, 1)
-      }
+    del(index, row) {
+      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() {
-      this.deptBudgetList.tranCarInfoList.push({
-        driverName: '',
-        driverPhone: '',
-        carLength: 0,
-        carLengthKey: '',
-        loadWeight: null,
-        carModel: '',
-        carModelKey: '',
-        carNumber: '',
-        disabled: false,
-        tranType: '1',
+      if(!this.deptBudgetList.tranPrice){
+        this.$message({
+          message: '请设置运输单价！',
+          type: 'warning',
+        })
+      }
+      else{
+            var tmp1='C00'
+            if(this.deptBudgetList.tranCarInfoList.length<10){
+                this.deptBudgetList.tranCarInfoList.push({
+                driverName: '',
+                driverPhone: '',
+                carLength: 0,
+                carLengthKey: '',
+                loadWeight: null,
+                carModel: '',
+                carModelKey: '',
+                carNumber: '',
+                disabled: false,
+                tranType: '1',
+                tranCarNo: tmp1+(this.deptBudgetList.tranCarInfoList.length+1),
+                tranPrice:this.deptBudgetList.tranPrice
+              })
+          }
+         else if(this.deptBudgetList.tranCarInfoList.length>=10){
+                tmp1='C0'
+                this.deptBudgetList.tranCarInfoList.push({
+                driverName: '',
+                driverPhone: '',
+                carLength: 0,
+                carLengthKey: '',
+                loadWeight: null,
+                carModel: '',
+                carModelKey: '',
+                carNumber: '',
+                disabled: false,
+                tranType: '1',
+                tranCarNo: tmp1+(this.deptBudgetList.tranCarInfoList.length+1),
+                tranPrice:this.deptBudgetList.tranPrice
+              })
+          }
+      }
+    },
+    //审核
+    examine(){
+      this.$prompt('运输单价审核', {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+        }).then(({ value }) => {
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.flag = "2"
+              tranProcessInfo.tranPriceIng = value
+              setUpTranPrice(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('审核成功')
+                  this.getList()
+                });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消审核'
+          });       
+        });
+    },
+    priceSubmit(){
+      this.$confirm(`运输单价将发送给决策人审核，确定提交？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
       })
+        .then(() => {
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.flag = "1"
+              tranProcessInfo.tranPriceIng = this.deptBudgetList.tranPriceIng
+              setUpTranPrice(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('提交成功')
+                  this.getList()
+                })              
+        })
+        .catch(() => {
+          return false
+        })
     },
     //提交按钮
     submit() {
@@ -459,6 +670,7 @@ export default {
                 carNumber: '',
                 disabled: false,
                 tranType: '1',
+                tranCarNo: tmp1+(this.deptBudgetList.tranCarInfoList.length+1),
               },
             ]
           }
@@ -537,6 +749,11 @@ export default {
   .ws-info-table {
     border: none;
   }
+  .myTest{
+    width: 800px;
+    display: flex;
+    height: 40px;
+  }
   .el-form-item {
     width: 33.3333%;
     border: none;
@@ -701,6 +918,15 @@ export default {
   background: #e5f1f7;
   color: #50cad4;
 }
+.serviced {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #2c81cf;
+}
 //添加司机
 .add {
   width: 100px;

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -84,6 +84,18 @@
         }}</ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">派车</div>
+       <div class="myTest">
+            <!--当前运输单价-->
+          <ws-form-item label="当前运输单价(元/吨):" span="1" prop="tranPrice">
+              <ws-input
+                v-model="deptBudgetList.tranPrice"
+                maxlength="70"
+                :disabled="readonly"
+                size="small"
+                style="width:70px"
+              />
+          </ws-form-item>
+       </div>
       <div
         style="width: 100%"
         class="driver"
@@ -93,12 +105,15 @@
         <ws-info-table>
           <div class="catNos">
             司机-{{ index + 1 }}
-            <span class="noservice" v-show="item.status == '未送达'">
-              {{ item.status }}
-            </span>
-            <span class="service" v-show="item.status == '已送达'">
-              {{ item.status }}
-            </span>
+             <span class="noservice" v-show="item.status == '未装车'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已装车'">{{
+                  item.status
+                }}</span>
+                 <span class="serviced" v-show="item.status == '已送达'">{{
+                  item.status
+                }}</span>
           </div>
           <!--姓名-->
           <ws-form-item label="姓名:" span="1" prop="driver">{{
@@ -111,7 +126,76 @@
             prop="driverPhone"
             >{{ item.driverPhone }}</ws-form-item
           >
-          <ws-form-item label="车牌号:" span="1" prop="carNo">
+          <!--车牌号-->
+              <ws-form-item label="车牌号：" span="1" prop="carNo" class="siji">
+                {{ item.carNo }}
+              </ws-form-item>
+             <!--派车编号-->
+              <ws-form-item
+                label="派车编号："
+                span="1"
+                prop="carModel"
+                class="siji"
+                style="width:245px"
+              >
+               {{ item.tranCarNo }}
+              </ws-form-item>
+              <!--箱号-->
+              <ws-form-item
+                label="箱号："
+                span="1"
+                prop="caseNo"
+                class="siji"
+              >
+                {{ item.caseNo }}
+              </ws-form-item>
+              <!--封号-->
+              <ws-form-item
+                label="封号："
+                span="1"
+                prop="carModel"
+                class="siji"
+              >
+                {{ item.titleNo }}
+              </ws-form-item>
+              <!--车型-->
+              <ws-form-item
+                label="车型："
+                span="1"
+                prop="carModel"
+                class="siji"
+              >
+               {{ item.carModel }}
+              </ws-form-item>
+              <!--车长-->
+              <ws-form-item
+                label="车长："
+                span="1"
+                prop="carLength"
+                class="siji"
+              >
+               {{ item.carLength }}
+              </ws-form-item>
+              <!--载重吨-->
+              <ws-form-item
+                label="载重(吨):"
+                span="1"
+                prop="loadWeight"
+                class="siji zaizhong"
+              >
+                {{ item.loadWeight }}
+              </ws-form-item>
+               <!--运输单价-->
+              <ws-form-item
+                label="运输单价(元/吨):"
+                span="1"
+                prop="carModel"
+                class="siji"
+                style="width:245px"
+              >
+               {{ item.tranPrice }}
+              </ws-form-item>
+          <!-- <ws-form-item label="车牌号:" span="1" prop="carNo">
             <template slot-scope="scope">
               <el-popover
                 placement="top"
@@ -154,7 +238,7 @@
             span="1"
             prop="unloadNetWeight"
             class="hetong"
-          ></ws-form-item>
+          ></ws-form-item> -->
         </ws-info-table>
       </div>
     </ws-form>
@@ -357,6 +441,11 @@ export default {
   padding: 10px;
   font-weight: 600;
 }
+  .myTest{
+    width: 800px;
+    display: flex;
+    height: 40px;
+  }
 .small-title::before {
   position: absolute;
   content: '';
@@ -444,6 +533,15 @@ export default {
   padding: 2px;
   font-size: 12px;
 }
+.serviced {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+  background: #e5f1f7;
+  color: #2c81cf;
+}
 .noservice {
   background: #c4cada;
   color: #ffffff;