修改内转多拼合并单元格

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

@@ -521,13 +521,13 @@ export default {
         });
         that.tableDataReal=tableData;
         if(tableData.length<=0){
-          that.$confirm('查询不到相关车皮!请联系万州港相关人员!')
+          that.$confirm('查询不到相关车皮!可能是没有出库，请联系万州港相关人员!')
           .then(_ => {
             that.isSend=false;
             done();
           });
         }else if(tableData.length<importData.length){
-           that.$confirm("共"+(importData.length-tableData.length)+"条车皮查询失败!请联系万州港相关人员!")
+           that.$confirm("共"+(importData.length-tableData.length)+"条车皮查询失败!可能是没有出库，请联系万州港相关人员!")
           .then(_ => {
             that.isSend=false;
             done();

src/views/inward/components/truckAppoint/addPlan.vue

@@ -29,7 +29,7 @@
 </div>
     <template>
 			<div>		
-			<dilTable v-bind.sync="first" @radio-change="currentRadioChange" ref="table">
+			<mergeRowTable v-bind.sync="first" @radio-change="currentRadioChange" ref="table">
             <el-table-column fixed="right" label="操作" width="120">
                 <template slot-scope="scope">
                   <el-button type="text" size="mini" @click="deleteRequirement(scope)">
@@ -37,7 +37,7 @@
                   </el-button>
                 </template>
               </el-table-column>
-			</dilTable>
+			</mergeRowTable>
       </div>
 		</template>
     <div class="button-box">
@@ -62,6 +62,8 @@ export default {
       first:{
         requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
         selectionType: "radio",
+        columnIndexs:[0,1,2,3,4,20],
+        comparison: "requirementNumber",
 				mapList: {},
       },
       numberValidateForm: {

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -311,7 +311,7 @@
       </el-drawer>
     </div>
     <div class="button-box">
-      <el-button type="primary" @click="makeSure" :disabled="disabled"
+      <el-button type="primary" @click="makeSure" 
         >确认新增</el-button
       >
       <el-button type="primary" @click="cancel">返回</el-button>
@@ -579,15 +579,13 @@ export default {
       //执行选择
     },
     handleClose2(done) {
-      console.log("add2");
-
       console.log(this.tableData.length);
-      console.log("ad");
-      if (this.tableData.length > 0 && this.selectionList1.length > 0) {
+      console.log("this.form.requirementType:",this.form.requirementType);
+      if (this.tableData.length > 0 && this.selectionList1.length > 0 && this.form.requirementType!='倒库') {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
-      if (this.selectionList1.length > 1) {
+      if (this.selectionList1.length > 1 && this.form.requirementType!='倒库') {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
@@ -669,12 +667,11 @@ export default {
     // 返回主界面
     makeSure1() {
       console.log(this.tableData.length);
-      console.log("ad");
-      if (this.tableData.length > 0 && this.selectionList1.length > 0) {
+      if (this.tableData.length > 0 && this.selectionList1.length > 0 && this.form.requirementType!="倒库") {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
-      if (this.selectionList1.length > 1) {
+      if (this.selectionList1.length > 1 && this.form.requirementType!="倒库") {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
@@ -800,6 +797,10 @@ export default {
       // console.log("进来了");
       // console.log(this.whether);
       // console.log(this.installremark);
+      if (this.tableData.length > 1 && this.form.requirementType!='倒库') {
+        this.$message.warning("非倒库需求只允许填写一个物资");
+        return;
+      }
       if (this.whether == 2 && this.installremark == "") {
         console.log("确实进来了");
         this.$message.warning("请选择装机必填");

src/views/inward/components/truckAppoint/plan.vue

@@ -89,7 +89,7 @@
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="third">
-            <dilTable v-bind.sync="third" ref="table2">
+            <mergeRowTable v-bind.sync="third" ref="table2">
               <el-table-column
                 fixed="right"
                 align="center"
@@ -132,7 +132,7 @@
                   </el-form>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
           <!-- <el-tab-pane label="已完成" name="fourth">
             <dilTable
@@ -201,6 +201,8 @@ export default {
         mapList: []
       },
       third: {
+        columnIndexs:[0,1,2,3,4,5,9,10,13,16,21,22],
+        comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
       },

src/views/inward/components/truckAppoint/requirement.vue

@@ -36,7 +36,7 @@
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="未下发" name="first">
-            <dilTable
+            <mergeRowTable
               v-bind.sync="first"
               @selection-change="selectionChange"
               ref="table"
@@ -52,10 +52,10 @@
                   </el-button>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <dilTable
+            <mergeRowTable
               v-bind.sync="second"
               ref="table1"
               :isPagination="false"
@@ -71,7 +71,7 @@
                   >
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -92,9 +92,13 @@ export default {
         // first请求数据的地址
         requestUrl: "",
         selectionType: "select",
+        columnIndexs:[0,1,2,6,7,8,9],
+        comparison: "requirementNumber",
         mapList: []
       },
       second: {
+        columnIndexs:[0,1,5,6,7,8,9],
+        comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
       },

src/views/inward/components/truckAppoint/requirementOther.vue

@@ -44,7 +44,7 @@
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="未下发" name="first">
-            <dilTable
+            <mergeRowTable
               v-bind.sync="first"
               @selection-change="selectionChange"
               ref="table1"
@@ -60,10 +60,10 @@
                   </el-button>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <dilTable v-bind.sync="second" ref="table">
+            <mergeRowTable v-bind.sync="second" ref="table">
               <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">
                   <el-button
@@ -74,7 +74,7 @@
                   >
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -95,10 +95,14 @@ export default {
         // first请求数据的地址
         requestUrl: "",
         selectionType: "select",
+        columnIndexs:[0,1,2,6,7,8,9],
+        comparison: "requirementNumber",
         mapList: []
       },
       second: {
         // second请求数据的地址
+        columnIndexs:[0,1,5,6,7,8,9],
+        comparison: "requirementNumber",
         requestUrl: ""
       },
       tableData: [],

src/views/inward/components/truckOrder/plan.vue

@@ -12,7 +12,7 @@
       <div>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="待分解" name="second">
-            <dilTable v-bind.sync="second" ref="table1">
+            <mergeRowTable v-bind.sync="second" ref="table1">
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot-scope="scope">
                   <el-button
@@ -24,10 +24,10 @@
                   </el-button>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
           <el-tab-pane label="已分解" name="third">
-            <dilTable v-bind.sync="third" ref="table2">
+            <mergeRowTable v-bind.sync="third" ref="table2">
               <el-table-column fixed="right" label="操作" width="180">
                 <template slot-scope="scope">
                   <el-button
@@ -76,11 +76,11 @@
                   </el-form>
                 </template>
               </el-table-column>
-            </dilTable>
+            </mergeRowTable>
           </el-tab-pane>
 
           <el-tab-pane label="已完成" name="four">
-            <dilTable v-bind.sync="four" ref="table3"> </dilTable>
+            <mergeRowTable v-bind.sync="four" ref="table3"> </mergeRowTable>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -95,14 +95,20 @@ export default {
       inputText: "",
       carrierId: 40,
       first: {
+        columnIndexs:[0,1,2,3,4,5,9.10,21,22],
+        comparison: "requirementNumber",
         // first请求数据的地址
         requestUrl: ""
       },
       second: {
+        columnIndexs:[0,1,2,3,4,5,9.10,21,22],
+        comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
       },
       third: {
+        columnIndexs:[0,1,2,3,4,5,9.10,21,22],
+        comparison: "requirementNumber",
         // second请求数据的地址
         requestUrl: ""
       },