yuwenfen 4 жил өмнө
parent
commit
a6275301d7

+ 22 - 8
components/date-time-picker/date-time-picker.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="date-time">
 		<picker mode="multiSelector" :range="range" range-key="text" @change="change" @columnchange="columnchange" :value="value" :disabled="disabled">
-			<view class="content" :class="{ placeholder: !dateStr }">
+			<view class="content" :class="{ placeholder: !dateStr }" :style="{height: pickHeight}">
 				<text>{{ dateStr ? dateStr : placeholder }}</text>
         <slot></slot>
 			</view>
@@ -64,7 +64,17 @@ export default {
     defaultValue: {
       type: String,
       default: ""
-    }
+    },
+    // 高度
+    height: {
+      type: Number,
+      default: 40
+    },
+    // 下标
+    pickIndex: {
+      type: Number,
+      default: 0
+    },
   },
 
   /**
@@ -79,7 +89,6 @@ export default {
       dtEnd: null // 有效范围结束
     };
   },
-
   /**
    * 监听数据
    */
@@ -100,6 +109,11 @@ export default {
       }
     }
   },
+  computed: {
+    pickHeight() {
+      return (this.height * 750 / 1200).toFixed(2) + 'rpx';
+    }
+  },
   /**
    * 组件初次加载完成
    */
