safdjhfs\

build/utils.js

@@ -15,11 +15,11 @@ 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','sale']
+// let devModules = ['index','statisticalReport','appoint']
 // let devModules = ['index','appoint','sale','RMS','statisticalReport'];
 // let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','inward']
-// let devModules = ['all']
+let devModules = ['all']
 // let devModules = ['index','sale']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']

config/index.js

@@ -64,16 +64,16 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:8080",
-    target: "http://192.168.1.112:8080",
+    target: "http://172.16.33.166:8080",
+    // target: "http://192.168.1.112:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://localhost:8080",
-    // target: "http://192.168.1.109:8080",
+    target: "http://172.16.33.166:8080",
+    // target: "http://192.168.1.112:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

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

@@ -1181,7 +1181,6 @@ export default {
     },
     //准备生成部分订单
     createACar() {
-      console.log("我进来了");
       if (
         !this.saleOrderConsigneeTel &&
         this.ignoreSaleOrderConsigneeTel == 0
@@ -1337,23 +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

@@ -19,7 +19,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 未上报 -->
       <el-tab-pane label="未上报" name="first">
-        <dilTable
+        <mergeRowTable
           v-bind.sync="option"
           ref="table3"
           @selection-change="selectionChange"
@@ -49,102 +49,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>
@@ -165,16 +81,40 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getSaleOrderInfoes?apiId=408",
-        selectionType: "select"
+        selectionType: "select",
+        comparison: "saleNumber",
+        columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408"
+        requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408",
+        comparison: "saleNumber",
+        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
       },
       option4: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1"
+          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&saleType=1",
+        comparison: "saleNumber",
+        columnIndexs: [
+          0,
+          1,
+          2,
+          3,
+          7,
+          8,
+          9,
+          10,
+          11,
+          12,
+          13,
+          14,
+          15,
+          16,
+          17,
+          18,
+          20
+        ]
       },
       mapList: [],
       mapItemList: [],
@@ -317,37 +257,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/statisticalReport/components/salesLogisticsStatistics/saleSteelForm.vue

@@ -58,7 +58,7 @@ export default {
       option: {
         requestUrl: "",
         comparison: "orderNumber",
-        columnIndexs: [1, 2, 3, 11, 12, 13, 16, 21, 22, 23, 24]
+        columnIndexs: [0, 1, 2, 3, 11, 12, 13, 16, 21, 22, 23, 24]
       },
       startTime: null,
       endTime: null,