From 61c87154768c513a8e87e9a125c3231633de499d Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Tue, 23 Jan 2024 14:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E8=AE=BE=E7=BD=AE=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E6=8E=AA=E6=96=BD=E7=A1=AE=E8=AE=A4=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hotwork-measures-detail.vue               | 770 ++++--------------
 1 file changed, 178 insertions(+), 592 deletions(-)

diff --git a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue
index 410be5e..d1d5878 100644
--- a/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue
+++ b/pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue
@@ -22,43 +22,45 @@
 					{{pd.CHECK_NO}}
 				</view>
 
-				<view class="cu-form-textarea">
-					<view class="cu-form-title">作业内容:</view>
-					<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT" placeholder="请输入作业内容"></textarea>
+				<view class="cu-form-group bb-default">
+					<view class="title">作业内容:</view>
+          {{pd.WORK_CONTENT}}
 				</view>
 
-				<view class="cu-form-group">
-					<view class="title">动火地点及动火部位:</view>
-					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_PLACE" placeholder="请输入"></input>
+        <view class="cu-form-group bb-default">
+          <view class="title">动火地点及动火部位:</view>
+          {{pd.WORK_PLACE}}
 				</view>
 
-				<view class="cu-form-group group-picker">
-					<view class="title">动火作业级别:</view>
+        <view class="cu-form-group bb-default">
+          <view class="title">动火作业级别:</view>
 					{{pd.WORK_LEVEL}}
 				</view>
 
-				<view class="cu-form-group">
-					<view class="title">动火方式:</view>
-					<input name="input" :disabled="forbidEdit" v-model="pd.WORK_FUNCTION" placeholder="请输入"></input>
+        <view class="cu-form-group bb-default">
+          <view class="title">动火方式:</view>
+					{{pd.WORK_FUNCTION}}
 				</view>
-				<view class="cu-form-textarea">
-					<view style="display: flex;justify-content: space-between;align-items: center">
-						<view class="cu-form-title">动火人及证书编号:</view>
-					</view>
-					<textarea maxlength="255" v-model="pd.WORK_USER" placeholder="请输入动火人及证书编号"></textarea>
+        <view class="cu-form-group bb-default">
+          <view class="title">动火人及证书编号:</view>
+					{{pd.WORK_USER}}
 				</view>
 
-				<view class="cu-form-textarea" >
-					<view class="cu-form-title">关联的其他特殊作业及安全作业票编号:</view>
-					<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.SPECIAL_WORK" placeholder="请输入关联的其他特殊作业及安全作业票编号"></textarea>
+        <view class="cu-form-group bb-default">
+          <view class="title">关联的其他特殊作业及安全作业票编号:</view>
+					{{pd.SPECIAL_WORK}}
 				</view>
 
-				<view class="cu-form-textarea" >
-					<view class="cu-form-title">风险辨识结果:</view>
-					<textarea maxlength="255" auto-height :disabled="forbidEdit" v-model="pd.RISK_IDENTIFICATION" placeholder="请输入风险辨识结果"></textarea>
+        <view class="cu-form-group bb-default">
+          <view class="title">风险辨识结果:</view>
+					{{pd.RISK_IDENTIFICATION}}
 				</view>
 
-
+        <view class="cu-form-group bb-default">
+          <text class="title">分析人:</text>
+          <text>{{pd.ANALYZE_USER_NAME}}</text>
+          <button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
+        </view>
 			</view>
 
 			<view class="wui-form-list" style="padding-top: 20upx;">
@@ -70,95 +72,59 @@
 						<!-- 表头行 -->
 						<uni-tr>
 							<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
-							<uni-th align="center" style="font-weight: bold;width: 80px">操作</uni-th>
 						</uni-tr>
-						<uni-tr v-for="(item,index) in measuresList" :key="item.BUS_HOTWORK_MEASURES_ID">
-							<uni-td>
-								<view style="margin-bottom: 20upx;">
-								    {{item.PROTECTIVE_MEASURES}}
-								  </view>
+            <template v-for="(item,index) in measuresList">
+              <uni-tr>
+                <uni-td>
+                  <view style="margin-bottom: 20upx;">
+                    {{item.PROTECTIVE_MEASURES}}
+                  </view>
 
