流程逻辑修改

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/dzfoprecord/controller/DzfQuestionOpRecordController.java

@@ -11,8 +11,12 @@ import com.jeeplus.core.excel.ExcelOptions;
 import com.jeeplus.core.excel.annotation.ExportMode;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.question.domain.DzfQuestionDetil;
+import com.jeeplus.question.service.DzfQuestionDetilService;
 import com.jeeplus.question.service.DzfQuestionService;
 import com.jeeplus.question.service.dto.DzfQuestionDTO;
+import com.jeeplus.question.service.dto.DzfQuestionDetilDTO;
+import com.jeeplus.question.service.mapstruct.DzfQuestionDetilWrapper;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.UserUtils;
 import io.swagger.annotations.Api;
@@ -52,6 +56,9 @@ public class DzfQuestionOpRecordController {
 	@Autowired
 	private DzfQuestionService dzfQuestionService;
 
+	@Autowired
+	private DzfQuestionDetilService dzfQuestionDetilService;
+
 	/**
 	 * 处理操作流程列表数据
 	 */
@@ -98,6 +105,8 @@ public class DzfQuestionOpRecordController {
 	public  ResponseEntity <String> save2(@Valid @RequestBody DzfQuestionDTO op) {
 		UserDTO userDTO = UserUtils.getCurrentUserDTO();
 
+		String nextuser="",nextusername="";//默认办结（有一个问题属于提交那都改成提交）
+
 		// 新增流程记录
 		for(int i=0;i<op.getDzfQuestionDetilDTOList().size();i++){
 
@@ -110,55 +119,182 @@ public class DzfQuestionOpRecordController {
 				if(op.getDzfQuestionDetilDTOList().get(i).current.equals("0")){
 					dzfQuestionOpRecordDTO.setOpType("3");
 					dzfQuestionOpRecordDTO.setOpTypeName("办结");
+					nextuser="dazoufang";
+					nextusername="大走访办公室";
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("1")){
 					dzfQuestionOpRecordDTO.setOpType("4");
 					dzfQuestionOpRecordDTO.setOpTypeName("反馈大走访活动办");
+					nextuser="dazoufang";
+					nextusername="大走访办公室";
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("2")){
 					dzfQuestionOpRecordDTO.setOpType("5");
 					dzfQuestionOpRecordDTO.setOpTypeName("正在办理");
+					nextuser=userDTO.getLoginName()+",dazoufang";
+					nextusername=userDTO.getName()+",大走访办公室";
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("3")){
 					dzfQuestionOpRecordDTO.setOpType("6");
 					dzfQuestionOpRecordDTO.setOpTypeName("难以化解");
+					nextuser=userDTO.getLoginName()+",dazoufang";
+					nextusername=userDTO.getName()+",大走访办公室";
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("4")){
 					dzfQuestionOpRecordDTO.setOpType("7");
 					dzfQuestionOpRecordDTO.setOpTypeName("持续跟踪");
+					nextuser=userDTO.getLoginName()+",dazoufang";
+					nextusername=userDTO.getName()+",大走访办公室";
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("5")){
 					dzfQuestionOpRecordDTO.setOpType("8");
 					dzfQuestionOpRecordDTO.setOpTypeName("提请会办");
+					nextuser=userDTO.getLoginName()+",dazoufang";
+					nextusername=userDTO.getName()+",大走访办公室";
 				}
 
 				dzfQuestionOpRecordDTO.setRoleName("挂钩干部");
 				dzfQuestionOpRecordDTO.setDes1("");//单位名称
-				dzfQuestionOpRecordDTO.setDes2(userDTO.getName());
 				//挂钩干部提交，将dazoufang带入到待办人中
 				dzfQuestionOpRecordDTO.setDes3("dazoufang");
 				dzfQuestionOpRecordDTO.setDes4("大走访办公室");
-				dzfQuestionOpRecordDTO.setDes5(op.getDzfQuestionDetilDTOList().get(i).finishdate);//预计办结时间
 
-				//修改主表的待办人
-				DzfQuestionDTO aa=dzfQuestionService.findById ( op.getId() );
-				aa.setStates("1");//新增时提交；
-				//挂钩干部提交，大走访办公室带入到待办人中
-				aa.setDes1("dazoufang");
-				aa.setDes2("大走访办公室");
-				dzfQuestionService.saveOrUpdate (aa);
+
+				//修改副表的状态
+				DzfQuestionDetilDTO aa=dzfQuestionDetilService.findById ( op.getDzfQuestionDetilDTOList().get(i).getId() );
+				aa.setDes1(nextuser);
+				aa.setDes2(nextusername);
+				dzfQuestionDetilService.saveOrUpdate ( DzfQuestionDetilWrapper.INSTANCE.toEntity ( aa ));
+
+
 
 			}
+
 			//办公室
 			if(userDTO.getRoleIds().equals("1910175386924417025")){
+				if(op.getDzfQuestionDetilDTOList().get(i).current.equals("0")){
+					dzfQuestionOpRecordDTO.setOpType("3");
+					dzfQuestionOpRecordDTO.setOpTypeName("办结");
+
+					//修改副表的状态
+					DzfQuestionDetilDTO aa=dzfQuestionDetilService.findById ( op.getDzfQuestionDetilDTOList().get(i).getId() );
+					aa.setStates("0");//问题办结；
+					aa.setDes1("");
+					aa.setDes2("");
+					dzfQuestionDetilService.saveOrUpdate ( DzfQuestionDetilWrapper.INSTANCE.toEntity ( aa ));
+
+				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("1")){
+					dzfQuestionOpRecordDTO.setOpType("9");
+					dzfQuestionOpRecordDTO.setOpTypeName("交办");
+
+					//大走访办公室提交，将选择的交办单位带入到待办人中
+					dzfQuestionOpRecordDTO.setDes3(op.getDzfQuestionDetilDTOList().get(i).checkUserList);
+					dzfQuestionOpRecordDTO.setDes4(op.getDzfQuestionDetilDTOList().get(i).checkUserListName);
+
+					//修改副表的状态
+					DzfQuestionDetilDTO aa=dzfQuestionDetilService.findById ( op.getDzfQuestionDetilDTOList().get(i).getId() );
+					aa.setDes1(op.getDzfQuestionDetilDTOList().get(i).checkUserList);
+					aa.setDes2(op.getDzfQuestionDetilDTOList().get(i).checkUserListName);
+					dzfQuestionDetilService.saveOrUpdate ( DzfQuestionDetilWrapper.INSTANCE.toEntity ( aa ));
+
+
+				}
+				//设置其他默认值
+				dzfQuestionOpRecordDTO.setRoleName("大走访办公室");
+				dzfQuestionOpRecordDTO.setDes1("");//单位名称
 
 			}
+
+
 			//办理部门
 			if(userDTO.getRoleIds().equals("1910175949166673921")){
+				//不办结的情况下都没有待办人
+				dzfQuestionOpRecordDTO.setDes3("");
+				dzfQuestionOpRecordDTO.setDes4("");
+
+				if(op.getDzfQuestionDetilDTOList().get(i).current.equals("0")){
+					dzfQuestionOpRecordDTO.setOpType("3");
+					dzfQuestionOpRecordDTO.setOpTypeName("办结");
+
+					//修改副表的状态(删除问题表中的  待办人)
+					DzfQuestionDetilDTO aa=dzfQuestionDetilService.findById ( op.getDzfQuestionDetilDTOList().get(i).getId() );
+					String olduser=aa.getDes1()+",";
+					String oldusern=aa.getDes2()+",";
+					String newuser=olduser.replaceFirst(userDTO.getLoginName()+",","");
+					newuser=newuser.substring(0,newuser.length()-2);
+					String newusern=oldusern.replaceFirst(userDTO.getName()+",","");
+					newusern=newusern.substring(0,newusern.length()-2);
+					aa.setDes1(newuser);
+					aa.setDes2(newusern);
+					dzfQuestionDetilService.saveOrUpdate ( DzfQuestionDetilWrapper.INSTANCE.toEntity ( aa ));
+
+
+				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("1")){
+					dzfQuestionOpRecordDTO.setOpType("5");
+					dzfQuestionOpRecordDTO.setOpTypeName("正在办理");
+				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("2")){
+					dzfQuestionOpRecordDTO.setOpType("6");
+					dzfQuestionOpRecordDTO.setOpTypeName("难以化解");
+				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("3")){
+					dzfQuestionOpRecordDTO.setOpType("7");
+					dzfQuestionOpRecordDTO.setOpTypeName("持续跟踪");
+				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("4")){
+					dzfQuestionOpRecordDTO.setOpType("8");
+					dzfQuestionOpRecordDTO.setOpTypeName("提请会办");
+				}
+
 
+				//设置其他默认值
+				dzfQuestionOpRecordDTO.setRoleName("交办单位");
+				dzfQuestionOpRecordDTO.setDes1(userDTO.getName());//单位名称
 			}
+
+
+
+
+			//所有角色一样的默认值
+			dzfQuestionOpRecordDTO.setDes2(userDTO.getName());
+			dzfQuestionOpRecordDTO.setDes5(op.getDzfQuestionDetilDTOList().get(i).finishdate);//预计办结时间
+			dzfQuestionOpRecordDTO.setDes6(op.getDzfQuestionDetilDTOList().get(i).delyj);//处理建议
 			dzfQuestionOpRecordService.saveOrUpdate (dzfQuestionOpRecordWrapper.toEntity (dzfQuestionOpRecordDTO));
 
 		}
 
+
+		//修改主表状态，待办人以及问题是否办结
+		updateQusestionState(op.getId());
+
 		return ResponseEntity.ok ( "保存处理操作流程成功" );
 	}
 
+	private void updateQusestionState(String id){
+		DzfQuestionDTO aa=dzfQuestionService.findById ( id );
+		int states=0;
+		String nextuser="",nextusername="";
+		for(int i=0;i<aa.getDzfQuestionDetilDTOList().size();i++){
+			if(aa.getDzfQuestionDetilDTOList().get(i).getStates()==null||!aa.getDzfQuestionDetilDTOList().get(i).getStates().equals("0")){
+				states=1;
+			}
+			if(nextuser.equals("")){
+				nextuser=aa.getDzfQuestionDetilDTOList().get(i).getDes1();
+				nextusername=aa.getDzfQuestionDetilDTOList().get(i).getDes2();
+			}else{
+				nextuser=nextuser+","+aa.getDzfQuestionDetilDTOList().get(i).getDes1();
+				nextusername=nextusername+","+aa.getDzfQuestionDetilDTOList().get(i).getDes2();
+			}
+
+
+		}
+		//如果都是办结，就更新主表为办结
+		if(states==0){
+			aa.setStates("3");
+			aa.setDes1("");
+			aa.setDes2("");
+			dzfQuestionService.saveOrUpdate (aa);
+		}else{
+		//没有办结，那就是提交，并将附表的代办人相加赋值给主表（一个诉求，多个问题都有一个用户代办，主表会有多个这个用户）
+			aa.setStates("1");
+			aa.setDes1(nextuser);
+			aa.setDes2(nextusername);
+			dzfQuestionService.saveOrUpdate (aa);
+
+		}
+	}
 
 	/**
 	 * 删除处理操作流程

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/mapper/DzfQuestionDetilMapper.java

@@ -5,6 +5,8 @@ package com.jeeplus.question.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.question.domain.DzfQuestionDetil;
+import com.jeeplus.question.service.dto.DzfQuestionDTO;
+import com.jeeplus.question.service.dto.DzfQuestionDetilDTO;
 
 /**
  * 问题详情MAPPER接口
@@ -13,5 +15,5 @@ import com.jeeplus.question.domain.DzfQuestionDetil;
  */
 public interface DzfQuestionDetilMapper extends BaseMapper<DzfQuestionDetil> {
 
-
+    DzfQuestionDetilDTO findById(String id);
 }

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/mapper/xml/DzfQuestionDetilMapper.xml

@@ -3,4 +3,38 @@
 <mapper namespace="com.jeeplus.question.mapper.DzfQuestionDetilMapper">
 
 
+    <select id="findById" resultType="com.jeeplus.question.service.dto.DzfQuestionDetilDTO">
+        SELECT
+            a.id AS "id",
+            a.qid AS "qidId",
+            a.q_name AS "qName",
+            a.q_type AS "qType",
+            a.gaps AS "gaps",
+            a.des AS "des",
+            a.dept AS "dept",
+            a.states AS "states",
+            a.deal_progress AS "dealProgress",
+            a.progress_name AS "progressName",
+            a.evaluate_flag AS "evaluateFlag",
+            a.pre_time AS "preTime",
+            a.des1 AS "des2",
+            a.des2 AS "des2",
+            a.des3 AS "des3",
+            a.des4 AS "des4",
+            a.des5 AS "des5",
+            a.des6 AS "des6",
+            a.des7 AS "des7",
+            a.des8 AS "des8",
+            a.des9 AS "des9",
+            a.des10 AS "des10",
+            a.create_by AS "createBy.id",
+            a.create_date AS "createDate",
+            a.update_by AS "updateBy.id",
+            a.update_date AS "updateDate",
+            a.del_flag AS "delFlag"
+        FROM dzf_question a
+        WHERE a.id = #{id} and a.del_flag = 0
+
+    </select>
+
 </mapper>

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/service/DzfQuestionDetilService.java

@@ -6,6 +6,7 @@ package com.jeeplus.question.service;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.jeeplus.question.service.dto.DzfQuestionDTO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -32,4 +33,8 @@ public class DzfQuestionDetilService extends ServiceImpl<DzfQuestionDetilMapper,
 		return super.lambdaQuery ().eq ( DzfQuestionDetil::getQidId, qidId ).list ().stream ().map (DzfQuestionDetilWrapper.INSTANCE::toDTO ).collect( Collectors.toList());
 	}
 
+	public DzfQuestionDetilDTO findById(String id) {
+		DzfQuestionDetilDTO dzfQuestionDetilDTO = baseMapper.findById ( id );
+		return dzfQuestionDetilDTO;
+	}
 }

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/service/dto/DzfQuestionDetilDTO.java

