Merge branch 'dev_info' into test-new

src/pages/main/performance/components/sheet.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: daiqisheng
- * @LastEditTime: 2022-02-15 15:59:58
+ * @LastEditTime: 2022-02-16 15:25:40
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 <template>
@@ -508,7 +508,7 @@ export default {
             });
             let changedList = middle.join(",").split(",");
             that.rowList.push(...changedList);
-            console.log(that.rowList,'that.rowList');
+            console.log(that.rowList, "that.rowList");
           },
         },
       };
@@ -648,56 +648,6 @@ export default {
       } else {
         // 职位
         let duty = JSON.parse(sessionStorage.userInfo).duty;
-        // let { permission_type, charge } = this.form;
-        this.rowList.shift();
-        let reqdata = {
-          rowIndex: [...new Set(this.rowList)]
-            .sort(function (a, b) {
-              return a - b;
-            })
-            .join(","),
-          rowContent: [...new Set(this.rowList)]
-            .sort(function (a, b) {
-              return a - b;
-            })
-            .map((el) => {
-              return data.data[el];
-            }),
-        };
-        console.log(reqdata, "reqdata");
-        // if (permission_type) {
-        //   // 特殊权限
-        //   reqdata = {
-        //     ...reqdata,
-        //     rowIndex: this.paramsArr(
-        //       charge[0].row_start - 1,
-        //       charge[0].row_end - 1
-        //     ),
-        // rowContent: this.paramsArr(
-        //   charge[0].row_start - 1,
-        //   charge[0].row_end - 1
-        // )
-        //   .split(",")
-        //   .map((el) => {
-        //     return data.data[el];
-        //   }),
-        //   };
-        // } else {
-        //   // 公共权限
-        //   const RowList = [];
-        //   const RowContent = [];
-        //   data.data.forEach((item, rowIndex) => {
-        //     if (this.confirmArrayData(item)) {
-        //       RowList.push(rowIndex);
-        //       RowContent.push(item);
-        //     }
-        //   });
-        //   reqdata = {
-        //     ...reqdata,
-        //     rowIndex: RowList.join(","),
-        //     rowContent: RowContent,
-        //   };
-        // }
         if (duty === "7") {
           this.manager_approve = true;
         } else {
@@ -719,7 +669,22 @@ export default {
             this.$emit("save");
             return;
           }
-          // 员工提交
+           // 员工提交
+          this.rowList.shift();
+          let reqdata = {
+            rowIndex: [...new Set(this.rowList)]
+              .sort(function (a, b) {
+                return a - b;
+              })
+              .join(","),
+            rowContent: [...new Set(this.rowList)]
+              .sort(function (a, b) {
+                return a - b;
+              })
+              .map((el) => {
+                return data.data[el];
+              }),
+          };
           await this.$http({
             url: edit_url, //提交
             method: "post",
@@ -827,7 +792,7 @@ export default {
         const sheet_name = window.luckysheet.getSheet().name;
         const data = window.luckysheet.getSheet(sheet_name);
         const workbook_name = window.luckysheet.getWorkbookName();
-        // let { permission_type, charge } = this.form;
+        // 经理提交
         this.rowList.shift();
         let reqdata = {
           rowIndex: [...new Set(this.rowList)]
@@ -843,39 +808,6 @@ export default {
               return data.data[el];
             }),
         };
-        // if (permission_type) {
-        //   // 特殊权限
-        //   reqdata = {
-        //     ...reqdata,
-        //     rowIndex: this.paramsArr(
-        //       charge[0].row_start - 1,
-        //       charge[0].row_end - 1
-        //     ),
-        //     rowContent: this.paramsArr(
-        //       charge[0].row_start - 1,
-        //       charge[0].row_end - 1
-        //     )
-        //       .split(",")
-        //       .map((el) => {
-        //         return data.data[el];
-        //       }),
-        //   };
-        // } else {
-        //   // 公共权限
-        //   const RowList = [];
-        //   const RowContent = [];
-        //   data.data.forEach((item, rowIndex) => {
-        //     if (this.confirmArrayData(item)) {
-        //       RowList.push(rowIndex);
-        //       RowContent.push(item);
-        //     }
-        //   });
-        //   reqdata = {
-        //     ...reqdata,
-        //     rowIndex: RowList.join(","),
-        //     rowContent: RowContent,
-        //   };
-        // }
         await this.$http({
           url: "/market/CMKIssued/CMKIssuedSubmit", // 提交
           method: "post",