Merge branch 'dev_info' of https://git.agilestar.cn/spfm-group/spfm-market-front into dev_info

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

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-12-04 14:23:58
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-01-14 16:12:41
+ * @LastEditTime: 2022-01-18 20:44:14
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 
@@ -110,15 +110,15 @@
                 </el-select>
                 <div class="form-select">
                   <span class="form-content">可编辑行：从</span>
-                  <el-input v-model="item.col_start" />
+                  <el-input v-model="item.row_start" />
                   <span class="form-content">到</span>
-                  <el-input v-model="item.col_end" />
+                  <el-input v-model="item.row_end" />
                 </div>
                 <div class="form-select">
                   <span class="form-content">可编辑列：从</span>
-                  <el-input v-model="item.row_start" />
+                  <el-input v-model="item.col_start" />
                   <span class="form-content">到</span>
-                  <el-input v-model="item.row_end" />
+                  <el-input v-model="item.col_end" />
                 </div>
               </div>
             </el-form-item>
@@ -593,8 +593,8 @@ export default {
         //  特殊权限
         reqdata.specialAuth = charge.map((el) =>
           JSON.stringify({
-            allowEditingColumns: this.paramsArr(el.col_start, el.col_end),
-            rowNum: this.paramsArr(el.row_start, el.row_end),
+            allowEditingColumns: `${el.col_start},${el.col_end}`,
+            rowNum: `${el.row_start},${el.row_end}`,
             principalId: el.person.split(",")[0],
             principalName: el.person.split(",")[1],
           })

src/pages/main/performance/department.vue

@@ -403,6 +403,10 @@ export default {
           // 0.待处理  1.待汇总 2.待审批  3.已完成
           dictionary: [
             {
+              label: "已撤回",
+              value: "-1",
+            },
+            {
               label: "待处理",
               value: "0",
             },
@@ -483,7 +487,7 @@ export default {
           label: "状态",
           props: "status",
           type: "dictionary",
-          dictionary: { 0: "待处理", 1: "待汇总", 2: "待审批", 3: "已完成" },
+          dictionary: { '-1':'已撤回', 0: "待处理", 1: "待汇总", 2: "待审批", 3: "已完成" },
         },
       ],
     };
@@ -620,7 +624,7 @@ export default {
           id,
         },
       }).then(() => {
-        this.$message.success("撤回成功");
+        this.$message.success("撤回成功， 请重新创建模版");
         this.handleInit({
           ...this.table_search,
           page: this.page,
@@ -918,21 +922,6 @@ export default {
           }
         });
       }
-      // this.$http({
-      //   url: "/market/CMKIssued/CMKIssuedCheck",
-      //   method: "post",
-      //   headers: {
-      //     "Content-Type": "application/json",
-      //   },
-      //   data: {
-      //     groupId,
-      //   },
-      // }).then((res) => {
-      //   console.log(res, "res");
-      //  this.handleInit()
-      // this.handleCancel("visible");
-      // this.handleCancel("approve_visible");
-      // });
     },
     // 通用方法用于转化全局
     paramsArr(start, end) {
@@ -991,66 +980,6 @@ export default {
           break;
       }
     },
-    // handleBack() {
-    //   const object = {
-    //     ...JSON.parse(sessionStorage.global_data)[0],
-    //     department_status: "待处理",
-    //   };
-    //   sessionStorage.setItem("global_data", JSON.stringify([object]));
-    //   const process_array = JSON.parse(sessionStorage.global_process);
-    //   process_array.push({
-    //     link: "审批驳回",
-    //     creatperson: `ADMIN ${this.$formatDate(new Date(), "YYYY-MM-DD")}`,
-    //     explain: this.approveForm.comments,
-    //   });
-    //   sessionStorage.setItem("global_process", JSON.stringify(process_array));
-
-    //   // this.handleInit();
-    //   // this.$message.success("打回成功");
-    //   // this.handleCancel("visible");
-    //   // this.handleCancel("approve_visible");
-    // },
-    // handleAgree() {
-    //   const object = {
-    //     ...JSON.parse(sessionStorage.global_data)[0],
-    //     department_status: "已完成",
-    //   };
-    //   sessionStorage.setItem("global_data", JSON.stringify([object]));
-    //   const process_array = JSON.parse(sessionStorage.global_process);
-    //   process_array.push({
-    //     link: "审批通过",
-    //     creatperson: `ADMIN ${this.$formatDate(new Date(), "YYYY-MM-DD")}`,
-    //     explain: this.approveForm.comments,
-    //   });
-    //   sessionStorage.setItem("global_process", JSON.stringify(process_array));
-    //   this.handleInit();
-    //   this.$message.success("审批成功");
-    //   this.handleCancel("visible");
-    //   this.handleCancel("approve_visible");
-    // },
-    // handleSubmit() {
-    //   // 提交好了
-    //   let reqdata = {
-    //     id: this.edit_form.id,
-    //     templateContent: "asdad",
-    //   };
-    //   this.$http({
-    //     url: "/CMKIssued/CMKIssuedSubmit",
-    //     method: "post",
-    //     headers: {
-    //       "Content-Type": "application/json",
-    //     },
-    //     data: reqdata,
-    //   }).then(({ data }) => {
-    //     console.log(data, "data");
-    //     if (data) {
-    //       this.$message.success("提交成功");
-    //       this.handleCancel("visible");
-    //     } else {
-    //       this.$message.error("提交失败");
-    //     }
-    //   });
-    // },
   },
 };
 </script>

src/pages/main/performance/mould.vue

@@ -121,7 +121,11 @@ export default {
       template_id: null,
       // issue
       issue_visible: false,
-      issue_form: {},
+      issue_form: {
+        reason: "",
+        precautions: "",
+        endTime: "",
+      },
       issue_id: null,
       // table
       table_loading: false,
@@ -230,6 +234,13 @@ export default {
         case "issue":
           this.issue_visible = !this.issue_visible;
           this.issue_id = params ? params.id : null;
+          if (this.issue_visible) {
+            this.issue_form.reason = params.reason ? params.reason : "";
+            this.issue_form.precautions = params.precautions
+              ? params.precautions
+              : "";
+            this.issue_form.endTime = params.endTime ? params.endTime : "";
+          }
           break;
       }
     },