@@ -124,5 +124,9 @@ public class DzfQuestionDetilDTO extends BaseDTO {
 
 	public String fj;
 
+	public String checkUserList;
+
+	public String checkUserListName;
+
 	public List<DzfQuestionOpRecordDTO> oplist = Lists.newArrayList();
 }

jp-mobile/pages/index/Dzfindex.vue

@@ -62,7 +62,7 @@
 						<p>服务对接</p>
 					</view>
 					<!-- 挂钩干部或大走访办公室 -->
-					<view class="btn-Imbox" @click="totongxunlu5" v-if="roleIds=='1910141956174053377'||roleIds=='1910175386924417025'">
+					<view class="btn-Imbox" @click="totongxunlu3" v-if="roleIds=='1910141956174053377'||roleIds=='1910175386924417025'">
 						<image  class="center-img" src="/static/img/cd4.png"></image>
 						<p>问题处理</p>
 					</view>

jp-mobile/pages/question/questionAdd.vue

@@ -27,7 +27,7 @@
 					 属地
 				</view>
 				<view class="text22">
-					 {{inputForm.qy_sd}}
+					 {{inputForm.qySd}}
 				</view>				
 			</view>
 			
@@ -145,7 +145,7 @@
 				inputForm: {
 					id:'',
 					name: '',
-					qy_sd: '',
+					qySd: '',
 					lxr: '',
 					phone: '',
 					bz5: '',
@@ -186,7 +186,7 @@
 				
 				this.inputForm.id = data2.data.id;
 				this.inputForm.name = data2.data.qyName;
-				this.inputForm.qy_sd = data2.data.des1;
+				this.inputForm.qySd = data2.data.qySd;
 				this.inputForm.lxr = data2.data.qyFzr;
 				this.inputForm.phone = data2.data.phone;
 				this.inputForm.bz5 = data2.data.officer;
@@ -201,6 +201,7 @@
 				//新增
 				let data2 = await loginService.queryByUserName()
 				this.inputForm = this.recover(this.inputForm, data2.data)	
+				this.inputForm.qySd = data2.data.des1;
 				this.inputForm.id="";
 			}
 			

