pdca修改

pages/mission-details/mission-details.vue

@@ -131,7 +131,7 @@
             } else if(taskType === 11){
                 btnInfo= {
                 ...btnInfo,
-                ...pdcaSetting['pdcaBtnInfo'],
+                ...pdcaSetting[needApproveFlag ? 'pdcaBtnInfo' : 'pdcaBtnInfo2'],
                 pDisabled: needApproveFlag // plan内容是否禁用取决于needApproveFlag
               };
             }else if(taskType === 13){ // 制定改善方案p中（需要回显暂存过的数据）
@@ -151,7 +151,7 @@
               // taskType === 4 || taskType === 6 || taskType === 7 || taskType === 9
               btnInfo= {
                 ...btnInfo,
-                ...pdcaSetting[needApproveFlag ? 'pBtnInfo' : 'pdcaBtnInfo']
+                ...pdcaSetting[needApproveFlag ? 'pBtnInfo' : 'pdcaBtnInfo2']
               };
             }
           }

pages/mission-details/pdcaSetting.js

@@ -2,7 +2,7 @@ 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: 'deptNanageName', isOutvalueKey: true }, // 接收人姓名
+  { paramsKey: 'receiveEmpName', valueKey: 'deptManageName', isOutvalueKey: true }, // 接收人姓名
 ];
 
 let pdcaSetting = {
@@ -33,6 +33,17 @@ let pdcaSetting = {
       { 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',

utils/requestUrl.js

@@ -1,8 +1,8 @@
 // export const URL = 'http://192.168.38.140:8088'; // 李磊
 // export const URL = 'http://192.168.38.174:8088';
-// export const URL = 'http://192.168.1.45:8088'; //内网
+export const URL = 'http://192.168.1.45:8088'; //内网
 // export const URL = 'http://s1.nsloop.com:5137';  // 外网
 // export const URL = 'http://121.43.139.179:8801';  // 云端服务1
-export const URL = 'http://172.18.116.20:8801';  // 云端服务2
+// export const URL = 'http://172.18.116.20:8801';  // 云端服务2
 
 

utils/wsUrl.js

@@ -1,3 +1,3 @@
-// export const wsURL = `ws://192.168.1.45:8088/websocket/${hiId}/${user}/${permission}`; // 内网
+export const wsURL = `ws://192.168.1.45:8088/websocket/${hiId}/${user}/${permission}`; // 内网
 // export const wsURL = `ws://121.43.139.179:8801/websocket/${hiId}/${user}/${permission}`; // 云端服务1
-export const wsURL = `ws://172.18.116.20:8801/websocket/${hiId}/${user}/${permission}`; // 云端服务2
+// export const wsURL = `ws://172.18.116.20:8801/websocket/${hiId}/${user}/${permission}`; // 云端服务2