提交陆运

src/api/landTransportation/index.js

@@ -139,3 +139,11 @@ export function motorcadeDriver(name) {
         method: 'get'
     })
 }
+//保存车队司机
+export function fleetDriverSave(data) {
+    return request({
+        url: '/api/blade-land/order-item/submit',
+        method: 'post',
+        data:data
+    })
+}

src/views/basicData/landTransportation/driverInformation/index.vue

@@ -42,6 +42,9 @@
       <template slot-scope="scope" slot="fleetIdSearch">
         <crop-select v-model="form.fleetId"/>
       </template>
+      <template slot-scope="scope" slot="fleetId">
+        <span>{{scope.row.fleetName}}</span>
+      </template>
       <template slot-scope="{type,size}" slot="menu">
         <el-button icon="el-icon-check" :size="size" :type="type">创建用户</el-button>
       </template>
@@ -294,10 +297,14 @@ export default {
     },
     //点击行编辑时查看
     beforeOpen(done,type){
-      detailDelegationList(this.form.id).then(res=>{
-        this.form = res.data.data
+      if (this.form.id){
+        detailDelegationList(this.form.id).then(res=>{
+          this.form = res.data.data
+          done()
+        })
+      }else {
         done()
-      })
+      }
     },
     //修改
     rowUpdate(row,index,done,loading){

src/views/basicData/landTransportation/vehicleInformation/index.vue

@@ -2,86 +2,92 @@
   <div>
     <basic-container>
       <avue-crud
-        ref="crud"
-        :data="dataList"
-        :option="option"
-        :page.sync="page"
-        :search.sync="search"
-        :table-loading="loading"
-        v-model="form"
-        @on-load="onLoad"
-        @row-save="rowSave"
-        @row-update="rowUpdate"
-        @row-del="rowDel"
-        @search-change="searchChange"
-        :before-open="beforeOpen"
-        @search-reset="searchReset"
-        @refresh-change="refreshChange"
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        @search-criteria-switch="searchCriteriaSwitch"
+          ref="crud"
+          :data="dataList"
+          :option="option"
+          :page.sync="page"
+          :search.sync="search"
+          :table-loading="loading"
+          v-model="form"
+          @on-load="onLoad"
+          @row-save="rowSave"
+          @row-update="rowUpdate"
+          @row-del="rowDel"
+          @search-change="searchChange"
+          :before-open="beforeOpen"
+          @search-reset="searchReset"
+          @refresh-change="refreshChange"
+          @current-change="currentChange"
+          @size-change="sizeChange"
+          @search-criteria-switch="searchCriteriaSwitch"
       >
         <template slot="urlForm" slot-scope="{ row }">
           <el-input
-            placeholder="文件地址"
-            size="small"
-            v-if="row.$cellEdit"
-            v-model="row.url"
-            class="input-with-select">
+              placeholder="文件地址"
+              size="small"
+              v-if="row.$cellEdit"
+              v-model="row.url"
+              class="input-with-select">
             <el-button size="small" type="primary" slot="prepend" @click="download(row)">查看</el-button>
             <el-upload
-              class="upload-demo"
-              :show-file-list="false"
-              slot="append"
-              :action="action"
-              :headers="headers"
-              :on-success="(response)=>{onSuccessTwo(response,row)}"
-              :multiple="false">
+                class="upload-demo"
+                :show-file-list="false"
+                slot="append"
+                :action="action"
+                :headers="headers"
+                :on-success="(response)=>{onSuccessTwo(response,row)}"
+                :multiple="false">
               <el-button size="small" type="primary">上传</el-button>
             </el-upload>
           </el-input>
           <span v-else>{{ row.url }}</span>
         </template>
         <template slot="fleetIdForm" slot-scope="{ row }">
-          <span>{{row}}</span>
+          <span>{{ row }}</span>
           <crop-select
-            v-model="form.fleetId"
-            corpType="KH"
+              v-model="form.fleetId"
+              corpType="KH"
           />
         </template>
         <template slot="fleetIdSearch">
           <crop-select v-model="search.fleetId" corpType="KH"></crop-select>
         </template>
+        <template slot="fleetId" slot-scope="{row,disabled}">
+          <span>{{ row.fleetName }}</span>
+        </template>
+        <template slot="driverId" slot-scope="{row,disabled}">
+          <span>{{ row.driverName }}</span>
+        </template>
       </avue-crud>
     </basic-container>
   </div>
 </template>
 
 <script>
-import { getCarList, carSubmit, carRemove ,detailDelegationList,removeFile} from "@/api/landTransportation/car";
+import {getCarList, carSubmit, carRemove, detailDelegationList, removeFile} from "@/api/landTransportation/car";
 import {getToken} from '@/util/auth';
 
 export default {
   name: "index",
-  data(){
-    return{
-      dataList:[],
-      option:{
-        dialogWidth:'85%',
+  data() {
+    return {
+      dataList: [],
+      option: {
+        dialogWidth: '85%',
         searchIcon: true,
         searchIndex: 2,
         searchMenuSpan: 24,
-        searchLabelWidth:100,
-        align:'center',
+        searchLabelWidth: 100,
+        align: 'center',
         index: true,
-        column:[{
+        column: [{
           label: '车牌号',
           prop: 'plateNo',
           index: 1,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
           rules: [{
@@ -89,47 +95,47 @@ export default {
             message: "请输入车牌号",
             trigger: "blur"
           }],
-        },{
+        }, {
           label: '车队名称',
           prop: 'fleetId',
           index: 2,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '司机名称',
           prop: 'driverId',
           index: 3,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '挂车号',
           prop: 'trailerNo',
           index: 4,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '燃油类型',
           prop: 'fuelType',
           index: 5,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           type: "select",
           dicUrl: "/api/blade-system/dict-biz/dictionary?code=carType",
           props: {
@@ -142,229 +148,240 @@ export default {
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '车辆品牌',
           prop: 'brand',
           index: 7,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '制造单位',
           prop: 'manufacturer',
           index: 8,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '发证机关',
           prop: 'issuingAuthority',
           index: 9,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '牵引车辆型号',
           prop: 'towModel',
           index: 10,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '牵引车车架号',
           prop: 'towVin',
           index: 11,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '挂车型号',
           prop: 'trailerModel',
           index: 12,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '挂车车架号',
           prop: 'trailerVin',
           index: 13,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '发动机型号',
           prop: 'engineModel',
           index: 14,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '核载人数',
           prop: 'allowPassenger',
           index: 15,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '购车日期',
           prop: 'purchaseDate',
           index: 16,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '注册日期',
           prop: 'registerDate',
           index: 17,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '报废日期',
           prop: 'scrapDate',
           index: 18,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '外廓尺寸mm',
           prop: 'oto',
           index: 19,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '总重量kg',
           prop: 'totalWeight',
           index: 20,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '核定重量kg',
           prop: 'approvedWeight',
           index: 21,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
+        }, {
           label: '装备重量kg',
           prop: 'equipmentWeight',
           index: 22,
           width: 140,
           cell: true,
           overHidden: true,
-          search:true,
+          search: true,
           span: 8,
           searchSpan: 8,
-        },{
-          label: '附件',
-          prop: 'fileList',
-          type: 'dynamic',
-          hide: true,
-          showColumn: false,
-          span:24,
-          children: {
-            align: 'center',
-            headerAlign: 'center',
-            rowAdd:(done)=>{
-              // this.$message.success('新增回调');
-              done()
-            },
-            rowDel:(row,done)=>{
-              if (row.id) {
-                removeFile(row.id).then(res=>{
+        },
+          {
+            label: '附件',
+            prop: 'fileList',
+            type: 'dynamic',
+            hide: true,
+            showColumn: false,
+            span: 24,
+            children: {
+              align: 'center',
+              headerAlign: 'center',
+              rowAdd: (done) => {
+                // this.$message.success('新增回调');
+                done()
+              },
+              rowDel: (row, done) => {
+                if (row.id) {
+                  removeFile(row.id).then(res => {
+                    done();
+                  })
+                } else {
                   done();
-                })
-              }else {
+                }
+                // this.$message.success('删除回调'+JSON.stringify(row));
                 done();
-              }
-              // this.$message.success('删除回调'+JSON.stringify(row));
-              done();
-            },
-            column: [{
-              width: 200,
-              label: '文件名称',
-              prop: "fileName",
-              formslot: true
-            }, {
-              width: 360,
-              label: '文件地址',
-              prop: "url"
-            }, {
-              width: 200,
-              label: '文件属性',
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=file_type",
-              props: {
-                label: "dictValue",
-                value: "dictValue"
-              }
-            }, {
-              label: '备注',
-              prop: "remarks",
-            }]
-          }
-        }]
+              },
+              column: [{
+                width: 200,
+                label: '文件名称',
+                prop: "fileName",
+                formslot: true
+              }, {
+                width: 360,
+                label: '文件地址',
+                prop: "url"
+              }, {
+                width: 200,
+                label: '文件属性',
+                type: "select",
+                dicUrl: "/api/blade-system/dict-biz/dictionary?code=file_type",
+                props: {
+                  label: "dictValue",
+                  value: "dictValue"
+                }
+              }, {
+                label: '备注',
+                prop: "remarks",
+              }]
+            }
+          },
+          // {
+          //   label: '司机变更记录',
+          //   prop: 'vehicleChangeList',
+          //   type: 'dynamic',
+          //   hide: true,
+          //   showColumn: false,
+          //   span: 24,
+          //   column: []
+          // }
+        ]
       },
       page: {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-        pageSizes: [10,50,100,200,300]
+        pageSizes: [10, 50, 100, 200, 300]
       },
       search: {},
       loading: false,
       action: "/api/blade-resource/oss/endpoint/put-file",
-      headers: { "Blade-Auth": "Bearer " + getToken() },
+      headers: {"Blade-Auth": "Bearer " + getToken()},
       ids: [], // id集合
       form: {},
     }
@@ -374,7 +391,7 @@ export default {
     this.option.column.forEach(item => {
       if (item.search) i++
     })
-    if (i % 3 !== 0){
+    if (i % 3 !== 0) {
       const num = 3 - Number(i % 3)
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
@@ -382,17 +399,21 @@ export default {
   },
   methods: {
     //点击行编辑时查看
-    beforeOpen(done,type){
-      detailDelegationList(this.form.id).then(res=>{
-        this.form = res.data.data
+    beforeOpen(done, type) {
+      if (this.form.id) {
+        detailDelegationList(this.form.id).then(res => {
+          this.form = res.data.data
+          done()
+        })
+      } else {
         done()
-      })
+      }
     },
     // 获得高度
-    searchCriteriaSwitch(type){
-      if (type){
+    searchCriteriaSwitch(type) {
+      if (type) {
         this.option.height = this.option.height - 322
-      }else {
+      } else {
         this.option.height = this.option.height + 322
       }
       this.$refs.crud.getTableHeight()
@@ -410,14 +431,14 @@ export default {
     },
     rowSave(form, done, loading) {
       carSubmit(form).then(res => {
-        this.$message.success(form.id? '修改成功': '新增成功')
+        this.$message.success(form.id ? '修改成功' : '新增成功')
       })
       this.onLoad(this.page)
       done();
     },
-    rowUpdate(form,index,done) {
+    rowUpdate(form, index, done) {
       carSubmit(form).then(res => {
-        this.$message.success(form.id? '修改成功': '新增成功')
+        this.$message.success(form.id ? '修改成功' : '新增成功')
       })
       this.onLoad(this.page)
       done();
@@ -428,7 +449,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        const ids = this.ids.length == 0? row.id: this.ids.join(',');
+        const ids = this.ids.length == 0 ? row.id : this.ids.join(',');
         carRemove({ids}).then(res => {
           this.$message.success('删除成功');
           this.onLoad(this.page);
@@ -436,15 +457,15 @@ export default {
       })
     },
     //附件上传成功
-    onSuccessTwo(response,row){
+    onSuccessTwo(response, row) {
       row.url = response.data.link
       row.fileName = response.data.originalName
     },
     //下载附件
-    download(row){
-      if (row.url){
+    download(row) {
+      if (row.url) {
         window.open(row.url)
-      }else {
+      } else {
         this.$message.warning('无附件，请上传附件后再查看');
       }
     },
@@ -455,7 +476,8 @@ export default {
       done()
     },
     // 重置
-    searchReset() {},
+    searchReset() {
+    },
     //刷新
     refreshChange() {
       this.onLoad(this.page, this.search)

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -330,6 +330,7 @@ export default {
             label: '车队',
             width: 200,
             type: 'select',
+            filterable:true,
             dicUrl: "/api/blade-client/corpsdesc/fleet-list",
             props: {
               label: "cname",
@@ -698,7 +699,7 @@ export default {
       done()
     },
     //箱信息调度
-    designate(row) {
+    designate(row,index) {
       if (row.fleetId) {
         this.$confirm('是否确定调度', '提示', {
           confirmButtonText: '确定',
@@ -707,7 +708,7 @@ export default {
         }).then(() => {
           dispatchCollection(row).then(res => {
             this.$message.success('操作成功');
-            row = res.data
+            this.entrustList[index].status = res.data.data.status
           })
         }).catch(() => {
           this.$message({
@@ -720,7 +721,7 @@ export default {
       }
     },
     //取消调度
-    cancelDesignate(row) {
+    cancelDesignate(row,index) {
       this.$confirm('是否确定取消调度', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -728,7 +729,7 @@ export default {
       }).then(() => {
         cancelDispatchCollection({id: row.id}).then(res => {
           this.$message.success('操作成功');
-          row = res.data
+          this.entrustList[index].status = res.data.data.status
         })
       }).catch(() => {
         this.$message({

src/views/landTransportation/dispatchingCars/index.vue

@@ -13,7 +13,7 @@
                 </div>
                 <div class="card-content">
                   <span class="card-content-num">{{ totalData.all }}</span>
-                  <span class="card-content-text">全部订单</span>
+                  <span class="card-content-text">全部</span>
                 </div>
               </div>
             </div>
@@ -306,7 +306,7 @@ export default {
       selectInvoiceList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        this.option.height = window.innerHeight - 420;
+        this.option.height = window.innerHeight - 350;
       }).finally(() => {
         this.loading = false;
       })
@@ -427,7 +427,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 15vh;
+  height: 6vh !important;
   width: 80vw;
 
   .divider {

src/views/landTransportation/driver/index.vue

@@ -13,7 +13,7 @@
                 </div>
                 <div class="card-content">
                   <span class="card-content-num">{{ totalData.all }}</span>
-                  <span class="card-content-text">全部订单</span>
+                  <span class="card-content-text">全部</span>
                 </div>
               </div>
             </div>
@@ -115,7 +115,7 @@ import {
   acceptanceCollection,
   acceptanceDispatchCollection,
   confirmCompletion,
-  fleetList, motorcadeDriver
+  fleetList, motorcadeDriver, fleetDriverSave
 } from "@/api/landTransportation";
 
 export default {
@@ -294,6 +294,11 @@ export default {
     },
     //箱信息保存
     rowSaveT(row, index, done, loading) {
+      if (row.$cellEdit){
+        fleetDriverSave(row).then(res=>{
+          this.$message.success("保存成功");
+        })
+      }
       this.$refs.crudContact.rowCell(row, index)
     },
     //箱信息派车
@@ -336,7 +341,7 @@ export default {
         });
       });
     },
-    confirmCompletion() {
+    confirmCompletion(row) {
       this.$confirm('是否确定完工', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -415,7 +420,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 15vh;
+  height: 6vh;
   width: 80vw;
 
   .divider {

src/views/landTransportation/motorcadeDriver/index.vue

@@ -12,8 +12,8 @@
                 </span>
                 </div>
                 <div class="card-content">
-                  <span class="card-content-num">{{totalData.all}}</span>
-                  <span class="card-content-text">全部订单</span>
+                  <span class="card-content-num">{{ totalData.all }}</span>
+                  <span class="card-content-text">全部</span>
                 </div>
               </div>
             </div>
@@ -122,7 +122,8 @@ import {
   sendACarDispatchCollection,
   driverQueryCollection,
   fleetList,
-  motorcadeDriver
+  motorcadeDriver,
+  fleetDriverSave
 } from "@/api/landTransportation";
 
 export default {
@@ -140,7 +141,7 @@ export default {
       roleName: localStorage.getItem("roleName").split(',')[0],
       goodsList: [],
       entrustOptionTwoT: {
-        stripe:true,
+        stripe: true,
         align: 'center',
         menuAlign: 'center',
         index: true,
@@ -222,6 +223,8 @@ export default {
           cell: true,
           prop: 'vehicleId',
           overHidden: true,
+          filterable:true,
+          cascader: ['driverId'],
           type: 'select',
           dicUrl: "/api/blade-client/land-vehicle/vehicle-list?fleetId={{key}}",
           props: {
@@ -246,11 +249,20 @@ export default {
           search: true,
           // prop: 'driverId'
           overHidden: true,
-          prop: 'driverName'
+          cell: true,
+          filterable:true,
+          prop: 'driverId',
+          type: 'select',
+          dicUrl: "/api/blade-client/land-driver/driver-list?vehicleId={{key}}",
+          props: {
+            label: "name",
+            value: "id"
+          },
         }, {
           label: '电话',
           overHidden: true,
           width: 160,
+          cell: true,
           prop: 'tel'
         }, {
           label: '陆运费(D)',
@@ -277,8 +289,8 @@ export default {
         }
         ]
       },
-      totalData:{},
-      activeName:''
+      totalData: {},
+      activeName: ''
     }
   },
   methods: {
@@ -297,13 +309,13 @@ export default {
     },
     //查询
     onLoad(page, params) {
-      motorcadeDriver(3).then(res=>{
+      motorcadeDriver(3).then(res => {
         this.totalData = res.data.data
       })
       let queryParams = {
         size: page.pageSize,
         current: page.currentPage,
-        status:this.activeName,
+        status: this.activeName,
         tag: '3',
         ...params
       }
@@ -317,6 +329,11 @@ export default {
     },
     //箱信息保存
     rowSaveT(row, index, done, loading) {
+      if (row.$cellEdit) {
+        fleetDriverSave(row).then(res=>{
+          this.$message.success("保存成功");
+        })
+      }
       this.$refs.crudContact.rowCell(row, index)
     },
     //切换订单状态
@@ -426,7 +443,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 15vh;
+  height: 6vh;
   width: 80vw;
 
   .divider {

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -340,7 +340,8 @@ export default {
             decimals: 2
           }, {
             name: 'ctnQuantity',
-            type: 'count'
+            type: 'sum',
+            decimals: 0
           }],
         column: [{
           label: '尺寸箱型',
@@ -378,7 +379,7 @@ export default {
           rules: [{
             required: true,
             message: " ",
-            trigger: "blur"
+            trigger: "change"
           }],
         }, {
           label: '所属公司',
@@ -464,7 +465,7 @@ export default {
           }, {
             name: 'ctnQuantity',
             type: 'sum',
-            decimals: 1
+            decimals: 0
           }],
         column: [{
           label: '尺寸箱型',
@@ -783,9 +784,9 @@ export default {
     },
     //保存
     editCustomer() {
+      this.$refs['goodsForm'].validate((valid,done) => {done()})
       for (let item in this.tableData){
         if (!this.tableData[item].corpId) return this.$message.error('请选择第'+ Number(Number(item)+1) +'行发货工厂');
-        if (this.tableData[item].region.length === 0) return this.$message.error('请选择第'+ Number(Number(item)+1) +'行省市区');
         if (!this.tableData[item].address) return this.$message.error('请输入第'+ Number(Number(item)+1) +'行详细地址');
       }
       for (let item in this.entrustList){
@@ -794,7 +795,8 @@ export default {
         if (!this.entrustList[item].landWeight) return this.$message.error('请输入第'+ Number(Number(item)+1) +'行总重量');
         if (!this.entrustList[item].landAmountD) return this.$message.error('请输入第'+ Number(Number(item)+1) +'陆运费');
       }
-      this.$refs['goodsForm'].validate((valid) => {
+      this.$refs['goodsForm'].validate((valid,done) => {
+        done();
         if (valid) {
           let data = JSON.parse(JSON.stringify(this.tableData))
           data.forEach((item, index) => {
@@ -809,11 +811,13 @@ export default {
             orderFeeList: this.collectionList.concat(this.paymentList)
           }).then(res => {
             this.$message.success('保存成功');
+            // this.$refs.goodsForm.submitData()
+            this.goodsForm = {}
             if (!this.goodsForm.id) {
-              this.goodsForm = {}
-              this.$emit('backToList')
+              // this.id = res.data.data
+              // this.refreshData()
             } else {
-              this.refreshData()
+              // this.refreshData()
             }
           })
         } else {

src/views/landTransportation/placeAnOrder/index.vue

@@ -13,7 +13,21 @@
                 </div>
                 <div class="card-content">
                   <span class="card-content-num">{{totalData.all}}</span>
-                  <span class="card-content-text">全部订单</span>
+                  <span class="card-content-text">全部</span>
+                </div>
+              </div>
+            </div>
+            <div class="divider"/>
+            <div class="content-item" @click="handleClick('999')">
+              <div class="card">
+                <div class="card-title card-title7">
+                <span>
+                  提
+                </span>
+                </div>
+                <div class="card-content">
+                  <span class="card-content-num">{{ totalData.last }}</span>
+                  <span class="card-content-text">未提交</span>
                 </div>
               </div>
             </div>
@@ -22,7 +36,7 @@
               <div class="card">
                 <div class="card-title card-title2">
                 <span>
-                  未
+                  调
                 </span>
                 </div>
                 <div class="card-content">
@@ -358,7 +372,7 @@ export default {
       selectInvoiceList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        this.option.height = window.innerHeight - 420;
+        this.option.height = window.innerHeight - 350;
       }).finally(() => {
         this.loading = false;
       })
@@ -475,7 +489,7 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 15vh;
+  height: 6vh;
   width: 80vw;
 
   .divider {
@@ -538,6 +552,10 @@ export default {
         color: rgba(4, 66, 31, 0.63);
         background-color: rgba(66, 188, 111, 0.15);
       }
+      &-title7 {
+        color: rgba(255, 98, 14, 0.63);
+        background-color: rgba(220, 150, 42, 0.15);
+      }
 
       &-content {
         padding-left: 1vw;