修改陆运问题

src/page/index/top/top-notice.vue

@@ -21,7 +21,7 @@
       </avue-notice>
     </el-scrollbar>
     <div slot="reference" @click="init">
-      <el-badge  :value="badge">
+      <el-badge  :value="badge>99?'99+':badge">
         <i class="el-icon-bell"></i>
       </el-badge>
     </div>

src/views/landTransportation/dispatchingCars/index.vue

@@ -59,6 +59,7 @@
           :option="option"
           @on-load="onLoad"
           @row-del="rowDel"
+          @search-reset="query={};activeName = ''"
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
           @search-criteria-switch="searchCriteriaSwitch"
@@ -273,6 +274,7 @@ export default {
   activated() {
     if (this.$route.query.orderId){
       this.rowCell({id:this.$route.query.orderId},0)
+      this.$router.$avueRouter.closeTag(window.location.hash.slice(1))
     }
     // if (this.$route.query.params){
     //   this.rowCell({id:this.$route.query.params},0)
@@ -332,6 +334,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         itemStatus: this.activeName,
+        status: this.activeName,
         kind: '2',
         ...params,
         ...Object.assign(params, this.query)

src/views/landTransportation/driver/index.vue

@@ -73,6 +73,7 @@
           @on-load="onLoad"
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
+          @search-reset="query={};activeName=''"
           @search-change="searchChange"
           @search-criteria-switch="searchCriteriaSwitch"
           @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
@@ -623,6 +624,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         tag: '4',
+        status:this.activeName,
         ...params,
         ...Object.assign(params, this.query)
       }

src/views/landTransportation/motorcadeDriver/index.vue

@@ -88,6 +88,7 @@
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
           @search-change="searchChange"
+          @search-reset="query={};activeName = ''"
           @search-criteria-switch="searchCriteriaSwitch"
           @row-save="(row,done,loading)=>{rowSave(row,0,done,loading)}"
           @row-update="rowSave">

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -189,9 +189,9 @@
         <!--        <template slot="landWeightHeader" slot-scope="{column}">-->
         <!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
         <!--        </template>-->
-<!--        <template slot="landAmountDHeader" slot-scope="{column}">-->
-<!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
-<!--        </template>-->
+        <!--        <template slot="landAmountDHeader" slot-scope="{column}">-->
+        <!--          {{ column.label }}<span style="color:#F56C6C">*</span>-->
+        <!--        </template>-->
         <template slot="arrivalTimeHeader" slot-scope="{column}">
           {{ column.label }}<span style="color:#F56C6C">*</span>
         </template>
@@ -349,7 +349,7 @@
     <basic-container>
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
         <el-tab-pane label="应收" name="1"></el-tab-pane>
-<!--        <el-tab-pane label="应付" name="2"></el-tab-pane>-->
+        <!--        <el-tab-pane label="应付" name="2"></el-tab-pane>-->
       </el-tabs>
       <avue-crud
           v-if="activeIndex === '1'"
@@ -382,21 +382,21 @@
           <span v-else>{{ row.feeName }}</span>
         </template>
         <template slot-scope="{row,index}" slot="menu">
-<!--          <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              :disabled="goodsForm.status === 1"-->
-<!--              :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"-->
-<!--              @click="rowCell(row,index)"-->
-<!--          >{{ row.$cellEdit ? '保存' : '编辑' }}-->
-<!--          </el-button>-->
-<!--          <el-button type="text"-->
-<!--                     icon="el-icon-delete"-->
-<!--                     size="small"-->
-<!--                     :disabled="goodsForm.status === 1"-->
-<!--                     @click="$refs.collection.rowDel(row,index)"-->
-<!--          >删除-->
-<!--          </el-button>-->
+          <!--          <el-button-->
+          <!--              type="text"-->
+          <!--              size="small"-->
+          <!--              :disabled="goodsForm.status === 1"-->
+          <!--              :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"-->
+          <!--              @click="rowCell(row,index)"-->
+          <!--          >{{ row.$cellEdit ? '保存' : '编辑' }}-->
+          <!--          </el-button>-->
+          <!--          <el-button type="text"-->
+          <!--                     icon="el-icon-delete"-->
+          <!--                     size="small"-->
+          <!--                     :disabled="goodsForm.status === 1"-->
+          <!--                     @click="$refs.collection.rowDel(row,index)"-->
+          <!--          >删除-->
+          <!--          </el-button>-->
           <el-button
               size="small"
               type="text"
@@ -406,12 +406,12 @@
           </el-button>
         </template>
         <template slot="menuLeft">
-<!--          <el-button-->
-<!--              type="primary"-->
-<!--              icon="el-icon-plus"-->
-<!--              :disabled="goodsForm.status !== 0"-->
-<!--              @click="addRowCollection"-->
-<!--              size="small">录入明细</el-button>-->
+          <!--          <el-button-->
+          <!--              type="primary"-->
+          <!--              icon="el-icon-plus"-->
+          <!--              :disabled="goodsForm.status !== 0"-->
+          <!--              @click="addRowCollection"-->
+          <!--              size="small">录入明细</el-button>-->
         </template>
       </avue-crud>
       <avue-crud
@@ -468,7 +468,8 @@
               icon="el-icon-plus"
               :disabled="goodsForm.status === 1"
               @click="addRowPayment"
-              size="small">录入明细</el-button>
+              size="small">录入明细
+          </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -524,10 +525,10 @@ export default {
       activeIndex: '1',
       KeyBox: 0,
       KeyBoxTwo: 0,
-      typeTwo:false,
+      typeTwo: false,
       type: false,
       enclosure: false,
-      orderList:[],
+      orderList: [],
       goodsForm: {},
       modelKey: 1,
       orderFilesList: [],
@@ -648,22 +649,22 @@ export default {
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          index:3,
+          index: 3,
           width: 140,
         }, {
           label: '车号',
           width: 150,
-          index:4,
+          index: 4,
           prop: 'plateNo'
         }, {
           label: '司机',
           width: 115,
-          index:5,
+          index: 5,
           prop: 'driverName'
         }, {
           label: '电话',
           width: 160,
-          index:6,
+          index: 6,
           prop: 'tel'
         }, {
           label: '完工日期',
@@ -1730,8 +1731,8 @@ export default {
       })
     },
     //确认变更
-    confirmChange(){
-      validChange().then(res=>{
+    confirmChange() {
+      validChange().then(res => {
         console.log(res)
         this.goodsForm.status = 0
         this.goodsOptionFormC.disabled = false
@@ -1741,25 +1742,39 @@ export default {
       })
     },
     //变更保存
-    changeSaving(){
-      let data = JSON.parse(JSON.stringify(this.tableData))
-      data.forEach((item, index) => {
-        item.sort = index + 1
-      })
-      this.type = true
-      delete this.goodsForm.status
-      changeSubmission({
-        ...this.goodsForm,
-        kind: '1',
-        orderAddressList: data,
-        fileList: this.orderFilesList,
-        itemList: this.entrustList,
-        orderItemList:this.vehicleList,
-        orderFeeList: this.collectionList.concat(this.paymentList)
-      }).then(res=>{
-        this.$message.success('保存成功');
-        this.typeTwo = false
-        this.refreshData()
+    changeSaving() {
+      this.$refs['goodsFormE'].validate((valid, doneE) => {
+        doneE()
+        if (valid) {
+          this.$refs['goodsForm'].validate((valid, done) => {
+            done();
+            if (valid) {
+              let data = JSON.parse(JSON.stringify(this.tableData))
+              data.forEach((item, index) => {
+                item.sort = index + 1
+              })
+              this.type = true
+              delete this.goodsForm.status
+              changeSubmission({
+                ...this.goodsForm,
+                kind: '1',
+                orderAddressList: data,
+                fileList: this.orderFilesList,
+                itemList: this.entrustList,
+                orderItemList: this.vehicleList,
+                orderFeeList: this.collectionList.concat(this.paymentList)
+              }).then(res => {
+                this.$message.success('保存成功');
+                this.typeTwo = false
+                this.refreshData()
+              })
+            } else {
+              return false;
+            }
+          });
+        } else {
+          return false;
+        }
       })
     },
     //提交委托
@@ -1837,7 +1852,8 @@ export default {
           this.refreshData()
         })
       }
-    },
+    }
+    ,
     //收费新增
     addRowCollection() {
       this.$refs.collection.rowCellAdd({
@@ -1845,14 +1861,16 @@ export default {
         type: '1',
         $cellEdit: true
       });
-    },
+    }
+    ,
     //打开附件
-    annexOpen(row, index){
+    annexOpen(row, index) {
       this.enclosure = true
-      getFee({id:row.id}).then(res=>{
+      getFee({id: row.id}).then(res => {
         this.orderList = res.data.data
       })
-    },
+    }
+    ,
     //付费新增
     addRowPayment() {
       this.$refs.payment.rowCellAdd({
@@ -1860,15 +1878,18 @@ export default {
         type: '2',
         $cellEdit: true
       });
-    },
+    }
+    ,
     //选择费用
     selectValue(value, row) {
       this.$set(row, 'feeName', value.cname)
-    },
+    }
+    ,
     //选择客户信息触发
     getfleetId(data, row) {
       this.$set(row, 'corpName', data.cname)
-    },
+    }
+    ,
     //收款信息移除
     makeDel(row, index) {
       this.$confirm('此操作将永久删除该单据, 是否继续?', '提示', {
@@ -1884,7 +1905,8 @@ export default {
           message: '已取消删除'
         });
       });
-    },
+    }
+    ,
     //付款信息移除
     feeDel(row, index) {
       this.$confirm('此操作将永久删除该单据, 是否继续?', '提示', {
@@ -1900,24 +1922,26 @@ export default {
           message: '已取消删除'
         });
       });
-    },
+    }
+    ,
     //选择公司名称带出所属公司
     getCorpData(row) {
       this.goodsForm.belongCompany = row.belongCompany
       this.goodsForm.salesman = ''
       //查询业务员
       this.salesmanQuery()
-    },
+    }
+    ,
     //选择地址客户带出地址
     withAddress(row, scope) {
-      this.$set(this.tableData[scope.$index],'contacts',row.attn)
-      this.$set(this.tableData[scope.$index],'tel',row.tel)
-      this.$set(this.tableData[scope.$index],'address',row.storageAddr)
+      this.$set(this.tableData[scope.$index], 'contacts', row.attn)
+      this.$set(this.tableData[scope.$index], 'tel', row.tel)
+      this.$set(this.tableData[scope.$index], 'address', row.storageAddr)
       // this.tableData[scope.$index].contacts = row.attn
       // this.tableData[scope.$index].tel = row.tel
       // this.tableData[scope.$index].address = row.storageAddr
       if (!scope.row.key) scope.row.key = 0
-      this.$set(this.tableData[scope.$index],'corpName',row.cname)
+      this.$set(this.tableData[scope.$index], 'corpName', row.cname)
       // this.tableData[scope.$index].corpName = row.cname
       if (row.belongtoarea) {
         addressList(row.belongtoarea.split(',')[0]).then(res => {
@@ -1925,7 +1949,8 @@ export default {
           scope.row.key++
         })
       }
-    },
+    }
+    ,
     //自定义表头
     renderHeader(h) {
       return (
@@ -1936,7 +1961,8 @@ export default {
             </el-tooltip>
           </div>
       )
-    },
+    }
+    ,
     //自定义表头
     customTitle(h, {column, $index}) {
       let text = column.label

src/views/landTransportation/placeAnOrder/index.vue

@@ -115,6 +115,7 @@
           :option="option"
           @on-load="onLoad"
           @row-del="rowDel"
+          @search-reset="query={};activeName = ''"
           @selection-change="selectionChange"
           @resetColumn="resetColumn"
           @saveColumn="saveColumn"
@@ -405,6 +406,7 @@ export default {
         size: page.pageSize,
         current: page.currentPage,
         itemStatus: this.activeName,
+        status: this.activeName,
         kind: '1',
         ...Object.assign(params, this.query)
       }

src/views/landTransportation/reportAnalysis/index.vue

@@ -350,9 +350,8 @@ export default {
             width: 140,
             search: true,
           }, {
-            label: '尺寸箱型',
+            label: '箱型箱量',
             width: 100,
-            search: true,
             index: 8,
             overHidden: true,
             prop: 'ctnDetail'
@@ -533,9 +532,9 @@ export default {
     // 获得高度
     searchCriteriaSwitch(type) {
       if (type) {
-        this.goodsOptionCrud.height = this.goodsOptionCrud.height - 184
+        this.goodsOptionCrud.height = this.goodsOptionCrud.height - 90
       } else {
-        this.goodsOptionCrud.height = this.goodsOptionCrud.height + 184
+        this.goodsOptionCrud.height = this.goodsOptionCrud.height + 90
       }
       this.$refs.crud.getTableHeight()
     },

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -25,12 +25,14 @@
             <el-table-column
               align="center"
               label="货运日期"
+              width="150"
               show-overflow-tooltip
               prop="arrivalTime"
             ></el-table-column>
             <el-table-column
               align="center"
               label="业务员"
+              width="60"
               show-overflow-tooltip
               prop="salesmanName"
             ></el-table-column>
@@ -48,22 +50,19 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="提单号"
-              show-overflow-tooltip
-              prop="billNo">
-              <template slot-scope="{row}">
-                <span class="el-button--text" style="cursor: pointer"
-                      @click="openTrack(row,0)">{{ row.billNo }}</span>
-              </template>
+              label="票据号"
+              prop="receiptNo"
+            >
             </el-table-column>
             <el-table-column
               align="center"
-              label="车号"
+              label="提单号"
+              width="130"
               show-overflow-tooltip
               prop="billNo">
               <template slot-scope="{row}">
                 <span class="el-button--text" style="cursor: pointer"
-                      @click="openTrack(row,1)">{{ row.plateNo }}</span>
+                      @click="openTrack(row,0)">{{ row.billNo }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -76,9 +75,27 @@
               align="center"
               label="箱型箱量"
               show-overflow-tooltip
-              prop="ctnType"
+              prop="ctnDetail"
             ></el-table-column>
             <el-table-column
+                align="center"
+                label="车队"
+                width="190"
+                show-overflow-tooltip
+                prop="fleetName"
+            ></el-table-column>
+            <el-table-column
+                align="center"
+                label="车号"
+                width="100"
+                show-overflow-tooltip
+                prop="billNo">
+              <template slot-scope="{row}">
+                <span class="el-button--text" style="cursor: pointer"
+                      @click="openTrack(row,1)">{{ row.plateNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
               align="center"
               label="运费"
               show-overflow-tooltip
@@ -87,10 +104,24 @@
             <el-table-column
               align="center"
               label="其他费用(总)"
+              width="100"
               show-overflow-tooltip
               prop="allFeeD"
             ></el-table-column>
             <el-table-column
+              align="center"
+              label="应付杂费"
+              v-if="roleName.indexOf('平台') !== -1"
+              show-overflow-tooltip
+              prop="extraAmountC"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="应收杂费"
+              show-overflow-tooltip
+              prop="extraAmountD"
+            ></el-table-column>
+            <el-table-column
                 width="100"
                 label="状态"
                 show-overflow-tooltip
@@ -107,7 +138,15 @@
             </el-table-column>
             <el-table-column
                 align="center"
+                label="客户名称"
+                width="190"
+                show-overflow-tooltip
+                prop="corpName"
+            ></el-table-column>
+            <el-table-column
+                align="center"
                 label="备注"
+                width="190"
                 show-overflow-tooltip
                 prop="remarks"
             ></el-table-column>
@@ -177,6 +216,7 @@ export default {
   },
   data() {
     return {
+      roleName: localStorage.getItem("roleName").split(','),
       dialogVisible: false,
       loading: false,
       tableData: [],