jp-mobile/pages/question/questionInfo.vue

@@ -27,7 +27,7 @@
 					 属地
 				</view>
 				<view class="text22">
-					 {{inputForm.des1}}
+					 {{inputForm.qySd}}
 				</view>				
 			</view>
 			
@@ -120,7 +120,7 @@
 					<radio-group @change="(e) => radioChange(e, index2)" class="radiog">
 						<label class="uni-list-cell uni-list-cell-pd"  v-for="(item3, index3) in dels" :key="item3">
 							<view>
-								<radio :value="item3" :checked="index3 === item.current" />
+								<radio :value="item3" :checked="index3 === item.current"  :disabled="index3 != item.current&&!item.cansubmit" />
 							</view>
 							<view style="padding-left: 15rpx;">{{item3}}</view>
 						</label>
@@ -134,20 +134,22 @@
 					<radio-group @change="(e) => radioChange(e, index2)" class="radiog">
 						<label class="uni-list-cell uni-list-cell-pd"  v-for="(item3, index3) in dels2" :key="item3">
 							<view>
-								<radio :value="item3" :checked="index3 === item.current" />
+								<radio :value="item3" :checked="index3 === item.current" :disabled="index3 != item.current&&!item.cansubmit"/>
 							</view>
 							<view style="padding-left: 15rpx;">{{item3}}</view>
 						</label>
 					</radio-group>
 				</view>
