解决冲突

components/tm-upload-img/tm-upload-img.vue

@@ -132,7 +132,7 @@
 				margin-right: 25rpx;
 				margin-bottom: 25rpx;
 				width: 300rpx;
-				height: 225rpx;
+        height: 225rpx;
 
 				>image {
 					width: 300rpx;

pages.json

@@ -117,6 +117,20 @@
 						"enablePullDownRefresh": false
 					}
 				}
+    ,{
+       "path" : "pages/planList/planList",
+       "style":  {
+          "navigationBarTitleText": "计划列表",
+          "enablePullDownRefresh": false
+       }
+    },
+		{
+			"path" : "pages/checkList/checkList",
+			"style" :	{
+				"navigationBarTitleText": "查核列表",
+				"enablePullDownRefresh": false
+			}
+    }
   ],
 	"globalStyle": {
 		"navigationStyle": "custom",

pages/calendar/calendar.vue

@@ -4,8 +4,8 @@
       <image
         :src="
           messageType
-            ? '/static/mission/消息中心未读.png'
-            : '/static/mission/消息中心已读.png'
+            ? '/static/message-unread.png'
+            : '/static/message-read.png'
         "
         mode=""
       ></image>
@@ -24,27 +24,30 @@
           v-for="(items, index) in item"
           class="calendarCon"
           @click="dateClick(items, index)"
+          :style="items.greyFlag ? { color: '#B8BECC' } : { color: '#292C33' }"
         >
-          <view class="date">
-            {{
-              items.time
-                ? items.time.slice(9, 10) == "0"
-                  ? items.time.slice(10, 11)
-                  : items.time.slice(9, 11)
-                : ""
-            }}
+          <view :class="items.specificDate == changedDate ? 'date2' : 'date'">
+            {{ items.day ? items.day : "" }}
           </view>
-          <view class="yinDate">
-            {{ items.yinTime ? items.yinTime : "" }}
+          <view
+            class="yinDate"
+            :style="
+              items.greyFlag ? { color: '#B8BECC' } : { color: '#292C33' }
+            "
+          >
+            {{ items.chineseDay ? items.chineseDay : "" }}
           </view>
-          <view :class="items.work ? 'work' : ''">
-            <view class="sum">{{ items.work ? items.work : "" }}</view>
-            <view class="danwei">{{ items.work ? "单位" : "" }}</view>
+          <view :class="items.deptCount != '0' ? 'work' : ''">
+            <view class="sum">{{
+              items.deptCount != "0" ? items.deptCount : ""
+            }}</view>
+            <view class="danwei">{{
+              items.deptCount != "0" ? "单位" : ""
+            }}</view>
           </view>
         </view>
       </view>
     </view>
-    <!-- <view v-for=""></view> -->
     <change-calendar
       v-if="showCC"
       :changedYear="changedYear"
@@ -77,42 +80,32 @@ export default {
       dayOfWeek: "",
       str_nums: "",
       data1: [],
+      changedDate: moment().format("YYYY-MM-DD"),
     };
   },
   components: {
     changeCalendar,
   },
   created() {
-    // this.getMissionList();
-    // var data = '2021-02-19';
     this.changedDay = this.dayArray[new Date().getDay()];
     this.init(true);
     this.refTimer = setInterval(() => {
       this.isInitWs = websocket.ws ? false : true;
       this.init(this.isInitWs);
     }, 3 * 60 * 1000);
+	this.messStatus();
   },
   beforeDestroy() {
     // 关闭ws连接
     websocket.close();
     clearInterval(this.refTimer);
   },
