同步代码

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -2524,7 +2524,7 @@ export default {
         });
       } else if (value === 3) {
         this.$router.push({
-          path: '/landTransportation/reportAnalysis/index'
+          path: '/landTransportation/bulkReportAnalysis/index'
         });
       }
     },

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -28,17 +28,15 @@
         </template>
         <template slot="billNo" slot-scope="{row,index}">
           <span v-if="roleName.indexOf('车队') !== -1" style="cursor: pointer">{{ row.billNo }}</span>
-          <span class="el-button--text" v-else style="cursor: pointer" @click.stop="celJump(row,index)">{{
-              row.billNo
-            }}</span>
+          <span class="el-button--text" v-else style="cursor: pointer" @click.stop="celJump(row,index)">{{row.billNo}}</span>
         </template>
-        <template slot="corpName" slot-scope="{row,index}">
+        <template slot="corpShortName" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer"
-                @click.stop="celJump(row,index)">{{ row.corpName }}</span>
+                @click.stop="celJump(row,index)">{{ row.corpShortName }}</span>
         </template>
-        <template slot="orderNo" slot-scope="{row,index}">
+        <template slot="dispatchNumber" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer"
-                @click.stop="celJump(row,index)">{{ row.orderNo }}</span>
+                @click.stop="celJump(row,index)">{{ row.dispatchNumber }}</span>
         </template>
         <template slot-scope="{row}" slot="fleetIdSearch">
           <crop-select
