浏览代码

任务流程数据构建

yuwenfen 4 年之前
父节点
当前提交
907e0e6169
共有 5 个文件被更改,包括 606 次插入127 次删除
  1. 0 1
      manifest.json
  2. 10 10
      pages/mission-action/mission-action.vue
  3. 33 23
      pages/mission-details/mission-details.vue
  4. 561 92
      pages/mission-details/setting.js
  5. 2 1
      utils/requestUrl.js

+ 0 - 1
manifest.json

@@ -73,7 +73,6 @@
                     "pathRewrite" : {
                         "^/TracerMethodology/api" : ""
                     },
-                    // "target" : "http://192.168.1.55:8901", // 内网
                     "target" : "http://192.168.1.45:8088", // 内网
                     "changeOrigin" : true,
                     "secure" : false,

+ 10 - 10
pages/mission-action/mission-action.vue

@@ -34,16 +34,16 @@
 				]
 			}
     },
-    // onLoad({ details }){
-    //   console.log(8,details)
-    //   const {
-    //     nextPermission,
-    //     nextPermissionName,
-    //     componentName,
-    //     disabled
-    //   } = details ? JSON.parse(details) : {};
-    //   this.currentComponet = componentName;
-    // },
+    onLoad({ details }){
+      const {
+        nextPermission,
+        nextPermissionName,
+        componentName,
+        disabled
+      } = details ? JSON.parse(details) : {};
+      console.log(8,componentName)
+      this.currentComponet = componentName;
+    },
 		methods: {
 
 		},

+ 33 - 23
pages/mission-details/mission-details.vue

@@ -28,21 +28,22 @@
 										<text>{{ item.createTime }}</text>
 									</view>
 								</view>
-                <view class="link-view"
-                  v-if="getContext(item, true, 'selectDetails')"
-                  @click="goToDetails(item, getContext(item, true, 'selectDetails'))"
-                >
-                  <text>{{ getContext(item, true, 'selectDetails').name }}</text>
-									<image class="blue-arr" src="/static/blue-arrow.png"></image>
-                </view>
+                <template v-if="getContext(item, true, 'selectDetails')">
+                  <view class="link-view"
+                    @click="goToDetails(item, getContext(item, true, 'selectDetails'))"
+                  >
+                    <text>{{ getContext(item, true, 'selectDetails').name }}</text>
+								  	<image class="blue-arr" src="/static/blue-arrow.png"></image>
+                  </view>
+                </template>
 						  </view>
 						</view>
 					</template>
 					<view class="btn-group" v-if="missionDetails.buttonDisplayFlag == 1">
-            <template v-for="(item, i) in currentTask.btnList || []">
+            <template v-for="(item, i) in taskBtn">
               <tm-button
                 :key="i"
-                :type="(currentTask.btnList || []).length === 1 ? 'default' : ( i === 0 ? 'default' : 'pramary')"
+                :type="taskBtn.length === 1 ? 'default' : ( i === 0 ? 'default' : 'pramary')"
                 :btnText="item.name"
                 @btnClick="clickBtn(item)"
               />
@@ -69,16 +70,20 @@
       taskStepLength() {
         return (this.missionDetails.pfmTaskCirculationList || []).length - 1;
       },
-      // 当前改善进度
-      currentTask() {
-        const { taskType, checkResult } = this.missionDetails;
-        let currentTypeTask = null;
-        if(taskType == 1){
-          currentTypeTask = taskTypeList.find(item => (item.taskType == taskType && item.checkResult == checkResult));
+      // 获取底部按钮
+      taskBtn() {
+        const { buttonDisplayFlag, pfmTaskCirculationList, taskType, checkResult } = this.missionDetails;
+        if(buttonDisplayFlag == 1 && pfmTaskCirculationList && pfmTaskCirculationList.length > 0) {
+          let task = null;
+          if(taskType == 1) { // 状态为1比较特殊,需要再比较checkResult
+            task = taskTypeList.find(item => (item.taskType == taskType && item.checkResult == checkResult));
+          }else {
+            task = taskTypeList.find(item => item.taskType == taskType);
+          }
+          return task ? task.btnList : []
         }else {
-          currentTypeTask = taskTypeList.find(item => item.taskType == taskType);
+          return [];
         }
-        return currentTypeTask || {};
       }
     },
 		data() {
@@ -107,15 +112,15 @@
 				});
 			},
 			// 点击右侧按钮