-								<view class="cu-form-group" v-if="item.QUESTION1">
-									<view class="title">{{item.QUESTION1}}</view>
-									<input name="input" v-model="item.ANSWER1"  type="number" placeholder="请输入"></input>
-								</view>
-								<view class="cu-form-group" v-if="item.QUESTION2">
-									<view class="title">{{item.QUESTION2}}</view>
-									<input name="input" v-model="item.ANSWER2" type="number" placeholder="请输入"></input>
-								</view>
-								<view class="cu-form-group" v-if="item.QUESTION3">
-									<view class="title">{{item.QUESTION3}}</view>
-									<input name="input"  v-model="item.ANSWER3" type="number" placeholder="请输入"></input>
-								</view>
-								<view class="cu-form-group" v-if="item.QUESTION4">
-									<view class="title">{{item.QUESTION4}}</view>
-									<input name="input"  v-model="item.ANSWER4" type="number" placeholder="请输入"></input>
-								</view>
-							</uni-td>
-							<uni-td align="center">
-								<radio-group class="wui-radio-group wui-radio-col">
-									<view class="group" style="margin-bottom: 10px">
-										<radio class='radio'  value="-1" :checked="item.STATUS=='-1'" @click="changeRadio(index,'-1')">
-											<text class="wui-pl10">不涉及</text></radio>
-									</view>
-									<view class="group" style="margin-bottom: 10px">
-										<radio class='radio' value="1" :checked="item.STATUS=='1'" @click="changeRadio(index,'1')">
-											<text class="wui-pl10">涉&nbsp;&nbsp;&nbsp;&nbsp;及</text></radio>
-									</view>
-								</radio-group>
-							</uni-td>
-						</uni-tr>
+                  <view class="cu-form-group" >
+                    <view class="title">确认单位:</view>
+                    <view class="picker-tree-box">
+                      <view class="picker-tree" @tap="showDeptTree(index)">{{measuresList[index].DEPARTMENT_NAME?measuresList[index].DEPARTMENT_NAME:'请选择'}}</view>
+                    </view>
+                    <tki-tree :ref="'tkiTree'+index"
+                              :selectParent=true
+                              :range="treeNode"
+                              rangeKey="name"
+                              @confirm="deptTreeConfirm($event,index)"
+                              @cancel="deptTreeCancel($event,index)"></tki-tree>
+                  </view>
+
+                  <view class="cu-form-group" >
+                    <view class="title">作业结束负责人</view>
+                    <picker @change="pickerUser($event,index)" :value="item.userIndex" :range="item.userList" range-key="NAME" :disabled="item.userList.length == 0" @click="isBlankList(index)">
+                      <view class="picker">
+                        {{measuresList[index].USER_NAME?measuresList[index].USER_NAME:'请选择'}}
+                      </view>
+                    </picker>
+                  </view>
+                </uni-td>
+              </uni-tr>
+            </template>
 					</uni-table>
 				</view>
 
-				<view class="cu-form-group bb-default" v-if="pd.APPLY_STATUS && pd.APPLY_STATUS!=0 && pd.APPLY_STATUS!=-99">
-					<view>
-						<text class="title">分析人:</text>
-						<text>{{pd.ANALYZE_USER_NAME}}</text>
-					</view>
-					<button class="cu-btn bg-green sm" @click="$noMultipleClicks(goToDetail,pd.HOTWORK_ID)">分析详情</button>
-				</view>
+        <view class="wui-sign" >
+          <view class="title"></view>
+          <button class="cu-btn bg-green shadow" @tap="showModal" data-target="Modal">手写签字</button>
+        </view>
+        <view class="wui-sign-box"  v-show="imgList && imgList.length > 0">
+          <view class="sign-title">
+            签字照片:
+          </view>
+          <view class="wui-sign-cotent">
+            <view class="sign-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage"  data-type="0" :data-url="imgList[index].filePath">
+              <image :src="imgList[index].filePath" mode="aspectFit"></image>
+            </view>
+          </view>
+        </view>
+        <view class="cu-modal" :class="modalName=='Modal'?'show':''">
+          <writing-board  @confirm="subCanvas" @cancel="hideModal"></writing-board>
+        </view>
 			</view>