@@ -224,7 +222,6 @@ export default {
           {
             label: '费用名称',
             slot: true,
-            width: 160,
             prop: 'feeName'
           }, {
             label: '金额',
@@ -354,7 +351,7 @@ export default {
           prop: 'corpShortName',
           overHidden: true,
           index: 1,
-          width: 140,
+          width: 100,
           search: true,
         }, {
           label: '货运日期',
@@ -366,13 +363,13 @@ export default {
           format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 2,
-          width: 150,
+          width: 126,
           search: true,
         }, {
           label: '业务员',
           prop: 'salesmanName',
           index: 3,
-          width: 140,
+          width: 70,
         }, {
           label: '物流运输',
           prop: 'dispatchDept',
@@ -385,16 +382,16 @@ export default {
           },
           overHidden: true,
           index: 4,
-          width: 140
+          width: 80
         }, {
           label: '运输调度',
           prop: 'dispatcherName',
           overHidden: true,
           index: 5,
-          width: 140,
+          width: 70,
         }, {
           label: '派车单号',
-          width: 90,
+          width: 80,
           index: 5,
           overHidden: true,
           prop: 'dispatchNumber'
@@ -408,15 +405,15 @@ export default {
           label: '装货地点',
           prop: 'addressDetail',
           index: 7,
-          width: 130,
+          width: 132,
         }, {
           label: '卸货地点',
           prop: 'unloadingPlace',
           index: 8,
-          width: 130,
+          width: 132,
         }, {
           label: '车型',
-          width: 80,
+          width: 90,
           index: 9,
           prop: 'fleetVolum'
         }, {
@@ -435,6 +432,7 @@ export default {
           label: '应收运费',
           overHidden: true,
           index: 12,
+          width: 100,
           prop: 'landAmountD'
         }, {
           label: '应收杂费',
@@ -552,7 +550,7 @@ export default {
           prop: 'corpShortName',
           overHidden: true,
           index: 1,
-          width: 140,
+          width: 100,
           search: true,
         }, {
           label: '货运日期',
@@ -564,22 +562,22 @@ export default {
           format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 2,
-          width: 150,
+          width: 126,
           search: true,
         }, {
           label: '业务员',
           prop: 'salesmanName',
           index: 3,
-          width: 140,
+          width: 70,
         }, {
           label: '运输调度',
           prop: 'dispatcherName',
           overHidden: true,
           index: 4,
-          width: 140,
+          width: 70,
         }, {
           label: '派车单号',
-          width: 90,
+          width: 80,
           index: 5,
           overHidden: true,
           prop: 'dispatchNumber'
@@ -593,15 +591,15 @@ export default {
           label: '装货地点',
           prop: 'addressDetail',
           index: 7,
-          width: 130,
+          width: 132,
         }, {
           label: '卸货地点',
           prop: 'unloadingPlace',
           index: 8,
-          width: 130,
+          width: 132,
         }, {
           label: '车型',
-          width: 80,
+          width: 90,
           index: 9,
           prop: 'fleetVolum'
         }, {
@@ -620,6 +618,7 @@ export default {
           label: '应收运费',
           overHidden: true,
           index: 12,
+          width: 100,
           prop: 'landAmountD'
         }, {
           label: '应收杂费',
@@ -647,7 +646,7 @@ export default {
           overHidden: true
         }, {
           label: '利润',
-          width: 100,
+          width: 80,
           precision: 2,
           index: 17,
           type: 'number',
@@ -766,7 +765,7 @@ export default {
           format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 1,
-          width: 150,
+          width: 126,
           search: true,
         }, {
           label: '物流运输',
@@ -780,16 +779,16 @@ export default {
           },
           overHidden: true,
           index: 2,
-          width: 140
+          width: 80
         }, {
           label: '运输调度',
           prop: 'dispatcherName',
           overHidden: true,
           index: 3,
-          width: 140,
+          width: 70,
         }, {
           label: '派车单号',
-          width: 90,
+          width: 80,
           index: 4,
           overHidden: true,
           prop: 'dispatchNumber'
@@ -803,15 +802,15 @@ export default {
           label: '装货地点',
           prop: 'addressDetail',
           index: 6,
-          width: 130,
+          width: 132,
         }, {
           label: '卸货地点',
           prop: 'unloadingPlace',
           index: 7,
-          width: 130,
+          width: 132,
         }, {
           label: '车型',
-          width: 80,
+          width: 90,
           index: 8,
           prop: 'fleetVolum'
         }, {
@@ -969,17 +968,10 @@ export default {
     },
     //行跳转
     celJump(row, index) {
-      if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('admin') !== -1) {
-        this.$router.push({
-          path: '/landTransportation/dispatchingCars/index',
-          query: {orderId: row.orderId},
-        });
-      } else {
-        this.$router.push({
-          path: '/landTransportation/placeAnOrder/index',
-          query: {id: '台账' + row.orderId},
-        });
-      }
+      this.$router.push({
+        path: '/landTransportation/bulkCargo/index',
+        query: {id: '台账' + row.orderId},
+      });
     },
     // 获得高度
     searchCriteriaSwitch(type) {

src/views/landTransportation/reportAnalysis/index.vue

@@ -225,9 +225,11 @@ export default {
             prop: 'amount'
           }, {
             label: '车号',
+            width: 90,
             prop: 'plateNo'
           }, {
             label: '备注',
+            width: 100,
             prop: 'remarks'
           }
         ]
@@ -349,12 +351,12 @@ export default {
           format: "yyyy-MM-dd HH:mm",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index: 2,
-          width: 150,
+          width: 126,
           search: true,
         }, {
           label: '货运地点',
           index: 4,
-          width: 160,
+          width: 132,
           search: true,
           prop: 'addressDetail'
         }
@@ -371,11 +373,11 @@ export default {
             prop: 'receiptNo',
             overHidden: true,
             index: 5,
-            width: 140,
+            width: 100,
             search: true,
           }, {
             label: '提单号',
-            width: 140,
+            width: 100,
             index: 6,
             search: true,
             overHidden: true,
@@ -385,17 +387,17 @@ export default {
             prop: 'station',
             overHidden: true,
             index: 7,
-            width: 140,
+            width: 70,
             search: true,
           }, {
             label: '箱型箱量',
-            width: 100,
+            width: 80,
             index: 8,
             overHidden: true,
             prop: 'ctnDetail'
           }, {
             label: '车号',
-            width: 150,
+            width: 90,
             prop: 'plateNo',
             overHidden: true,
             index: 10,
@@ -404,6 +406,7 @@ export default {
             label: '备注',
             overHidden: true,
             index: 13,
+            width: 100,
             prop: 'remarks'
           }]
       },
@@ -438,16 +441,16 @@ export default {
               },
               overHidden: true,
               index: 3,
-              width: 140
+              width: 80
             }, {
               label: '运输调度',
               prop: 'dispatcherName',
               overHidden: true,
               index: 3,
-              width: 140,
+              width: 70,
             }, {
               label: '车队',
-              width: 200,
+              width: 90,
               search: true,
               index: 9,
               overHidden: true,
@@ -456,11 +459,13 @@ export default {
               label: '应付运费',
               overHidden: true,
               index: 14,
+              width: 100,
               prop: 'landAmountC'
             }, {
               label: '应付杂费',
               overHidden: true,
               index: 15,
+              width: 100,
               prop: 'extraAmountC'
             }, {
               label: '应付杂费明细',
@@ -479,29 +484,31 @@ export default {
               prop: 'corpShortName',
               overHidden: true,
               index: 1,
-              width: 140,
+              width: 100,
               search: true,
             }, {
               label: '运输调度',
               prop: 'dispatcherName',
               overHidden: true,
               index: 3,
-              width: 140,
+              width: 70,
             }, {
               label: '业务员',
               prop: 'salesmanName',
               search: true,
               index: 2,
-              width: 140,
+              width: 70,
             }, {
               label: '应收运费',
               overHidden: true,
               index: 11,
+              width: 100,
               prop: 'landAmountD'
             }, {
               label: '应收杂费',
               overHidden: true,
               index: 12,
+              width: 100,
               prop: 'extraAmountD'
             }, {
               label: '应收杂费明细',
@@ -510,7 +517,7 @@ export default {
               prop: 'extraAmountItemD'
             }, {
               label: '车队',
-              width: 100,
+              width: 90,
               search: true,
               index: 9,
               overHidden: true,
@@ -519,15 +526,17 @@ export default {
               label: '应付运费',
               overHidden: true,
               index: 14,
+              width: 100,
               prop: 'landAmountC'
             }, {
               label: '应付杂费',
               overHidden: true,
               index: 15,
+              width: 100,
               prop: 'extraAmountC'
             }, {
               label: '利润',
-              width: 100,
+              width: 80,
               precision: 2,
               index: 16,
               type: 'number',
@@ -552,7 +561,7 @@ export default {
             prop: 'corpShortName',
             overHidden: true,
             index: 1,
-            width: 140,
+            width: 100,
             search: true,
           }, {
             label: '杂费确认',
@@ -586,22 +595,24 @@ export default {
             },
             overHidden: true,
             index: 3,
-            width: 140
+            width: 80
           }, {
             label: '应收运费',
             overHidden: true,
             index: 11,
+            width: 100,
             prop: 'landAmountD'
           }, {
             label: '业务员',
             prop: 'salesmanName',
             search: true,
             index: 2,
-            width: 140,
+            width: 70,
           }, {
             label: '应收杂费',
             overHidden: true,
             index: 12,
+            width: 100,
             prop: 'extraAmountD'
           }, {
             label: '应收杂费明细',
@@ -610,7 +621,7 @@ export default {
             prop: 'extraAmountItemD'
           }, {
             label: '车队',
-            width: 100,
+            width: 90,
             search: true,
             index: 9,
             overHidden: true,
@@ -629,18 +640,19 @@ export default {
             prop: 'corpShortName',
             overHidden: true,
             index: 1,
-            width: 140,
+            width: 100,
             search: true,
           }, {
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
             index: 3,
-            width: 140,
+            width: 70,
           }, {
             label: '应付运费',
             overHidden: true,
             index: 14,
+            width: 100,
             prop: 'landAmountC'
           }, {
             label: '物流运输',
@@ -654,21 +666,22 @@ export default {
             },
             overHidden: true,
             index: 3,
-            width: 140
+            width: 80
           }, {
             label: '业务员',
             prop: 'salesmanName',
             search: true,
             index: 2,
-            width: 140,
+            width: 70,
           }, {
             label: '应付杂费',
             overHidden: true,
             index: 15,
+            width: 100,
             prop: 'extraAmountC'
           }, {
             label: '利润',
-            width: 100,
+            width: 80,
             precision: 2,
             index: 16,
             type: 'number',
@@ -682,11 +695,13 @@ export default {
             label: '应收运费',
             overHidden: true,
             index: 11,
+            width: 100,
             prop: 'landAmountD'
           }, {
             label: '应收杂费',
             overHidden: true,
             index: 12,
+            width: 100,
             prop: 'extraAmountD'
           }, {
             label: '应收杂费明细',
@@ -695,7 +710,7 @@ export default {
             prop: 'extraAmountItemD'
           }, {
             label: '车队',
-            width: 100,
+            width: 90,
             search: true,
             index: 9,
             overHidden: true,
@@ -825,16 +840,16 @@ export default {
                 },
                 overHidden: true,
                 index: 3,
-                width: 140
+                width: 80
               }, {
                 label: '运输调度',
                 prop: 'dispatcherName',
                 overHidden: true,
                 index: 3,
-                width: 140,
+                width: 70,
               }, {
                 label: '车队',
-                width: 200,
+                width: 90,
                 search: true,
                 index: 9,
                 overHidden: true,
@@ -843,11 +858,13 @@ export default {
                 label: '应付运费',
                 overHidden: true,
                 index: 14,
+                width: 100,
                 prop: 'landAmountC'
               }, {
                 label: '应付杂费',
                 overHidden: true,
                 index: 15,
+                width: 100,
                 prop: 'extraAmountC'
               }, {
                 label: '应付杂费明细',
@@ -866,29 +883,31 @@ export default {
                 prop: 'corpShortName',
                 overHidden: true,
                 index: 1,
-                width: 140,
+                width: 100,
                 search: true,
               }, {
                 label: '运输调度',
                 prop: 'dispatcherName',
                 overHidden: true,
                 index: 3,
-                width: 140,
+                width: 70,
               }, {
                 label: '业务员',
                 prop: 'salesmanName',
                 search: true,
                 index: 2,
-                width: 140,
+                width: 70,
               }, {
                 label: '应收运费',
                 overHidden: true,
                 index: 11,
+                width: 100,
                 prop: 'landAmountD'
               }, {
                 label: '应收杂费',
                 overHidden: true,
                 index: 12,
+                width: 100,
                 prop: 'extraAmountD'
               }, {
                 label: '应收杂费明细',
@@ -897,7 +916,7 @@ export default {
                 prop: 'extraAmountItemD'
               }, {
                 label: '车队',
-                width: 100,
+                width: 90,
                 search: true,
                 index: 9,
                 overHidden: true,
@@ -906,15 +925,17 @@ export default {
                 label: '应付运费',
                 overHidden: true,
                 index: 14,
+                width: 100,
                 prop: 'landAmountC'
               }, {
                 label: '应付杂费',
                 overHidden: true,
                 index: 15,
+                width: 100,
                 prop: 'extraAmountC'
               }, {
                 label: '利润',
-                width: 100,
+                width: 80,
                 precision: 2,
                 index: 16,
                 type: 'number',
@@ -939,7 +960,7 @@ export default {
               prop: 'corpShortName',
               overHidden: true,
               index: 1,
-              width: 140,
+              width: 100,
               search: true,
             }, {
               label: '杂费确认',
@@ -973,22 +994,24 @@ export default {
               },
               overHidden: true,
               index: 3,
-              width: 140
+              width: 80
             }, {
               label: '应收运费',
               overHidden: true,
               index: 11,
+              width: 100,
               prop: 'landAmountD'
             }, {
               label: '业务员',
               prop: 'salesmanName',
               search: true,
               index: 2,
-              width: 140,
+              width: 70,
             }, {
               label: '应收杂费',
               overHidden: true,
               index: 12,
+              width: 100,
               prop: 'extraAmountD'
             }, {
               label: '应收杂费明细',
@@ -997,7 +1020,7 @@ export default {
               prop: 'extraAmountItemD'
             }, {
               label: '车队',
-              width: 100,
+              width: 90,
               search: true,
               index: 9,
               overHidden: true,
@@ -1016,18 +1039,19 @@ export default {
               prop: 'corpShortName',
               overHidden: true,
               index: 1,
-              width: 140,
+              width: 100,
               search: true,
             }, {
               label: '运输调度',
               prop: 'dispatcherName',
               overHidden: true,
               index: 3,
-              width: 140,
+              width: 70,
             }, {
               label: '应付运费',
               overHidden: true,
               index: 14,
+              width: 100,
               prop: 'landAmountC'
             }, {
               label: '物流运输',
@@ -1041,21 +1065,22 @@ export default {
               },
               overHidden: true,
               index: 3,
-              width: 140
+              width: 80
             }, {
               label: '业务员',
               prop: 'salesmanName',
               search: true,
               index: 2,
-              width: 140,
+              width: 70,
             }, {
               label: '应付杂费',
               overHidden: true,
               index: 15,
+              width: 100,
               prop: 'extraAmountC'
             }, {
               label: '利润',
-              width: 100,
+              width: 80,
               precision: 2,
               index: 16,
               type: 'number',
@@ -1069,11 +1094,13 @@ export default {
               label: '应收运费',
               overHidden: true,
               index: 11,
+              width: 100,
               prop: 'landAmountD'
             }, {
               label: '应收杂费',
               overHidden: true,
               index: 12,
+              width: 100,
               prop: 'extraAmountD'
             }, {
               label: '应收杂费明细',
@@ -1082,7 +1109,7 @@ export default {
               prop: 'extraAmountItemD'
             }, {
               label: '车队',
-              width: 100,
+              width: 90,
               search: true,
               index: 9,
               overHidden: true,

src/views/statisticAnalysis/dataDetail/index.vue

@@ -160,6 +160,12 @@ export default {
             search: true,
             overHidden: true,
           },
+          {
+            label: "政策",
+            prop: "priceType",
+            search: false,
+            overHidden: true,
+          }
         ],
       },
     };

src/views/statisticAnalysis/salesmanCommission/index.vue

@@ -110,6 +110,12 @@ export default {
             search: false,
             overHidden: true,
           },
+          {
+            label: "政策",
+            prop: "priceType",
+            search: false,
+            overHidden: true,
+          },
         ],
       },
       // 仓库配置

src/views/warehousing/cargoClearance/AddOrUpdate.vue

@@ -400,6 +400,10 @@
         <el-button type="primary" @click="save()">确 定</el-button>
       </span>
     </el-dialog>
+    <trade-card title="通关明细"></trade-card>
+    <annex :data="relevantAttachments"/>
+    <collection ref="collection" :data="[]" @addBut="addRowCol"/>
+    <payment ref="payment" :data="[]" @addBut="addRowPay"/>
     <el-collapse v-model="collapselist">
       <el-collapse-item name="1">
         <template slot="title">
@@ -580,7 +584,6 @@
           </el-table>
         </div>
       </el-collapse-item>
-
       <el-collapse-item>
         <template slot="title">
           <i class="el-icon-s-order" style="font-size: 16px"></i>
@@ -848,6 +851,10 @@ import draggable from "vuedraggable";
 // import upLoad from "../components/upLoad";
 // import incomeMoney from '../components/incomeMoney'
 // import payMoney from '../components/payMoney'
+
+import annex from "@/components/annex/main";
+import collection from "@/components/collection/main";
+import payment from "@/components/payment/main";
 export default {
   name: "inStock",
   props: {
@@ -869,6 +876,9 @@ export default {
     // upLoad,
     // incomeMoney,
     // payMoney,
+    annex,
+    collection,
+    payment
   },
   data() {
     return {
@@ -1339,7 +1349,7 @@ export default {
   },
   created() {
     // this.setRowList = this.tableDate;
-    // this.getRowList = this.tableDate;
+    this.getRowList = this.tableDate;
     // this.setRowList2 = this.tableDate2;
     // this.getRowList2 = this.tableDate2;
     // this.getDicts("data_stltype_type").then((response) => {
@@ -3475,6 +3485,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+::v-deep .el-form-item {
+  margin-bottom: 0;
+}
 .tag-hover:hover {
   background-color: #d9ebfb;
 }