-								
-				<view class="cu-form-group margin-top">
+				
+				<!-- 挂钩干部或大走访办公室 -->			
+				<view class="cu-form-group margin-top" v-if="roleIds=='1910175386924417025'||roleIds=='1910141956174053377'" >
 					<view class="title">
 						预计办结时间
 					</view>					
-					<picker mode="date" class="title2" @change="(e) => onDateChange(e, index2)"  >
+					<picker mode="date" class="title2" @change="(e) => onDateChange(e, index2)" v-if="item.cansubmit" >
 						<view class="input2">{{item.finishdate||'请选择'}}</view>
-					</picker>				
+					</picker>
+				    <view class="input2" v-if="!item.cansubmit">{{item.finishdate||'请选择'}}</view>
 				</view>	
 				
 				<view v-if="showjbdw" class="cu-form-group margin-top" >
@@ -164,25 +166,25 @@
 						placeholder=" 请选择"
 						title="请选择交办单位"
 						clearable
-						v-model="checkUserList"
+						v-model="item.checkUserList"
 						@search="searchEvent"
 						@change="selectChange2"
 					></zqs-select>
 				</view>	
 				
 				
-				<view v-if="showjbdw" class="cu-form-group margin-top" >
+				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1910141956174053377')&&showjbdw">
 					<view class="title">
 						交办要求
 					</view>
 					<textarea v-model="item.delyj" placeholder="请填写交办要求"  ></textarea>
 				</view>
 				
