daiqisheng 3 rokov pred
rodič
commit
722090509d

+ 3 - 3
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-18 17:21:47
+ * @LastEditTime: 2022-01-18 20:44:14
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\sheet.vue
 -->
 
@@ -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],
           })

+ 5 - 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: "已完成" },
         },
       ],
     };

+ 12 - 1
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;
       }
     },