-  mounted() {
-    this.days_per_month = new Array(
-      31,
-      28 + this.isLeap(this.changedYear),
-      31,
-      30,
-      31,
-      30,
-      31,
-      31,
-      30,
-      31,
-      30,
-      31
-    ); //创建月份数组
-    this.getCanList2();
+  watch:{
+	  "$route":{
+		  handler(route){
+			  this.messStatus();
+		  }
+	  }
   },
   methods: {
     getCanList() {
@@ -120,10 +113,9 @@ export default {
         .dispatch({
           type: "calendar/commActions",
           payload: {
-            key: "getDefault",
+            key: "getCalList",
             data: {
-              pageNum: 1,
-              pageSize: 10,
+              years: this.changedYear + "-" + this.changedMonth,
             },
           },
         })
@@ -133,6 +125,13 @@ export default {
             let user = uni.getStorageSync("id");
             let permission = uni.getStorageSync("nowPermission");
             this.isInitWs && this.initWebsocket(hiId, user, permission);
+            this.str_nums = Math.ceil(data.length / 7); //确定日期表格所需的行数
+            let data2 = [];
+            for (let i = 0; i < this.str_nums; i++) {
+              data2[i] = [];
+              data2[i] = data.splice(0, 7);
+            }
+            this.data1 = data2;
           }
         });
     },
@@ -147,10 +146,8 @@ export default {
     // 解析websocket返回数据
     resolverWsData(type) {
       let types = JSON.parse(type);
-      console.log(types, "iiiiiii");
       switch (types.type) {
         case "TO_READ":
-          alert("99999");
           this.messageType = true;
           break;
         default:
@@ -159,6 +156,7 @@ export default {
       }
     },
     toMessagePage() {
+      // this.messageType = false;
       uni.navigateTo({
         url: `/pages/messages/messages`,
       });
@@ -175,237 +173,42 @@ export default {
       this.changedMonth = month;
       let day = year + "-" + month + "-01";
       this.changedDay = this.dayArray[new Date(day).getDay()];
-      this.getCanList2();
-    },
-    isLeap(year) {
-      return year % 4 == 0
-        ? year % 100 != 0
-          ? 1
-          : year % 400 == 0
-          ? 1
-          : 0
-        : 0;
-    },
-    getMonth(m) {
-      console.log(m);
-      if (m.substr(0, 1) == "0") {
-        console.log(true);
-        return m.substr(1, 2);
-      } else {
-        return m;
-      }
-    },
-    //获取上个月的天数
-    getPreMonthCount(year, month) {
-      if (month === 0) {
-        return getMonthCount(year - 1, 11);
-      } else {
-        return getMonthCount(year, month - 1);
-      }
-    },
-    getCanList2() {
-      this.$store
-        .dispatch({
-          type: "calendar/commActions",
-          payload: {
-            key: "getDefault",
-            data: {
-              pageNum: 1,
-              pageSize: 10,
-            },
-          },
-        })
-        .then((data) => {
-          let data1 = [
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: 5,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-            {
-              time: "2021-02-03",
-              yinTime: "二十",
-              work: null,
-            },
-          ];
-
-          this.firstday = new Date(
-            this.changedYear,
-            this.changedMonth.slice(0, 1) == "0"
-              ? this.changedMonth.slice(1, 2) - 1
-              : this.changedMonth - 1,
-            1
-          ); //获取每月第一天
-          this.dayOfWeek = this.firstday.getDay(); //判断第一天是星期几(返回[0-6]中的一个，0代表星期天，1代表星期一，以此类推)
-          this.str_nums = Math.ceil((this.dayOfWeek + data1.length) / 7); //确定日期表格所需的行数
-          let data2 = [];
-          for (let i = 0; i < this.str_nums; i++) {
-            data2[i] = [];
-            if (i == 0 && this.dayOfWeek != 0) {
-              for (let j = 0; j < this.dayOfWeek; j++) {
-                data2[i].push({});
-              }
-              let data3 = data1.splice(0, 7 - this.dayOfWeek);
-              for (let k = 0; k < data3.length; k++) {
-                data2[i].push(data3[k]);
-              }
-            } else if (i == 0 && this.dayOfWeek == 0) {
-              data2[i] = data1.splice(0, 7);
-            } else {
-              if (i == this.str_nums - 1 && data1.length < 7) {
-                data2[i] = data1.splice(0, 7);
-                for (let k = 1; k < 7 - data1.length; k++) {
-                  data2[i].push({});
-                }
-              } else if (i == this.str_nums - 1 && data1.length == 7) {
-                data2[i] = data1.splice(0, 7);
-              } else {
-                data2[i] = data1.splice(0, 7);
-              }
-            }
-          }
-          console.log(data2);
-          this.data1 = data2;
-        });
+      this.getCanList();
     },
     dateClick(data, i) {
-      console.log(data, i);
-      if (data && data.work) {
-        // uni.navigateTo({
-        //   url: `/pages/mission-details/mission-details?taskId=${data.businessId}`,
-        // });
+      if (data && data.specificDate) {
+        uni.navigateTo({
+          url: `/pages/todayCheck/todayCheck?date=${data.specificDate}`,
+        });
       }
     },
+	messStatus(){
+		let num = 1;
+		let timer = setInterval(()=>{
+		  this.$store.dispatch({
+			  type: "calendar/commActions",
+			  payload: {
+				key: "messagesList",
+				data: {
+				  pageNum: num,
+				  pageSize: 100,
+				},
+			  },
+			}).then((res)=>{
+				if(res && res.list.length == 0){
+					clearInterval(timer)
+				}else if(res && res.list.length != 0){
+					res.list.map((item)=>{
+						if(!item.readStatus){
+							this.messageType = true;
+							return;
+						}
+					})
+				}
+			})
+		  num++;
+		},100)
+	}
   },
 };
 </script>
@@ -459,8 +262,20 @@ export default {
     font-size: 35rpx;
     color: #292c33;
     .date {
-      padding-top: 25rpx;
-      padding-bottom: 15rpx;
+      margin: 16.25rpx auto 6.25rpx;
+      height: 52.5rpx;
+      width: 52.5rpx;
+      line-height: 52.5rpx;
+      border-radius: 50%;
+    }
+    .date2 {
+      margin: 16.25rpx auto 6.25rpx;
+      height: 52.5rpx;
+      width: 52.5rpx;
+      line-height: 52.5rpx;
+      border-radius: 50%;
+      background-color: #3377ff;
+      color: #fff;
     }
     .yinDate {
       color: #666e80;

pages/calendar/server.js

@@ -1,22 +1,16 @@
 import { creatRequest } from '../../utils/request.js';
 
 const requestList = {
-	// 保存配置
-	postResultConfig: {
-		method: 'POST',
-		url: 'resultConfig'
-	},
-	//最新配置
-	getResultConfig:{
+	// 获取日历
+	getCalList: {
 		method: 'GET',
-		url: 'resultConfig'
+		url: 'checkTask/calendar'
+	},
+	//获取分页列表
+	messagesList: {
+	  method: 'GET',
+	  url: 'notice/page'
 	},
-	//默认配置列表
-	getDefault:{
-		method: 'GET',
-		url: 'notice/page'
-	}
-	
 };
 
 export const commServer = ({ key, data }) => {

pages/messages/messages.vue

@@ -16,11 +16,11 @@
             :src="
               item.businessType == 1
                 ? item.readStatus
-                  ? '/static/橙色已读.png'
-                  : '/static/橙色未读.png'
+                  ? '/static/orange-read.png'
+                  : '/static/orange-noRead.png'
                 : item.readStatus
-                ? '/static/绿色已读.png'
-                : '/static/绿色未读.png'
+                  ? '/static/green-read.png'
+                  : '/static/green-noRead.png'
             "
           ></image>
         </view>

pages/mission-action/components/pdca-components/one-textarea.vue

@@ -53,9 +53,6 @@
 			label() {
         return this.type === 'plan' ? '改善计划' : '对策处置'
       }
-    },
-    created() {
-      this.value = this.defaultValue;
     },
 		methods: {
       changeVal(e) {

pages/mission-action/components/pdca.vue

@@ -120,7 +120,7 @@
 			uni.setNavigationBarTitle({
 				title: '改善计划'
       });
-      if(this.disabled) {
+      if(this.disabled || this.btnInfo.isEdit) {
         this.plan = this.values['plan'] || '';
         this.doList = (this.values['do'] && this.values['do'].length > 0)
           ? this.getComList(this.values['do'], 'do')
@@ -159,7 +159,7 @@
           improveScheme // 改善方案名称
         };
         this.btnInfo.params && this.btnInfo.params.map(item => {
-          if(item.valueKey){
+          if(item.valueKey && !item.isEdit){
             requestParams[item.paramsKey] = (
               item.isOutvalueKey
               ? this.missionDetails

pages/mission-action/mission-action.vue

@@ -62,7 +62,9 @@
           key,
           labelKey,
           dataKey,
-          pdcaSetting
+          pdcaSetting,
+          isEdit,
+          params
         } = details;
         this.currentComponet = componentName;
         this.disabled = disabled;
@@ -78,6 +80,15 @@
           this.values = values;
         }else { // 编辑流程
           this.btnInfo = details;
+          if(isEdit) { // 之前暂存过,需要先回显数据
+            let values = {};
+            params && params.map(item => {
+              if(item.labelKey){
+                values[item.labelKey] = details[item.valueKey];
+              }
+            });
+            this.values = values;
+          }
         }
         this.pdcaSetting = pdcaSetting;
       },
@@ -90,7 +101,7 @@
 						data
 					}
 				}).then(data1 => {
-          if(!data1){
+          if(data1){
             let taskId = uni.getStorageSync('taskId');
             uni.redirectTo({
               url: `/pages/mission-details/mission-details?taskId=${taskId}`

pages/mission-details/mission-details.vue

@@ -25,7 +25,7 @@
 										<text>{{ getContext(item, false, 'row2') }}</text>
 									</view>
 									<view class="sub-title">
-										<text>{{ item.createTime }}</text>
+										<text>{{ item.recordTime }}</text>
 									</view>
 								</view>
                 <template v-if="getContext(item, true, 'selectDetails')">
@@ -64,6 +64,7 @@
   import { mapState } from "vuex";
   import listItem from '../mission/components/list-item.vue';
   import taskTypeList from './setting.js';
+  import pdcaSetting from './pdcaSetting.js'
 
 	export default {
     computed: {
@@ -118,6 +119,22 @@
 			// 点击右侧按钮
 			clickBtn(currentInfo, btnInfo) {
         if(btnInfo.componentName){ // 有组件名,则跳转页面
+          if(btnInfo.componentName === 'pdca'){
+            const { taskType, needApproveFlag } = this.missionDetails;
+            if(taskType === 13 || taskType === 15){ // 制定改善方案中（需要回显暂存过的数据）
+              if(needApproveFlag){// 需要审核（pdca）
+                btnInfo= { ...btnInfo, ...pdcaSetting['editPdcaBtnInfo'], isEdit: true };
+              }else {
+                btnInfo= { ...btnInfo, ...pdcaSetting['editPBtnInfo'], isEdit: true };
+              }
+            }else {
+              if(needApproveFlag){ // 需要审核（pdca）
+                btnInfo= { ...btnInfo, ...pdcaSetting['pdcaBtnInfo'] };
+              }else {
+                btnInfo= { ...btnInfo, ...pdcaSetting['pBtnInfo'] };
+              }
+            }
+          }
           uni.navigateTo({
             url: `/pages/mission-action/mission-action?details=${encodeURIComponent(JSON.stringify({...currentInfo, ...btnInfo}))}`
 				  });

pages/mission-details/pdcaSetting.js

@@ -0,0 +1,49 @@
+const baseSetting = [
+  { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+  { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+  { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+  { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+];
+
+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: 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/setting-old.js

@@ -0,0 +1,770 @@
+// 任务流程列表
+
+const taskTypeList = [
+  {
+    taskType: 1, // 任务当前状态
+    currentPermission: 4, // 当前任务在哪
+    taskName: '创建任务',
+    checkResult: 3, // 只针对第一步操作区分按钮是显示 (指派改善任务还是改善回复) 1不用管 2 改善回复 3 制定改善方案
+    btnList: [ //  底部按钮
+      {
+        name: '不认可', // 按钮显示名字
+        componentName: 'disagree', // 点击后跳转的组件名
+        nextPermission: 1, // 接收人id
+        nextPermissionName: '管理员', // 接收人名字
+        params: [ // 接口保存的参数配置(paramsKey: 参数名, valueKey: 使用详情接口key, 为null, 表示当前组件可自输入, isOutvalueKey: 是否详情接一级key, 不是则在当前任务状态中找key(如pfmTaskCirculationList下面))
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'adminId', isOutvalueKey: true }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'adminName', isOutvalueKey: true }, // 接收人姓名
+          { paramsKey: 'approveReason', valueKey: null } // 不认可原因
+        ]
+      },
+      {
+        name: '指派改善任务',
+        componentName: 'assign-mission',
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'appointFlag', valueKey: 'appointFlag', isOutvalueKey: true }, // 已指派标志, 0 未指派 1已指派
+          { paramsKey: 'desicion', valueKey: null }, // 改善方案 目前只有pdca
+          { paramsKey: 'receiveEmpId', valueKey: null }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: null }, // 指派人姓名
+          { paramsKey: 'needApproveFlag', valueKey: null } // 是否需要审核 true 是 false 不需要
+        ]
+      }
+    ],
+    // 第一行显示的内容
+    row1: {
+      hasJoin: true, // 是否需要拼接
+      name: '查核人x', // 显示的内容, x未来被替换的值
+      key: 'establishEmpName', // 使用详情接口key,用来替换x
+      isOutvalueKey: false // 是否详情接口一级key, 不是则在当前任务状态中找key(如pfmTaskCirculationList下面)
+    },
+    // 第二行显示的内容
+    row2: {
+      hasJoin: true,
+      name: '发送改善通知，查核结果：x',
+      key: 'checkDetailResult',
+      isOutvalueKey: true
+    },
+    // 查看xx详情 (name: 详情名字, componentName: 点击后跳转的页面, disabled: 底部按钮禁用)
+    selectDetails: {
+      name: '查看查核结果详情', // 详情显示的名字
+      hasAnyData: false, // 是否有多个数据需要回显 为true则使用dateKey, 否则使用key <key和datakey互斥)
+      key: 'checkDetailResult', //使用详情接口key
+      dataKey: [],
+      isOutvalueKey: true,  // 是否详情接口一级key, 不是则在当前任务状态中找key(如pfmTaskCirculationList下面)
+      componentName: 'disagree', //点击后跳转的组件名
+      disabled: true, // 调整后是否编辑和禁用
+      labelKey: 'textarea' // 回显时使用的key
+    }
+  },
+  {
+    taskType: 1,
+    currentPermission: 4,
+    taskName: '创建任务',
+    checkResult: 2,
+    btnList: [
+      {
+        name: '不认可',
+        componentName: 'disagree',
+        nextPermission: 1,
+        nextPermissionName: '管理员',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'adminId', isOutvalueKey: true }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'adminName', isOutvalueKey: true }, // 接收人姓名
+          { paramsKey: 'approveReason', valueKey: null }, // 不认可原因
+        ]
+      },
+      {
+        name: '改善回复',
+        componentName: 'write-back',
+        nextPermission: 1,
+        nextPermissionName: '管理员',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'receiveEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'adminName', isOutvalueKey: true }, // 接收人姓名
+          { paramsKey: 'approveReason', valueKey: null }, // 不认可原因
+          { paramsKey: 'improveUrl', valueKey: null } // 图片地址
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '查核人x', key: 'establishEmpName' },
+    row2: {hasJoin: true, name: '发送改善通知，查核结果：x', key: 'checkDetailResult', isOutvalueKey: true },
+    selectDetails: {
+      name: '查看查核结果详情',
+      key: 'checkDetailResult',
+      isOutvalueKey: true,
+      componentName: 'disagree',
+      disabled: true,
+      labelKey: 'textarea'
+    }
+  },
+  {
+    taskType: 2,
+    currentPermission: 1,
+    taskName: '不认可',
+    checkResult: 1,
+    btnList: [
+      {
+        name: '重新发送',
+        componentName: 'disagree',
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+          { paramsKey: 'approveReason', valueKey: null } // 不认可原因
+        ]
+      },
+      {
+        name: '发送给其他人',
+        componentName: 'personnel',
+        keys: null,
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: null }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: null } // 接收人姓名
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '不认可改善通知' },
+    selectDetails: {
+      name: '查看不认可原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true,
+      labelKey: 'textarea'
+    }
+  },
+  {
+    taskType: 3,
+    currentPermission: 4,
+    taskName: '重新发送',
+    checkResult: 1,
+    btnList: [
+      {
+        name: '指派改善任务',
+        componentName: 'assign-mission',
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'appointFlag', valueKey: 'appointFlag', isOutvalueKey: true }, // 已指派标志, 0 未指派 1已指派
+          { paramsKey: 'desicion', valueKey: null }, // 改善方案 目前只有pdca
+          { paramsKey: 'receiveEmpId', valueKey: null }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: null }, // 指派人姓名
+          { paramsKey: 'needApproveFlag', valueKey: null } // 是否需要审核 true 是 false 不需要
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '管理员x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '重新发送改善通知' },
+    selectDetails: {
+      name: '查看原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true,
+      labelKey: 'textarea'
+    }
+  },
+  {
+    taskType: 4,
+    checkResult: 1,
+    taskName: '指派改善任务',
+    currentPermission: 5,
+    btnList: [
+      {
+        name: '申请更换改善人',
+        componentName: null,
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false } // 接收人姓名
+        ]
+      },
+      {
+        name: '制定改善方案',
+        componentName: 'pdca',
+        nextPermission: 6,
+        nextPermissionName: '单位负责人',
+        pdcaSetting: 'p',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+          { paramsKey: 'taskPlan', valueKey: null} // 接收人姓名
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
+    row2: {hasJoin: true, name: '指派x为改善人', key: 'receiveEmpName'},
+    selectDetails: null
+  },
+  {
+    taskType: 5,
+    checkResult: 1,
+    taskName: '改善回复',
+    currentPermission: 1,
+    btnList: [
+      {
+        name: '不通过',
+        componentName: null,
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+        ]
+      },
+      {
+        name: '通过',
+        componentName: null,
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '提交了改善回复'},
+    selectDetails: {
+      name: '查看改善回复详情',
+      componentName: 'write-back',
+      hasAnyData: true, // 是否有多个数据需要回显（多个数据对多个key）
+      dataKey: [
+        {key: 'approveReason', isOutvalueKey: false, labelKey: 'textarea'}, // 回复内容
+        {key: 'improveUrl', isOutvalueKey: false, labelKey: 'filePath'} // 回复图片地址(多个用逗号分隔)
+      ],
+      disabled: true
+    },
+  },
+  {
+    taskType: 6,
+    checkResult: 1,
+    taskName: '更换改善人',
+    currentPermission: 5,
+    btnList: [
+      {
+        name: '申请更换改善人',
+        componentName: null,
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false } // 接收人姓名
+        ]
+      },
+      {
+        name: '制定改善方案',
+        componentName: 'pdca',
+        pdcaSetting: 'p',
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+          { paramsKey: 'taskPlan', valueKey: null }, // 接收人姓名
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
+    row2: {hasJoin: true, name: '指派x为改善人', key: 'receiveEmpName'},
+    selectDetails: null
+  },
+  {
+    taskType: 7,
+    checkResult: 1,
+    taskName: '更换改善人驳回',
+    currentPermission: 5,
+    btnList: [
+      {
+        name: '制定改善方案',
+        componentName: 'pdca',
+        pdcaSetting: 'p',
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+          { paramsKey: 'taskPlan', valueKey: null } // plan
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '驳回更换改善人的申请'},
+    selectDetails: null
+  },
+  {
+    taskType: 8,
+    checkResult: 1,
+    taskName: '改善计划plan通过',
+    currentPermission: 5,
+    btnList: [
+      {
+        name: '记录改善方案',
+        componentName: 'pdca',
+        pdcaSetting: 'pdca',
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+          { paramsKey: 'taskPlan', valueKey: null }, // plan
+          { paramsKey: 'taskAction', valueKey: null }, // action
+          { paramsKey: 'taskDoRequestList', valueKey: null }, // do
+          { paramsKey: 'taskCheckRequestList', valueKey: null } // check
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '单位管理员x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '通过改善计划审核，开始执行改善计划'},
+    selectDetails: {
+      name: '查看改善计划详情',
+      componentName: 'pdca',
+      pdcaSetting: 'p',
+      key: 'taskPlan',
+      disabled: true,
+      labelKey: 'plan'
+    }
+  },
+  {
+    taskType: 9,
+    checkResult: 1,
+    taskName: '改善计划plan不通过',
+    currentPermission: 5,
+    btnList: [
+      {
+        name: '制定改善方案',
+        componentName: 'pdca',
+        pdcaSetting: 'p',
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+          { paramsKey: 'taskPlan', valueKey: null } // plan
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '单位管理员x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '建议重新完善改善计划'},
+    selectDetails: {
+      name: '查看原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true,
+      labelKey: 'textarea'
+    }
+  },
+  {
+    taskType: 10,
+    checkResult: 1,
+    taskName: '改善方案PDCA通过',
+    currentPermission: 1,
+    btnList: [
+      {
+        name: '不通过',
+        componentName: 'disagree',
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+          { paramsKey: 'approveReason', valueKey: 'approveReason', isOutvalueKey: false } // 原因
+        ]
+      },
+      {
+        name: '通过',
+        componentName: null,
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false } // 接收人姓名
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '通过了改善方案(PDCA)'},
+    selectDetails: {
+      name: '查看改善方案详情',
+      componentName: 'pdca',
+      pdcaSetting: 'pdca',
+      hasAnyData: true, // 是否有多个数据需要回显（多个数据对多个key）
+      dataKey: [
+        {key: 'taskPlan', isOutvalueKey: false, labelKey: 'plan'}, // plan
+        {key: 'taskDoRequestList', isOutvalueKey: false, labelKey: 'do'}, // do
+        {key: 'taskCheckRequestList', isOutvalueKey: false, labelKey: 'check'}, // check
+        {key: 'taskAction', isOutvalueKey: false, labelKey: 'action'}, // action
+      ],
+      disabled: true
+    }
+  },
+  {
+    taskType: 11,
+    checkResult: 1,
+    taskName: '改善方案PDCA不通过',
+    currentPermission: 5,
+    btnList: [
+      {
+        name: '制定改善方案',
+        componentName: 'pdca',
+        pdcaSetting: 'p',
+        nextPermission: 4,
+        nextPermissionName: '单位负责人',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+          { paramsKey: 'taskPlan', valueKey: null } // plan
+        ]
+      },
+    ],
+    row1: { hasJoin: true, name: '单位管理员x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '建议重新完善改善计划'},
+    selectDetails: {
+      name: '查看原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true,
+      labelKey: 'textarea'
+    }
+  },
+  {
+    taskType: 12,
+    checkResult: 1,
+    taskName: '申请更改改善人',
+    currentPermission: 4,
+    btnList: [
+      {
+        name: '更改改善人',
+        componentName: 'assign-mission',
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'appointFlag', valueKey: 'appointFlag', isOutvalueKey: true }, // 已指派标志, 0 未指派 1已指派
+          { paramsKey: 'desicion', valueKey: null }, // 改善方案 目前只有pdca 0
+          { paramsKey: 'receiveEmpId', valueKey: null }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: null }, // 指派人姓名
+          { paramsKey: 'needApproveFlag', valueKey: null } // 是否需要审核 true 是 false 不需要
+        ]
+      },
+      {
+        name: '驳回请求',
+        componentName: null,
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
+          { paramsKey: 'approveReason', valueKey: null } // 原因
+        ]
+      },
+    ],
+    row1: { hasJoin: true, name: '改善人x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '申请更换改善人'},
+    selectDetails: null
+  },
+  {
+    taskType: 13,
+    checkResult: 1,
+    taskName: '制定改善方案',
+    currentPermission: 4,
+    btnList: [
+      {
+        name: '不通过',
+        componentName: 'disagree',
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
+          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false }, // 改善plan
+          { paramsKey: 'approveReason', valueKey: null } // 审核不通过原因
+        ]
+      },
+      {
+        name: '通过',
+        componentName: null,
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
+          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false } // 改善plan
+        ]
+      },
+    ],
+    row1: { hasJoin: true, name: '改善者x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '提交了改善计划(PLAN)'},
+    selectDetails: {
+      name: '查看改善计划详情',
+      componentName: 'pdca',
+      pdcaSetting: 'p',
+      key: 'taskPlan',
+      disabled: true,
+      labelKey: 'plan'
+    }
+  },
+  {
+    taskType: 14,
+    checkResult: 1,
+    taskName: '制定改善方案plan',
+    currentPermission: 4,
+    btnList: [
+      {
+        name: '不通过',
+        componentName: 'disagree',
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
+          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false }, // 改善plan
+          { paramsKey: 'approveReason', valueKey: null } // 审核不通过原因
+        ]
+      },
+      {
+        name: '通过',
+        componentName: null,
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
+          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false } // 改善plan
+        ]
+      },
+    ],
+    row1: { hasJoin: true, name: '改善者x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '提交了改善计划(PLAN)'},
+    selectDetails: {
+      name: '查看改善计划详情',
+      key: 'taskPlan',
+      componentName: 'pdca',
+      pdcaSetting: 'p',
+      nextPermission: 5,
+      disabled: true,
+      labelKey: 'plan'
+    }
+  },
+  {
+    taskType: 15,
+    checkResult: 1,
+    taskName: '制定改善方案',
+    currentPermission: 4,
+    btnList: [
+      {
+        name: '不通过',
+        componentName: 'disagree',
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
+          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false }, // 改善plan
+          { paramsKey: 'approveReason', valueKey: null } // 审核不通过原因
+        ]
+      },
+      {
+        name: '通过',
+        componentName: null,
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
+          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false } // 改善plan
+        ]
+      },
+    ],
+    row1: { hasJoin: true, name: '改善者x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '提交了改善计划(PLAN)'},
+    selectDetails: {
+      name: '查看改善计划详情',
+      key: 'taskPlan',
+      componentName: 'pdca',
+      pdcaSetting: 'pdca',
+      nextPermission: 5,
+      disabled: true,
+      labelKey: 'plan'
+    }
+  },
+  {
+    taskType: 16,
+    checkResult: 1,
+    taskName: '记录改善方案pdca',
+    currentPermission: 4,
+    btnList: [
+      {
+        name: '不通过',
+        componentName: 'disagree',
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
+          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false }, // 改善plan
+          { paramsKey: 'taskAction', valueKey: 'taskAction', isOutvalueKey: false }, // action
+          { paramsKey: 'taskDoRequestList', valueKey: 'taskDoRequestList', isOutvalueKey: false }, // do
+          { paramsKey: 'taskCheckRequestList', valueKey: 'taskCheckRequestList', isOutvalueKey: false }, // check
+          { paramsKey: 'approveReason', valueKey: null } // 不通过原因
+        ]
+      },
+      {
+        name: '通过',
+        componentName: null,
+        nextPermission: 1,
+        nextPermissionName: '管理员',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'receiveEmpId', valueKey: 'adminId', isOutvalueKey: true }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'adminName', isOutvalueKey: true }, // 接收人姓名
+          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false }, // 改善plan
+          { paramsKey: 'taskAction', valueKey: 'taskAction', isOutvalueKey: false }, // action
+          { paramsKey: 'taskDoRequestList', valueKey: 'taskDoRequestList', isOutvalueKey: false }, // do
+          { paramsKey: 'taskCheckRequestList', valueKey: 'taskCheckRequestList', isOutvalueKey: false }, // check
+          { paramsKey: 'improveScheme', valueKey: 'improveScheme', isOutvalueKey: false }, // 改善方案名称
+        ]
+      },
+    ],
+    row1: { hasJoin: true, name: '改善者x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '提交了改善方案(PDCA)'},
+    selectDetails: {
+      name: '查看改善方案详情',
+      hasAnyData: true, // 是否有多个数据需要回显（多个数据对多个key）
+      dataKey: [
+        {key: 'taskPlan', isOutvalueKey: false, labelKey: 'plan'}, // plan
+        {key: 'taskDoRequestList', isOutvalueKey: false, labelKey: 'do'}, // do
+        {key: 'taskCheckRequestList', isOutvalueKey: false, labelKey: 'check'}, // check
+        {key: 'taskAction', isOutvalueKey: false, labelKey: 'action'}, // action
+      ],
+      componentName: 'pdca',
+      pdcaSetting: 'pdca',
+      disabled: true
+    }
+  },
+  {
+    taskType: 17,
+    checkResult: 1,
+    taskName: '改善方案plan通过',
+    currentPermission: 4,
+    btnList: [],
+    row1: { hasJoin: true, name: '管理员x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '完成改善，本次任务结束'},
+    selectDetails: {
+      name: '查看改善方案详情',
+      hasAnyData: true, // 是否有多个数据需要回显（多个数据对多个key）
+      dataKey: [
+        {key: 'taskPlan', isOutvalueKey: false, labelKey: 'plan'}, // plan
+        {key: 'taskDoRequestList', isOutvalueKey: false, labelKey: 'do'}, // do
+        { key: 'taskCheckRequestList', isOutvalueKey: false, labelKey: 'check'}, // check
+        {key: 'taskAction', isOutvalueKey: false, labelKey: 'action'}, // action
+      ],
+      componentName: 'pdca',
+      pdcaSetting: 'pdca',
+      disabled: true
+    }
+  },
+  {
+    taskType: 18,
+    checkResult: 1,
+    taskName: '改善方案plan通过， 改善回复通过',
+    currentPermission: 4,
+    btnList: [
+      {
+        name: '指派改善任务',
+        componentName: 'assign-mission',
+        nextPermission: 5,
+        nextPermissionName: '改善者',
+        params: [
+          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+          { paramsKey: 'appointFlag', valueKey: 'appointFlag', isOutvalueKey: true }, // 已指派标志, 0 未指派 1已指派
+          { paramsKey: 'desicion', valueKey: null }, // 改善方案 目前只有pdca
+          { paramsKey: 'receiveEmpId', valueKey: null }, // 指派人
+          { paramsKey: 'receiveEmpName', valueKey: null }, // 指派人姓名
+          { paramsKey: 'needApproveFlag', valueKey: null } // 是否需要审核 true 是 false 不需要
+        ]
+      }
+    ],
+    row1: { hasJoin: true, name: '管理员x', key: 'establishEmpName' },
+    row2: {hasJoin: false, name: '改善方案不通过，重新执行改善流程'},
+    selectDetails: {
+      name: '查看原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true,
+      labelKey: 'textarea'
+    }
+  },
+];
+
+export default taskTypeList;
+
+/**
+ * taskType: 4 => 制定改善方案 =>  pdcaSetting: 'p',要根据前面的改善工具决定p 还是pdca
+ * taskType: 6,
+ * taskType: 7,
+ * taskType: 9,
+ * taskType: 11,
+ */

pages/mission-details/setting.js

@@ -3,15 +3,12 @@
 const taskTypeList = [
   {
     taskType: 1, // 任务当前状态
-    currentPermission: 4, // 当前任务在哪
     taskName: '创建任务',
     checkResult: 3, // 只针对第一步操作区分按钮是显示 (指派改善任务还是改善回复) 1不用管 2 改善回复 3 制定改善方案
     btnList: [ //  底部按钮
       {
         name: '不认可', // 按钮显示名字
         componentName: 'disagree', // 点击后跳转的组件名
-        nextPermission: 1, // 接收人id
-        nextPermissionName: '管理员', // 接收人名字
         params: [ // 接口保存的参数配置(paramsKey: 参数名, valueKey: 使用详情接口key, 为null, 表示当前组件可自输入, isOutvalueKey: 是否详情接一级key, 不是则在当前任务状态中找key(如pfmTaskCirculationList下面))
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -23,8 +20,6 @@ const taskTypeList = [
       {
         name: '指派改善任务',
         componentName: 'assign-mission',
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -64,15 +59,12 @@ const taskTypeList = [
   },
   {
     taskType: 1,
-    currentPermission: 4,
     taskName: '创建任务',
     checkResult: 2,
     btnList: [
       {
         name: '不认可',
         componentName: 'disagree',
-        nextPermission: 1,
-        nextPermissionName: '管理员',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -84,8 +76,6 @@ const taskTypeList = [
       {
         name: '改善回复',
         componentName: 'write-back',
-        nextPermission: 1,
-        nextPermissionName: '管理员',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -109,15 +99,12 @@ const taskTypeList = [
   },
   {
     taskType: 2,
-    currentPermission: 1,
     taskName: '不认可',
     checkResult: 1,
     btnList: [
       {
         name: '重新发送',
         componentName: 'disagree',
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -130,8 +117,6 @@ const taskTypeList = [
         name: '发送给其他人',
         componentName: 'personnel',
         keys: null,
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -152,15 +137,12 @@ const taskTypeList = [
   },
   {
     taskType: 3,
-    currentPermission: 4,
     taskName: '重新发送',
     checkResult: 1,
     btnList: [
       {
         name: '指派改善任务',
         componentName: 'assign-mission',
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -186,13 +168,10 @@ const taskTypeList = [
     taskType: 4,
     checkResult: 1,
     taskName: '指派改善任务',
-    currentPermission: 5,
     btnList: [
       {
         name: '申请更换改善人',
         componentName: null,
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -203,16 +182,14 @@ const taskTypeList = [
       {
         name: '制定改善方案',
         componentName: 'pdca',
-        nextPermission: 6,
-        nextPermissionName: '单位负责人',
-        pdcaSetting: 'p',
-        params: [
-          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
-          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
-          { paramsKey: 'taskPlan', valueKey: null} // 接收人姓名
-        ]
+        // pdcaSetting: 'p',
+        // params: [
+        //   { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+        //   { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+        //   { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+        //   { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+        //   { paramsKey: 'taskPlan', valueKey: null} // 接收人姓名
+        // ]
       }
     ],
     row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
@@ -223,25 +200,20 @@ const taskTypeList = [
     taskType: 5,
     checkResult: 1,
     taskName: '改善回复',
-    currentPermission: 1,
     btnList: [
       {
         name: '不通过',
         componentName: null,
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
           { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
           { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
-        ] // todo
+        ]
       },
       {
         name: '通过',
         componentName: null,
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -267,13 +239,10 @@ const taskTypeList = [
     taskType: 6,
     checkResult: 1,
     taskName: '更换改善人',
-    currentPermission: 5,
     btnList: [
       {
         name: '申请更换改善人',
         componentName: null,
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -284,16 +253,14 @@ const taskTypeList = [
       {
         name: '制定改善方案',
         componentName: 'pdca',
-        pdcaSetting: 'p',
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
-        params: [
-          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
-          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
-          { paramsKey: 'taskPlan', valueKey: null }, // 接收人姓名
-        ]
+        // pdcaSetting: 'p',
+        // params: [
+        //   { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+        //   { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+        //   { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+        //   { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+        //   { paramsKey: 'taskPlan', valueKey: null }, // 接收人姓名
+        // ]
       }
     ],
     row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
@@ -304,21 +271,18 @@ const taskTypeList = [
     taskType: 7,
     checkResult: 1,
     taskName: '更换改善人驳回',
-    currentPermission: 5,
     btnList: [
       {
         name: '制定改善方案',
         componentName: 'pdca',
-        pdcaSetting: 'p',
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
-        params: [
-          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
-          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
-          { paramsKey: 'taskPlan', valueKey: null } // plan
-        ]
+        // pdcaSetting: 'p',
+        // params: [
+        //   { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+        //   { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+        //   { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+        //   { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+        //   { paramsKey: 'taskPlan', valueKey: null } // plan
+        // ]
       }
     ],
     row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
@@ -329,24 +293,21 @@ const taskTypeList = [
     taskType: 8,
     checkResult: 1,
     taskName: '改善计划plan通过',
-    currentPermission: 5,
     btnList: [
       {
         name: '记录改善方案',
         componentName: 'pdca',
-        pdcaSetting: 'pdca',
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
-        params: [
-          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
-          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
-          { paramsKey: 'taskPlan', valueKey: null }, // plan
-          { paramsKey: 'taskAction', valueKey: null }, // action
-          { paramsKey: 'taskDoRequestList', valueKey: null }, // do
-          { paramsKey: 'taskCheckRequestList', valueKey: null } // check
-        ]
+        // pdcaSetting: 'pdca',
+        // params: [
+        //   { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+        //   { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+        //   { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+        //   { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+        //   { paramsKey: 'taskPlan', valueKey: null }, // plan
+        //   { paramsKey: 'taskAction', valueKey: null }, // action
+        //   { paramsKey: 'taskDoRequestList', valueKey: null }, // do
+        //   { paramsKey: 'taskCheckRequestList', valueKey: null } // check
+        // ]
       }
     ],
     row1: { hasJoin: true, name: '单位管理员x', key: 'establishEmpName' },
@@ -364,21 +325,18 @@ const taskTypeList = [
     taskType: 9,
     checkResult: 1,
     taskName: '改善计划plan不通过',
-    currentPermission: 5,
     btnList: [
       {
         name: '制定改善方案',
         componentName: 'pdca',
-        pdcaSetting: 'p',
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
-        params: [
-          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
-          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
-          { paramsKey: 'taskPlan', valueKey: null } // plan
-        ]
+        // pdcaSetting: 'p',
+        // params: [
+        //   { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+        //   { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+        //   { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+        //   { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+        //   { paramsKey: 'taskPlan', valueKey: null } // plan
+        // ]
       }
     ],
     row1: { hasJoin: true, name: '单位管理员x', key: 'establishEmpName' },
@@ -387,21 +345,19 @@ const taskTypeList = [
       name: '查看原因详情',
       key: 'approveReason',
       componentName: 'disagree',
+      isOutvalueKey: false,
       disabled: true,
-      labelKey: 'textarea'
+      labelKey: 'textarea',
     }
   },
   {
     taskType: 10,
     checkResult: 1,
     taskName: '改善方案PDCA通过',
-    currentPermission: 1,
     btnList: [
       {
         name: '不通过',
         componentName: 'disagree',
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -413,8 +369,6 @@ const taskTypeList = [
       {
         name: '通过',
         componentName: null,
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -443,21 +397,18 @@ const taskTypeList = [
     taskType: 11,
     checkResult: 1,
     taskName: '改善方案PDCA不通过',
-    currentPermission: 5,
     btnList: [
       {
         name: '制定改善方案',
         componentName: 'pdca',
-        pdcaSetting: 'p',
-        nextPermission: 4,
-        nextPermissionName: '单位负责人',
-        params: [
-          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
-          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
-          { paramsKey: 'taskPlan', valueKey: null } // plan
-        ]
+        // pdcaSetting: 'p',
+        // params: [
+        //   { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
+        //   { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
+        //   { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+        //   { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 接收人姓名
+        //   { paramsKey: 'taskPlan', valueKey: null } // plan
+        // ]
       },
     ],
     row1: { hasJoin: true, name: '单位管理员x', key: 'establishEmpName' },
@@ -465,6 +416,7 @@ const taskTypeList = [
     selectDetails: {
       name: '查看原因详情',
       key: 'approveReason',
+      isOutvalueKey: false,
       componentName: 'disagree',
       disabled: true,
       labelKey: 'textarea'
@@ -474,13 +426,10 @@ const taskTypeList = [
     taskType: 12,
     checkResult: 1,
     taskName: '申请更改改善人',
-    currentPermission: 4,
     btnList: [
       {
         name: '更改改善人',
         componentName: 'assign-mission',
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -494,8 +443,6 @@ const taskTypeList = [
       {
         name: '驳回请求',
         componentName: null,
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -512,59 +459,37 @@ const taskTypeList = [
   {
     taskType: 13,
     checkResult: 1,
-    taskName: '制定改善方案',
-    currentPermission: 4,
+    taskName: '制定改善方案中',
     btnList: [
       {
-        name: '不通过',
-        componentName: 'disagree',
-        nextPermission: 5,
-        nextPermissionName: '改善者',
-        params: [
-          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
-          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
-          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false }, // 改善plan
-          { paramsKey: 'approveReason', valueKey: null } // 审核不通过原因
-        ]
-      },
-      {
-        name: '通过',
+        name: '申请更换改善人',
         componentName: null,
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
-          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false } // 改善plan
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false } // 接收人姓名
         ]
       },
+      {
+        name: '制定改善方案',
+        componentName: 'pdca',
+        pdcaSetting: 'pdca',
+        params: [],
+      }
     ],
-    row1: { hasJoin: true, name: '改善者x', key: 'establishEmpName' },
-    row2: {hasJoin: false, name: '提交了改善计划(PLAN)'},
-    selectDetails: {
-      name: '查看改善计划详情',
-      componentName: 'pdca',
-      pdcaSetting: 'p',
-      key: 'taskPlan',
-      disabled: true,
-      labelKey: 'plan'
-    }
+    row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
+    row2: {hasJoin: true, name: '指派x为改善人', key: 'receiveEmpName'},
+    selectDetails: null
   },
   {
     taskType: 14,
     checkResult: 1,
     taskName: '制定改善方案plan',
-    currentPermission: 4,
     btnList: [
       {
         name: '不通过',
         componentName: 'disagree',
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -577,8 +502,6 @@ const taskTypeList = [
       {
         name: '通过',
         componentName: null,
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -603,60 +526,37 @@ const taskTypeList = [
   {
     taskType: 15,
     checkResult: 1,
-    taskName: '制定改善方案',
-    currentPermission: 4,
+    taskName: '制定改善方案中pdca',
     btnList: [
       {
-        name: '不通过',
-        componentName: 'disagree',
-        nextPermission: 5,
-        nextPermissionName: '改善者',
-        params: [
-          { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
-          { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
-          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false }, // 改善plan
-          { paramsKey: 'approveReason', valueKey: null } // 审核不通过原因
-        ]
-      },
-      {
-        name: '通过',
+        name: '申请更换改善人',
         componentName: null,
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
-          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 指派人
-          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false }, // 指派人姓名
-          { paramsKey: 'taskPlan', valueKey: 'taskPlan', isOutvalueKey: false } // 改善plan
+          { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
+          { paramsKey: 'receiveEmpName', valueKey: 'establishEmpName', isOutvalueKey: false } // 接收人姓名
         ]
       },
+      {
+        name: '制定改善方案',
+        componentName: 'pdca',
+        pdcaSetting: 'pdca',
+        params: [],
+      }
     ],
-    row1: { hasJoin: true, name: '改善者x', key: 'establishEmpName' },
-    row2: {hasJoin: false, name: '提交了改善计划(PLAN)'},
-    selectDetails: {
-      name: '查看改善计划详情',
-      key: 'taskPlan',
-      componentName: 'pdca',
-      pdcaSetting: 'pdca',
-      nextPermission: 5,
-      disabled: true,
-      labelKey: 'plan'
-    }
+    row1: { hasJoin: true, name: '单位负责人x', key: 'establishEmpName' },
+    row2: {hasJoin: true, name: '指派x为改善人', key: 'receiveEmpName'},
+    selectDetails: null
   },
   {
     taskType: 16,
     checkResult: 1,
     taskName: '记录改善方案pdca',
-    currentPermission: 4,
     btnList: [
       {
         name: '不通过',
         componentName: 'disagree',
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -672,8 +572,6 @@ const taskTypeList = [
       {
         name: '通过',
         componentName: null,
-        nextPermission: 1,
-        nextPermissionName: '管理员',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -706,8 +604,7 @@ const taskTypeList = [
   {
     taskType: 17,
     checkResult: 1,
-    taskName: '改善方案plan通过',
-    currentPermission: 4,
+    taskName: '改善方案pdca通过',
     btnList: [],
     row1: { hasJoin: true, name: '管理员x', key: 'establishEmpName' },
     row2: {hasJoin: false, name: '完成改善，本次任务结束'},
@@ -728,14 +625,11 @@ const taskTypeList = [
   {
     taskType: 18,
     checkResult: 1,
-    taskName: '改善方案plan通过， 改善回复通过',
-    currentPermission: 4,
+    taskName: '改善方案pdca不通过',
     btnList: [
       {
         name: '指派改善任务',
         componentName: 'assign-mission',
-        nextPermission: 5,
-        nextPermissionName: '改善者',
         params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
@@ -752,6 +646,7 @@ const taskTypeList = [
     selectDetails: {
       name: '查看原因详情',
       key: 'approveReason',
+      isOutvalueKey: false,
       componentName: 'disagree',
       disabled: true,
       labelKey: 'textarea'

pages/mission/mission.vue

@@ -90,12 +90,20 @@
 			    this.isInitWs = websocket.ws ? false : true;
 			    this.init(this.isInitWs);
 			}, 3 * 60 * 1000);
+			this.messStatus();
 		},
 		beforeDestroy() {
 		    // 关闭ws连接
 		    websocket.close();
 		    clearInterval(this.refTimer);
 		  },
+		  watch:{
+		  	  "$route":{
+		  		  handler(route){
+		  			  this.messStatus();
+		  		  }
+		  	  }
+		  },
 		methods: {
 			toggleBtn() {
 				let flag = !this.showCloseList;
@@ -138,7 +146,8 @@
 			},
 			// 解析websocket返回数据
 			resolverWsData(type) {
-			  switch (type) {
+			  let types = JSON.parse(type);
+			  switch (types.type) {
 			    case "TO_READ":
 			      this.messageType = true;
 			      break;
@@ -148,14 +157,42 @@
 			  }
 			},
 			toMessagePage(){
+				// this.messageType = false;
 				uni.navigateTo({
 				  url: `/pages/messages/messages`
 				});
+			},
+			messStatus(){
+				let num = 1;
+				let timer = setInterval(()=>{
+				  this.$store.dispatch({
+					  type: "calendar/commActions",
+					  payload: {
+						key: "messagesList",
+						data: {
+						  pageNum: num,
+						  pageSize: 100,
+						},
+					  },
+					}).then((res)=>{
+						if(res && res.list.length == 0){
+							clearInterval(timer)
+						}else if(res && res.list.length != 0){
+							res.list.map((item)=>{
+								if(!item.readStatus){
+									this.messageType = true;
+									return;
+								}
+							})
+						}
+					})
+				  num++;
+				},100)
 			}
 		},
 		components: {
 			listItem
-		}
+		},
 	}
 </script>
 

pages/mission/model.js

@@ -5,99 +5,99 @@ export default {
   state: {
     // 任务详情
     missionDetails: {
-      appointFlag: false, // 已指派标志, 0 未指派 1已指派
-      checkGroupId: 1, // 查核组id
-      checkGroupName: "测试群组", // 查核组名称
-      checkId: 1,
-      checkItemId: 1, // 查核项目id
-      checkItemName: "测试点", // 查核项目名称
-      checkPlan: "第1/3次查核计划", // 查核计划
-      checkPointId: 1, // 查核要点id
-      checkPointName: "测试", // 查核要点名称(查核项)
-      createDate: "2021-02-03T01:44:09.000+0000", // 任务创建时间
-      createEmpId: 1, //创建人
-      createEmpName: "管理员", // 创建人姓名
-      delFlag: false,
-      deptId: 1, // 单位id
-      deptName: "测试部门", // 单位名称
-      desicion: "", // 改善工具:0,进行PDCA改善 1,暂不改善
-      endFlag: false, // 完结标识
-      id: 1, // 任务id
-      needApproveFlag: false, // 需要审核标志
-      recordTime: "2021-02-03 09:44:17", // 最终修改时间
-      situationId: 1, // 情景id
-      situationName: "测试情景", // 情景名称
-      taskType: 10, // 任务当前状态
-      updateTime: "2021-02-03T01:44:16.000+0000", // 修改时间 (发送时间)
-      improveEmpName: '', //改善人
-      improveEmpId: '', //改善人id
-      buttonDisplayFlag: 1,  // 底部按钮显示隐藏 0 不展示 1展示
-      checkResult: 2, // 《只针对第一步操作区分按钮是显示 指派改善任务还是改善回复》 1不用管 2 改善回复 3 制定改善方案
-      checkDetailResult: '查核结果xxx', // 查核结果
-      checkDetailId: '', // 查核明细id
-      adminId: 1,  // 管理员id
-      adminName: '管理员丫', // 管理员名称
-      pfmTaskCirculationList: [
-        {
-          createTime: "2021-02-03T01:44:42.000+0000", // 创建时间
-          establishEmpId: 1, // 员工id
-          establishEmpName: "管理员",// 发送人员名称
-          id: 1, // 流转记录id
-          receiveEmpId: 1, // 接收人id
-          receiveEmpName: "管理员吧",// 接收人姓名
-          taskAction: "", // 改善处置 action
-          taskId: 1, // 任务id
-          taskPlan: "噢噢噢噢",// plan整改计划
-          taskType: 8, // 流转状态
-          improveScheme: '', // 改善方案名称
-          approveReason: '审核意见', // 审核意见/原因
-          taskDoRequestList: [ // do
-            {
-              taskDoId:"mock",  // 过程记录id
-              taskDoProcess:"mock", // 过程记录内容
-              taskDoPlan:"mock" // 计划日期
-            }
-          ],
-          taskCheckRequestList: [// check
-            {
-              taskCheckId:"mock",  // 改善确认id
-              taskCheckProcess:"mock", // 改善确认记录过程
-              taskCheckPlan:"mock",  // 改善确认计划日期
-              taskCheckEffect:"mock" //改善确认改善效果
-            }
-          ],
-          recordTime: 'recordTime' //测量时间
-        },
-        {
-          createTime: "2021-02-03T01:44:42.000+0000", // 创建时间
-          establishEmpId: 1, // 员工id
-          establishEmpName: "管理员",// 发送人员名称
-          id: 1, // 流转记录id
-          receiveEmpId: 1, // 接收人id
-          receiveEmpName: "管理员吧",// 接收人姓名
-          taskAction: "", // 改善处置 action
-          taskId: 1, // 任务id
-          taskPlan: "plan内容",// plan整改计划
-          taskType: 10, // 流转状态
-          improveScheme: '', // 改善方案名称
-          approveReason: '审核意见', // 审核意见
-          taskDoRequestList: [ // do
-            {
-              taskDoId:"mock",  // 过程记录id
-              taskDoProcess:"mock", // 过程记录内容
-              taskDoPlan:"2020-12-12 00:01:50" // 计划日期
-            }
-          ],
-          taskCheckRequestList: [// check
-            {
-              taskCheckId:"mock",  // 改善确认id
-              taskCheckProcess:"mock", // 改善确认记录过程
-              taskCheckPlan:"mock",  // 改善确认计划日期
-              taskCheckEffect:"mock" //改善确认改善效果
-            }
-          ]
-        },
-      ]
+      // appointFlag: false, // 已指派标志, 0 未指派 1已指派
+      // checkGroupId: 1, // 查核组id
+      // checkGroupName: "测试群组", // 查核组名称
+      // checkId: 1,
+      // checkItemId: 1, // 查核项目id
+      // checkItemName: "测试点", // 查核项目名称
+      // checkPlan: "第1/3次查核计划", // 查核计划
+      // checkPointId: 1, // 查核要点id
+      // checkPointName: "测试", // 查核要点名称(查核项)
+      // createDate: "2021-02-03T01:44:09.000+0000", // 任务创建时间
+      // createEmpId: 1, //创建人
+      // createEmpName: "管理员", // 创建人姓名
+      // delFlag: false,
+      // deptId: 1, // 单位id
+      // deptName: "测试部门", // 单位名称
+      // desicion: "", // 改善工具:0,进行PDCA改善 1,暂不改善
+      // endFlag: false, // 完结标识
+      // id: 1, // 任务id
+      // needApproveFlag: true, // 需要审核标志
+      // recordTime: "2021-02-03 09:44:17", // 最终修改时间
+      // situationId: 1, // 情景id
+      // situationName: "测试情景", // 情景名称
+      // taskType: 13, // 任务当前状态
+      // updateTime: "2021-02-03T01:44:16.000+0000", // 修改时间 (发送时间)
+      // improveEmpName: '', //改善人
+      // improveEmpId: '', //改善人id
+      // buttonDisplayFlag: 1,  // 底部按钮显示隐藏 0 不展示 1展示
+      // checkResult: 2, // 《只针对第一步操作区分按钮是显示 指派改善任务还是改善回复》 1不用管 2 改善回复 3 制定改善方案
+      // checkDetailResult: '查核结果xxx', // 查核结果
+      // checkDetailId: '', // 查核明细id
+      // adminId: 1,  // 管理员id
+      // adminName: '管理员丫', // 管理员名称
+      // pfmTaskCirculationList: [
+      //   {
+      //     createTime: "2021-02-03T01:44:42.000+0000", // 创建时间
+      //     establishEmpId: 1, // 员工id
+      //     establishEmpName: "管理员",// 发送人员名称
+      //     id: 1, // 流转记录id
+      //     receiveEmpId: 1, // 接收人id
+      //     receiveEmpName: "管理员吧",// 接收人姓名
+      //     taskAction: "", // 改善处置 action
+      //     taskId: 1, // 任务id
+      //     taskPlan: "噢噢噢噢",// plan整改计划
+      //     taskType: 8, // 流转状态
+      //     improveScheme: '', // 改善方案名称
+      //     approveReason: '审核意见', // 审核意见/原因
+      //     taskDoRequestList: [ // do
+      //       {
+      //         taskDoId:"mock",  // 过程记录id
+      //         taskDoProcess:"mock", // 过程记录内容
+      //         taskDoPlan:"mock" // 计划日期
+      //       }
+      //     ],
+      //     taskCheckRequestList: [// check
+      //       {
+      //         taskCheckId:"mock",  // 改善确认id
+      //         taskCheckProcess:"mock", // 改善确认记录过程
+      //         taskCheckPlan:"mock",  // 改善确认计划日期
+      //         taskCheckEffect:"mock" //改善确认改善效果
+      //       }
+      //     ],
+      //     recordTime: 'recordTime' //测量时间
+      //   },
+      //   {
+      //     createTime: "2021-02-03T01:44:42.000+0000", // 创建时间
+      //     establishEmpId: 1, // 员工id
+      //     establishEmpName: "管理员",// 发送人员名称
+      //     id: 1, // 流转记录id
+      //     receiveEmpId: 1, // 接收人id
+      //     receiveEmpName: "管理员吧",// 接收人姓名
+      //     taskAction: "", // 改善处置 action
+      //     taskId: 1, // 任务id
+      //     taskPlan: "plan内容",// plan整改计划
+      //     taskType: 13, // 流转状态
+      //     improveScheme: '', // 改善方案名称
+      //     approveReason: '审核意见', // 审核意见
+      //     taskDoRequestList: [ // do
+      //       {
+      //         taskDoId:"mock",  // 过程记录id
+      //         taskDoProcess:"mock", // 过程记录内容
+      //         taskDoPlan:"2020-12-12 00:01:50" // 计划日期
+      //       }
+      //     ],
+      //     taskCheckRequestList: [// check
+      //       {
+      //         taskCheckId:"mock",  // 改善确认id
+      //         taskCheckProcess:"mock", // 改善确认记录过程
+      //         taskCheckPlan:"mock",  // 改善确认计划日期
+      //         taskCheckEffect:"mock" //改善确认改善效果
+      //       }
+      //     ]
+      //   },
+      // ]
     }
   },
   mutations: {

pages/situationsCenter/situationsCenter.vue

@@ -1,5 +1,15 @@
 <template>
 	<view class="situationsCenter-page">
+		<view class="calender-remind" @click="toMessagePage">
+		  <image
+		    :src="
+		      messageType
+		        ? '/static/message-unread.png'
+		        : '/static/message-read.png'
+		    "
+		    mode=""
+		  ></image>
+		</view>
 		<view class="situation-list">
 			<view class="search-box">
 				<view class="search-model" @click="openSearchBar" v-show="isSearchBoxShow">
@@ -46,6 +56,7 @@
  * 情境中心
  */
 <script>
+	import websocket from "../../utils/ws.js"; //引入websocket
 	export default {
 		data() {
 			return {
@@ -56,34 +67,32 @@
 				isSearchBoxShow:true,//搜索图标是否可见
 				situationList:[],//情境卡片列表
 				totalCount:'',//返回数据的总条数
+				refTimer: null,
+				isInitWs: null,
+				messageType: null,
 			}
 		},
 		created: function() {
 			this.nowPermission=uni.getStorageSync('nowPermission');
-			this.$store.dispatch({
-				type: 'situationsCenter/commActions',
-				payload: {
-					key: 'situationList',
-					data:{
-						pageNum:1,
-						pageSize:10
-					}
-				}
-			}).then((data) => {
-				if (data) {
-					this.totalCount=data.totalCount;
-					this.situationList=data.list.map((item,index)=>{
-						return{
-							name:item.name,
-							checkStatus:item.checkStatus,
-							nextCheckTime:item.nextCheckTime,
-							checkGroupName:item.checkGroupName,
-							topic:item.topic==0?true:false,
-							situationID:item.id,
-						}
-					});
-				}
-			});
+			
+			this.init(true);
+			this.refTimer = setInterval(() => {
+			  this.isInitWs = websocket.ws ? false : true;
+			  this.init(this.isInitWs);
+			}, 3 * 60 * 1000);
+			this.messStatus();
+		},
+		beforeDestroy() {
+		  // 关闭ws连接
+		  websocket.close();
+		  clearInterval(this.refTimer);
+		},
+		watch:{
+			  "$route":{
+				  handler(route){
+					  this.messStatus();
+				  }
+			  }
 		},
 		methods: {
 			openSearchBar(){
@@ -163,6 +172,10 @@
 									situationID:item.id,
 								}
 							});
+							let hiId = uni.getStorageSync("hiId");
+							let user = uni.getStorageSync("id");
+							let permission = uni.getStorageSync("nowPermission");
+							this.isInitWs && this.initWebsocket(hiId, user, permission);
 						}
 					});
 				}
@@ -174,6 +187,90 @@
 					});
 				}
 			},
+			toMessagePage() {
+			  // this.messageType = false;
+			  uni.navigateTo({
+			    url: `/pages/messages/messages`,
+			  });
+			},
+			
+			init(isInitWs) {
+			  this.isInitWs = isInitWs;
+			  this.getSituationList();
+			},
+			initWebsocket(hiId, user, permission) {
+			  websocket.url = `ws://192.168.1.45:8088/imed/pfm/websocket/${hiId}/${user}/${permission}`;
+			  websocket.createWebSocket(this.resolverWsData.bind(this));
+			},
+			// 解析websocket返回数据
+			resolverWsData(type) {
+			  let types = JSON.parse(type);
+			  switch (types.type) {
+			    case "TO_READ":
+			      this.messageType = true;
+			      break;
+			    default:
+			      this.messageType = false;
+			      break;
+			  }
+			},
+			getSituationList(){
+				this.$store.dispatch({
+					type: 'situationsCenter/commActions',
+					payload: {
+						key: 'situationList',
+						data:{
+							pageNum:1,
+							pageSize:10
+						}
+					}
+				}).then((data) => {
+					if (data) {
+						this.totalCount=data.totalCount;
+						this.situationList=data.list.map((item,index)=>{
+							return{
+								name:item.name,
+								checkStatus:item.checkStatus,
+								nextCheckTime:item.nextCheckTime,
+								checkGroupName:item.checkGroupName,
+								topic:item.topic==0?true:false,
+								situationID:item.id,
+							}
+						});
+						let hiId = uni.getStorageSync("hiId");
+						let user = uni.getStorageSync("id");
+						let permission = uni.getStorageSync("nowPermission");
+						this.isInitWs && this.initWebsocket(hiId, user, permission);
+					}
+				});
+			},
+			messStatus(){
+				let num = 1;
+				let timer = setInterval(()=>{
+				  this.$store.dispatch({
+					  type: "calendar/commActions",
+					  payload: {
+						key: "messagesList",
+						data: {
+						  pageNum: num,
+						  pageSize: 100,
+						},
+					  },
+					}).then((res)=>{
+						if(res && res.list.length == 0){
+							clearInterval(timer)
+						}else if(res && res.list.length != 0){
+							res.list.map((item)=>{
+								if(!item.readStatus){
+									this.messageType = true;
+									return;
+								}
+							})
+						}
+					})
+				  num++;
+				},200)
+			}
 		}
 	}
 </script>
@@ -181,6 +278,21 @@
 <style lang="less">
 	.situationsCenter-page{
 		height: 100%;
+		.calender-remind {
+		  width: 62.5rpx;
+		  height: 62.5rpx;
+		  position: fixed;
+		  right: 25rpx;
+		  background: rgba(255, 255, 255, 0.95);
+		  border-radius: 50%;
+		  z-index: 2;
+		  image {
+		    margin-left: 17.5rpx;
+		    margin-top: 16.87rpx;
+		    width: 27.5rpx;
+		    height: 28.75rpx;
+		  }
+		}
 		.situation-list{
 			// display: flex;
 			// flex-flow: row wrap;

pages/todayCheck/server.js

@@ -2,9 +2,9 @@ import { creatRequest } from '../../utils/request.js';
 
 const requestList = {
   //登录
-  login: {
-    method: 'POST',
-    url: 'login/in'
+  specificCheckTaskList: {
+    method: 'GET',
+    url: 'checkTask/specificCheckTaskList'
   },
 };
 export const commServer = ({ key, data }) => {

pages/todayCheck/todayCheck.vue

@@ -1,8 +1,191 @@
 <template>
+	<view class="todayCheckPage">
+		<view class="content" v-for="item in list">
+			<view class="contTitle">
+				<text class="contTitleLeft">{{item.situationName}}</text>
+				<text class="contTitleRight">{{item.checkPlan}}</text>
+			</view>
+			<view class="contCon">
+				<view v-for="items in item.planDepListReps" class="conEveryCon" @click="goToPonitDetails(items)">
+					<view class="title">
+						<view class="name">{{items.deptName}}</view>	
+						<view class="buMen">
+							<image src="../../static/icon-map-dis.png" mode="" class="img"></image>
+							<view class="keshi">{{items.deptClassName}}</view>
+						</view>
+					</view>
+					<view class="status" >
+						<image :src="items.completeDes == '完成'?'../../static/top-img.png':items.completeDes == '查核中'?'../../static/hight-bg.png':'../../static/disabled-bg.png'" mode="" class="bgImg"></image>
+						<text class="statusType">{{items.completeDes}}</text>
+					</view>
+					<view class="points">{{items.decs}}</view>
+					<view class="pointsGK">要点概括：{{items.checkPointNames}}</view>
+					<view>
+						<view class="checkName">{{items.empName}}</view>
+						<view class="checkTime">{{items.startDate}}~{{items.endDate}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+		  return {
+			  list:[],
+			  date:'',
+		  }
+		},
+		mounted() {
+			this.getList();
+			
+		},
+		methods:{
+			getList(){
+				this.$store.dispatch({
+					type: "todayCheck/commActions",
+					payload: {
+					  key: "specificCheckTaskList",
+					  data: {
+					    specificDate:this.date
+					  },
+					},
+				}).then((res)=>{
+					if(res){
+						this.list =res;
+					}
+				})
+			},
+			goToPonitDetails(data){
+				// console.log(data)
+				// uni.navigateTo({
+				//   url: `/pages/messages/messages?id=${data.checkId}`,
+				// });
+			}
+		},
+		onLoad({ date }){
+		  this.date = date;
+		},
+	}
 </script>
 
 <style lang="less">
+	.todayCheckPage{
+		padding:0rpx 25rpx;
+		height: 100%;
+		width: 100%;
+		.content{
+			width: 100%;
+			.contTitle{
+				font-size: 22.5rpx;
+				color: #666F80;
+				height: 22.5rpx;
+				line-height: 22.5rpx;
+				margin: 25rpx 0rpx 15rpx;
+				.contTitleLeft{
+					display: inline-block;
+					width: 50%;
+					text-align: left;
+				}
+				.contTitleRight{
+					display: inline-block;
+					width: 50%;
+					text-align: right;
+				}
+			}
+			.contCon{
+				.conEveryCon{
+					margin-bottom: 25rpx;
+					padding:25rpx 25rpx 0rpx;
+					background-color: #fff;
+					height: 225rpx;
+					border-radius: 5rpx;
+					position: relative;
+					.title{
+						margin-bottom: 10rpx;
+						color: #292C33;
+						// vertical-align: top;
+						.name{
+							height: 35rpx;
+							display: inline-block;
+							font-size: 35rpx;
+							font-weight: 400;
+						}
+						.buMen{
+							margin-left: 20rpx;
+							display: inline-block;
+							// width: 117.5rpx;
+							height: 35rpx;
+							background-color: #EDF2FA;
+							border-radius: 17.5rpx;
+							line-height: 82.5rpx;
+							vertical-align: top;
+							.img{
+								vertical-align: top;
+								width: 35rpx;
+								height: 35rpx;
+							}
+							.keshi{
+								margin-left: 10rpx;
+								margin-right: 20rpx;
+								display: inline-block;
+								vertical-align: top;
+								font-size: 17.5rpx;
+								line-height: 35rpx;
+							}
+						}
+					}
+					.status{
+						width: 100rpx;
+						height: 35rpx;
+						position: absolute;
+						top: 0rpx;
+						right: 0rpx;
+						.bgImg{
+							width: 100rpx;
+							height: 35rpx;
+						}
+						.statusType{
+							position: absolute;
+							top:8.75rpx;
+							right:18.75rpx;
+							font-size: 17.5rpx;
+							line-height: 17.5rpx;
+							color: #fff;
+						}
+					}
+					.points{
+						font-size: 20rpx;
+						color: #292C33;
+						line-height: 50rpx;
+						font-weight: bold;
+					}
+					.pointsGK{
+						padding-bottom: 25rpx;
+						border-bottom: 0.62rpx solid #DADEE6;
+						font-size: 20rpx;
+						color: #666F80;
+					}
+					.checkName{
+						width: 50%;
+						display: inline-block;
+						color: #666E80;
+						text-align: left;
+						line-height: 57.5rpx;
+						font-size: 17.5rpx;
+					}
+					.checkTime{
+						width: 50%;
+						display: inline-block;
+						color: #666E80;
+						text-align: right;
+						line-height: 57.5rpx;
+						font-size: 17.5rpx;
+					}
+				}
+			}
+		}
+	}
 </style>

utils/requestUrl.js

@@ -1,7 +1,6 @@
 // export const URL = 'http://192.168.38.140:8088'; // 李磊
-// export const URL = 'http://192.9.216.251:8088'; // 建德
 // export const URL = 'http://192.168.38.174:8088';
-// export const URL = 'http://192.168.1.45:8088'; //内网
-export const URL = 'http://s1.nsloop.com:5137';  // 外网
+export const URL = 'http://192.168.1.45:8088'; //内网
+// export const URL = 'http://s1.nsloop.com:5137';  // 外网
 
 

utils/wsUrl.js

@@ -1 +1 @@
-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}`; // 内网