-				<view v-if="!showjbdw" class="cu-form-group margin-top" >
+				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1910141956174053377')&&!showjbdw">
 					<view class="title">
 						处理建议
 					</view>
-					<textarea v-model="item.delyj" placeholder="请填写处理建议"  ></textarea>
+					<textarea v-model="item.delyj" placeholder="请填写处理建议" :disabled="!item.cansubmit" ></textarea>
 				</view>
 				
 	<!--			<view class="cu-form-group2 margin-top" style="border-bottom: 3px solid #eee;">
@@ -201,7 +203,7 @@
 				</view> -->
 				
 				
-				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;">
+				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;" v-if="roleIds=='1910175386924417025'||roleIds=='1910141956174053377'">
 					<uni-file-picker style="margin-bottom: 10px;" limit="3" ref="picFile" v-model="item.fj"
 						fileMediatype="all" mode="grid" title="附件上传" :auto-upload="autoUpload" @select="select"
 						@progress="progress" @success="success" @fail="fail" @delete="deleteFile"
@@ -210,7 +212,7 @@
 				</view>
 				
 				<!-- 流程展示 -->
-				<view v-for="(record, index4) in item.oplist" :key="index4" class="record-item" @click="viewDetails(record)">
+				<view v-for="(record, index4) in item.oplist" :key="index4" class="record-item" @click="viewDetails(record)" style="border-bottom: 6px solid #eee;">
 					
 					<view style="display: flex; flex-direction:row;align-items: center; "> 
 						<view v-if="item.oplist.length!=1" :class="index4 === item.oplist.length - 1 ? 'record-p2' : 'record-p1'"></view>
