Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -15,8 +15,7 @@ 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','sale']
-// let devModules = ['all']
+// let devModules = ['index','statisticalReport','appoint']
 // let devModules = ['index','appoint','sale','RMS','statisticalReport'];
 //let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward']
@@ -24,7 +23,7 @@ let devModules = ['all']
 // let devModules = ['index','sale']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
-//  let devModules = ['index','WMS','appoint','TMS','inward','SporadicManage']
+//  let devModules = ['index','WMS','appoint','TMS','inward','statisticalReport','sale']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','RMS'];
 if (pathSrc.indexOf('node_modules') > -1) {

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.js

@@ -52,16 +52,19 @@ export default {
       for (var i = 0; i < data.length; i++) {
         if (i === 0) {
           this.spanArr.push(1);
+          data[i].group = i;
           this.pos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-        
           if (data[i][this.comparison] === data[i - 1][this.comparison]) {
             this.spanArr[this.pos] += 1;
             this.spanArr.push(0);
+            data[i].group = data[i-1].group;
+
           } else {
             this.spanArr.push(1);
             this.pos = i;
+            data[i].group = data[i-1].group + 1
           }
         }
       }
@@ -148,8 +151,9 @@ export default {
           .then(response => {
             let d = response.data.data;
             this.dataTabel = d.list;
-            this.dataTotal = d.total;
             this.getSpanArr(this.dataTabel);
+            this.dataTotal = d.total;
+            
             //执行成功的回调
             this.$emit('func',response.data.data);
             this.refreshColumnData(d.columnData);

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.vue

@@ -57,14 +57,13 @@
 
       <!-- 序号 -->
       <el-table-column
-        v-if="showIndex"
-        type="index"
         width="50"
         label="序号"
         align="center"
         fixed="left"
         :resizable="false"
       >
+        <template slot-scope="scope">{{ scope.row.group + 1 }}</template>
       </el-table-column>
 
       <!-- 表格列 -->
@@ -123,11 +122,11 @@ export default {
   extends: table,
   props: {
     // 合并行下标
-    columnIndexs:{
-     default: []
+    columnIndexs: {
+      default: []
     },
     //比对字段
-    comparison:{
+    comparison: {
       default: ""
     },
     shiyHeigth: {

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

@@ -1277,6 +1277,7 @@ export default {
     },
     // 添加物资到某个车序号
     addToCxh() {
+      console.log("wkk");
       if (!this.toCxh) {
         this.$message.warning("请先在左侧输入要添加物资的车序号！");
       } else {
@@ -1335,22 +1336,27 @@ export default {
           }
         });
         //若添加的车序号为最后一个车序号
-        if (this.selectionList.length - 1 == toCxh) {
+        if (alreadyAdd == 0) {
           //插入新增物资
+          console.log("1345wjj");
           this.materialList.forEach(e => {
             var addmap = {
-              cxh: arr[toCxh].cxh,
+              cxh: arr[this.selectionList.length - 1].cxh,
               materialName: e.materialName,
               Specification: e.Specification,
               materialCode: e.materialCode,
               orderPlanWeight: e.orderPlanWeight,
               meterNumber: e.meterNumber,
               isPound: e.isPound,
-              saleShipperAddressId: arr[toCxh].saleShipperAddressId,
-              place: arr[toCxh].place,
-              saleShipperAddressName: arr[toCxh].saleShipperAddressName,
-              saleDateOfReceipt: arr[toCxh].saleDateOfReceipt,
-              saleOrderConsigneeTel: arr[toCxh].saleOrderConsigneeTel,
+              saleShipperAddressId:
+                arr[this.selectionList.length - 1].saleShipperAddressId,
+              place: arr[this.selectionList.length - 1].place,
+              saleShipperAddressName:
+                arr[this.selectionList.length - 1].saleShipperAddressName,
+              saleDateOfReceipt:
+                arr[this.selectionList.length - 1].saleDateOfReceipt,
+              saleOrderConsigneeTel:
+                arr[this.selectionList.length - 1].saleOrderConsigneeTel,
               materialId: e.materialId,
               haveMeter: e.haveMeter
             };

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

@@ -16,7 +16,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 已审批 -->
       <el-tab-pane label="已审批" name="four">
-        <dilTable
+        <mergeRowTable
           v-bind.sync="option4"
           @selection-change="selectionChange"
           ref="table"
@@ -56,7 +56,7 @@
               </el-form>
             </template>
           </el-table-column>
-        </dilTable>
+        </mergeRowTable>
       </el-tab-pane>
     </el-tabs>
     <!-- 承运商模态框 -->
@@ -123,7 +123,9 @@ export default {
         // 表格请求数据的地址
         requestUrl:
           "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1",
-        selectionType: "select"
+        selectionType: "select",
+        comparison: "saleNumber",
+        columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
       },
       carrier: {
         requestUrl: "",

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

@@ -12,7 +12,7 @@
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 已审批 -->
-       <el-tab-pane label="已审批" name="four">
+      <el-tab-pane label="已审批" name="four">
         <dilTable v-bind.sync="option4" ref="table">
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
@@ -31,24 +31,24 @@
             </template>
           </el-table-column>
           <!-- 物资详情抽屉 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
+          <el-table-column type="expand" width="1">
+            <template slot-scope="props">
+              <el-form label-position="center" inline class="demo-table-expand">
+                <div v-if="false">{{ props }}</div>
+                <div>
+                  <el-table :data="tableData" border>
+                    <el-table-column
+                      v-for="(item, i) in tableHead"
+                      :key="i"
+                      :prop="item.prop"
+                      :label="item.label"
+                      :width="item.width"
+                    ></el-table-column>
+                  </el-table>
+                </div>
+              </el-form>
+            </template>
+          </el-table-column>
         </dilTable>
       </el-tab-pane>
     </el-tabs>
@@ -66,8 +66,7 @@ export default {
       carrierName: null,
       option4: {
         // 表格请求数据的地址
-        requestUrl:
-          "",
+        requestUrl: ""
       },
       //记录旧的row对象 (销售公司已审批)
       oldRow: "",
@@ -77,34 +76,34 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150,
+          width: 150
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150,
+          width: 150
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100,
+          width: 100
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100,
-        },
+          width: 100
+        }
       ],
       //(销售公司已审批)
-      tableData: [],
+      tableData: []
     };
   },
-  created(){
-      this.initUrl();
+  created() {
+    this.initUrl();
   },
   methods: {
-    initUrl(){
-        if (getCookie("orgCode") == "chengyunshang") {
+    initUrl() {
+      if (getCookie("orgCode") == "chengyunshang") {
         this.option4.requestUrl =
           "/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409&carrierSsoId=" +
           getCookie("userId");
@@ -113,18 +112,20 @@ export default {
           "/api/v1/ams/getSaleOrderListByCarrierSsoId?apiId=409";
       }
     },
-    refresh(){
+    refresh() {
       this.$router.go(0);
     },
     handleClick(tab, event) {
       console.log(tab, event);
     },
     onclick() {
-      if(this.activeName == "four"){
-        this.option4.requestUrl = "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con="+this.input;      
+      if (this.activeName == "four") {
+        this.option4.requestUrl =
+          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=" +
+          this.input;
       }
     },
-    coproductSendClick(saleOrderId){
+    coproductSendClick(saleOrderId) {
       this.$router.push("/addSaleOrderCoproductSendCarrier/" + saleOrderId);
     },
     // -------查看物资详情 (已审批)
@@ -152,15 +153,15 @@ export default {
       this.oldRow = row;
       // 根据销售订单id查询物资信息
       this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" +row.saleOrderId)
-        .then((res) => {
+        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
+        .then(res => {
           this.tableData = res.data.data;
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .salePlan {
   .top {
     padding: 1.25rem 0.375rem;
@@ -170,4 +171,4 @@ export default {
     }
   }
 }
-</style>
+</style>

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

@@ -22,7 +22,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 未上报 -->
       <el-tab-pane label="未上报" name="first">
-        <dilTable
+        <mergeRowTable
           v-bind.sync="option"
           ref="excelDom"
           @selection-change="selectionChange"
@@ -52,102 +52,18 @@
                 @click="deleteclick(scope.row.saleOrderId)"
                 >删除</el-button
               >
-              <el-button
-                @click="detailclick3(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</el-button
-              >
             </template>
           </el-table-column>
           <!-- 物资详情抽屉 -->
-          <el-table-column type="expand" width="1">
-            <template slot-scope="props">
-              <el-form label-position="center" inline class="demo-table-expand">
-                <div v-if="false">{{ props }}</div>
-                <div>
-                  <el-table :data="tableData3" border>
-                    <el-table-column
-                      v-for="(item, i) in tableHead"
-                      :key="i"
-                      :prop="item.prop"
-                      :label="item.label"
-                      :width="item.width"
-                    ></el-table-column>
-                  </el-table>
-                </div>
-              </el-form>
-            </template>
-          </el-table-column>
-        </dilTable>
+        </mergeRowTable>
       </el-tab-pane>
       <!-- 已审批 -->
       <el-tab-pane label="已审批" name="four">
-        <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="80">
-            <template slot-scope="scope">
-              <el-button
-                @click="detailclick(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</el-button
-              >
-            </template>
-          </el-table-column>
-          <!-- 物资详情抽屉 -->
-          <el-table-column type="expand" width="1">
-            <template slot-scope="props">
-              <el-form label-position="center" inline class="demo-table-expand">
-                <div v-if="false">{{ props }}</div>
-                <div>
-                  <el-table :data="tableData" border>
-                    <el-table-column
-                      v-for="(item, i) in tableHead"
-                      :key="i"
-                      :prop="item.prop"
-                      :label="item.label"
-                      :width="item.width"
-                    ></el-table-column>
-                  </el-table>
-                </div>
-              </el-form>
-            </template>
-          </el-table-column>
-        </dilTable>
+        <mergeRowTable v-bind.sync="option4" ref="table"> </mergeRowTable>
       </el-tab-pane>
       <!-- 已上报 -->
       <el-tab-pane label="已上报" name="second">
-        <dilTable v-bind.sync="option2" ref="table2">
-          <el-table-column fixed="right" label="操作" width="70">
-            <template slot-scope="scope">
-              <el-button
-                @click="detailclick2(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</el-button
-              >
-            </template>
-          </el-table-column>
-          <!-- 物资详情抽屉 -->
-          <el-table-column type="expand" width="1">
-            <template slot-scope="props">
-              <el-form label-position="center" inline class="demo-table-expand">
-                <div v-if="false">{{ props }}</div>
-                <div>
-                  <el-table :data="tableData2" border>
-                    <el-table-column
-                      v-for="(item, i) in tableHead"
-                      :key="i"
-                      :prop="item.prop"
-                      :label="item.label"
-                      :width="item.width"
-                    ></el-table-column>
-                  </el-table>
-                </div>
-              </el-form>
-            </template>
-          </el-table-column>
-        </dilTable>
+        <mergeRowTable v-bind.sync="option2" ref="table2"> </mergeRowTable>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -170,15 +86,48 @@ export default {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getSaleOrderInfoes?apiId=408",
         selectionType: "select",
+<<<<<<< HEAD
+        comparison: "saleNumber",
+        columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
+=======
+>>>>>>> f2150ab3172b86585a09574acc2db8baa1c3db03
       },
       option2: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408",
+<<<<<<< HEAD
+        comparison: "saleNumber",
+        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+=======
+>>>>>>> f2150ab3172b86585a09574acc2db8baa1c3db03
       },
       option4: {
         // 表格请求数据的地址
         requestUrl:
           "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1",
+<<<<<<< HEAD
+        comparison: "saleNumber",
+        columnIndexs: [
+          0,
+          1,
+          2,
+          3,
+          7,
+          8,
+          9,
+          10,
+          11,
+          12,
+          13,
+          14,
+          15,
+          16,
+          17,
+          18,
+          20
+        ]
+=======
+>>>>>>> f2150ab3172b86585a09574acc2db8baa1c3db03
       },
       mapList: [],
       mapItemList: [],
@@ -321,37 +270,49 @@ export default {
             "/api/v1/ams/getSaleOrderInfoes?apiId=408&saleType=1&con=" +
             this.input +
             "&consigneeSsoId=" +
-            getCookie("userId");
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else if (this.activeName == "second") {
           this.option2.requestUrl =
             "/api/v1/ams/getSaleOrderReportedes?apiId=408&saleType=1&con=" +
             this.input +
             "&consigneeSsoId=" +
-            getCookie("userId");
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else if (this.activeName == "four") {
           this.option4.requestUrl =
             "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&saleType=1&shipperId=1&con=" +
             this.input +
             "&consigneeSsoId=" +
-            getCookie("userId");
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         }
       } else {
         if (this.activeName == "first") {
           this.option.requestUrl =
-            "/api/v1/ams/getSaleOrderInfoes?apiId=408&saleType=1&con=" + this.input;
+            "/api/v1/ams/getSaleOrderInfoes?apiId=408&saleType=1&con=" +
+            this.input +
+            "&i=" +
+            new Date();
         } else if (this.activeName == "second") {
           this.option2.requestUrl =
-            "/api/v1/ams/getSaleOrderReportedes?apiId=408&saleType=1&con=" + this.input;
+            "/api/v1/ams/getSaleOrderReportedes?apiId=408&saleType=1&con=" +
+            this.input +
+            "&i=" +
+            new Date();
         } else if (this.activeName == "four") {
           this.option4.requestUrl =
             "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&saleType=1&shipperId=1&con=" +
-            this.input;
+            this.input +
+            "&i=" +
+            new Date();
         }
       }
     },
-    handleClose(){
-
-    },
+    handleClose() {},
     seeclick(saleOrderId) {
       this.$router.push("/saleOrderDetail/" + saleOrderId);
     },

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

@@ -31,7 +31,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 未授权 -->
       <el-tab-pane label="未授权" name="four">
-        <dilTable v-bind.sync="option4" ref="table">
+        <mergeRowTable v-bind.sync="option4" ref="table">
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
@@ -46,106 +46,26 @@
                 size="small"
                 >钢材派车</el-button
               >
-              <el-button
-                @click="detailclick(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</el-button
-              >
             </template>
           </el-table-column>
-          <!-- 物资详情抽屉 -->
-          <el-table-column type="expand" width="1">
-            <template slot-scope="props">
-              <el-form label-position="center" inline class="demo-table-expand">
-                <div v-if="false">{{ props }}</div>
-                <div>
-                  <el-table :data="tableData" border>
-                    <el-table-column
-                      v-for="(item, i) in tableHead"
-                      :key="i"
-                      :prop="item.prop"
-                      :label="item.label"
-                      :width="item.width"
-                    ></el-table-column>
-                  </el-table>
-                </div>
-              </el-form>
-            </template>
-          </el-table-column>
-        </dilTable>
+        </mergeRowTable>
       </el-tab-pane>
 
       <!-- 未派车 -->
       <el-tab-pane label="未派车" name="five">
-        <dilTable v-bind.sync="option0" ref="table0">
+        <mergeRowTable v-bind.sync="option0" ref="table0">
           <el-table-column fixed="right" label="操作" width="160">
             <template slot-scope="scope">
               <el-button @click="updateCarrier(scope)" type="text" size="small"
                 >修改承运商授权</el-button
               >
-              <el-button
-                @click="detailclick0(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</el-button
-              >
             </template>
           </el-table-column>
-          <!-- 物资详情抽屉 -->
-          <el-table-column type="expand" width="1">
-            <template slot-scope="props">
-              <el-form label-position="center" inline class="demo-table-expand">
-                <div v-if="false">{{ props }}</div>
-                <div>
-                  <el-table :data="tableData0" border>
-                    <el-table-column
-                      v-for="(item, i) in tableHead"
-                      :key="i"
-                      :prop="item.prop"
-                      :label="item.label"
-                      :width="item.width"
-                    ></el-table-column>
-                  </el-table>
-                </div>
-              </el-form>
-            </template>
-          </el-table-column>
-        </dilTable>
+        </mergeRowTable>
       </el-tab-pane>
       <!-- 已派车 -->
       <el-tab-pane label="已派车" name="first">
-        <dilTable v-bind.sync="option" ref="table3">
-          <el-table-column fixed="right" label="操作" align="center" width="80">
-            <template slot-scope="scope">
-              <el-button
-                @click="detailclick3(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</el-button
-              >
-            </template>
-          </el-table-column>
-          <!-- 物资详情抽屉 -->
-          <el-table-column type="expand" width="1">
-            <template slot-scope="props">
-              <el-form label-position="center" inline class="demo-table-expand">
-                <div v-if="false">{{ props }}</div>
-                <div>
-                  <el-table :data="tableData3" border>
-                    <el-table-column
-                      v-for="(item, i) in tableHead"
-                      :key="i"
-                      :prop="item.prop"
-                      :label="item.label"
-                      :width="item.width"
-                    ></el-table-column>
-                  </el-table>
-                </div>
-              </el-form>
-            </template>
-          </el-table-column>
-        </dilTable>
+        <mergeRowTable v-bind.sync="option" ref="table3"> </mergeRowTable>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -166,26 +86,32 @@ 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]
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408",
+        requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408"
       },
       option3: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getAmsSaleOrderApprovedes?apiId=409",
+        requestUrl: "/api/v1/ams/getAmsSaleOrderApprovedes?apiId=409"
       },
       option4: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getSteelTruckNoList?apiId=411",
+        comparison: "saleOrderMaterialId",
+        columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
       },
       option0: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getNoCarTruckNoList?apiId=466",
+        comparison: "saleOrderMaterialId",
+        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
       },
       carrierOption: {
         requestUrl: "/api/v1/uc/getCarrierListByLike?apiId=412",
-        selectionType: "radio",
+        selectionType: "radio"
       },
       mapList: [],
       mapItemList: [],
@@ -213,23 +139,23 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150,
+          width: 150
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150,
+          width: 150
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100,
+          width: 100
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100,
-        },
+          width: 100
+        }
       ],
       //(销售公司已审批)
       tableData: [],
@@ -240,7 +166,7 @@ export default {
       //(未上报)
       tableData3: [],
       //(未派车)
-      tableData0: [],
+      tableData0: []
     };
   },
   methods: {
@@ -270,9 +196,9 @@ export default {
     updateTruckCapacity() {
       let map = {
         carrierId: this.carrierId,
-        saleOrderMaterialId: this.saleOrderMaterialId,
+        saleOrderMaterialId: this.saleOrderMaterialId
       };
-      this.axios.post("/api/v1/ams/updateTruckNoCarrier", map).then((res) => {
+      this.axios.post("/api/v1/ams/updateTruckNoCarrier", map).then(res => {
         if (res.data.code == "200") {
           this.$message.success("修改授权成功");
           this.getRequestUrl();
@@ -293,11 +219,11 @@ export default {
           "/api/v1/ams/getSteelTruckNoList?apiId=411&con=" + this.input;
         // console.log("aaaa" + this.input);
       } else if (this.activeName == "five") {
-        this.option0.requestUrl = 
-        "/api/v1/ams/getNoCarTruckNoList?apiId=466&con=" + this.input;
+        this.option0.requestUrl =
+          "/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;
+        this.option.requestUrl =
+          "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" + this.input;
       }
     },
     seeclick(saleOrderId) {
@@ -338,7 +264,7 @@ export default {
           "/api/v1/ams/getTruckNoMaterialList?saleOrderMaterialId=" +
             row.saleOrderMaterialId
         )
-        .then((res) => {
+        .then(res => {
           this.tableData = res.data.data;
         });
     },
@@ -372,7 +298,7 @@ export default {
           "/api/v1/ams/getTruckNoMaterialList?saleOrderMaterialId=" +
             row.saleOrderMaterialId
         )
-        .then((res) => {
+        .then(res => {
           this.tableData3 = res.data.data;
         });
     },
@@ -406,11 +332,11 @@ export default {
           "/api/v1/ams/getTruckNoMaterialList?saleOrderMaterialId=" +
             row.saleOrderMaterialId
         )
-        .then((res) => {
+        .then(res => {
           this.tableData0 = res.data.data;
         });
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

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

@@ -13,8 +13,8 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 已审批 -->
       <el-tab-pane label="已审批" name="four">
-        <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="200">
+        <mergeRowTable v-bind.sync="option4" ref="table">
+          <el-table-column fixed="right" label="操作" width="120">
             <template slot-scope="scope">
               <el-button
                 @click="steelSendClick(scope.row.saleOrderId)"
@@ -22,34 +22,9 @@
                 size="small"
                 >钢材派车</el-button
               >
-              <el-button
-                @click="detailclick(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</el-button
-              >
-            </template>
-          </el-table-column>
-          <!-- 物资详情抽屉 -->
-          <el-table-column type="expand" width="1">
-            <template slot-scope="props">
-              <el-form label-position="center" inline class="demo-table-expand">
-                <div v-if="false">{{ props }}</div>
-                <div>
-                  <el-table :data="tableData" border>
-                    <el-table-column
-                      v-for="(item, i) in tableHead"
-                      :key="i"
-                      :prop="item.prop"
-                      :label="item.label"
-                      :width="item.width"
-                    ></el-table-column>
-                  </el-table>
-                </div>
-              </el-form>
             </template>
           </el-table-column>
-        </dilTable>
+        </mergeRowTable>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -69,37 +44,13 @@ export default {
       option4: {
         // 表格请求数据的地址
         requestUrl: "",
+        comparison: "saleNumber",
+        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
       },
       mapList: [],
       mapItemList: [],
-      //记录旧的row对象 (销售公司已审批)
-      oldRow: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (销售公司已审批)
-      oldRowCount: 1,
-      tableHead: [
-        {
-          prop: "materialName",
-          label: "物资名称",
-          width: 150,
-        },
-        {
-          prop: "specificationModel",
-          label: "规格型号",
-          width: 150,
-        },
-        {
-          prop: "materialNumber",
-          label: "物资件数",
-          width: 100,
-        },
-        {
-          prop: "materialWeight",
-          label: "物资重量",
-          width: 100,
-        },
-      ],
       //(销售公司已审批)
-      tableData: [],
+      tableData: []
     };
   },
   created() {
@@ -135,7 +86,10 @@ export default {
       } else {
         if (this.activeName == "four") {
           this.option4.requestUrl =
-            "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&con=" + this.input+"&carrierSsoId="+"";
+            "/api/v1/ams/getSaleOrderListToCarrier?apiId=467&con=" +
+            this.input +
+            "&carrierSsoId=" +
+            "";
         }
       }
     },
@@ -171,14 +125,14 @@ export default {
       // 根据销售订单id查询物资信息
       this.axios
         .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
-        .then((res) => {
+        .then(res => {
           this.tableData = res.data.data;
         });
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .salePlan {
   .top {
     padding: 1.25rem 0.375rem;
@@ -188,4 +142,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/queue/components/qmsEnFacotory/queueFListMonitor.vue

@@ -1,26 +1,68 @@
 // 链表监控 // 排队开始
 <template>
   <div class="sale">
-    <div class="top">
-      <el-form :inline="true" style="margin-top: 1rem;">
-        <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">车牌号</label>
-        </el-form-item>
-        <el-form-item>
-          <el-input v-model="capacityNo"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            class="btn"
-            @click="onclick"
-            style="margin-left: 4px;"
-            clearable
-            ><i class="el-icon-search"></i>查询</el-button
-          >
-        </el-form-item>
-      </el-form>
-    </div>
+    <div class="top"></div>
+    <el-dialog title="链表详情" :visible.sync="dialogTableVisible">
+      <el-table
+        :data="tableDataDetails"
+        border
+        style="width: 100%; margin-top: 20px"
+        max-height="500px"
+      >
+        <el-table-column type="index" width="50"> </el-table-column>
+        <el-table-column prop="capacityNumber" label="车牌号" fit>
+        </el-table-column>
+        <el-table-column prop="resultStartTime" label="排队开始时间">
+        </el-table-column>
+        <el-table-column prop="listNodeOrder" label="序号"></el-table-column>
+        <el-table-column prop="materialName" label="物资名称">
+        </el-table-column>
+        <el-table-column prop="materialSpecification" label="物资规格">
+        </el-table-column>
+        <el-table-column prop="materialModel" label="物资型号">
+        </el-table-column>
+        <el-table-column prop="materialNumber" label="物资件数">
+        </el-table-column>
+        <el-table-column prop="driverTel" label="司机电话号码">
+        </el-table-column>
+        <el-table-column prop="sureTime" label="可进厂确认时间">
+        </el-table-column>
+        <el-table-column prop="gatepostName" label="进厂门岗">
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog title="链表详情" :visible.sync="spelldialogTableVisible">
+      <el-table
+        :data="tableDataSpellDetails"
+        :span-method="objectSpanMethod"
+        border
+        style="width: 100%; margin-top: 20px"
+        @selection-change="handleSelectionChange"
+        max-height="500px"
+      >
+        <el-table-column type="selection" width="55"></el-table-column>
+        <el-table-column prop="capacityNumber" label="车牌号" fit>
+        </el-table-column>
+        <el-table-column prop="grid" label="拼数" fit> </el-table-column>
+        <el-table-column prop="resultStartTime" label="排队开始时间">
+        </el-table-column>
+        <el-table-column prop="listNodeOrder" label="序号"></el-table-column>
+        <el-table-column prop="materialName" label="物资名称">
+        </el-table-column>
+        <el-table-column prop="materialSpecification" label="物资规格">
+        </el-table-column>
+        <el-table-column prop="materialModel" label="物资型号">
+        </el-table-column>
+        <el-table-column prop="materialNumber" label="物资件数">
+        </el-table-column>
+        <el-table-column prop="driverTel" label="司机电话号码">
+        </el-table-column>
+        <el-table-column prop="gatepostName" label="进厂门岗">
+        </el-table-column>
+        <el-table-column prop="sureTime" label="可进厂确认时间">
+        </el-table-column>
+      </el-table>
+    </el-dialog>
     <div class="tabs">
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane label="单拼车辆排队链表" name="first">
@@ -28,7 +70,6 @@
             :data="tableData1"
             border
             style="width: 100%; margin-top: 20px"
-            @selection-change="handleSelectionChange"
             max-height="500px"
           >
             <el-table-column type="index" width="50"> </el-table-column>
@@ -39,19 +80,34 @@
             </el-table-column>
             <el-table-column prop="materialModel" label="物资型号">
             </el-table-column>
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button type="text" size="mini" @click="getDetails(scope)">
+                  链表详情
+                </el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="多拼车辆排队链表" name="second">
           <el-table
             :data="tableData"
-            :span-method="objectSpanMethod"
             border
             style="width: 100%; margin-top: 20px"
-            @selection-change="handleSelectionChange"
             max-height="500px"
           >
-            <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column prop="count" label="排队数"> </el-table-column>
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click="getSpellDetails(scope)"
+                >
+                  链表详情
+                </el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -59,10 +115,15 @@
   </div>
 </template>
 <script>
-import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      //存放每一行记录的合并数
+      spanArr: [],
+      tableDataSpellDetails: [],
+      spelldialogTableVisible: false,
+      dialogTableVisible: false,
+      tableDataDetails: [],
       capacityNo: "",
       inputText: "",
       activeName: "first",
@@ -89,6 +150,68 @@ export default {
     this.getNoSpellingArray();
   },
   methods: {
+    //记录每一行的合并数
+    getSpanArr(data) {
+      //每次调用方法初始化
+      this.spanArr = [];
+      for (var i = 0; i < data.length; i++) {
+        if (i === 0) {
+          this.spanArr.push(1);
+          this.pos = 0;
+        } else {
+          // 判断当前元素与上一个元素是否相同
+          if (data[i].resultTotalId === data[i - 1].resultTotalId) {
+            this.spanArr[this.pos] += 1;
+            this.spanArr.push(0);
+          } else {
+            this.spanArr.push(1);
+            this.pos = i;
+          }
+        }
+      }
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (
+        columnIndex === 0 ||
+        columnIndex === 1 ||
+        columnIndex === 2 ||
+        columnIndex === 3 ||
+        columnIndex === 4 ||
+        columnIndex === 9 ||
+        columnIndex === 10 ||
+        columnIndex === 12
+      ) {
+        const _row = this.spanArr[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
+      }
+    },
+    getDetails(scope) {
+      console.log(scope.row.gridId);
+      let map = {
+        locationId: scope.row.gridId
+      };
+      this.axios.post("/api/v1/qms/getListMonitorMes", map).then(res => {
+        console.log(res);
+        this.tableDataDetails = res.data.data;
+        this.dialogTableVisible = true;
+      });
+    },
+    getSpellDetails(scope) {
+      let map = {
+        locationId: scope.row.gridId
+      };
+      this.axios
+        .post("/api/v1/qms/getSpellingListMonitorMes", map)
+        .then(res => {
+          this.tableDataSpellDetails = res.data.data;
+          this.getSpanArr(res.data.data);
+          this.spelldialogTableVisible = true;
+        });
+    },
     handleClick() {
       if (this.activeName == "first") {
         this.getNoSpellingArray();

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -3,22 +3,6 @@
   <div class="sale">
     <div class="top">
       <el-form :inline="true" style="margin-top: 1rem;">
-        <el-form-item>
-          <label class="el-form-item__label" style="width: auto;">车牌号</label>
-        </el-form-item>
-        <el-form-item>
-          <el-input v-model="capacityNo"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            class="btn"
-            @click="onclick"
-            style="margin-left: 4px;"
-            clearable
-            ><i class="el-icon-search"></i>查询</el-button
-          >
-        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -29,6 +13,11 @@
             ><i class="el-icon-search"></i>查询物资</el-button
           >
         </el-form-item>
+        <el-form-item
+          ><el-button type="primary" class="btn" @click="refresh">
+            <i class="el-icon-d-arrow-right"></i>刷新
+          </el-button></el-form-item
+        >
         <el-form-item
           ><el-button type="primary" class="btn" @click="allow">
             <i class="el-icon-d-arrow-right"></i>放行
@@ -93,13 +82,20 @@
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane label="单拼车辆排队链表" name="first">
           <el-table
+            ref="mutiData"
             :data="tableData1"
             border
+            :row-key="getRowKey"
             style="width: 100%; margin-top: 20px"
             @selection-change="handleSelectionChange"
             max-height="500px"
           >
-            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column
+              type="selection"
+              width="55"
+              :selectable="selectInit"
+              reserve-selection
+            ></el-table-column>
             <el-table-column type="index" width="50"> </el-table-column>
             <el-table-column prop="capacityNumber" label="车牌号" fit>
             </el-table-column>
@@ -251,6 +247,32 @@ export default {
     this.getNoSpellingArray();
   },
   methods: {
+    refresh() {
+      this.getSpellingArray();
+      this.getNoSpellingArray();
+    },
+    getRowKey(row) {
+      return row.ROW_ID;
+    },
+    selectInit(row) {
+      if (this.maplist.length == 0) {
+        if (row.ROW_ID == 1) {
+          return true;
+        } else {
+          return false;
+        }
+      } else {
+        if (
+          this.maplist.some(e => {
+            return e.ROW_ID == row.ROW_ID || e.ROW_ID + 1 == row.ROW_ID;
+          })
+        ) {
+          return true;
+        } else {
+          return false;
+        }
+      }
+    },
     rowDbClick(row) {
       this.materialList = [];
       this.materialList.push(row);
@@ -268,7 +290,6 @@ export default {
       this.table1 = true;
       this.optionMa.requestUrl =
         "/api/v1/uc/getSteelMaterial?apiId=244&i=" + new Date();
-      console.log("dasd");
     },
     //返回选中的物资信息
     selectionChange2(selection) {
@@ -400,6 +421,20 @@ export default {
     handleSelectionChange(selection) {
       this.maplist = [];
       this.maplist = selection;
+      for (let i = 0; i < this.maplist.length; i++) {
+        if (i + 1 < this.maplist.length) {
+          if (this.maplist[i].ROW_ID + 1 != this.maplist[i + 1].ROW_ID) {
+            this.$refs.mutiData.clearSelection();
+          }
+        }
+      }
+      if (
+        !this.maplist.some(e => {
+          return e.ROW_ID == 1;
+        })
+      ) {
+        this.$refs.mutiData.clearSelection();
+      }
     },
     updateBill(scope) {
       console.log(scope.row.capacityId);
@@ -441,6 +476,14 @@ export default {
       this.axios.post("/api/v1/qms/allowEnFactory", map).then(res => {
         if (res.data.code == "200") {
           this.$message.success("放行成功，等待进厂");
+          this.maplist = [];
+          this.$refs.mutiData.clearSelection();
+          this.getNoSpellingArray();
+          this.getSpellingArray();
+        } else {
+          this.$message.error("请按顺序勾选");
+          this.maplist = [];
+          this.$refs.mutiData.clearSelection();
           this.getNoSpellingArray();
           this.getSpellingArray();
         }

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

@@ -6,80 +6,101 @@
       <el-date-picker
         v-model="startTime"
         type="datetime"
-        placeholder="选择日期时间">
+        placeholder="选择日期时间"
+      >
       </el-date-picker>
       <span>至</span>
       <el-date-picker
         v-model="endTime"
         type="datetime"
-        placeholder="选择日期时间">
+        placeholder="选择日期时间"
+      >
       </el-date-picker>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
       <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>
       <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>
     </div>
     <div class="table">
-      <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable>
+      <!-- <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>
     </div>
   </div>
 </template>
 
 <script>
-import { sjTime } from '@/utils/sharedJsFile'
+import { sjTime } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
-      shiyHeigth:140,
-      isHeigth:true,
-      pageSize:100,
-      isKuang:false,
+      shiyHeigth: 140,
+      isHeigth: true,
+      pageSize: 100,
+      isKuang: false,
       option: {
         requestUrl: "",
+        comparison: "orderNumber",
+        columnIndexs: [0, 1, 2, 3, 11, 12, 13, 16, 21, 22, 23, 24]
       },
-      startTime:null,
-      endTime:null,
+      startTime: null,
+      endTime: null,
       //合计净重
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
-      tableTitle:'销售统计报表'
+      tableTitle: "销售统计报表"
     };
   },
-  created(){
+  created() {
     //初始化表头
     if (getCookie("orgCode") == "chengyunshang") {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" +
+        getCookie("userId") +
+        "&i=" +
+        new Date();
     } else {
       this.option.requestUrl =
-        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" + null +"&i=" +new Date();
+        "/api/v1/tms/getAllSaleReport?apiId=423&startTime=null&endTime=null&orderType=1&shipperId=1&carrierSsoId=" +
+        null +
+        "&i=" +
+        new Date();
     }
     //时间段初始化
     const start = new Date(new Date(new Date().toLocaleDateString()).getTime());
     var startTime = this.dataFormat(sjTime(start));
     var endTime = this.dataFormat(sjTime(new Date()));
-    this.tableTitle = startTime + ' 至 ' + endTime;
+    this.tableTitle = startTime + " 至 " + endTime;
   },
   methods: {
-    refresh(){
+    refresh() {
       this.$router.go(0);
     },
-    func(res){
-      console.log(res)
-      var resultNetWeightTotal = 0
+    func(res) {
+      console.log(res);
+      var resultNetWeightTotal = 0;
       res.list.forEach(e => {
-        resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
+        resultNetWeightTotal = resultNetWeightTotal + e.resultNetWeight;
       });
-      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t"
+      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t";
       this.totalCapacity = res.total;
       //获取总记录条数作为合计车数
       // this.totalCapacity = res.total;
@@ -88,53 +109,85 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
-      if(this.startTime && this.endTime){
+      if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime);
         endTime = sjTime(this.endTime);
         //修改报表名称
-        this.tableTitle = this.dataFormat(startTime) + ' 至 ' + this.dataFormat(endTime);
+        this.tableTitle =
+          this.dataFormat(startTime) + " 至 " + this.dataFormat(endTime);
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&orderType=1&shipperId=1"+ "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=1&shipperId=1" +
+            "&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime + "&orderType=1&shipperId=1"+ "&carrierSsoId=" + null +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=1&shipperId=1" +
+            "&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
         }
-      }else{
-        if(this.startTime){
+      } else {
+        if (this.startTime) {
           startTime = sjTime(this.startTime);
-        }else if(this.endTime){
+        } else if (this.endTime) {
           endTime = sjTime(this.endTime);
         }
         //加上时间重置表头
         if (getCookie("orgCode") == "chengyunshang") {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime +"&orderType=1&shipperId=1"+ "&carrierSsoId=" + getCookie("userId") +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=1&shipperId=1" +
+            "&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else {
           this.option.requestUrl =
-            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" + startTime + "&endTime=" + endTime +"&orderType=1&shipperId=1"+ "&carrierSsoId=" + null +"&i=" +new Date();
+            "/api/v1/tms/getAllSaleReport?apiId=423&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&orderType=1&shipperId=1" +
+            "&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
         }
       }
     },
     //格式化日期
-    dataFormat(value){
+    dataFormat(value) {
       let date = new Date(value);
-        let y = date.getFullYear();
-        let MM = date.getMonth() + 1;
-        MM = MM < 10 ? ('0' + MM) : MM;
-        let d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        let h = date.getHours();
-        h = h < 10 ? ('0' + h) : h;
-        let m = date.getMinutes();
-        m = m < 10 ? ('0' + m) : m;
-        let s = date.getSeconds();
-        s = s < 10 ? ('0' + s) : s;
-        return y + '-' + MM + '-' + d + ' ' + h + '：' + m + '：' + s;
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      let d = date.getDate();
+      d = d < 10 ? "0" + d : d;
+      let h = date.getHours();
+      h = h < 10 ? "0" + h : h;
+      let m = date.getMinutes();
+      m = m < 10 ? "0" + m : m;
+      let s = date.getSeconds();
+      s = s < 10 ? "0" + s : s;
+      return y + "-" + MM + "-" + d + " " + h + "：" + m + "：" + s;
     }
-
-  },
+  }
 };
 </script>
 
@@ -146,9 +199,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
-    .el-date-editor{
+    .el-date-editor {
       margin: 20px;
     }
   }
 }
-</style>
+</style>