调整流程；手机端

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

@@ -129,11 +129,11 @@ public class DzfQuestionOpRecordController {
 			//挂钩干部
 			if(userDTO.getRoleIds().equals("1915280292672946177")){
 				if(op.getDzfQuestionDetilDTOList().get(i).current.equals("0")){
-					q_detils_state="0";//问题附表用0
-					dzfQuestionOpRecordDTO.setOpType("3");
-					dzfQuestionOpRecordDTO.setOpTypeName("办结");
-					nextuser="dazoufang";
-					nextusername="大走访办公室";
+					q_detils_state="5";
+					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
+					dzfQuestionOpRecordDTO.setOpTypeName("正在办理");
+					nextuser=userDTO.getLoginName()+",dazoufang";
+					nextusername=userDTO.getName()+",大走访办公室";
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("1")){
 					q_detils_state="4";
 					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
@@ -141,29 +141,11 @@ public class DzfQuestionOpRecordController {
 					nextuser="dazoufang";
 					nextusername="大走访办公室";
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("2")){
-					q_detils_state="5";
-					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
-					dzfQuestionOpRecordDTO.setOpTypeName("正在办理");
-					nextuser=userDTO.getLoginName()+",dazoufang";
-					nextusername=userDTO.getName()+",大走访办公室";
-				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("3")){
-					q_detils_state="6";
-					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
-					dzfQuestionOpRecordDTO.setOpTypeName("难以化解");
-					nextuser=userDTO.getLoginName()+",dazoufang";
-					nextusername=userDTO.getName()+",大走访办公室";
-				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("4")){
-					q_detils_state="7";
-					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
-					dzfQuestionOpRecordDTO.setOpTypeName("持续跟踪");
-					nextuser=userDTO.getLoginName()+",dazoufang";
-					nextusername=userDTO.getName()+",大走访办公室";
-				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("5")){
-					q_detils_state="8";
-					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
-					dzfQuestionOpRecordDTO.setOpTypeName("提请会办");
-					nextuser=userDTO.getLoginName()+",dazoufang";
-					nextusername=userDTO.getName()+",大走访办公室";
+					q_detils_state="0";//问题附表用0
+					dzfQuestionOpRecordDTO.setOpType("3");
+					dzfQuestionOpRecordDTO.setOpTypeName("办结");
+					nextuser="dazoufang";
+					nextusername="大走访办公室";
 				}
 
 				dzfQuestionOpRecordDTO.setRoleName("挂钩干部");

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/controller/DzfQuestionController.java

@@ -173,13 +173,14 @@ public class DzfQuestionController {
 
 		if(type!=null&&type.equals("submit")){//提交状态，其他为暂存
 			dzfQuestionDTO.setStates("1");//新增时提交；
-			//企业提交，将挂钩干部带入到待办人中
-			dzfQuestionDTO.setDes1(ei.getDes13());
-			dzfQuestionDTO.setDes2(ei.getDes14());
+			//企业提交，将挂钩干部带入到待办人中(4-29 将办公室也加到待办中)
+			dzfQuestionDTO.setDes1(ei.getDes13()+",dazoufang");
+			dzfQuestionDTO.setDes2(ei.getDes14()+",大走访办公室");
 
 			for(int i=0;i<dzfQuestionDTO.getDzfQuestionDetilDTOList().size();i++){
-				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes1(ei.getDes13());
-				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes2(ei.getDes14());
+				//(4-29 将办公室也加到待办中)
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes1(ei.getDes13()+",dazoufang");
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes2(ei.getDes14()+",大走访办公室");
 
 
 				//企业+  选择交办部门
@@ -206,9 +207,9 @@ public class DzfQuestionController {
 				dzfQuestionOpRecordDTO.setDes1(ei.getName());//单位名称
 				dzfQuestionOpRecordDTO.setDes2(userDTO.getName());
 
-				//企业第一步提交，将挂钩干部带入到待办人中
-				dzfQuestionOpRecordDTO.setDes3(ei.getDes13());
-				dzfQuestionOpRecordDTO.setDes4(ei.getDes14());
+				//企业第一步提交，将挂钩干部带入到待办人中(4-29 将办公室也加到待办中)
+				dzfQuestionOpRecordDTO.setDes3(ei.getDes13()+",dazoufang");
+				dzfQuestionOpRecordDTO.setDes4(ei.getDes14()+",大走访办公室");
 
 				dzfQuestionOpRecordService.saveOrUpdate (dzfQuestionOpRecordWrapper.toEntity (dzfQuestionOpRecordDTO));
 

jp-mobile/components/jp-picker2/jp-picker2.vue

@@ -74,6 +74,7 @@
 				//if(this.index !== -1){
 					this.label = this.range[this.index][this.rangeKey]
 					this.$emit('input', this.range[this.index][this.rangeValue])
+					this.$emit('change', this.range[this.index][this.rangeValue])
 				// }else{
 				// 	this.label = '请选择'
 				// 	this.$emit('input', null)

jp-mobile/pages/question/questionAdd.vue

@@ -61,7 +61,7 @@
 					 姓名
 				</view>
 				<view class="text22">
-					 {{inputForm.bz5}}
+					 {{inputForm.des14}}
 				</view>				
 			</view>
 			
@@ -192,7 +192,7 @@
 					lxr: '',
 					phone: '',
 					bz5: '',
-					
+					des14:'',
 				},
 				t1: '可供产品',
 				t1s: '请填写可供产品',
@@ -236,7 +236,7 @@
 				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.inputForm.des14 = data2.data.officer;
 				
 				for (let i = 0; i < data2.data.dzfQuestionDetilDTOList.length; i++) {
 					data2.data.dzfQuestionDetilDTOList[i].checkUserList=[];

jp-mobile/pages/question/questionInfo.vue

@@ -262,7 +262,8 @@
 				<view v-for="(record, index4) in item.oplist" :key="index4" class="record-item" @click="viewDetails(record)" style="border-bottom: 2px 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>
+						<!-- <view v-if="item.oplist.length!=1" :class="index4 === item.oplist.length - 1 ? 'record-p2' : 'record-p1'"></view> -->
+						<view v-if="item.oplist.length!=1" class="record-p1"></view>
 						<view v-if="item.oplist.length==1" class="record-p1"></view>
 						<text class="record-time">{{ record.opTypeName }}</text>
 					</view>
@@ -281,7 +282,7 @@
 				
 				<view v-if="canpj">
 					
-					<view class="cu-form-group margin-top"  >
+					<view class="cu-form-group margin-top" style="padding-left: 20rpx;" >
 						<view class="title" style="color: #3c9cff;">
 							企业主要负责人知晓情况：
 						</view>
@@ -295,7 +296,7 @@
 						</radio-group>
 					</view>
 					
-					<view class="cu-form-group margin-top"  >
+					<view class="cu-form-group margin-top" style="padding-left: 20rpx;" >
 						<view class="title" style="padding-right: 0;color: #3c9cff;">
 							满意度评价：
 						</view>
@@ -396,7 +397,8 @@
 				},
 				parkList: [ "用工人才", "资金需求", "土地厂房", "订单及配套", "政策兑现", "创新及品牌", "审批手续", "水电气供应", "安全环保消防", "其他（需详细说明）"],
 				questionList:[{qname:"",qtype:"",qTypeindex:"",gaps:"",des:"",t1:"",t1s:"",picLists2:[]}],
-				dels:["办结","反馈大走访活动办","正在办理","难以化解","持续跟踪","提请会办"],
+				// dels:["办结","反馈大走访活动办","正在办理","难以化解","持续跟踪","提请会办"],
+				dels:["正在办理","反馈大走访办公室","办结"],
 				dels2:["办结","交办"],
 				dels3:["办结","正在办理","难以化解","持续跟踪","提请会办"],
 				dels4:["是","否"],
@@ -483,8 +485,15 @@
 							//问题处理
 							console.log("问题："+data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType)
 							
-							if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='3'){
-								data2.data.dzfQuestionDetilDTOList[i].current=0
+							if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='3'){								
+								//挂钩干部
+								if(this.roleIds=='1915280292672946177'){
+									data2.data.dzfQuestionDetilDTOList[i].current=2
+								//交办部门
+								}else{
+									data2.data.dzfQuestionDetilDTOList[i].current=0
+								}
+								
 								data2.data.dzfQuestionDetilDTOList[i].showjbdw=false;
 								data2.data.dzfQuestionDetilDTOList[i].showjbdw2=false;
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='4'){
@@ -492,7 +501,7 @@
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='5'){
 								//挂钩干部
 								if(this.roleIds=='1915280292672946177'){
-									data2.data.dzfQuestionDetilDTOList[i].current=2
+									data2.data.dzfQuestionDetilDTOList[i].current=0
 								//交办部门
 								}else{
 									data2.data.dzfQuestionDetilDTOList[i].current=1