@@ -219,7 +221,12 @@
 					</view>
 					
 					<view style="display: flex; flex-direction:row;align-items: center; ">
-						<text class="submit-time">{{ record.roleName }}-{{ record.des2 }} &nbsp;&nbsp;    {{ record.updateDate }}</text>
+						<view class="submit-time">
+							<text v-if="record.des6!=''&&record.des6!=undefined" >处理建议：{{ record.des6 }}</text>
+							<text v-if="record.des5!=''&&record.des5!=undefined" >预计办结时间：{{ record.des5 }}</text>
+							<text >{{ record.roleName }}-{{ record.des2 }} &nbsp;&nbsp;    {{ record.updateDate }}</text>
+						</view>
+						
 					</view>
 					
 				</view>
@@ -260,6 +267,7 @@
 				title: '问题诉求情况',
 				cansubmit: false,
 				roleIds:'',
+				uid:'',
 				inputForm: {
 					id:'',
 					name: '',
@@ -303,13 +311,23 @@
 				ischeck: false,
 				
 				 showjbdw: false,
-				 checkUserList: [],
 				 importUserId: [],
 				 pickerData: [],
 				 pickerDataOld: [],
 				 selectedValues: []
 			}
 		},
+		computed: {
+		    // 动态计算选中的 label
+		    selectedLabels() {
+		      return this.item.checkUserList
+		        .map((value) => {
+		          const item = this.pickerData.find((option) => option.value === value);
+		          return item ? item.label : value; // 如果找不到，返回 value
+		        })
+		        .join(", ");
+		    },
+		  },
 		onShow() {
 			this.$auth.checkLogin()
 			
@@ -334,7 +352,9 @@
 		},
 		mounted() {			
 		},
