ss

src/views/Marketing/order/offlineOrder/batchRecord/secondStep/index.vue

@@ -4,15 +4,15 @@
       已选择
       <strong style="color: red">{{ objCopy.length }}</strong> 人；共<strong
         style="color: red"
-        >{{ compay(tableData, 7) }}</strong
+        >{{ compay(tableData, 8) }}</strong
       >个商品（<strong style="color: red">{{ compay(tableData, 1) }}</strong
       >视频、<strong style="color: red">{{ compay(tableData, 2) }}</strong
       >题库、<strong style="color: red">{{ compay(tableData, 3) }}</strong
       >补考、<strong style="color: red">{{ compay(tableData, 4) }}</strong
-      >前培、<strong style="color: red">{{ compay(tableData, 6) }}</strong
-      >直播、<strong style="color: red">{{ compay(tableData, 8) }}</strong
+      >前培、<strong style="color: red">{{ compay(tableData, 7) }}</strong
+      >直播、<strong style="color: red">{{ compay(tableData, 9) }}</strong
       >讲义资料）；总价<strong style="color: red"
-        >￥{{ compay(tableData, 5).toFixed(2) }}</strong
+        >￥{{ compay(tableData, 6).toFixed(2) }}</strong
       >
     </div>
     <div class="bodySy">
@@ -159,6 +159,11 @@ export default {
           prop: "telphone",
           width: "140px",
         },
+        {
+          label: "业务员",
+          prop: "salesman",
+          width: "100px",
+        },
         {
           label: "科目",
           prop: "subjectId",
@@ -218,6 +223,8 @@ export default {
       feePos: 0, // 上面的数组的下标值
       fourArr: [], // 第三列进行合并操作时存放的数组变量
       fourPos: 0, // 上面的数组的下标值
+      fiveArr: [], // 第五列进行合并操作时存放的数组变量
+      fivePos: 0, // 上面的数组的下标值
       sujectList: [],
       SN: "", //总单号
     };
@@ -243,22 +250,23 @@ export default {
           case 2:
           case 3:
           case 4:
-          case 6:
-          case 8:
+          case 5:
+          case 7:
+          case 9:
             data.forEach((item) => {
               if (item.goodsType === int && item.checked) {
                 num++;
               }
             });
             break;
-          case 5:
+          case 6:
             data.forEach((item) => {
               if (item.goodsReceived && item.checked) {
                 num += Number(item.goodsReceived);
               }
             });
             break;
-          case 7:       
+          case 8:       
             data.forEach((item) => {
               if (
                 item.goodsType &&
@@ -477,6 +485,8 @@ export default {
       this.feePos = 0;
       this.fourArr = [];
       this.fourPos = 0;
+      this.fiveArr = [];
+      this.fivePos = 0;
     },
     merage() {
       this.merageInit(); // 前文的初始化数据函数
@@ -495,6 +505,8 @@ export default {
           this.feePos = 0;
           this.fourArr.push(1);
           this.fourPos = 0;
+          this.fiveArr.push(1);
+          this.fivePos = 0;
         } else {
           // 判断当前元素与上一个元素是否相同,eg：this.typeNamePos 是 this.typeNameArr序号
           // 第一列 下面的是eslint的不限制语法
@@ -534,7 +546,7 @@ export default {
             arys[i].telphone === arys[i - 1].telphone &&
             arys[i].idCard === arys[i - 1].idCard &&
             arys[i].realname === arys[i - 1].realname &&
-            arys[i].subjectId === arys[i - 1].subjectId
+            arys[i].salesman === arys[i - 1].salesman
           ) {
             this.fourArr[this.fourPos] += 1;
             this.fourArr.push(0);
@@ -542,6 +554,20 @@ export default {
             this.fourArr.push(1);
             this.fourPos = i;
           }
+          // 第五列
+          if (
+            arys[i].telphone === arys[i - 1].telphone &&
+            arys[i].idCard === arys[i - 1].idCard &&
+            arys[i].realname === arys[i - 1].realname &&
+            arys[i].salesman === arys[i - 1].salesman &&
+            arys[i].subjectId === arys[i - 1].subjectId
+          ) {
+            this.fiveArr[this.fivePos] += 1;
+            this.fiveArr.push(0);
+          } else {
+            this.fiveArr.push(1);
+            this.fivePos = i;
+          }
         }
       }
     },
@@ -578,7 +604,15 @@ export default {
           rowspan: row4,
           colspan: col4,
         };
-      } else if (columnIndex >= 8) {
+      } else if (columnIndex === 4) {
+        // 第五列的合并方法
+        const row5 = this.fiveArr[rowIndex];
+        const col5 = row5 > 0 ? 1 : 0; // 如果被合并了row = 0; 则他这个列需要取消
+        return {
+          rowspan: row5,
+          colspan: col5,
+        };
+      }else if (columnIndex >= 9) {
         // 第一列的合并方法
         const row8 = this.typeNameArr[rowIndex];
         const col8 = row8 > 0 ? 1 : 0; // 如果被合并了row = 0; 则他这个列需要取消
@@ -809,6 +843,7 @@ export default {
                 goodsInputData: {
                   gradeId: this.toData.templateStatus == 1 ? item.gradeId : "",
                 },
+                salesman: item.salesman
               },
             ],
           });
@@ -825,6 +860,7 @@ export default {
               goodsInputData: {
                 gradeId: this.toData.templateStatus == 1 ? item.gradeId : "",
               },
+                salesman: item.salesman
             });
           } else {
             arr.push({
@@ -841,6 +877,7 @@ export default {
                     gradeId:
                       this.toData.templateStatus == 1 ? item.gradeId : "",
                   },
+                salesman: item.salesman
                 },
               ],
             });

src/views/Marketing/order/offlineOrder/index.vue

@@ -117,6 +117,10 @@ export default {
           prop: "oldOrderSn",
           placeholder: "订单编号（业务系统）",
         },
+        {
+          prop: "salesman",
+          placeholder: "业务员名称",
+        },
       ],
       formData: {
         status: 1,

src/views/Marketing/order/offlineOrder/orderDetailsT/index.vue

@@ -160,6 +160,10 @@ export default {
           prop: "searchKey",
           placeholder: "订单编码/商品名/姓名/身份证",
         },
+        {
+          prop: "salesman",
+          placeholder: "业务员名称",
+        },
       ],
       formData: {
         goodsType: "",
@@ -203,6 +207,11 @@ export default {
           prop: "companyName",
           hidden: true,
         },
+        {
+          label: "业务员",
+          prop: "salesman",
+          hidden: true,
+        },
         {
           label: "商品名称",
           prop: "goodsName",