-			clickBtn() {
+			clickBtn(btnInfo) {
 				uni.navigateTo({
-					url: '/pages/mission-action/mission-action'
+					url: `/pages/mission-action/mission-action?details=${encodeURIComponent(JSON.stringify(btnInfo))}`
 				})
       },
       // 查看详情
-      goToDetails(detailsInfo) {
-        	uni.navigateTo({
-				  url: `/pages/mission-action/mission-action?details=${encodeURIComponent(JSON.stringify(detailsInfo))}`
+      goToDetails(currentInfo, detailInfo) {
+        uni.navigateTo({
+				  url: `/pages/mission-action/mission-action?details=${encodeURIComponent(JSON.stringify({...currentInfo, ...detailInfo}))}`
 				});
       },
       /***
@@ -125,7 +130,12 @@
 			 *  @param {String} rowKey 任务流程中的key
        */
       getContext(obj, isLink, rowKey){
-        let currentTypeTask = taskTypeList.find(item => item.taskType == obj.taskType) || {};
+        let currentTypeTask = null;
+        if(obj.taskType == 1) {
+          currentTypeTask = taskTypeList.find(item => (item.taskType == obj.taskType && item.checkResult == this.missionDetails.checkResult)) || {};
+        }else {
+          currentTypeTask = taskTypeList.find(item => item.taskType == obj.taskType) || {};
+        }
         if(isLink) {
           return currentTypeTask[rowKey];
         }else {

+ 561 - 92
pages/mission-details/setting.js

@@ -1,23 +1,71 @@
 // 任务流程列表
+/**
+ * 注意:
+ 1. 所有imgPath要换成正式接口key;
+ 2. taskType: 11的按钮需要重新来一遍plan吗,还是pdca都可修改
+ 3. taskType: 12的驳回请求按钮好像不需要填写原因,(原因没画)
+ 4. taskType: 15 制定改善方案,从p开始还是pdca都需要执行)
+ */
 const taskTypeList = [
   {
-    // 任务当前状态
-    taskType: 1,
+    taskType: 1, // 任务当前状态
     currentPermission: 4, // 当前任务在哪
     taskName: '创建任务',
-    // 《只针对第一步操作区分按钮是显示 指派改善任务还是改善回复》 1不用管 2 改善回复 3 制定改善方案
-    checkResult: 3,
-    //  底部按钮 (name: 按钮名字, componentName: 点击后跳转的页面, nextPermission:下一步指派给谁)
-    btnList: [
-      {name: '不认可', componentName: 'disagree', isOutDataKey: true, keys: [{key: 'adminId', name: '管理员id'}, {key: 'adminName', name: '管理员名称'}], nextPermission: 1, nextPermissionName: '管理员' },
-      {name: '指派改善任务', componentName: 'assign-mission', keys: null, nextPermission: 5, nextPermissionName: '改善者' }
+    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', key: 'establishEmpName' },
-    // 第二行
-    row2: {hasJoin: true, name: '发送改善通知,查核结果:x', key: 'checkDetailResult', isOutDataKey: true },
+    // 第一行显示的内容
+    row1: {
+      hasJoin: true, // 是否需要拼接
+      name: '查核人x', // 显示的内容, x未来被替换的值
+      key: 'establishEmpName', // 使用详情接口key,用来替换x
+      isOutDataKey: false // 是否详情接口一级key, 不是则在当前任务状态中找key(如pfmTaskCirculationList下面)
+    },
+    // 第二行显示的内容
+    row2: {
+      hasJoin: true,
+      name: '发送改善通知,查核结果:x',
+      key: 'checkDetailResult',
+      isOutDataKey: true
+    },
     // 查看xx详情 (name: 详情名字, componentName: 点击后跳转的页面, disabled: 底部按钮禁用)
-    selectDetails: { name: '查看查核结果详情', key: 'checkDetailResult', isOutDataKey: true, componentName: 'disagree', disabled: true }
+    selectDetails: {
+      name: '查看查核结果详情', // 详情显示的名字
+      hasAnyData: false, // 是否有多个数据需要回显 为true则使用dateKey, 否则使用key <key和datakey互斥)
+      key: 'checkDetailResult', //使用详情接口key
+      dataKey: [],
+      isOutDataKey: true,  // 是否详情接口一级key, 不是则在当前任务状态中找key(如pfmTaskCirculationList下面)
+      componentName: 'disagree', //点击后跳转的组件名
+      disabled: true // 调整后是否编辑和禁用
+    }
   },
   {
     taskType: 1,
@@ -25,12 +73,43 @@ const taskTypeList = [
     taskName: '创建任务',
     checkResult: 2,
     btnList: [
-      {name: '不认可', componentName: 'disagree', isOutDataKey: true, keys: [{key: 'adminId', name: '管理员id'}, {key: 'adminName', name: '管理员名称'}], nextPermission: 1, nextPermissionName: '管理员' },
-      {name: '改善回复', componentName: 'write-back', keys: [{key: 'establishEmpId', name: '发送人员工id'}, {key: 'establishEmpName', name: '发送人员名称'}], nextPermission: 1, nextPermissionName: '管理员' }
+      {
+        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: 'imgPath', valueKey: null } // 图片地址
+        ]
+      }
     ],
     row1: { hasJoin: true, name: '查核人x', key: 'establishEmpName' },
     row2: {hasJoin: true, name: '发送改善通知,查核结果:x', key: 'checkDetailResult', isOutDataKey: true },
-    selectDetails: { name: '查看查核结果详情', key: 'checkDetailResult', isOutDataKey: true, componentName: 'disagree', disabled: true }
+    selectDetails: {
+      name: '查看查核结果详情',
+      key: 'checkDetailResult',
+      isOutDataKey: true,
+      componentName: 'disagree',
+      disabled: true
+    }
   },
   {
     taskType: 2,
@@ -38,12 +117,41 @@ const taskTypeList = [
     taskName: '不认可',
     checkResult: 1,
     btnList: [
-      {name: '重新发送', componentName: 'disagree', keys: [{key: 'establishEmpId', name: '发送人员工id'}, {key: 'establishEmpName', name: '发送人员名称'}], nextPermission: 4, nextPermissionName: '单位负责人'},
-      {name: '发送给其他人', componentName: 'personnel', keys: null, nextPermission: 4, nextPermissionName: '单位负责人' }
+      {
+        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}
+    selectDetails: {
+      name: '查看不认可原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true
+    }
   },
   {
     taskType: 3,
@@ -51,11 +159,30 @@ const taskTypeList = [
     taskName: '重新发送',
     checkResult: 1,
     btnList: [
-      {name: '指派改善任务', componentName: 'assign-mission', keys: null, nextPermission: 4, nextPermissionName: '单位负责人' }
+      {
+        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}
+    selectDetails: {
+      name: '查看原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true
+    }
   },
   {
     taskType: 4,
@@ -63,8 +190,32 @@ const taskTypeList = [
     taskName: '指派改善任务',
     currentPermission: 5,
     btnList: [
-      {name: '申请更换改善人', componentName: null, nextPermission: 4, nextPermissionName: '单位负责人' },
-      {name: '制定改善方案', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'p' }
+      {
+        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'},
@@ -76,12 +227,43 @@ const taskTypeList = [
     taskName: '改善回复',
     currentPermission: 1,
     btnList: [
-      {name: '不通过', componentName: null, nextPermission: 4, nextPermissionName: '单位负责人' },
-      {name: '通过', componentName: null, nextPermission: null, nextPermission: 4, nextPermissionName: '单位负责人' }
+      {
+        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 }, // 状态值
+          { 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: '查看改善回复详情', key: 'approveReason', componentName: 'write-back', disabled: true},
+    selectDetails: {
+      name: '查看改善回复详情',
+      componentName: 'write-back',
+      hasAnyData: true, // 是否有多个数据需要回显(多个数据对多个key)
+      dataKey: [
+        {key: 'approveReason', isOutvalueKey: false}, // 回复内容
+        {key: 'imgPath', isOutvalueKey: false} // 回复图片地址
+      ],
+      disabled: true
+    },
   },
   {
     taskType: 6,
@@ -89,8 +271,32 @@ const taskTypeList = [
     taskName: '更换改善人',
     currentPermission: 5,
     btnList: [
-      {name: '申请更换改善人', componentName: null, nextPermission: 4, nextPermissionName: '单位负责人' },
-      {name: '制定改善方案', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'p' }
+      {
+        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'},
@@ -102,7 +308,20 @@ const taskTypeList = [
     taskName: '更换改善人驳回',
     currentPermission: 5,
     btnList: [
-      {name: '制定改善方案', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'p' }
+      {
+        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: '驳回更换改善人的申请'},
@@ -114,11 +333,33 @@ const taskTypeList = [
     taskName: '改善计划plan通过',
     currentPermission: 5,
     btnList: [
-      {name: '记录改善方案', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'pdca' }
+      {
+        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: '查看改善计划详情', key: '', componentName: 'pdca',  pdcaSetting: 'p', disabled: true}
+    selectDetails: {
+      name: '查看改善计划详情',
+      componentName: 'pdca',
+      pdcaSetting: 'p',
+      key: 'taskPlan',
+      disabled: true
+    }
   },
   {
     taskType: 9,
@@ -126,11 +367,29 @@ const taskTypeList = [
     taskName: '改善计划plan不通过',
     currentPermission: 5,
     btnList: [
-      {name: '制定改善方案', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'p' }
+      {
+        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}
+    selectDetails: {
+      name: '查看原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true
+    }
   },
   {
     taskType: 10,
@@ -138,12 +397,47 @@ const taskTypeList = [
     taskName: '改善方案PDCA通过',
     currentPermission: 1,
     btnList: [
-      {name: '不通过', componentName: 'disagree', nextPermission: 4, nextPermissionName: '单位负责人' },
-      {name: '通过', componentName: null, nextPermission: 4, nextPermissionName: '单位负责人' }
+      {
+        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: '查看改善方案详情', key: '', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'pacd', disabled: true}
+    selectDetails: {
+      name: '查看改善方案详情',
+      componentName: 'pdca',
+      pdcaSetting: 'pacd',
+      hasAnyData: true, // 是否有多个数据需要回显(多个数据对多个key)
+      dataKey: [
+        {key: 'taskPlan', isOutvalueKey: false}, // plan
+        {key: 'taskDoRequestList', isOutvalueKey: false}, // do
+        {key: 'taskCheckRequestList', isOutvalueKey: false}, // check
+        {key: 'taskAction', isOutvalueKey: false}, // action
+      ],
+      disabled: true
+    }
   },
   {
     taskType: 11,
@@ -151,11 +445,29 @@ const taskTypeList = [
     taskName: '改善方案PDCA不通过',
     currentPermission: 5,
     btnList: [
-      {name: '制定改善方案', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'p' },
+      {
+        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', nextPermission: 4, nextPermissionName: '单位负责人', disabled: true}
+    selectDetails: {
+      name: '查看原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true
+    }
   },
   {
     taskType: 12,
@@ -163,8 +475,34 @@ const taskTypeList = [
     taskName: '申请更改改善人',
     currentPermission: 4,
     btnList: [
-      {name: '更改改善人', componentName: 'assign-mission', nextPermission: 5, nextPermissionName: '改善者' },
-      {name: '驳回请求', componentName: null, nextPermission: 5, nextPermissionName: '改善者' },
+      {
+        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: '申请更换改善人'},
@@ -176,12 +514,43 @@ const taskTypeList = [
     taskName: '制定改善方案',
     currentPermission: 4,
     btnList: [
-      {name: '不通过', componentName: 'disagree', nextPermission: 4, nextPermissionName: '单位负责人' },
-      {name: '通过', componentName: null, nextPermission: 4, nextPermissionName: '单位负责人' },
+      {
+        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: '', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'p', disabled: true}
+    selectDetails: {
+      name: '查看改善计划详情',
+      componentName: 'pdca',
+      pdcaSetting: 'p',
+      key: 'taskPlan',
+      disabled: true
+    }
   },
   {
     taskType: 14,
@@ -189,95 +558,195 @@ const taskTypeList = [
     taskName: '制定改善方案plan',
     currentPermission: 4,
     btnList: [
-      {name: '不通过', componentName: 'disagree', nextPermission: 5, nextPermissionName: '改善者' },
-      {name: '通过', componentName: null, nextPermission: 5, nextPermissionName: '改善者' },
+      {
+        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: '', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'p', disabled: true}
+    selectDetails: {
+      name: '查看改善计划详情',
+      key: 'taskPlan',
+      componentName: 'pdca',
+      pdcaSetting: 'p',
+      nextPermission: 5,
+      disabled: true
+    }
   },
   {
     taskType: 15,
     checkResult: 1,
-    taskName: '改善方案暂停',
+    taskName: '制定改善方案',
     currentPermission: 4,
     btnList: [
-      {name: '不通过', componentName: 'disagree', nextPermission: 4, nextPermissionName: '单位负责人' },
-      {name: '通过', componentName: null, nextPermission: 4, nextPermissionName: '单位负责人' },
+      {
+        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: '', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'p', disabled: true}
+    selectDetails: {
+      name: '查看改善计划详情',
+      key: 'taskPlan',
+      componentName: 'pdca',
+      pdcaSetting: 'p',
+      nextPermission: 5,
+      disabled: true
+    }
   },
   {
     taskType: 16,
     checkResult: 1,
-    taskName: '记录改善方案plan',
+    taskName: '记录改善方案pdca',
     currentPermission: 4,
     btnList: [
-      {name: '不通过', componentName: 'disagree', nextPermission: 5, nextPermissionName: '改善者' },
-      {name: '通过', componentName: null, nextPermission: 1, nextPermissionName: '管理员' },
+      {
+        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: null }, // action
+          { paramsKey: 'taskDoRequestList', valueKey: null }, // do
+          { paramsKey: 'taskCheckRequestList', valueKey: null } // check
+        ]
+      },
+      {
+        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 }, // 接收人姓名
+        ]
+      },
     ],
     row1: { hasJoin: true, name: '改善者x', key: 'establishEmpName' },
     row2: {hasJoin: false, name: '提交了改善计划(PLAN)'},
-    selectDetails: {name: '查看改善方案详情', key: '', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'pdca', disabled: true}
+    selectDetails: {
+      name: '查看改善方案详情',
+      hasAnyData: true, // 是否有多个数据需要回显(多个数据对多个key)
+      dataKey: [
+        {key: 'taskPlan', isOutvalueKey: false}, // plan
+        {key: 'taskDoRequestList', isOutvalueKey: false}, // do
+        {key: 'taskCheckRequestList', isOutvalueKey: false}, // check
+        {key: 'taskAction', isOutvalueKey: false}, // action
+      ],
+      componentName: 'pdca',
+      pdcaSetting: 'pdca',
+      disabled: true
+    }
   },
   {
     taskType: 17,
     checkResult: 1,
-    taskName: '改善方案plan通过, 改善回复通过',
+    taskName: '改善方案plan通过',
     currentPermission: 4,
     btnList: [],
     row1: { hasJoin: true, name: '管理员x', key: 'establishEmpName' },
     row2: {hasJoin: false, name: '完成改善,本次任务结束'},
-    selectDetails: {name: '查看改善方案详情', key: '', componentName: 'pdca', nextPermission: 5, nextPermissionName: '改善者', pdcaSetting: 'pdca', disabled: true}
+    selectDetails: {
+      name: '查看改善方案详情',
+      hasAnyData: true, // 是否有多个数据需要回显(多个数据对多个key)
+      dataKey: [
+        {key: 'taskPlan', isOutvalueKey: false}, // plan
+        {key: 'taskDoRequestList', isOutvalueKey: false}, // do
+        {key: 'taskCheckRequestList', isOutvalueKey: false}, // check
+        {key: 'taskAction', isOutvalueKey: false}, // action
+      ],
+      componentName: 'pdca',
+      pdcaSetting: 'pdca',
+      disabled: true
+    }
   },
+
   {
     taskType: 18,
     checkResult: 1,
     taskName: '改善方案plan通过, 改善回复通过',
     currentPermission: 4,
     btnList: [
-      {name: '指派改善任务', componentName: 'assign-mission', nextPermission: 4, nextPermissionName: '单位负责人' },
+      {
+        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 }
+    selectDetails: {
+      name: '查看原因详情',
+      key: 'approveReason',
+      componentName: 'disagree',
+      disabled: true
+    }
   },
 ];
 
 export default taskTypeList;
-
-/**
- * 字段描述:
- * taskType:          // 任务当前状态
- * currentPermission:  // 当前任务位置在哪 (1、管理员 2、查核组长 3、查核组员 4、单位负责人 5、改善者)
- * taskName:          // 任务名称
- * checkResult:       // 《只针对第一步创建任务 区分按钮 显示指派改善任务还是改善回复》 1不用管 2 改善回复 3 制定改善方案
- * btnList:{ // 底部按钮
- *   name: // 按钮名字,
- *   componentName: // 点击后跳转的页面,null直接刷新页面即可
- *   nextPermission: // 下一步指派给谁id
- *   nextPermissionName: // 下一步指派给谁
- *   pdcaSetting: // 跳转pdca的配置: <p: 只能编辑plan, pdca: 都可以编辑>
- * }
- * row1: { // 第一行显示的内容
- *    hasJoin:// 是否需要拼接,
- *    name:   // 显示的内容 <注意 x指占位符, 后面需要被key字段替换的,
- *    key:    //  要显示的的内容(后端返回的key, 用于替换x)
- *    isOutDataKey: true // 是否从外层获取数据, 不然从pfmTaskCirculationList获取(比如状态为1的时候查核结果需要从外层获取)
- *  }
- * row2: { // 第二行显示的内容
- *    hasJoin: // 是否需要拼接,
- *    name:    // 显示的内容 <注意 x指占位符, 后面需要被key字段替换的,
- *    key:     // 要显示的的内容(后端返回的key, 用于替换x)
- *    isOutDataKey: true // 是否从外层获取数据, 不然从pfmTaskCirculationList获取(比如状态为1的时候查核结果需要从外层获取)
- *  }
- * selectDetails {
- *   name: '查看改善计划详情', // 详情显示的名字
- *   key:  'approveReason',  // 取接口的哪个字段值, 当key='' 则跳转组件未pdca
- *   componentName: 'pdca', // 点击后跳转的页面
- *   pdcaSetting: 'p', // 当componentName='pdca', 需要判断pdcaSetting='p', 还是‘pdca’
- *   disabled: true // 底部按钮禁用
- * }
- */

+ 2 - 1
utils/requestUrl.js

@@ -1,6 +1,7 @@
 // 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://192.168.1.45:8088'; //内网 
+export const URL = 'http://s1.nsloop.com:5137';  // 外网