-			<view class="wui-form-list">
-				<view v-if="pd.GUARDIAN_USER_SIGNER_PATH">
-					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-						<view class="cu-form-group" >
-							<view class="title">监护人</view>
-							{{pd.GUARDIAN_USER_NAME}} {{pd.GUARDIAN_USER_SIGNER_TIME}}
-						</view>
-						<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
-							<image :src="baseImgPath + pd.GUARDIAN_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.GUARDIAN_USER_SIGNER_PATH)" style="height: 100%;"></image>
-						</view>
-					</view>
-				</view>
-				<view v-if="pd.CONFESS_USER_SIGNER_PATH">
-					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-						<view class="cu-form-group" >
-							<view class="title">安全交底人</view>
-							{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_SIGNER_TIME}}
-						</view>
-						<view style="width: 400upx; height: 200upx; margin: 30upx;margin-top: 0upx;margin-bottom: 20upx;" >
-							<image :src="baseImgPath + pd.CONFESS_USER_SIGNER_PATH" mode="aspectFill" @click="previewImage(baseImgPath + pd.CONFESS_USER_SIGNER_PATH)" style="height: 100%;"></image>
-						</view>
-					</view>
-				</view>
-				<view v-if="files.length > 0">
-					<view style="border-bottom: 1px solid #eeeeee;  border-top: 1px solid #eeeeee">
-						<view class="cu-form-group" >
-							<view class="title">接受交底人</view>
-							{{pd.ACCEPT_CONFESS_USER_NAME}} {{pd.ACCEPT_CONFESS_USER_SIGNER_TIME}}
-						</view>
-						<view class="cu-item" v-for="(item,index) in files" :key="index" style="border-bottom: 1px solid  #e3e3e3">
-							<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
-								<image :src="baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH" :data-index="index" @click="ViewShowImage(baseImgPath+item.ACCEPT_CONFESS_USER_SIGNER_PATH)"
-									   mode="" style="width: 200upx;height: 200upx;"></image>
-								<text>{{item.ACCEPT_CONFESS_USER_SIGNER_TIME}}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-
 		</view>
 		<view class="cu-bar btn-group" style="margin-top: 30upx;">
 			<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-2')">打 回</button>
