修改

build/utils.js

@@ -15,7 +15,8 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['index','appoint','TMS'];
+// let devModules = ["index", "appoint", "statisticalReport"];
+let devModules = ["all"];
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -32,7 +32,7 @@
         <el-table-column
         align="center"
           prop="materialName"
-          label="物资"
+          label="品  名"
           width="180px">
         </el-table-column>
         <el-table-column
@@ -570,7 +570,7 @@ export default {
           if(rows.length>0){
             that.disable=false;
             that.tableData=[];
-            if((typeof rows[0]['车号'])=='undefined'){
+            if((typeof rows[0]['车号'])=='undefined' || (typeof rows[0]['发站'])=='undefined' ){
               that.$message({
                 message: "导入Excel格式错误，请参考下方表头格式!",
                 type: "warning",

src/views/TMS/components/domesticMine/wagonLoadEdit.vue

@@ -163,30 +163,40 @@ export default {
       let tmstrainLoadingResult = {
         resultId: this.$route.params.resultId,
         resultWagonNo: this.form1.resultWagonNo,
-        purchaseOrderRailPlanId:this.form1.purchaseOrderNo,
+        purchaseOrderNo:this.form1.purchaseOrderNo,
         sendStationId: this.sendStationId,
         arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
-        resultRemarks: this.form1.resultRemarks
+        resultRemarks: this.form1.resultRemarks,
+        resultType:3
       };
       console.log(tmstrainLoadingResult)
       if (
       tmstrainLoadingResult.resultWagonNo==null||
       tmstrainLoadingResult.sendStationId==null||
       tmstrainLoadingResult.arrivalStationId==null||
-      tmstrainLoadingResult.resultLoadingDate==null||
-      tmstrainLoadingResult.purchaseOrderRailPlanId==null
+      tmstrainLoadingResult.resultLoadingDate==null
+     // || tmstrainLoadingResult.purchaseOrderNo==null
       ) this.$message.error("必填项存在空值！");
       else{
           this.axios
           .post("/api/v1/tms/upadteTmstrainLoadingResultByResultId",
             tmstrainLoadingResult)
-          .then(() => {
-            this.$message({
-              type: "success",  
-              message: "修改成功!",
-            });
-            this.$router.go(-1);
+          .then((res) => {
+            console.log(res.data.message);
+            if(res.data.code=='200'){
+              this.$message({
+                type: "success",  
+                message: "修改成功!",
+              });
+              this.$router.go(-1);
+            }else{
+              this.$message({
+                type: "error",  
+                message: res.data.data,
+              });
+            }
+           
           });
       }
     },

src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -304,6 +304,9 @@ export default {
       toTheStation:"老区轨道衡"
     };
   },
+  mounted(){
+    this.form1.resultLoadingDate=new Date();
+  },
   methods: {
     currentRadioChange1(selection) {
       this.input = null;
@@ -677,7 +680,9 @@ export default {
     orderChange(selection){
       console.log(selection);
       this.purchaseOrderId=selection.purchaseOrderId;
-      this.form1 = { purchaseOrderNo: selection.purchaseOrderNo };
+      this.form1 = { 
+        purchaseOrderNo: selection.purchaseOrderNo ,
+        resultLoadingDate:new Date() };
       this.materialId=selection.materialId;
       this.materialName=selection.materialName;
       this.supplierId=selection.supplierId;

src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue

@@ -182,6 +182,7 @@ export default {
         resultMaterialNumber: this.form1.resultMaterialNumber,
         resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
         resultRemarks: this.form1.resultRemarks,
+        resultType:2
       };
       console.log(tmstrainLoadingResult)
       if (

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -304,6 +304,9 @@ export default {
       toTheStation:"老区轨道衡"
     };
   },
+  mounted(){
+    this.form1.resultLoadingDate=new Date();
+  },
   methods: {
     currentRadioChange1(selection) {
       this.input = null;
@@ -677,7 +680,10 @@ export default {
     orderChange(selection){
       console.log(selection);
       this.purchaseOrderId=selection.purchaseOrderId;
-      this.form1 = { purchaseOrderNo: selection.purchaseOrderNo };
+      this.form1 = { 
+        purchaseOrderNo: selection.purchaseOrderNo,
+        resultLoadingDate:new Date() 
+        };
       this.materialId=selection.materialId;
       this.materialName=selection.materialName;
       this.supplierId=selection.supplierId;

src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -167,17 +167,22 @@ export default {
     onClickConfirm() {
       let tmstrainLoadingResult = {
         resultId: this.$route.params.resultId,
-        resultIsclear: this.form1.resultIsclear,
+        resultWagonNo: this.form1.resultWagonNo,
+        resultBillableTonnage: this.form1.resultBillableTonnage,
         resultClass: this.form1.resultClass,
+        resultIsclear: this.form1.resultIsclear,
         sendStationId: this.sendStationId,
         arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
+        batchId: this.form1.batchId,
         capacityId: this.form1.capacityId,
         resultMaterialNumber: this.form1.resultMaterialNumber,
         resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
         resultRemarks: this.form1.resultRemarks,
+        resultType:1
       };
       if (
+        tmstrainLoadingResult.resultId ==null ||
         tmstrainLoadingResult.resultIsclear == null ||
         tmstrainLoadingResult.resultClass == null ||
         tmstrainLoadingResult.sendStationId == null ||
@@ -197,6 +202,11 @@ export default {
                 type: "success",
                 message: "修改成功!",
               });
+            }else{
+               this.$message({
+                type: "error",
+                message: res.data.data,
+              });
             }
 
             this.$router.go(-1);

src/views/WMS/components/steel/steel_outbound.vue

@@ -13,8 +13,8 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
-      </dilTable>
+      <mergeRowTable v-bind.sync="options" @selection-change="selectionChange" ref="table">
+      </mergeRowTable>
     </div>
   </div>
 </template>
@@ -30,7 +30,11 @@ export default {
       endTime: null,
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152&warehouseId="+3
+        requestUrl: "/api/v1/wms/getWmspOutboundResult?apiId=152&warehouseId="+3,
+        comparison:"orderNumber1",
+        columnIndexs:[
+          0,1,2,3,4,5,6,7,8,9,10,13
+        ]
         // selectionType: "select",
         // mapList: [],
       },

src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -17,6 +17,7 @@
           :trigger-on-focus="false"
           @select="handleSelectCarrier"
           style="width:245px"
+          disabled
         >
           <template slot-scope="{ item }">
             <div class="name">{{ item.shipperName }}</div>
@@ -87,7 +88,7 @@
         <el-input
           v-model="remarks"
           placeholder="(非必填)"
-          style="width: 100px"
+          style="width: 180px"
         ></el-input>
       </el-form-item>
     </el-form>
@@ -1719,7 +1720,9 @@ export default {
           //是否磅重销售
           isPoundSale: 0,
           //备注
-          truckRemark: ""
+          truckRemark: "",
+          //物资名称
+          materialName: ""
         };
         mapItem.truckNo = item.cxh;
         mapItem.shipperAddressId = item.saleShipperAddressId;
@@ -1731,6 +1734,7 @@ export default {
         mapItem.steelMeters = item.meterNumber;
         mapItem.isPoundSale = item.isPound;
         mapItem.truckRemark = item.truckRemark;
+        mapItem.materialName = item.materialName;
         mapList.push(mapItem);
       });
       let mapValue = {
@@ -1745,14 +1749,21 @@ export default {
       console.log(mapValue);
       //所有列件数都填写
       if (orderPlanWeightAllFill == 0) {
-        this.axios.post("/api/v1/ams/addSteelSaleOrder", mapValue).then(res => {
-          if (res.data.code == "200") {
-            this.$router.go(-1);
-          }
-          this.$message.success("新增订单成功！");
-        });
+        this.axios
+          .post("/api/v1/ams/addSteelSaleOrder", mapValue)
+          .then(res => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+              this.notDebounce = false;
+            }
+            this.$message.success("新增订单成功！");
+          })
+          .catch(() => {
+            this.$message.error();
+          });
       } else {
         this.$message.error("还有物资件数未填写！");
+        this.notDebounce = false;
       }
     },
     // 取消

src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -17,6 +17,7 @@
           :trigger-on-focus="false"
           @select="handleSelectCarrier"
           style="width:245px"
+          disabled
         >
           <template slot-scope="{ item }">
             <div class="name">{{ item.shipperName }}</div>
@@ -32,6 +33,7 @@
           placeholder="请输入下单客户名称"
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
+          style="width:300px"
         >
           <template slot-scope="{ item }">
             <div class="name">{{ item.consigneeCompanyName }}</div>
@@ -85,7 +87,7 @@
         <el-input
           v-model="remarks"
           placeholder="(非必填)"
-          style="width: 100px"
+          style="width: 180px"
         ></el-input>
       </el-form-item>
     </el-form>
@@ -454,7 +456,6 @@
         <el-button type="primary" @click="addAddressClick">确定</el-button>
       </div>
     </el-dialog>
-
     <!-- 物资选择模态框 -->
     <el-drawer
       title="选择物资信息"
@@ -508,7 +509,6 @@
         </dilTable>
       </div>
     </el-drawer>
-
     <!-- 更改行物资 -->
     <el-dialog title="更改物资" :visible.sync="drawer" width="80%">
       <el-form :inline="true" style="margin-top: 0.5rem;">
@@ -912,6 +912,7 @@ export default {
           this.shipperId = res.data.data.shipperId;
           this.consigneeName = res.data.data.receiveName;
           this.consigneeId = res.data.data.receiveId;
+          this.remarks = res.data.data.saleRemark;
           if (res.data.data.isSelfMention == "否") {
             this.values = "no";
           } else {

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -85,7 +85,12 @@
         </el-tab-pane>
         <!-- 已审批 -->
         <el-tab-pane label="已审批" name="four">
-          <mergeRowTable v-bind.sync="option4" ref="table" :pageSize="200">
+          <mergeRowTable
+            v-bind.sync="option4"
+            ref="table"
+            :pageSize="200"
+            @func="func1"
+          >
             <el-table-column
               fixed="right"
               label="操作"
@@ -116,7 +121,12 @@
           </mergeRowTable>
         </el-tab-pane>
         <el-tab-pane label="反审批" name="five">
-          <mergeRowTable v-bind.sync="option5" ref="table2" :pageSize="200">
+          <mergeRowTable
+            v-bind.sync="option5"
+            ref="table2"
+            :pageSize="200"
+            @func="func3"
+          >
             <el-table-column
               fixed="right"
               label="操作"
@@ -136,7 +146,27 @@
         </el-tab-pane>
         <!-- 已上报 -->
         <el-tab-pane label="已上报" name="second">
-          <mergeRowTable v-bind.sync="option2" ref="table2" :pageSize="200">
+          <mergeRowTable
+            v-bind.sync="option2"
+            ref="table2"
+            :pageSize="200"
+            @func="func2"
+          >
+            <el-table-column
+              fixed="right"
+              label="操作"
+              align="center"
+              width="200"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  @click="updateSaleOrderStatusById(scope)"
+                  type="text"
+                  size="small"
+                  >撤销上报</el-button
+                >
+              </template>
+            </el-table-column>
           </mergeRowTable>
         </el-tab-pane>
       </el-tabs>
@@ -165,7 +195,7 @@ export default {
         requestUrl: "/api/v1/ams/getSaleOrderInfoes?apiId=408",
         selectionType: "select",
         comparison: "saleNumber",
-        columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        columnIndexs: [0, 1, 2, 3, 4, 9, 10, 11, 12, 13, 14, 15, 16, 17]
       },
       option2: {
         // 表格请求数据的地址
@@ -242,6 +272,19 @@ export default {
       this.option5.requestUrl =
         "/api/v1/ams/getSteelOrderDeletedList?apiId=409&consigneeSsoId=" +
         getCookie("userId");
+    } else if (getCookie("orgCode") == "xiaoshouyewuyuan") {
+      this.option.requestUrl =
+        "/api/v1/ams/getSaleOrderInfoes?apiId=408&saler=" +
+        getCookie("loginName");
+      this.option2.requestUrl =
+        "/api/v1/ams/getSaleOrderReportedes?apiId=408&saler=" +
+        getCookie("loginName");
+      this.option4.requestUrl =
+        "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1&saler=" +
+        getCookie("loginName");
+      this.option5.requestUrl =
+        "/api/v1/ams/getSteelOrderDeletedList?apiId=409&saler=" +
+        getCookie("loginName");
     } else {
       this.option.requestUrl =
         "/api/v1/ams/getSaleOrderInfoes?apiId=408&consigneeSsoId=" + null;
@@ -255,6 +298,57 @@ export default {
     }
   },
   methods: {
+    updateSaleOrderStatusById(scope) {
+      console.log(scope.row.saleOrderId);
+      this.$confirm("是否撤销", "警告", {
+        confirmButtonText: "确定撤销",
+        cancelButtonText: "取消撤销",
+        type: "warning",
+        center: true
+      })
+        .then(() => {
+          this.axios
+            .post(
+              "/api/v1/uc/updateSaleOrderStatusById?saleOrderId=" +
+                scope.row.saleOrderId
+            )
+            .then(res => {
+              if (res.data.code == "200") {
+                this.$message.success("撤销成功");
+                this.activeName = "first";
+                this.getRequestUrl();
+              } else {
+                this.$message.error("撤销失败");
+              }
+            })
+            .catch(() => {
+              this.$message.error("撤销失败");
+            });
+        })
+        .catch(() => {
+          console.log("取消撤销");
+        });
+    },
+    func(res) {
+      this.matSum = res.list.reduce(function(prev, item) {
+        return prev + item.materialNumber;
+      }, 0);
+    },
+    func1(res) {
+      this.matSum = res.list.reduce(function(prev, item) {
+        return prev + item.materialNumber;
+      }, 0);
+    },
+    func2(res) {
+      this.matSum = res.list.reduce(function(prev, item) {
+        return prev + item.materialNumber;
+      }, 0);
+    },
+    func3(res) {
+      this.matSum = res.list.reduce(function(prev, item) {
+        return prev + item.materialNumber;
+      }, 0);
+    },
     deleteSaleOrder(row) {
       this.$prompt("此操作将关闭订单且下面的待运输订单，是否继续?", "提示", {
         confirmButtonText: "确定",

src/views/appoint/components/saleContract/saleOrderSteelCar.vue

@@ -2,10 +2,28 @@
   <!-- 销售订单页面 -->
   <div class="salePlan">
     <div class="top">
+      <span>制单时间:</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
@@ -69,17 +87,31 @@
         </el-tab-pane>
         <!-- 已派车 -->
         <el-tab-pane label="已派车" name="first">
-          <mergeRowTable v-bind.sync="option" ref="table3"> </mergeRowTable>
+          <mergeRowTable v-bind.sync="option" ref="table3">
+            <el-table-column fixed="right" label="操作" width="160">
+              <template slot-scope="scope">
+                <el-button
+                  @click="updateDriverTel(scope)"
+                  type="text"
+                  size="small"
+                  >修改司机电话号码</el-button
+                >
+              </template>
+            </el-table-column>
+          </mergeRowTable>
         </el-tab-pane>
       </el-tabs>
     </div>
   </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "saleOrder",
   data() {
     return {
+      endTime: null,
+      startTime: null,
       carrierText: null,
       dialogTableVisible: false,
       activeName: "four",
@@ -91,8 +123,8 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getHaveCarTruckNoList?apiId=466",
-        comparison: "saleOrderMaterialId",
-        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+        comparison: "orderId",
+        columnIndexs: [0, 1, 2, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       option2: {
         // 表格请求数据的地址
@@ -123,6 +155,40 @@ export default {
     };
   },
   methods: {
+    updateDriverTel(scope) {
+      console.log(scope.row);
+      this.$prompt(
+        `请输入--${scope.row.capacityNumber}--修改后的电话号码`,
+        `${scope.row.capacityNumber}--修改前的电话号码:${scope.row.drivelTel}`,
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          inputPlaceholder: "输入正确格式的电话号码",
+          center: true
+        }
+      )
+        .then(({ value }) => {
+          this.axios
+            .post("/api/v1/uc/updateDriverTel", {
+              orderId: parseInt(scope.row.orderId),
+              driverTel: value
+            })
+            .then(res => {
+              if (res.data.code == "200") {
+                this.$message.success("修改成功");
+                this.getRequestUrl();
+              } else {
+                this.$message.error("修改失败");
+              }
+            })
+            .catch(() => {
+              this.$message.error("修改失败");
+            });
+        })
+        .catch(() => {
+          this.$message.info("取消修改");
+        });
+    },
     getRequestUrl() {
       this.option.requestUrl =
         "/api/v1/ams/getHaveCarTruckNoList?apiId=466&i=" + new Date();
@@ -167,6 +233,12 @@ export default {
       console.log(tab, event);
     },
     onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
       if (this.activeName == "four") {
         this.option4.requestUrl =
           "/api/v1/ams/getSteelTruckNoList?apiId=411&con=" + this.input;
@@ -176,7 +248,14 @@ export default {
           "/api/v1/ams/getNoCarTruckNoList?apiId=466&con=" + this.input;
       } else if (this.activeName == "first") {
         this.option.requestUrl =
-          "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" + this.input;
+          "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" +
+          this.input +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       }
     },
     seeclick(saleOrderId) {

src/views/appoint/components/saleContract/updateSaleOrderSteel.vue

@@ -173,6 +173,14 @@
             >
               车辆变更
             </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="closeFlu(scope)"
+              v-if="deleted == 0"
+            >
+              关闭分录
+            </el-button>
             <el-button
               type="text"
               size="mini"
@@ -560,6 +568,10 @@ export default {
     this.getAllProvince();
   },
   methods: {
+    closeFlu(scope) {
+      this.capacityNumber = scope.row.capacityNumber;
+      this.deleteEasEntryId(scope.row);
+    },
     //车辆变更
     updateCapacity(scope) {
       this.oldCapacityNum = scope.row.capacityNumber;
@@ -624,8 +636,8 @@ export default {
       this.orderSaleMap = scope.row;
       console.log(this.orderSaleMap);
       let title = `请选择对-${scope.row.capacityNumber}-进行的操作?`;
-      let confirmText = `删除-${scope.row.capacityNumber}-金蝶分录`;
-      let cancelText = `不删除-${scope.row.capacityNumber}-金蝶分录`;
+      let confirmText = `关闭-${scope.row.capacityNumber}-金蝶分录`;
+      let cancelText = `不关闭-${scope.row.capacityNumber}-金蝶分录`;
       this.$confirm(title, "提示", {
         confirmButtonText: confirmText,
         cancelButtonText: cancelText,
@@ -645,7 +657,7 @@ export default {
     },
     //删除金蝶分录
     deleteEasEntryId(row) {
-      let title = `确定删除-${this.capacityNumber}-金蝶分录?`;
+      let title = `确定关闭-${this.capacityNumber}-金蝶分录?`;
       this.$confirm(title, {
         confirmButtonText: "是",
         cancelButtonText: "否",
@@ -656,13 +668,18 @@ export default {
           let map = row;
           map.isCloseEas = Number(0);
           map.saleOrderId = this.$route.params.saleOrderId;
-          this.axios.post("/api/v1/ams/updateCarAddress", map).then(res => {
-            if (res.data.code == "200") {
-              this.$message.success("删除成功");
-            } else {
-              this.$message.error("删除失败");
-            }
-          });
+          this.axios
+            .post("/api/v1/ams/updateCarAddress", map)
+            .then(res => {
+              if (res.data.code == "200") {
+                this.$message.success("关闭成功");
+              } else {
+                this.$message.error("关闭失败");
+              }
+            })
+            .catch(() => {
+              this.$message.error("关闭失败");
+            });
         })
         .catch(() => {
           this.$message.info("取消删除");

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelForm.vue

@@ -3,50 +3,53 @@
   <div class="purchasFuelNewMonitor">
     <el-form :inline="true" style="margin-top :5px">
       <el-form-item>
-        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
-            <el-date-picker
-            v-model="startTime"
-            type="datetime"
-            placeholder="选择日期时间"
-          >
-          </el-date-picker>
-          <span>至</span>
-          <el-date-picker
-            v-model="endTime"
-            type="datetime"
-            placeholder="选择日期时间"
-          >
-          </el-date-picker>
-          <el-button type="primary" class="btn" @click="onclick">
-            <i class="el-icon-search"></i>查询
-          </el-button>
+        <label class="el-form-item__label" style="width: auto;"
+          >计毛时间：</label
+        >
+        <el-date-picker
+          v-model="startTime"
+          type="datetime"
+          placeholder="选择日期时间"
+        >
+        </el-date-picker>
+        <span>至</span>
+        <el-date-picker
+          v-model="endTime"
+          type="datetime"
+          placeholder="选择日期时间"
+        >
+        </el-date-picker>
+        <el-button type="primary" class="btn" @click="onclick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+          ><i class="el-icon-download"></i>导出(Excel)</el-button
+        >
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="refresh">
-        <i class="el-icon-refresh"></i>刷新
-      </el-button>
+          <i class="el-icon-refresh"></i>刷新
+        </el-button>
       </el-form-item>
       <el-form-item>
         <span style="margin-left: 1rem;width:68px">合计净重：</span>
-      <el-input
-        v-model="totalNumber"
-        :disabled="true"
-        style="width: 150px;"
-      ></el-input>
+        <el-input
+          v-model="totalNumber"
+          :disabled="true"
+          style="width: 150px;"
+        ></el-input>
       </el-form-item>
       <el-form-item>
         <span style="margin-left: 1rem;width:68px">合计车数：</span>
-      <el-input
-        v-model="totalCapacity"
-        :disabled="true"
-        style="width: 150px;"
-      ></el-input>
+        <el-input
+          v-model="totalCapacity"
+          :disabled="true"
+          style="width: 150px;"
+        ></el-input>
       </el-form-item>
-    </el-form> 
+    </el-form>
     <div class="table">
       <!-- <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable> -->
       <mergeRowTable ref="excelDom" v-bind.sync="option"> </mergeRowTable>
@@ -67,7 +70,7 @@ export default {
       option: {
         requestUrl: "",
         comparison: "orderNumber",
-        columnIndexs: [0, 1, 2, 3, 11, 12, 13, 16, 21, 22, 23, 24]
+        columnIndexs: [0, 1, 2, 3, 4, 5, 6, 13, 14, 15, 16, 19, 24, 25, 26]
       },
       startTime: null,
       endTime: null,
@@ -200,5 +203,4 @@ export default {
 };
 </script>
 
-<style lang="scss">
-</style>
+<style lang="scss"></style>