@@ -147,14 +161,14 @@ export default {
         year = this.range[0][this.value[0]].number; // 年
         let dtStr = `${year}`;
         this.setDateStr(dtStr);
-        this.$emit("change", utils.formatDate(dtStr), this.pickType);
+        this.$emit("change", utils.formatDate(dtStr), this.pickType, this.pickIndex);
         return;
       } else if (this.fields == "month") {
         year = this.range[0][this.value[0]].number; // 年
         month = this.range[1][this.value[1]].number; // 月
         let dtStr = `${year}-${month}`;
         this.setDateStr(dtStr);
-        this.$emit("change", utils.formatDate(dtStr), this.pickType);
+        this.$emit("change", utils.formatDate(dtStr), this.pickType, this.pickIndex);
         return;
       } else if (this.fields == "day") {
         year = this.range[0][this.value[0]].number; // 年
@@ -162,7 +176,7 @@ export default {
         day = this.range[2][this.value[2]].number; // 日
         let dtStr = `${year}-${month}-${day}`;
         this.setDateStr(dtStr);
-        this.$emit("change", utils.formatDate(dtStr), this.pickType);
+        this.$emit("change", utils.formatDate(dtStr), this.pickType, this.pickIndex);
         return;
       } else if (this.fields == "hour") {
         year = this.range[0][this.value[0]].number; // 年
@@ -172,7 +186,7 @@ export default {
         day = this.range[2][this.value[2]].number; // 日
         let dtStr = `${year}-${month}-${day} ${hour}`;
         this.setDateStr(dtStr);
-        this.$emit("change", utils.formatDate(dtStr), this.pickType);
+        this.$emit("change", utils.formatDate(dtStr), this.pickType, this.pickIndex);
         return;
       } else if (this.fields == "minute") {
         year = this.range[0][this.value[0]].number; // 年
@@ -182,7 +196,7 @@ export default {
         minute = this.range[4][this.value[4]].number; // 分
         let dtStr = `${year}-${month}-${day} ${hour}:${minute}`;
         this.setDateStr(dtStr);
-        this.$emit("change", utils.formatDate(dtStr), this.pickType);
+        this.$emit("change", utils.formatDate(dtStr), this.pickType, this.pickIndex);
         return;
       }
     },

+ 27 - 10
components/tm-upload-img/tm-upload-img.vue

@@ -2,7 +2,7 @@
 	<view class="tm-upload-img">
 		<view class="row" @click="uploadPicture">
 			<view class="label-view">
-				<text>上传图片</text>
+				<text>{{ label }}</text>
 			</view>
 			<text class="placeholder" v-show="filePaths.length === 0">点击上传图片</text>
 			<image class="img-icon" src="/static/img-icon.png"></image>
@@ -43,34 +43,51 @@
 				type: Boolean,
 				default: false
       },
-        // 是否禁用
+      // 是否禁用
       disabled: {
         type: Boolean,
         default: false
       },
+      label: {
+        type: String,
+        default: '上传图片'
+      },
+      // 下标
+      pickIndex: {
+        type: Number,
+        default: 0
+      }
 		},
 		methods: {
 			// 上传图片
 			uploadPicture() {
         if(this.disabled) return;
 				uni.chooseImage({
-					count: this.isMultiple ? 0 : 1, // 是否多选
+					count: this.isMultiple ? 9 : 1, // 是否多选
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
 					sourceType: ['album'], //从相册选择
 					success: res1 => {
-						let filePathStr = res1.tempFilePaths.join(',');
-						console.log(filePathStr)
+            console.log(filePathStr)
+            // res1.tempFilePaths.map(item => {
+            // })
 						uni.uploadFile({
-							url: `${URL}/eduscreen/upload/picture`,
+              // url: `${URL}/eduscreen/upload/picture`,
+              url: `${URL}/imed/pfm/file/uploadImg`,
 							fileType: 'image',
-							filePath: filePathStr,
-							name: 'file',
+							filePath: res1.tempFilePaths[0],
+              name: 'file',
+              onUploadProgress(progressEvent) {
+                var percentCompleted = Math.round(
+                  (progressEvent.loaded * 100) / progressEvent.total
+                );
+                console.log('进度条:', percentCompleted, progressEvent);
+              },
 							success: res2 => {
 								if (res2.statusCode == 200) {
 									let data = JSON.parse(res2.data || '{}');
 									if (parseInt(data.meta.code, 10) === 200) {
 										const { viewUrl, picture } = data.body;
-										this.$emit('changeFilePaths', [...this.filePaths, viewUrl])
+										this.$emit('changeFilePaths', [...this.filePaths, viewUrl], this.pickIndex)
 										this.picture = picture;
 									} else {
 										uni.showToast({
@@ -100,7 +117,7 @@
 			// 删除图片
 			delImg(i) {
         if(this.disabled) return;
-				this.$emit('changeFilePaths',  this.filePaths.filter((item, index) => index != i))
+				this.$emit('changeFilePaths', this.filePaths.filter((item, index) => index != i), this.pickIndex);
 			}
 		}
 	}

+ 140 - 0
pages/mission-action/components/modal.vue

@@ -0,0 +1,140 @@
+<template>
+	<view class="modal-view">
+    <view class="content">
+      <view class="title">
+      	<text>方案名称</text>
+      </view>
+			<view class="label">
+				<text>请输入方案的名称</text>
+			</view>
+			<view class="input-box">
+			  <input
+				  class="input"
+					maxlength="16"
+					placeholder="限2~16个字符"
+					placeholder-style="color: #666E80"
+					@blur="changeImproveScheme"
+				/>
+			</view>
+			<view class="btn-box">
+				<view class="btn" @click="close">
+					<text>取消</text>
+				</view>
+				<view class="btn" @click="save">
+					<text>保存</text>
+				</view>
+			</view>
+    </view>
+	</view>
+</template>
+
+<script>
+	// 不认可原因
+	export default {
+    data() {
+      return {
+        // 方案名称
+        improveScheme: ''
+      }
+    },
+    methods: {
+			changeImproveScheme(e) {
+        this.improveScheme = e.detail.value;
+        this.checkImproveScheme(e.detail.value);
+      },
+      // 校验方案名称
+			checkImproveScheme(name) {
+			  if(name.length < 2 || name.length > 16){
+					uni.showToast({
+						title: '限2~16个字符!',
+						icon: 'none',
+						duration: 500
+          });
+          return true;
+				}
+      },
+      // 保存
+      save() {
+        if(this.checkImproveScheme(this.improveScheme)) return;
+        this.$emit('sure', this.improveScheme);
+      },
+      close() {
+        this.$emit('close');
+      }
+    }
+	}
+</script>
+
+<style lang="less">
+	.modal-view {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+    background: rgba(18, 20, 26, .5);
+
+    .content {
+			width: 562.5rpx;
+			border-radius: 15rpx;
+			background-color: #fff;
+			overflow: hidden;
+
+			.title {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 95rpx;
+				font-size: 25rpx;
+				font-weight: bold;
+				color: #292C33;
+			}
+
+			.label {
+				display: flex;
+				align-items: center;
+				height: 78.75rpx;
+				padding-left: 25rpx;
+				font-size: 22.5rpx;
+				color: #B8BECC;
+			}
+
+			.input-box {
+				border-top: 0.62rpx solid #DADEE6;
+				border-bottom: 0.62rpx solid #DADEE6;
+
+				.input {
+					width: 100%;
+					min-height: 103.12rpx;
+					padding: 0 25rpx;
+					line-height: 26.25rpx;
+					font-size: 22.5rpx;
+					color: #525866;
+					box-sizing: border-box;
+				}
+			}
+
+			.btn-box {
+				display: flex;
+				height: 75rpx;
+
+				.btn {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					flex: 1;
+					font-size: 22.5rpx;
+					color: #3377FF;
+
+				  &:last-child {
+				  	background-color: #007AFF;
+				  	color: #fff;
+			  	}
+				}
+			}
+    }
+	}
+</style>

+ 100 - 52
pages/mission-action/components/pdca-components/do-and-check.vue

@@ -1,13 +1,19 @@
 <template>
 	<view class="com-plan-content">
 		<view class="title">
-			<text>{{ title }}</text>
+			<text>
+        {{ type === 'do' ? '执行过程记录(Do)' :  '改善确认(Check)'}}
+      </text>
 		</view>
-		<template v-for="(item, i) in list">
-			<view class="item-view">
+		<template v-for="(item, i) in recordList">
+			<view class="item-view" :key="type + i">
 				<view class="top-action">
-					<text>改善确认(1)</text>
-					<text class="blue-text">删除</text>
+					<text>改善确认({{ i + 1 }})</text>
+					<text class="blue-text"
+            v-if="!disabled"
+            @click="delRecord(i)" >
+            删除
+          </text>
 				</view>
 				<view class="main">
 					<view class="row">
@@ -16,11 +22,14 @@
 						</view>
 						<view class="content">
 							<textarea class="textarea"
-						    :key="title"
+						    :key="type"
 							  placeholder="请输入"
 								placeholder-style="color: #B8BECC"
 								:maxlength="-1"
 								auto-height
+                :value="item.record"
+                :disabled="disabled"
+                @input="changeRecord($event, i)"
 							/>
 						</view>
 					</view>
@@ -28,18 +37,28 @@
 						<view class="label-view">
 							<text>计划日期</text>
 						</view>
-						<view class="content">
-							<text>选择计划日期</text>
+						<view class="time-pick">
+							<date-time-picker
+                :height="140"
+                :pickIndex="i"
+                :defaultValue="item.date"
+                :disabled="disabled"
+                @change="changeDateTime" />
 						</view>
 					</view>
-					<tm-upload-img
-						:filePaths="['/static/img-icon.png', '/static/img-icon.png']"
-					/>
+          <template v-if="showUploadImg">
+            <tm-upload-img
+              label="改善效果"
+						  :filePaths="item.filePath"
+              :disabled="disabled"
+              @changeFilePaths="changeFilePaths"
+					  />
+          </template>
 				</view>
 			</view>
 		</template>
-		<view class="add-btn" @click="addRecord">
-			<text class="blue-text"> 
+		<view class="add-btn" @click="addRecord" v-if="!disabled">
+			<text class="blue-text">
 			  <text class="big">+</text>
 			  增加一条记录
 			</text>
@@ -48,37 +67,62 @@
 </template>
 
 <script>
-	// 执行过程记录(Do)和 改善确认(Check)
+  // 执行过程记录(Do)和 改善确认(Check)
 	export default {
 		props: {
       // 多行文本框标题
-			title: {
+			type: {
         type: String,
-        default: '执行过程记录(Do)'
-			}
-    },
-    data() {
-      return {
-        // list长度 控制个数
-        list: [
-					{gcjl: '', date: '', imgPath: '' },
-					{gcjl: '', date: '', imgPath: '' }
-				]
-      }
+        default: 'do'
+			},
+      // 是否展示上传图片行
+			showUploadImg: {
+        type: Boolean,
+        default: false
+      },
+      // 是否禁用
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      // 控制记录列表数组
+      recordList: {
+        type: Array,
+        default: () => {
+          return [{record: '', date: '', filePath: [] }]
+        }
+      },
     },
 		methods: {
-      changeVal(e) {
-        if(this.label === '改善计划'){
-          this.planvalue = e.target.value;
-        }else {
-          this.actionvalue = e.target.value;
-        }
+      // 过程记录变化
+      changeRecord(e, index) {
+        let _recordList = [...this.recordList];
+        _recordList[index].record = e.target.value;
+         this.$emit('changeRecordList', _recordList);
+      },
+      // 日期时间改变
+      changeDateTime(dateObj, pickType, index) {
+        let _recordList = [...this.recordList];
+        _recordList[index].date = dateObj.f4;
+        console.log('日期时间', dateObj.f4, index);
+        this.$emit('changeRecordList', _recordList);
       },
-			// 新增一条记录
+      // 改善效果改变
+      changeFilePaths(filePaths, index) {
+        let _recordList = [...this.recordList];
+        _recordList[index].filePath = filePaths;
+        console.log('改善效果', filePaths, index);
+        this.$emit('changeRecordList', _recordList);
+      },
+      // 新增一条记录
 			addRecord() {
-				this.list = [...this.list, {gcjl: '', date: '', imgPath: '' }]
-			}
-		},
+        this.$emit('changeRecordList', [...this.recordList, {record: '', date: '', filePath: [] }]);
+      },
+      // 删除记录
+      delRecord(index) {
+         this.$emit('changeRecordList', this.recordList.filter((item, i) => i != index));
+      }
+    }
 	}
 </script>
 
@@ -96,18 +140,18 @@
 				color: #292C33;
 			}
 		}
-		
+
 		.blue-text {
 			font-size: 23.75rpx;
 			color: #3377FF !important;
-			
+
 			.big {
 				font-size: 28.75rpx;
 			}
 		}
-		
+
 		.item-view {
-			
+
 			.top-action {
 				display: flex;
 				align-items: center;
@@ -116,36 +160,36 @@
 				margin-bottom: 15rpx;
 				height: 22.5rpx;
 				padding: 0 25rpx;
-				
+
 				text {
 					font-size: 22.5rpx;
 					color: #666F80;
 				}
 			}
-			
+
 			.main {
 				background-color: #fff;
-				
+
 				.row {
 					display: flex;
 					border-bottom: 0.62rpx solid #DADEE6;
 					padding-left: 25rpx;
-					
+
 					.label-view {
 						width: 175rpx;
 						line-height: 22.5rpx;
 						padding: 31.25rpx 0;
-					
+
 						>text {
 							font-size: 22.5rpx;
 							color: #666F80;
 						}
 					}
-					
+
 					.content {
 						flex: 1;
 						padding: 25rpx 0;
-					
+
 						.textarea {
 							width: 100%;
 							min-height: 200rpx;
@@ -155,16 +199,20 @@
 							color: #525866;
 							box-sizing: border-box;
 						}
-						
+
 						>text {
 							font-size: 22.5rpx;
 							color: #B8BECC;
 						}
-					}
+          }
+
+          .time-pick {
+            flex: 1;
+          }
 				}
-				
+
 				.row-heigth {
-					
+
 					.label-view {
 						line-height: 22.5rpx;
 						padding: 31.25rpx 0;
@@ -172,7 +220,7 @@
 				}
 			}
 		}
-		
+
 		.add-btn {
 			display: flex;
 			justify-content: center;

+ 17 - 24
pages/mission-action/components/pdca-components/one-textarea.vue

@@ -14,7 +14,7 @@
 					placeholder-style="color: #B8BECC"
 					:maxlength="-1"
 					auto-height
-          :value="label === '改善计划' ? planvalue : actionvalue"
+          :value="defaultValue"
           :disabled="disabled"
           @input="changeVal"
 				/>
@@ -28,23 +28,13 @@
 
 	export default {
 		props: {
-      // 多行文本框标题
-			title: {
-        type: String,
-        default: '改善计划(Plan)'
-			},
-      // 多行文本框子标题
-			label: {
-        type: String,
-        default: '改善计划'
-      },
-      // 改善计划默认值
-      defaultPlanValue: {
+      // 类型 (plan 和 action)
+			type: {
         type: String,
-        default: ''
+        default: 'plan'
       },
       // 对策处置默认值
-      defaultactionValue: {
+      defaultValue: {
         type: String,
         default: ''
       },
@@ -54,19 +44,22 @@
         default: false
       },
     },
-    data() {
-      return {
-        planvalue: this.defaultPlanValue, // 改善计划
-        actionvalue: this.defaultactionValue // 对策处置
+    computed: {
+      // 多行文本框标题
+      title() {
+        return this.type === 'plan' ? '改善计划(Plan)' : '对策处置(Action)'
+      },
+        // 多行文本框子标题
+			label() {
+        return this.type === 'plan' ? '改善计划' : '对策处置'
       }
+    },
+    created() {
+      this.value = this.defaultValue;
     },
 		methods: {
       changeVal(e) {
-        if(this.label === '改善计划'){
-          this.planvalue = e.target.value;
-        }else {
-          this.actionvalue = e.target.value;
-        }
+        this.$emit('changeTextare', this.type,  e.target.value);
       }
 		},
 	}

+ 126 - 20
pages/mission-action/components/pdca.vue

@@ -2,7 +2,7 @@
 	<view class="pdca-page">
 		<uni-segmented-control
 		  :current="current"
-			:values="items"
+			:values="tabItems"
 			@clickItem="onClickItem"
 			style-type="text"
 			active-color="#3377FF" />
@@ -10,33 +10,50 @@
 			<scroll-view class="scroll-y" scroll-y="true">
         <one-textarea
           v-if="current === 0"
-          :defaultPlanValue="plan"
+          type="plan"
+          :defaultValue="plan"
           :disabled="disabled"
-         />
+          @changeTextare="changeTextare"
+        />
 				 <do-and-check
 					 v-if="current === 1"
+           type="do"
            :disabled="disabled"
-					/>
-				<view v-if="current === 2">
-						选项卡3的内容
-				</view>
+           :recordList="doList"
+           @changeRecordList="changeDoList"
+				/>
+				<do-and-check
+					v-if="current === 2"
+          type="check"
+          :disabled="disabled"
+          :recordList="checkList"
+          :showUploadImg="true"
+          @changeRecordList="changeCheckList"
+				/>
 				<one-textarea
           v-if="current === 3"
+          type="action"
           title="对策处置(Action)"
           label="对策处置"
-          :defaultactionValue="'123'"
+          :defaultValue="action"
           :disabled="disabled"
+          @changeTextare="changeTextare"
          />
 			</scroll-view>
 			<view class="fixed-buttom-btn" v-if="!disabled">
-				<view class="btn-text cancle">
+		   	<view class="fixed-buttom-btn">
 					<text>暂存</text>
 				</view>
-				<view class="btn-text">
-					<text>完成</text>
+				<view class="btn-text" @click="toggleModalVisibile">
+					<text>提交</text>
 				</view>
 			</view>
 		</view>
+    <!-- 方案名称modal -->
+    <modal
+      v-if="modalVisibile"
+      @close="toggleModalVisibile"
+      @sure="sure" />
 	</view>
 </template>
 
@@ -44,7 +61,8 @@
 	// 改善任务PDCA
 	import uniSegmentedControl from "@/components/uni-segmented-control/uni-segmented-control.vue"
 	import oneTextarea from './pdca-components/one-textarea.vue'
-	import doAndCheck from './pdca-components/do-and-check.vue'
+  import doAndCheck from './pdca-components/do-and-check.vue'
+  import modal from './modal.vue'
 
 	export default {
     props: {
@@ -73,23 +91,44 @@
         default: () => {
           return {}
         }
+      },
+      // pdca类型 p 和 pdca
+      pdcaSetting: {
+        type: String,
+        default: 'p'
       }
     },
 		data() {
 			return {
-				items: ['改善计划(P)', '执行过程(D)', '改善确认(C)', '对策处置(A)'],
         current: 0,
-        // plan 改善计划
-        plan: ''
+        plan: '', // 改善计划
+        doList: [{record: '', date: ''}], // 执行过程
+        checkList: [{record: '', date: '', filePath: [] }], // 改善确认
+        action: '', // 对策处置
+        // 方案名称显示隐藏
+        modalVisibile: false
 			}
-		},
+    },
+    computed: {
+      tabItems(){
+        return this.pdcaSetting === 'p'
+          ? ['改善计划(P)']
+          : ['改善计划(P)', '执行过程(D)', '改善确认(C)', '对策处置(A)'];
+      }
+    },
 		created() {
 			uni.setNavigationBarTitle({
 				title: '改善计划'
       });
       if(this.disabled) {
-        this.plan = this.values['plan'];
-        console.log(9, this.values)
+        this.plan = this.values['plan'] || '';
+        this.doList = (this.values['do'] && this.values['do'].length > 0)
+          ? this.values['do']
+          : [{record: '', date: ''}];
+        this.checkList = (this.values['check'] && this.values['check'].length > 0)
+          ? this.values['check']
+          : [{record: '', date: '', filePath: [] }];
+        this.action = this.values['action'] || '';
       }
 		},
 		methods: {
@@ -97,12 +136,79 @@
 				if (this.current !== e.currentIndex) {
 					this.current = e.currentIndex;
 				}
-			}
+      },
+      // 切换方案名称显示隐藏
+      toggleModalVisibile() {
+        this.modalVisibile = !this.modalVisibile;
+      },
+      // 改善计划/对策处置变化
+      changeTextare(type, text) {
+        this[type] = text;
+      },
+      // 执行过程变化
+      changeDoList(list) {
+        this.doList = list;
+      },
+      // 改善确认变化
+      changeCheckList(list) {
+        this.checkList = list;
+      },
+      // 提交审核/ 暂存(暂存时improveScheme为空)
+      sure(improveScheme) {
+        const { params } = this.btnInfo;
+        let requestParams = {
+          improveScheme // 改善方案名称
+        };
+        this.btnInfo.params && this.btnInfo.params.map(item => {
+          if(item.valueKey){
+            requestParams[item.paramsKey] = (
+              item.isOutvalueKey
+              ? this.missionDetails
+              : this.btnInfo
+            )[item.valueKey];
+          }else {
+            switch(item.paramsKey){
+              case 'taskPlan':
+                requestParams[item.paramsKey] = this.plan;
+                break;
+              case 'taskAction':
+                requestParams[item.paramsKey] = this.action;
+                break;
+              case 'taskDoRequestList':
+                requestParams[item.paramsKey] = this.doList.map((item, i) => {
+                  return {
+                    taskDoId: i + 1,
+                    taskDoProcess: item.record,
+                    taskDoPlan: item.date
+                  }
+                });
+                break;
+              case 'taskCheckRequestList':
+                requestParams[item.paramsKey] = this.checkList.map((item, i) => {
+                  return {
+                    taskCheckId: i + 1,
+                    taskCheckProcess: item.record,
+                    taskCheckPlan: item.date,
+                    taskCheckEffect: item.filePath.join(',')
+                  }
+                });
+                break;
+              default:
+                requestParams[item.paramsKey] = '';
+                break;
+            }
+          }
+        });
+        console.log(9, requestParams)
+        this.$emit('comRequest', requestParams);
+        this.toggleModalVisibile();
+      }
 		},
 		components: {
 			uniSegmentedControl,
 			oneTextarea,
-			doAndCheck
+      doAndCheck,
+      modal
 		}
 	}
 </script>

+ 4 - 2
pages/mission-action/mission-action.vue

@@ -7,6 +7,7 @@
       :values="values"
       :btnInfo="btnInfo"
       :missionDetails="missionDetails"
+      :pdcaSetting="pdcaSetting"
       @comRequest="comTaskCirculation"
 		/>
 	</view>
@@ -51,7 +52,7 @@
 		methods: {
       // 获取组件信息
       getComponentInfo(details) {
-        console.log(7, details)
+        console.log('组件数据', details)
         const {
           nextPermission,
           nextPermissionName,
@@ -67,7 +68,7 @@
         this.currentComponet = componentName;
         this.disabled = disabled;
         if(disabled) { // 查看xx详情
-        let values = {};
+          let values = {};
           if(hasAnyData){ // 回显数据由多个key组成
             dataKey.map(item => {
               values[item.labelKey] = (item.isOutvalueKey ? this.missionDetails : details)[item.key];
@@ -77,6 +78,7 @@
           }
           this.values = values;
           this.pdcaSetting = pdcaSetting;
+          this.btnInfo = details;
         }else { // 编辑流程
           this.btnInfo = details;
         }

+ 2 - 2
pages/mission-details/setting.js

@@ -457,7 +457,7 @@ const taskTypeList = [
         pdcaSetting: 'p',
         nextPermission: 4,
         nextPermissionName: '单位负责人',
-        params: [// ?
+        params: [
           { paramsKey: 'id', valueKey: 'id', isOutvalueKey: true }, // 任务id
           { paramsKey: 'taskType', valueKey: 'taskType', isOutvalueKey: false }, // 状态值
           { paramsKey: 'receiveEmpId', valueKey: 'establishEmpId', isOutvalueKey: false }, // 接收人id
@@ -646,7 +646,7 @@ const taskTypeList = [
       name: '查看改善计划详情',
       key: 'taskPlan',
       componentName: 'pdca',
-      pdcaSetting: 'p',
+      pdcaSetting: 'pdca',
       nextPermission: 5,
       disabled: true,
       labelKey: 'plan'

+ 2 - 2
utils/requestUrl.js

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