@@ -186,87 +152,21 @@
 			return {
 				baseImgPath:baseImgPath,
 				buttonloading: false,
-				isUps:false,
-				files: [],
-				forbidEdit:true,// 禁止修改
-				msg:'add',
 				noClick:true,
 				treeNode:[],//部门下拉数据
-				levelList:[
-					{id:'特级',name:'特级'},
-					{id:'一级',name:'一级'},
-					{id:'二级',name:'二级'},
-				],
-				levelindex:-1,
-
-				analyzeUserList:[],
-				analyzeindex:-1,
-				confirmUserList:[],
-				confirmindex:-1,
-				guardianUserList:[],
-				guardianindex:-1,
-                leaderUserList:[],
-                leaderindex:-1,
-				auditUserList:[],
-				auditindex:-1,
-				approveUserList:[],
-				approveindex:-1,
-                monitorUserList:[],
-                monitorindex:-1,
-                acceptUserList:[],
-				acceptindex:-1,
 				pd:{},// 数据
 				measuresList:[],
-				rules:[
-					{name:'CHECK_NO',message:'请输入编号'},
-					{name:'WORK_CONTENT',message:'请输入作业内容'},
-					{name:'WORK_PLACE',message:'请输入作业地点'},
-					{name:'WORK_LEVEL',message:'请选择动火级别'},
-					{name:'WORK_FUNCTION',message:'请输入动火方式'},
-					{name:'WORK_START_DATE',message:'请选择工作开始时间'},
-					{name:'WORK_START_DATE',message:'请选择工作结束时间'},
-					{name:'WORK_MANAGER',message:'请输入作业负责人'},
-					{name:'WORK_USER',message:'请输入作业人'},
-					{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
-					{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
-					{name:'CONFESS_USER',message:'请输入安全交底人'},
-					{name:'EDUCATE_USER',message:'请输入安全教育人'},
-					{name:'ACCEPT_EDUCATE_USER',message:'请输入接受交底、教育人'},
-					{name:'TRIAL_USER',message:'请输入动火措施初审人'},
-					{name:'ANALYZE_USER_ID',message:'请选择分析人'},
-					{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
-					{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
-					{name:'LEADER_USER_ID',message:'请选择动火点车间负责人'},
-					{name:'AUDIT_USER_ID',message:'请选择安全管理部门负责人'},
-					{name:'APPROVE_USER_ID',message:'请选择审批部门'},
-					{name:'MONITOR_USER_ID',message:'请选择验票班长'},
-					{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'}
-				],
-				todayDate:'',
 				modalName:null,
 				imgList:[],
 			}
 		},
 		onLoad(event){
-			this.todayDate =  formatDate(new Date(), 'yyyy-MM-dd hh:mm');
 			this.pd.HOTWORK_ID = event.HOTWORK_ID;
-			if(this.pd.HOTWORK_ID){
-				this.msg="edit";
-				this.getData();
-			}else {
-				// 初始化作业负责人
-				this.pd.APPLY_DEPARTMENT_ID = loginUser.DEPARTMENT_ID;
-				this.pd.APPLY_DEPARTMENT_NAME = loginUser.DEPARTMENT_NAME;
-				this.pd.APPLY_USER_ID = loginUser.USER_ID;
-				this.pd.APPLY_USER_NAME = loginUser.NAME;
-				this.forbidEdit = false;
-			}
+      this.getData();
 			// 初始化现场作业负责人
 			this.getDept();
-			this.getLimitSpace();
 			this.getMeasures();
 			loginSession();
-
 		},
 		methods: {
 			//跳转事件
@@ -290,14 +190,11 @@
 						HOTWORK_ID: _this.pd.HOTWORK_ID,
 						CORPINFO_ID:loginUser.CORPINFO_ID,
 						USER_ID:loginUser.USER_ID,
-								},
+          },
 					success: (res) => {
 						if ("success" == res.data.result) {
 							uni.hideLoading();
 							_this.pd = res.data.pd; //参数map
-							if(_this.pd.STEP_ID == 3){
-								_this.forbidEdit = false;
-							}
 						} else if ("exception" == data.result) {
 							uni.showToast({
 								title: '错误',
@@ -307,178 +204,72 @@
 					}
 				});
 			},
-			ViewShowImage(url) {
-				let files = [];
-				files.push(url)
-				uni.previewImage({
-					urls: files,
-					current: 0
-				});
-			},
-			goSubmit(STATUS){
+
+			goSubmit(){
 				var _this = this;
-				let required = true
 				uni.showLoading({
 					title: '请稍候'
 				})
-				if(STATUS==2) {
+        if (_this.imgList.length <= 0) {
+          uni.showToast({
+            icon: 'none',
+            title: '请签字',
+            duration: 1500
+          });
+          return;
+        }
+        for (let i = 0; i < this.measuresList.length; i++) {
+          const measures = this.measuresList[i]
+          if(!measures.USER_ID){
+            uni.showToast({
+              icon: 'none',
+              title: '第'+(i+1)+'项未设置确认人',
+              duration: 1500
+            });
+            return;
+          }
+        }
 
-					if (_this.imgList.length <= 0) {
-						uni.showToast({
-							icon: 'none',
-							title: '请签字',
-							duration: 1500
-						});
-						return;
-					}
-				}
-				const formData={}
-				Object.keys(this.pd).map(key => {
-					formData[key]=this.pd[key]
-				})
-				formData.CORPINFO_ID=corpinfoId
-				formData.CREATOR=loginUser.USER_ID
-				formData.OPERATOR=loginUser.USER_ID
-				formData.ACTION_USER=loginUser.NAME
-				formData.APPLY_STATUS=STATUS
-				if(STATUS==2){
-					if(!this.pd.CONFESS_USER_SIGNER_PATH || this.files.length <= 0 || !this.pd.GUARDIAN_USER_SIGNER_PATH) {
-						uni.showModal({
-							title: '',
-							content: '没有进行监护人、安全交底人或接受交底人签字,不能进行审核!',
-							cancelColor: "#000000",
-							cancelText: '取消',
-							confirmText: '确定',
-							success: res => {
-								this.buttonloading = false
-								_this.goback()
-							}
-						})
-					} else {
-						formData.STATUS = STATUS
-						for (let i = 0; i < this.measuresList.length; i++) {
-							const measures = this.measuresList[i]
-							if(!measures.STATUS){
-								uni.showToast({
-									icon: 'none',
-									title: '第'+(i+1)+'项未勾选',
-									duration: 1500
-								});
-								return;
-							}
-							if(measures.STATUS=='1' && measures.QUESTION1 && !measures.ANSWER1){
-								uni.showToast({
-									icon: 'none',
-									title: '第'+(i+1)+'项未填写第一项',
-									duration: 1500
-								});
-								return;
-							}
-							if(measures.STATUS=='1' && measures.QUESTION2 && !measures.ANSWER2){
-								uni.showToast({
-									icon: 'none',
-									title: '第'+(i+1)+'项未填写第二项',
-									duration: 1500
-								});
-								return;
-							}
-							if(measures.STATUS=='1' && measures.QUESTION3 && !measures.ANSWER3){
-								uni.showToast({
-									icon: 'none',
-									title: '第'+(i+1)+'项未填写第三项',
-									duration: 1500
-								});
-								return;
-							}
-						if(measures.STATUS=='1' && measures.QUESTION4 && !measures.ANSWER4){
-							uni.showToast({
-								icon: 'none',
-								title: '第'+(i+1)+'项未填写第四项',
-								duration: 1500
-							});
-							return;
-						}
-					}
-						formData.measuresList = JSON.stringify(this.measuresList)
-					  formData.CORPINFO_ID = loginUser.CORPINFO_ID
-					  formData.USER_ID = loginUser.USER_ID
-						this.buttonloading = true
-						uni.uploadFile({
-							url: basePath+'app/hotwork/editStatus',
-							filePath: _this.imgList[0].filePath,
-							name: 'FFILE',
-							formData:formData,
-							success: (res) => {
-								uni.showToast({
-									icon:'none',
-									title: '保存成功',
-									duration: 2000
-								});
-								_this.goback()
-								this.buttonloading = false
-							},
-							fail: (err) => {
-								uni.hideLoading();
-								uni.showModal({
-									content: err.errMsg,
-									showCancel: false
-								});
-							}
-						})
-					}
-				}else{
-					formData.STATUS=STATUS
-					this.buttonloading = true
-					uni.request({
-						url: basePath + "app/hotwork/editStatus",
-						method: 'POST',
-						dataType: 'json',
-						header:{
-							'Content-type':'application/x-www-form-urlencoded'
-						},
-						data: {
-							  ...formData,
-							  CORPINFO_ID:loginUser.CORPINFO_ID,
-							  USER_ID:loginUser.USER_ID,
-							},
-						success: (res) => {
-							uni.showToast({
-								icon:'none',
-								title: '保存成功',
-								duration: 2000
-							});
-							_this.goback()
-							this.buttonloading = false
-						},
-						fail: (err) => {
-							uni.hideLoading();
-							uni.showModal({
-								content: err.errMsg,
-								showCancel: false
-							});
-						}
-					})
-				}
-			},
-			// 获取动火列表
-			getLimitSpace(){
-				var _this = this;
-				uni.request({
-					method: 'POST',
-					dataType: 'json',
-					header: {
-						'Content-type': 'application/x-www-form-urlencoded'
-					},
-					url: basePath + '/app/limitspace/listAllSpace?tm=' + new Date().getTime(),
-					data: {
-						CORPINFO_ID:loginUser.CORPINFO_ID,
-						USER_ID:loginUser.USER_ID,
-					},
-					success: function (res) {
-						_this.limitSpaceList = res.data.varList;
-					}
-				});
+        const formData={}
+        var files = [];
+        var signtime = [];
+        this.uploadImgFaults(files,signtime)
+        formData.HOTWORK_ID = _this.pd.HOTWORK_ID
+        formData.SIGNTIME = signtime.join(",")
+        formData.USER_ID = loginUser.USER_ID
+        formData.PREPARERS = JSON.stringify(_this.measuresList)
+        uni.uploadFile({
+          url: basePath+'app/hotwork/nextStep',
+          files: files,
+          formData:formData,
+          success: (res) => {
+            uni.showToast({
+              icon:'none',
+              title: '保存成功',
+              duration: 2000
+            });
+            // _this.goback()
+          },
+          fail: (err) => {
+            uni.hideLoading();
+            uni.showModal({
+              content: err.errMsg,
+              showCancel: false
+            });
+          }
+        })
 			},
+
+      uploadImgFaults(files,signtime) {
+        this.imgList.map((item,index) => {
+          var img = {}
+          img.name = 'file'+index
+          img.uri = item.filePath
+          files.push(img)
+          signtime.push(item.SIGNER_TIME)
+        })
+      },
+
 			getMeasures(){
 				var _this = this;
 				uni.request({
@@ -493,15 +284,15 @@
 						USER_ID:loginUser.USER_ID,
 					},
 					success: function (res) {
-						_this.measuresList = res.data.measuresList;
+						_this.measuresList = res.data.measuresList.map((item,index)=>{
+                item.userList = []
+                item.userIndex = -1
+                return item
+            })
 					}
 				});
 			},
-			levelChange(e){
-				this.levelindex = e.detail.value;
-				this.pd.WORK_LEVEL=this.levelList[this.levelindex].name;
-				this.$forceUpdate();//强制刷新
-			},
+
 			getDept() {
 				var _this = this;
 				uni.request({
@@ -527,8 +318,44 @@
 					}
 				});
 			},
+
+      showDeptTree(index) {
+        this.isUps=true
+        this.$refs['tkiTree'+index][0]._show();
+      },
+
+      deptTreeConfirm(e,i) {
+        this.isUps=false;
+        this.measuresList[i].DEPARTMENT_ID=e[0].id;
+        this.measuresList[i].DEPARTMENT_NAME=e[0].name;
+        this.measuresList[i].USER_ID = ''
+        this.measuresList[i].USER_NAME = ''
+        this.getUserList(e[0].id,i);
+      },
+
+      deptTreeCancel(e) {
+        this.isUps=false;
+      },
+
+      pickerUser(e,i) {
+        this.measuresList[i].userIndex = e.detail.value;
+        this.measuresList[i].USER_ID=this.measuresList[i].userList[e.detail.value].USER_ID;
+        this.measuresList[i].USER_NAME=this.measuresList[i].userList[e.detail.value].NAME;
+        this.$forceUpdate();//强制刷新
+      },
+
+      isBlankList(i) {
+        if (this.measuresList[i].userList.length == 0) {
+          uni.showToast({
+            icon: 'none',
+            title: '请先选择确认单位',
+            duration: 1500
+          })
+        }
+      },
+
 			//获取人员列表
-			getUserList(dept,list,i){
+			getUserList(dept,i){
 				//发送 post 请求
 				var _this=this
 				uni.request({
@@ -546,13 +373,7 @@
 					  },
 					success: function(res){
 						if("success" == res.data.result){
-							if(i>-1) {
-								_this[list][i] = [];
-								_this[list][i] = res.data.userList;
-								_this.$forceUpdate();//强制刷新
-							}else{
-								_this[list]=res.data.userList;
-							}
+							_this.measuresList[i].userList = res.data.userList;
 						}else{
 							uni.showToast({
 								title: res.data.message,
@@ -588,235 +409,6 @@
 				});
 			},
 
-			/*
-			*分析人
-			 */
-			// 确定回调事件
-			analyzetreeConfirm(e) {
-				this.isUps=false;
-				this.pd.ANALYZE_DEPARTMENT_ID=e[0].id;
-				this.pd.ANALYZE_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'analyzeUserList');
-			},
-			// 取消回调事件
-			analyzetreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showAnalyzeTree() {
-				this.isUps=true
-				this.$refs.tkiTree_analyze._show();
-			},
-			PickerAnalyze(e) {
-				this.analyzeindex = e.detail.value;
-				this.pd.ANALYZE_USER_ID=this.analyzeUserList[this.analyzeindex].USER_ID;
-				this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-			/*
-			*确认人
-		 	*/
-			// 确定回调事件
-			confirmtreeConfirm(e) {
-				this.isUps=false;
-				this.pd.CONFIRM_DEPARTMENT_ID=e[0].id;
-				this.pd.CONFIRM_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'confirmUserList');
-			},
-			// 取消回调事件
-			confirmtreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showConfirmTree() {
-				this.isUps=true
-				this.$refs.tkiTree_confirm._show();
-			},
-			PickerConfirm(e) {
-				this.confirmindex = e.detail.value;
-				this.pd.CONFIRM_USER_ID=this.confirmUserList[this.confirmindex].USER_ID;
-				this.pd.CONFIRM_USER_NAME=this.confirmUserList[this.confirmindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-			/*
-			*监护人
-			 */
-			// 确定回调事件
-			guardiantreeConfirm(e) {
-				this.isUps=false;
-				this.pd.GUARDIAN_DEPARTMENT_ID=e[0].id;
-				this.pd.GUARDIAN_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'guardianUserList');
-			},
-			// 取消回调事件
-			guardiantreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showGuardianTree() {
-				this.isUps=true
-				this.$refs.tkiTree_guardian._show();
-			},
-			PickerGuardian(e) {
-				this.guardianindex = e.detail.value;
-				this.pd.GUARDIAN_USER_ID=this.guardianUserList[this.guardianindex].USER_ID;
-				this.pd.GUARDIAN_USER_NAME=this.guardianUserList[this.guardianindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-
-            /*
-            *单位领导
-            */
-// 确定回调事件
-            leadertreeConfirm(e) {
-                this.isUps=false;
-                this.pd.LEADER_DEPARTMENT_ID=e[0].id;
-                this.pd.LEADER_DEPARTMENT_NAME=e[0].name;
-                this.$forceUpdate();//强制刷新
-                this.getUserList(e[0].id,'leaderUserList');
-            },
-// 取消回调事件
-            leadertreeCancel(e) {
-                this.isUps=false;
-            },
-// 显示树形选择器
-            showLeaderTree() {
-                this.isUps=true
-                this.$refs.tkiTree_leader._show();
-            },
-            PickerLeader(e) {
-                this.leaderindex = e.detail.value;
-                this.pd.LEADER_USER_ID=this.leaderUserList[this.leaderindex].USER_ID;
-                this.pd.LEADER_USER_NAME=this.leaderUserList[this.leaderindex].NAME;
-                this.$forceUpdate();//强制刷新
-            },
-
-			/*
-			*安全管理部门负责人
-		 	*/
-			// 确定回调事件
-			audittreeConfirm(e) {
-				this.isUps=false;
-				this.pd.AUDIT_DEPARTMENT_ID=e[0].id;
-				this.pd.AUDIT_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'auditUserList');
-			},
-			// 取消回调事件
-			audittreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showAuditTree() {
-				this.isUps=true
-				this.$refs.tkiTree_audit._show();
-			},
-			PickerAudit(e) {
-				this.auditindex = e.detail.value;
-				this.pd.AUDIT_USER_ID=this.auditUserList[this.auditindex].USER_ID;
-				this.pd.AUDIT_USER_NAME=this.auditUserList[this.auditindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-			/*
-			*审批部门
-		 	*/
-			// 确定回调事件
-			approvetreeConfirm(e) {
-				this.isUps=false;
-				this.pd.APPROVE_DEPARTMENT_ID=e[0].id;
-				this.pd.APPROVE_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'approveUserList');
-			},
-			// 取消回调事件
-			approvetreeCancel(e) {
-				this.isUps=false;
-			},
-			// 显示树形选择器
-			showApproveTree() {
-				this.isUps=true
-				this.$refs.tkiTree_approve._show();
-			},
-			PickerApprove(e) {
-				this.approveindex = e.detail.value;
-				this.pd.APPROVE_USER_ID=this.approveUserList[this.approveindex].USER_ID;
-				this.pd.APPROVE_USER_NAME=this.approveUserList[this.approveindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-            /*
-*在岗班长
-*/
-// 确定回调事件
-            monitortreeConfirm(e) {
-                this.isUps=false;
-                this.pd.MONITOR_DEPARTMENT_ID=e[0].id;
-                this.pd.MONITOR_DEPARTMENT_NAME=e[0].name;
-                this.$forceUpdate();//强制刷新
-                this.getUserList(e[0].id,'monitorUserList');
-            },
-// 取消回调事件
-            monitortreeCancel(e) {
-                this.isUps=false;
-            },
-// 显示树形选择器
-            showMonitorTree() {
-                this.isUps=true
-                this.$refs.tkiTree_monitor._show();
-            },
-            PickerMonitor(e) {
-                this.monitorindex = e.detail.value;
-                this.pd.MONITOR_USER_ID=this.monitorUserList[this.monitorindex].USER_ID;
-                this.pd.MONITOR_USER_NAME=this.monitorUserList[this.monitorindex].NAME;
-                this.$forceUpdate();//强制刷新
-            },
-			/*
-			*验收部门
-			*/
-// 确定回调事件
-			accepttreeConfirm(e) {
-				this.isUps=false;
-				this.pd.ACCEPT_DEPARTMENT_ID=e[0].id;
-				this.pd.ACCEPT_DEPARTMENT_NAME=e[0].name;
-				this.$forceUpdate();//强制刷新
-				this.getUserList(e[0].id,'acceptUserList');
-			},
-// 取消回调事件
-			accepttreeCancel(e) {
-				this.isUps=false;
-			},
-// 显示树形选择器
-			showAcceptTree() {
-				this.isUps=true
-				this.$refs.tkiTree_accept._show();
-			},
-			PickerAccept(e) {
-				this.acceptindex = e.detail.value;
-				this.pd.ACCEPT_USER_ID=this.acceptUserList[this.acceptindex].USER_ID;
-				this.pd.ACCEPT_USER_NAME=this.acceptUserList[this.acceptindex].NAME;
-				this.$forceUpdate();//强制刷新
-			},
-
-			changeStartDate(e) {
-				this.pd.WORK_START_DATE = e
-				this.$forceUpdate();//强制刷新
-			},
-			changeEndDate(e) {
-				this.pd.WORK_END_DATE = e
-				this.$forceUpdate();//强制刷新
-			},
-
-			changeRadio(i,value){
-				this.measuresList[i].STATUS=value
-			},
-
 			goback(){
 				var pages = getCurrentPages();	// 获取当前页面栈
 				var prePage = pages[pages.length - 2];	// 上二级页面
@@ -824,12 +416,6 @@
 				uni.navigateBack({delta: 1});
 				uni.hideLoading();
 			},
-			radioType(e){
-				this.HASINSTRUCTOR = e.detail.value
-			},
-			goToEdit(){
-				this.forbidEdit = false;
-			}
 		}
 	}
 </script>