任务暂存调整

pages/mission-action/components/pdca.vue

@@ -201,7 +201,7 @@
         if(improveScheme){ // 提交
           requestParams['taskType'] = this.pdcaSetting === 'p' ? 14 : 16;
         }else { // 暂存
-          requestParams['taskType'] = this.pdcaSetting === 'p' ? 13 : 15;
+          // requestParams['taskType'] = this.pdcaSetting === 'p' ? 13 : 15;
           // 注意暂存的时候接收人是当前登录的账号
            requestParams['receiveEmpId'] = uni.getStorageSync('id');
            requestParams['receiveEmpName'] = uni.getStorageSync('name');

pages/mission-details/pdcaSetting-old.js

@@ -0,0 +1,60 @@
+const baseSetting = [
+  { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+  // { paramsKey: 'taskType', value: null }, // 状态值 13, 14, 15, 16(13/15暂存)
+  { paramsKey: 'receiveEmpId', valueKey: 'deptManageId', isOutvalueKey: true }, // 接收人id
+  { paramsKey: 'receiveEmpName', valueKey: 'deptManageName', isOutvalueKey: true }, // 接收人姓名
+];
+
+let pdcaSetting = {
+  // p按钮的信息（未暂存过的）
+  pBtnInfo: {
+    pdcaSetting: 'p',
+    params: [
+      ...baseSetting,
+      { paramsKey: 'taskPlan', valueKey: null } // plan
+    ]
+  },
+  // 编辑p按钮的信息（暂存过的）
+  editPBtnInfo: {
+    pdcaSetting: 'p',
+    params: [
+      ...baseSetting,
+      { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false, labelKey: 'plan', isEdit: true } // plan
+    ]
+  },
+  // pdca按钮的信息（未暂存过的）
+  pdcaBtnInfo: {
+    pdcaSetting: 'pdca',
+    params: [
+      ...baseSetting,
+      { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false, labelKey: 'plan' }, // plan
+      { paramsKey: 'taskAction', valueKey: null }, // action
+      { paramsKey: 'taskDoRequestList', valueKey: null }, // do
+      { paramsKey: 'taskCheckRequestList', valueKey: null } // check
+    ]
+  },
+  // pdca按钮的信息（未暂存过的, 且plan可以修改）
+  pdcaBtnInfo2: {
+    pdcaSetting: 'pdca',
+    params: [
+      ...baseSetting,
+      { paramsKey: 'taskPlan', valueKey: null }, // plan
+      { paramsKey: 'taskAction', valueKey: null }, // action
+      { paramsKey: 'taskDoRequestList', valueKey: null }, // do
+      { paramsKey: 'taskCheckRequestList', valueKey: null } // check
+    ]
+  },
+  // 编辑pdca按钮的信息（暂存过的）
+  editPdcaBtnInfo: {
+    pdcaSetting: 'pdca',
+    params: [
+      ...baseSetting,
+      { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false, labelKey: 'plan', isEdit: true }, // 改善plan
+      { paramsKey: 'taskAction', valueKey: 'taskAction', isOutvalueKey: false, labelKey: 'action', isEdit: true }, // action
+      { paramsKey: 'taskDoRequestList', valueKey: 'taskDoRequestList', isOutvalueKey: false, labelKey: 'do', isEdit: true }, // do
+      { paramsKey: 'taskCheckRequestList', valueKey: 'taskCheckRequestList', isOutvalueKey: false, labelKey: 'check', isEdit: true }, // check
+    ]
+  }
+};
+
+export default pdcaSetting;

pages/mission-details/pdcaSetting.js

@@ -1,6 +1,7 @@
 const baseSetting = [
   { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
   // { paramsKey: 'taskType', value: null }, // 状态值 13, 14, 15, 16(13/15暂存)
+  { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 暂存的时候传递的是当前taskType
   { paramsKey: 'receiveEmpId', valueKey: 'deptManageId', isOutvalueKey: true }, // 接收人id
   { paramsKey: 'receiveEmpName', valueKey: 'deptManageName', isOutvalueKey: true }, // 接收人姓名
 ];
@@ -11,7 +12,7 @@ let pdcaSetting = {
     pdcaSetting: 'p',
     params: [
       ...baseSetting,
-      { paramsKey: 'taskPlan', valueKey: null } // plan
+      { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false, labelKey: 'plan', isEdit: true } // plan
     ]
   },
   // 编辑p按钮的信息（暂存过的）
@@ -27,10 +28,10 @@ let pdcaSetting = {
     pdcaSetting: 'pdca',
     params: [
       ...baseSetting,
-      { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false, labelKey: 'plan' }, // plan
-      { paramsKey: 'taskAction', valueKey: null }, // action
-      { paramsKey: 'taskDoRequestList', valueKey: null }, // do
-      { paramsKey: 'taskCheckRequestList', valueKey: null } // check
+      { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false, labelKey: 'plan', isEdit: true }, // 改善plan
+      { paramsKey: 'taskAction', valueKey: 'taskAction', isOutvalueKey: false, labelKey: 'action', isEdit: true }, // action
+      { paramsKey: 'taskDoRequestList', valueKey: 'taskDoRequestList', isOutvalueKey: false, labelKey: 'do', isEdit: true }, // do
+      { paramsKey: 'taskCheckRequestList', valueKey: 'taskCheckRequestList', isOutvalueKey: false, labelKey: 'check', isEdit: true }, // check
     ]
   },
   // pdca按钮的信息（未暂存过的, 且plan可以修改）
@@ -38,10 +39,10 @@ let pdcaSetting = {
     pdcaSetting: 'pdca',
     params: [
       ...baseSetting,
-      { paramsKey: 'taskPlan', valueKey: null }, // plan
-      { paramsKey: 'taskAction', valueKey: null }, // action
-      { paramsKey: 'taskDoRequestList', valueKey: null }, // do
-      { paramsKey: 'taskCheckRequestList', valueKey: null } // check
+      { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false, labelKey: 'plan', isEdit: true }, // 改善plan
+      { paramsKey: 'taskAction', valueKey: 'taskAction', isOutvalueKey: false, labelKey: 'action', isEdit: true }, // action
+      { paramsKey: 'taskDoRequestList', valueKey: 'taskDoRequestList', isOutvalueKey: false, labelKey: 'do', isEdit: true }, // do
+      { paramsKey: 'taskCheckRequestList', valueKey: 'taskCheckRequestList', isOutvalueKey: false, labelKey: 'check', isEdit: true }, // check
     ]
   },
   // 编辑pdca按钮的信息（暂存过的）