-		async onLoad(query) {					
+		async onLoad(query) {			
+			this.uid= $auth.getUserInfo().id;
+			
 			
 			if(query.ischeck!=undefined&&query.ischeck=='1'){
 				//查看
@@ -343,21 +363,79 @@
 				
 				this.inputForm.id = data2.data.id;
 				this.inputForm.name = data2.data.qyName;
-				this.inputForm.des1 = data2.data.des1;
+				this.inputForm.qySd = data2.data.qySd;
 				this.inputForm.lxr = data2.data.qyFzr;
 				this.inputForm.phone = data2.data.phone;
 				this.inputForm.bz5 = data2.data.officer;								
 				
-				this.questionList=data2.data.dzfQuestionDetilDTOList;
+				
 				//判断是否显示提交，暂存按钮
-				this.cansubmit
+
 				if(data2.data.states=='1'&&data2.data.des1.includes($auth.getUserInfo().loginName)){
 					this.cansubmit=true;
 				}
 				
+				//将流程的最后一步设置到查看（问题处理，预计办结时间，处理建议）
+				
+				
+				for (let i = 0; i < data2.data.dzfQuestionDetilDTOList.length; i++) {		
+					let opsize=data2.data.dzfQuestionDetilDTOList[i].oplist.length;
+									
+					for (let j = 0; j < opsize; j++) {
+						
+						//当前登录人
+						if (data2.data.dzfQuestionDetilDTOList[i].oplist[j].createBy.id === this.uid) {
+							//问题处理
+							if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='3'){
+								data2.data.dzfQuestionDetilDTOList[i].current=0
+							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='4'){
+								data2.data.dzfQuestionDetilDTOList[i].current=1
+							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='5'){
+								data2.data.dzfQuestionDetilDTOList[i].current=2
+							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='6'){
+								data2.data.dzfQuestionDetilDTOList[i].current=3
+							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='7'){
+								data2.data.dzfQuestionDetilDTOList[i].current=4
+							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='8'){
+								data2.data.dzfQuestionDetilDTOList[i].current=5
+							}
+							
+							
+							//处理建议
+							data2.data.dzfQuestionDetilDTOList[i].delyj=data2.data.dzfQuestionDetilDTOList[i].oplist[j].des6
+						
+						}
+						
+					
+					}
+					
+					//办结时间就是显示最后一条处理意见的办结时间
+					if(data2.data.dzfQuestionDetilDTOList[i].oplist[opsize-1].des5!=undefined&&data2.data.dzfQuestionDetilDTOList[i].oplist[opsize-1].des5!=''){
+						data2.data.dzfQuestionDetilDTOList[i].finishdate=data2.data.dzfQuestionDetilDTOList[i].oplist[opsize-1].des5
+					}
+					
+					//每条问题是否需要提交
+					if(data2.data.dzfQuestionDetilDTOList[i].des1!=undefined){
+						let nextuser=data2.data.dzfQuestionDetilDTOList[i].des1+",";
+						if(nextuser.includes($auth.getUserInfo().loginName+",")){
+							data2.data.dzfQuestionDetilDTOList[i].cansubmit=true;
+						}else{
+							data2.data.dzfQuestionDetilDTOList[i].cansubmit=false;
+						}						
+					}else{
+							data2.data.dzfQuestionDetilDTOList[i].cansubmit=false;
+					}
+					
+					
+					data2.data.dzfQuestionDetilDTOList[i].checkUserList=[];
+										
+				}
+				
+				this.questionList=data2.data.dzfQuestionDetilDTOList;
+				
 				
 				this.roleIds= $auth.getUserInfo().roleIds;
-				console.log(this.roleIds);
+		
 				
 
 			}else{
@@ -400,6 +478,9 @@
 					}else if(evt.detail.value=='交办'){
 						this.showjbdw=true;
 						this.questionList[index2].delyj="请2日内回应，10内反馈办理结果，如办结请上传加盖公章的书面材料";
+						
+						
+						
 					}
 					
 					for (let i = 0; i < this.dels2.length; i++) {
@@ -540,7 +621,22 @@
 				// this.inputForm.dzfQuestionDetilDTOList=this.questionList;
 				// this.checkinput();
 			},
-			formSubmit: function(e) {						
+			formSubmit: function(e) {	
+				//将交办单位的名称带出
+				for (let i = 0; i < this.questionList.length; i++) {
+					
+					if (this.questionList[i].checkUserList != []) {
+						
+						this.questionList[i].checkUserListName=this.questionList[i].checkUserList.map((value) => {
+						          const item = this.pickerData.find((option) => option.value === value);
+						          return item ? item.label : value; // 如果找不到，返回 value
+						        })
+						        .join(", ");
+
+					}
+					this.questionList[i].checkUserList=this.questionList[i].checkUserList.join(",");
+				}
+				
 				this.inputForm.dzfQuestionDetilDTOList=this.questionList;
 				this.checkinput();				
 			},
@@ -552,6 +648,10 @@
 					});
 				}else{
 					
+					
+					
+					
+					
 					uni.showLoading()										
 					loginService.save2OpRecord(this.inputForm).then(({
 						data
@@ -758,6 +858,11 @@
 	  color: #666;
 	  margin-left: 28rpx;
 	  position: relative;
+	  
+	  display: flex; 
+	  flex-direction:column;
+	  
+	  
 	}
 	
 	.submit-time::before {