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

@@ -124,36 +124,43 @@ public class DzfQuestionOpRecordController {
 			DzfQuestionOpRecordDTO dzfQuestionOpRecordDTO=new DzfQuestionOpRecordDTO();
 			dzfQuestionOpRecordDTO.setRecordId(op.getDzfQuestionDetilDTOList().get(i).getId());
 			dzfQuestionOpRecordDTO.setRecordType("1");
+			String q_detils_state="";
 
 			//挂钩干部
 			if(userDTO.getRoleIds().equals("1910141956174053377")){
 				if(op.getDzfQuestionDetilDTOList().get(i).current.equals("0")){
+					q_detils_state="0";//问题附表用0
 					dzfQuestionOpRecordDTO.setOpType("3");
 					dzfQuestionOpRecordDTO.setOpTypeName("办结");
 					nextuser="dazoufang";
 					nextusername="大走访办公室";
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("1")){
-					dzfQuestionOpRecordDTO.setOpType("4");
+					q_detils_state="4";
+					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
 					dzfQuestionOpRecordDTO.setOpTypeName("反馈大走访活动办");
 					nextuser="dazoufang";
 					nextusername="大走访办公室";
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("2")){
-					dzfQuestionOpRecordDTO.setOpType("5");
+					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")){
-					dzfQuestionOpRecordDTO.setOpType("6");
+					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")){
-					dzfQuestionOpRecordDTO.setOpType("7");
+					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")){
-					dzfQuestionOpRecordDTO.setOpType("8");
+					q_detils_state="8";
+					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
 					dzfQuestionOpRecordDTO.setOpTypeName("提请会办");
 					nextuser=userDTO.getLoginName()+",dazoufang";
 					nextusername=userDTO.getName()+",大走访办公室";
@@ -170,6 +177,9 @@ public class DzfQuestionOpRecordController {
 				DzfQuestionDetilDTO aa=dzfQuestionDetilService.findById ( op.getDzfQuestionDetilDTOList().get(i).getId() );
 				aa.setDes1(nextuser);
 				aa.setDes2(nextusername);
+				aa.setStates(q_detils_state);
+				//附件放入附表
+				aa.setDes6(op.getDzfQuestionDetilDTOList().get(i).getDes6());
 				dzfQuestionDetilService.saveOrUpdate ( DzfQuestionDetilWrapper.INSTANCE.toEntity ( aa ));
 
 
@@ -179,18 +189,22 @@ public class DzfQuestionOpRecordController {
 			//办公室
 			if(userDTO.getRoleIds().equals("1910175386924417025")){
 				if(op.getDzfQuestionDetilDTOList().get(i).current.equals("0")){
+					q_detils_state="0";//问题附表用0
 					dzfQuestionOpRecordDTO.setOpType("3");
 					dzfQuestionOpRecordDTO.setOpTypeName("办结");
 
 					//修改副表的状态
 					DzfQuestionDetilDTO aa=dzfQuestionDetilService.findById ( op.getDzfQuestionDetilDTOList().get(i).getId() );
-					aa.setStates("0");//问题办结；
+					aa.setStates(q_detils_state);//问题办结；
 					aa.setDes1("");
 					aa.setDes2("");
+					//附件放入附表
+					aa.setDes6(op.getDzfQuestionDetilDTOList().get(i).getDes6());
 					dzfQuestionDetilService.saveOrUpdate ( DzfQuestionDetilWrapper.INSTANCE.toEntity ( aa ));
 
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("1")){
-					dzfQuestionOpRecordDTO.setOpType("9");
+					q_detils_state="9";
+					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
 					dzfQuestionOpRecordDTO.setOpTypeName("交办");
 
 					//大走访办公室提交，将选择的交办单位带入到待办人中
@@ -201,6 +215,9 @@ public class DzfQuestionOpRecordController {
 					DzfQuestionDetilDTO aa=dzfQuestionDetilService.findById ( op.getDzfQuestionDetilDTOList().get(i).getId() );
 					aa.setDes1(op.getDzfQuestionDetilDTOList().get(i).checkUserList);
 					aa.setDes2(op.getDzfQuestionDetilDTOList().get(i).checkUserListName);
+					aa.setStates(q_detils_state);
+					//附件放入附表
+					aa.setDes6(op.getDzfQuestionDetilDTOList().get(i).getDes6());
 					dzfQuestionDetilService.saveOrUpdate ( DzfQuestionDetilWrapper.INSTANCE.toEntity ( aa ));
 
 
@@ -217,13 +234,15 @@ public class DzfQuestionOpRecordController {
 				//不办结的情况下都没有待办人
 				dzfQuestionOpRecordDTO.setDes3("");
 				dzfQuestionOpRecordDTO.setDes4("");
+				//取附表
+				DzfQuestionDetilDTO aa=dzfQuestionDetilService.findById ( op.getDzfQuestionDetilDTOList().get(i).getId() );
 
 				if(op.getDzfQuestionDetilDTOList().get(i).current.equals("0")){
+					q_detils_state="0";//问题附表用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()+",","");
@@ -238,24 +257,38 @@ public class DzfQuestionOpRecordController {
 					}
 					aa.setDes1(newuser);
 					aa.setDes2(newusern);
-					dzfQuestionDetilService.saveOrUpdate ( DzfQuestionDetilWrapper.INSTANCE.toEntity ( aa ));
+					aa.setStates(q_detils_state);
 
 
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("1")){
-					dzfQuestionOpRecordDTO.setOpType("5");
+					q_detils_state="5";
+					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
 					dzfQuestionOpRecordDTO.setOpTypeName("正在办理");
+					aa.setStates(q_detils_state);
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("2")){
-					dzfQuestionOpRecordDTO.setOpType("6");
+					q_detils_state="6";
+					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
 					dzfQuestionOpRecordDTO.setOpTypeName("难以化解");
+					aa.setStates(q_detils_state);
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("3")){
-					dzfQuestionOpRecordDTO.setOpType("7");
+					q_detils_state="7";
+					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
 					dzfQuestionOpRecordDTO.setOpTypeName("持续跟踪");
+					aa.setStates(q_detils_state);
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("4")){
-					dzfQuestionOpRecordDTO.setOpType("8");
+					q_detils_state="8";
+					dzfQuestionOpRecordDTO.setOpType(q_detils_state);
 					dzfQuestionOpRecordDTO.setOpTypeName("提请会办");
+					aa.setStates(q_detils_state);
 				}
 
 
+
+
+				//附件放入附表
+				aa.setDes6(op.getDzfQuestionDetilDTOList().get(i).getDes6());
+				dzfQuestionDetilService.saveOrUpdate ( DzfQuestionDetilWrapper.INSTANCE.toEntity ( aa ));
+
 				//设置其他默认值
 				dzfQuestionOpRecordDTO.setRoleName("交办单位");
 				dzfQuestionOpRecordDTO.setDes1(userDTO.getName());//单位名称

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseother/controller/EnterpriseOtherController.java

@@ -40,6 +40,7 @@ import java.util.List;
 
 @Api(tags ="企业信息")
 @RestController
+@CrossOrigin
 @RequestMapping(value = "/enterpriseother/enterpriseOther")
 public class EnterpriseOtherController {
 

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

@@ -149,15 +149,26 @@ public class DzfQuestionController {
 			dzfQuestionDTO.setOfficeName(ei.getBz6());
 
 		}
-		if(dzfQuestionDTO.getId()==null||dzfQuestionDTO.getId().equals("")){//新增状态下,赋值id
+		//新增状态下,赋值id
+		if(dzfQuestionDTO.getId()==null||dzfQuestionDTO.getId().equals("")){
 			isAdd=true;
 			String uuid = UUID.randomUUID ( ).toString ( );
 			dzfQuestionDTO.setId(uuid);
 			for(int i=0;i<dzfQuestionDTO.getDzfQuestionDetilDTOList().size();i++){
 				String uuid2 = UUID.randomUUID ( ).toString ( );
 				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setId(uuid2);
-			}
 
+				//企业+  选择交办部门
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes7(dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).checkUserList);
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes8(dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).checkUserListName);
+			}
+		//编辑状态下,交办部门修改
+		}else{
+			for(int i=0;i<dzfQuestionDTO.getDzfQuestionDetilDTOList().size();i++){
+				//企业+  选择交办部门
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes7(dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).checkUserList);
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes8(dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).checkUserListName);
+			}
 		}
 
 		if(type!=null&&type.equals("submit")){//提交状态，其他为暂存
@@ -169,6 +180,10 @@ public class DzfQuestionController {
 			for(int i=0;i<dzfQuestionDTO.getDzfQuestionDetilDTOList().size();i++){
 				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes1(ei.getBz6());
 				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes2(ei.getBz5());
+
+				//企业+  选择交办部门
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes7(dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).checkUserList);
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes8(dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).checkUserListName);
 			}
 
 		}else{

jp-mobile/common/auth.js

@@ -94,6 +94,14 @@ function checkisLogin () {
 	return store.state.user.token;
 }
 
+function whichLogin () {		
+	return uni.getStorageSync('WMS-whichLogin');
+}
+
+function setwhichLogin(which){
+	uni.setStorageSync('WMS-whichLogin',which);
+}
+
 export {
 	getUserToken,
 	setUserToken,
@@ -116,5 +124,7 @@ export {
 	removePermissions,
 	hasPermission,
 	checkLogin,
-	checkisLogin
+	checkisLogin,
+	whichLogin,
+	setwhichLogin
 }

jp-mobile/common/config.js

@@ -3,7 +3,7 @@ let APP_SERVER_URL = ""
 if(process.env.NODE_ENV === 'development'){
     // 开发环境    http://47.97.69.114:8088/#/login 
     //APP_SERVER_URL = 'http://47.97.69.114:8088/panhuangly/'
-	APP_SERVER_URL = 'http://192.168.139.28:8071'
+	APP_SERVER_URL = 'http://192.168.139.27:8071'
 }else{
     // 生产环境
     APP_SERVER_URL = '/yd_qycpfb'

jp-mobile/common/request.js

@@ -9,10 +9,19 @@ function error(res){
 			title: res.data,
 			icon:"none"
 		})
+		
+		let which=$auth.whichLogin();		
 		setTimeout(function(){
-			uni.reLaunch({
-				url: '/pages/login/login'
-			});
+			if(which=='dzf'){
+				uni.reLaunch({
+					url: '/pages/login/dzflogin'
+				});
+			}else{
+				uni.reLaunch({
+					url: '/pages/login/login'
+				});
+			}
+			
 		}, 2000)
 	}else if(res.statusCode === 404){
 		uni.showToast({

jp-mobile/components/zqs-select/zqs-select.vue

@@ -2,8 +2,9 @@
   <view class="main">
     <view class="input" @click="showModal">
       <input
+	  
         v-model="_value"
-        :style="disabled ? 'color:#c0c4cc' : ''"
+        :style="disabled ? 'color:#c0c4cc;pointer-events: none' : 'pointer-events: none'"
         :placeholder="placeholder"
         placeholder-style="color: rgba(102, 102, 102, 0.25);"
         placeholder-class="zqs-select-placeholder-class"
@@ -29,17 +30,17 @@
           <text class="title-detail">{{ title }}</text>
         </view>
 
-        <view class="search-box" v-if="showSearch">
+       <view class="search-box" v-if="showSearch">
           <input
             class="search-input"
             confirm-type="search"
             v-model="searchInput"
-            placeholder="输入内容进行模糊查询"
+            placeholder="输入内容进行查询"
             placeholder-style="color:rgba(102, 102, 102, 0.25);"
           />
-          <text v-if="showSearchBtn" class="search-text" @click="handleSearch">
+        <!-- <text v-if="showSearchBtn" class="search-text" @click="handleSearch">
             搜索
-          </text>
+          </text> -->
         </view>
         <view class="select-content">
           <view
@@ -55,6 +56,7 @@
                   ';'
                 : 'color:' + color + ';'
             "
+			v-show="item.show!=2"
             @click="select(item)"
           >
             <view class="title">{{ getLabelKeyValue(item) }}</view>
@@ -67,6 +69,8 @@
             class="mini-btn action"
             type="default"
             size="default"
+			style="color: #999;
+    border: 1px solid #999;"
             @tap="empty"
           >
             {{ emptyText }}
@@ -75,6 +79,8 @@
             class="mini-btn action"
             type="primary"
             size="default"
+			:style="{'background-color':
+                  selectColor}"
             @tap="confirmClick"
           >
             {{ confirmText }}
@@ -192,6 +198,8 @@ export default {
   created() {},
   methods: {
     handleSearch() {
+		
+		
       this.$emit('search', this.searchInput)
     },
     get_value(val) {
@@ -322,7 +330,21 @@ export default {
   },
   watch: {
     searchInput(val) {
-      if (!this.$props.showSearchBtn) this.$emit('search', val)
+		var _this=this
+		this.list.find((temp) => {
+		   let label = _this.getLabelKeyValue(temp)
+		   if(val){
+			   if(label.indexOf(val)!=-1){
+			   			 temp.show=1
+			   }else{
+			   			   temp.show=2
+			   }
+		   }else{
+			    temp.show=1
+		   }
+		   
+		})
+      // if (!this.$props.showSearchBtn) this.$emit('search', val)
     },
   },
 }
@@ -399,7 +421,7 @@ export default {
 
   input {
     flex: 1;
-    text-align: right;
+    text-align: left;
     color: #333333;
   }
 

jp-mobile/pages.json

@@ -10,6 +10,10 @@
 			"path": "pages/index/Dzfindex",
 			"style": {}
 		},
+		{
+			"path": "pages/login/dzflogin",
+			"style": {}
+		},		
 		{
 			"path": "pages/dzf/questionDetail",
 			"style": {}

jp-mobile/pages/buildList/buildList.vue

@@ -143,7 +143,7 @@
 						<view class="choose-box3">
 												
 							<!-- <view style="width: 520rpx;">
-								<input type="text"  placeholder="输入或选择产业链上下游关键词" v-model="searchForm.bz2" confirm-type="search"
+								<input type="text"  placeholder="输入或选择产业链环节关键词" v-model="searchForm.bz2" confirm-type="search"
 								></input>
 							</view> -->
 							
@@ -152,7 +152,7 @@
 							</jp-picker> -->
 							
 							<view style="width: 300rpx;display: flex;align-items: center;color: #666666;font-size: 33rpx;">
-								产业链上下游：
+								产业链环节：
 							</view>
 							
 							<DoublePicker
@@ -297,7 +297,9 @@
 				loading: false,
 				parkId: '',
 				parkList: [],
-				parkList2: [],
+				parkList2: [{label: "全部",value: ""},{label: "高新区",value: "高新区"},{label: "盐渎",value: "盐渎"},{label: "潘黄",value: "潘黄"},{label: "龙冈",value: "龙冈"},{label: "张庄",value: "张庄"}
+				,{label: "大冈",value: "大冈"},{label: "郭猛",value: "郭猛"},{label: "大纵湖",value: "大纵湖"},{label: "秦南",value: "秦南"},{label: "学富",value: "学富"},{label: "楼王",value: "楼王"},
+				{label: "尚庄",value: "尚庄"},{label: "台创园",value: "台创园"}],
 				parkList3: [],
 				parkList4: [],
 				ddd1:"" ,
@@ -335,7 +337,7 @@
 		created() {
 			//this.getPageInfo();
 			this.getParkList()
-			this.getParkList2()	
+			//this.getParkList2()	
 			this.getParkList3()	
 		},
 
@@ -343,7 +345,7 @@
 		methods: {
 			...mapActions(['refreshUserInfo']),
 			
-			//选择产业链上下游
+			//选择产业链环节
 			getParkList3() {
 				loginService.getIndustryChainList({
 				}).then(({

jp-mobile/pages/buildList/buildList2.vue

@@ -174,7 +174,7 @@
 		methods: {
 			...mapActions(['refreshUserInfo']),
 			
-			//选择产业链上下游
+			//选择产业链环节
 			getParkList3() {
 				loginService.getIndustryChainList({
 				}).then(({

jp-mobile/pages/comEdit/comEdit.vue

@@ -140,7 +140,7 @@
 			
 			<view class="textbg" >
 				<view class="text12">
-					 产业链上下游
+					 产业链环节
 				</view>
 				<view class="text22">
 					 {{inputForm.bz2}}
@@ -165,7 +165,7 @@
 			
 			<view class="textbg" v-if="inputForm.bz3!=''&&inputForm.bz3!=undefined" >
 				<view class="text12">
-					 产业链上下游
+					 产业链环节
 				</view>
 				<view class="text22">
 					 {{inputForm.bz4}}

jp-mobile/pages/comInfo/comInfo.vue

@@ -110,7 +110,7 @@
 			
 			<view class="textbg" >
 				<view class="text12">
-					 产业链上下游
+					 产业链环节
 				</view>
 				<view class="text22">
 					 {{inputForm.bz2}}
@@ -135,7 +135,7 @@
 			
 			<view class="textbg" v-if="inputForm.bz3!=''&&inputForm.bz3!=undefined" >
 				<view class="text12">
-					 产业链上下游
+					 产业链环节
 				</view>
 				<view class="text22">
 					 {{inputForm.bz4}}

jp-mobile/pages/index/Dzfindex.vue

@@ -184,7 +184,7 @@
 		methods: {
 			...mapActions(['refreshUserInfo']),
 			
-			//选择产业链上下游
+			//选择产业链环节
 			getParkList3() {
 				loginService.getIndustryChainList({
 				}).then(({

jp-mobile/pages/index/Tabindex.vue

@@ -7,7 +7,7 @@
 		  </swiper-item>
 		</swiper>
 
-		<view >
+		<!-- <view >
 			<view class="btn-box-1-1 mart-t">
 				涉企政策集锦
 			</view>
@@ -21,7 +21,7 @@
 			  </swiper-item>
 			</swiper>
 			
-		</view>
+		</view> -->
 				
 
 		<view class="line-box">
@@ -150,7 +150,7 @@
 		methods: {
 			...mapActions(['refreshUserInfo']),
 			
-			//选择产业链上下游
+			//选择产业链环节
 			getParkList3() {
 				loginService.getIndustryChainList({
 				}).then(({
@@ -270,10 +270,14 @@
 			
 			gotoBuildInfo(name) {
 				if(name=='企业大走访'){
+					//添加跳转登录页面标识
+					this.$auth.setwhichLogin('dzf');					
 					uni.navigateTo({
 						url: '/pages/index/Dzfindex'
 					})
 				}else if(name=='都企供需'){
+					//添加跳转登录页面标识
+					this.$auth.setwhichLogin('dqgx');							
 					uni.navigateTo({
 						url: '/pages/index/index'
 					})

jp-mobile/pages/index/index.vue

@@ -127,7 +127,7 @@
 						<view class="choose-box3">											
 							
 							<view style="width: 300rpx;display: flex;align-items: center;color: #666666;font-size: 33rpx;">
-								产业链上下游：
+								产业链环节：
 							</view>
 							
 							<DoublePicker
@@ -279,7 +279,7 @@
 		methods: {
 			...mapActions(['refreshUserInfo']),
 			
-			//选择产业链上下游
+			//选择产业链环节
 			getParkList3() {
 				loginService.getIndustryChainList({
 				}).then(({

jp-mobile/pages/login/dzflogin.vue

@@ -0,0 +1,232 @@
+<template>
+	<view class="zai-box">
+		<view class="zai-title2">
+			<form class="zai-form">
+				<view class="title1">企业大走访</view>
+				<view class="formg">
+					<image class="formimg" src="@/static/img/zhanghao-.png"></image>
+					<input class="formgin" placeholder="请输入账号" v-model="account" name="input"></input>
+				</view>
+				<view class="formg">
+					<image class="formimg" src="@/static/img/mima.png"></image>
+					<input class="formgin" placeholder="请输入密码" type="password" displayable  v-model="password" name="input"></input>
+				</view>
+				<view class="formg">
+					<image class="formimg" src="@/static/img/yanzhengma.png"></image>
+					<input class="formgin" placeholder="请输入验证码" v-model="code" name="input"></input>
+					<image  @click="getCaptcha" style="height: 50rpx;width: 160rpx;" :src="captchaImg"  mode="aspectFill"></image>
+				</view>
+				
+				<view >
+					<view class="button " @click="bindLogin">登录</view>
+				</view>
+				
+			</form>
+			<!-- <view class="zai-label" @click="gotoNewPass">忘记密码？</view> -->
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as $auth from "@/common/auth.js"
+	import loginService from "@/api/auth/loginService"
+	import {mapActions} from 'vuex'
+
+	export default {
+		data() {
+			return {
+				captchaImg: '',
+				account: '',
+				password: '',
+				code: '',
+				uuid: ''
+			}
+		},
+		created() {
+			this.getCaptcha()
+		},
+		methods: {
+			...mapActions(['refreshUserInfo']),
+			
+			gotoNewPass() {
+				uni.navigateTo({
+					url: '/pages/newPass/newPass'
+				})
+			},
+			
+		  // 登录
+		  bindLogin() {
+				/**
+				 * 客户端对账号信息进行一些必要的校验。
+				 * 实际开发中，根据业务需要进行处理，这里仅做示例。
+				 */
+				if (this.account.length < 1) {
+					uni.showToast({
+						icon: 'none',
+						title: '账号不能为空'
+					});
+					return;
+				}
+				if (this.password.length < 1) {
+					uni.showToast({
+						icon: 'none',
+						title: '密码不能为空'
+					});
+					return;
+				}
+				const inputForm ={
+					'username': this.account,
+					'password': this.password,
+					'code': this.code,
+					'uuid': this.uuid
+				  }
+				loginService.login(inputForm).then(({data}) => {
+				  this.$store.commit('SET_TOKEN',data.token);
+				  this.refreshUserInfo();
+				  setTimeout(function() {
+					  uni.reLaunch({
+					  	url: '../index/Tabindex',
+					  });
+				  },1000)
+				  
+				}).catch(e => {
+				  this.getCaptcha()
+				  console.error(e)
+				})
+			},
+		// 获取验证码
+		  getCaptcha () {
+			  loginService.getCode().then(({data}) => {
+					this.captchaImg = 'data:image/gif;base64,' + data.codeImg
+					this.uuid = data.uuid
+			   })
+		  }
+		}
+	}
+</script>
+
+<style>
+
+	.zai-box{
+		  background-size: cover;
+		  background-position: center;
+		  background-repeat: no-repeat;
+		  height: 100vh; /* 设置高度，确保背景图片显示完整 */
+		  display: flex;
+		  justify-content: center;
+		  background-image: url('~@/static/login.png');
+		  background-size: cover; /* 调整图片大小以覆盖整个屏幕 */
+		  background-position: center; /* 图片居中 */
+		  background-repeat: no-repeat; /* 防止图片重复 */
+	}
+	.zai-title2{
+		display: flex;
+		flex-direction: column;
+		align-items: center; /* 水平居中 */
+	}
+	.zai-title{
+		
+		margin-top: 260upx;
+		color: #fff;
+		width: 100%; /* 可选：确保图片适应容器宽度 */
+		max-width: 610rpx;
+		height: 100rpx;
+	}
+	/* .title1{
+		font-size: 32upx;
+		font-weight: 600;
+		color: #000;
+	} */
+	.title1 {
+		font-size: 48rpx;
+		font-weight: bold;
+		line-height: 48rpx;
+		text-shadow: -1px 2px 1px rgba(0, 0, 0, 0.1);
+		background: -webkit-linear-gradient(45deg, #15EDFF, #23C1D7);
+		/* Chrome, Safari */
+		background: linear-gradient(45deg, #15EDFF, #23C1D7);
+		/* 标准语法 */
+		-webkit-background-clip: text;
+		/* Chrome, Safari */
+		background-clip: text;
+		-webkit-text-fill-color: transparent;
+		/* Chrome, Safari */
+		color: transparent;
+		/* 在不支持 -webkit-text-fill-color 的浏览器中，字体颜色设置为透明 */
+	}
+	
+	.zai-form{
+		margin-top: 200px;
+		border-radius: 16px;
+		height: 650upx;
+		background: rgba(255, 255, 255, 0.8);
+		padding: 45upx;
+		margin-left: 50upx;
+		margin-right: 50upx;
+		
+	}
+	
+	.formg{
+		display: flex;
+		padding-bottom: 43upx;
+		padding-top: 43upx;
+		border-bottom: 1px solid  #dcdcdc;
+	}
+	
+	.formimg{
+		width: 42upx;
+		height: 42upx;
+	}
+	.formgin{
+		margin-left: 32upx;
+		width: 250upx;
+	}
+	.zai-input{
+		
+		background: #e2f5fc;
+		margin-top: 30upx;
+		border-radius: 100upx;
+		padding: 20upx 40upx;
+		font-size: 36upx;
+	}
+	.input-placeholder, .zai-input{
+		color: #94afce;
+	}
+	.zai-label{
+		padding: 60upx 0;
+		text-align: center;
+		font-size: 30upx;
+		color: #a7b6d0;
+	}
+	.zai-btn{
+		background: #ff65a3;
+		color: #fff;
+		border: 0;
+		border-radius: 100upx;
+		font-size: 36upx;
+	}
+	.zai-btn:after{
+		border: 0;
+	}
+	/*按钮点击效果*/
+	.zai-btn.button-hover{
+		transform: translate(1upx, 1upx);
+	}
+	.cu-form-group .title {
+		min-width: calc(4em + 15px);
+	}
+	.button {
+		width: 100%;
+		height: 40px;
+		margin-top: 30upx;
+		border-radius: 16px;
+		text-align: center;
+		line-height: 40px;
+		letter-spacing: 4px;
+		color: #fff;
+		cursor: pointer;
+		background-color: #22c8db !important;
+		color: #fff !important;
+	}
+</style>

jp-mobile/pages/policy/policyInfo.vue

@@ -58,6 +58,18 @@
 				</view>			
 			</view>
 			
+			<view class="titlebg2">
+				<view class="titlet1" ></view>
+				<view class="titlet2" >政策要点</view>								
+			</view>
+			
+			
+			<view class="textbg">
+				<view class="text12">
+					 <rich-text :nodes="inputForm.des6"></rich-text>
+				</view>			
+			</view>
+			
 				
 			<view  style="height: 50rpx;background-color: white;"></view>
 
@@ -91,7 +103,7 @@
 					des2: '',
 					des3: '',
 					des4: '',
-					
+					des6: '',
 				},
 				text1:'',
 				text2:'',

jp-mobile/pages/question/questionAdd.vue

@@ -108,12 +108,33 @@
 					<input style="width: 200rpx;" v-model="item.gaps" :placeholder="item.t1s" :disabled="!canedit"></input>{{item.t1d}}
 				</view>
 
-				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;">
+				<view class="cu-form-group margin-top" >
 					<view class="title">
 						问题描述
 					</view>
 					<textarea v-model="item.des" placeholder="请填写问题描述" :disabled="!canedit" ></textarea>
 				</view>
+				
+				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;">
+					<view class="title">
+						涉及单位
+					</view>		
+								
+					<zqs-select
+						class="input2"
+						:multiple="true"
+						:list="pickerData"
+						label-key="label"
+						value-key="value"
+						placeholder=" 请选择"
+						title="请选择涉及单位"
+						clearable
+						v-model="item.checkUserList"
+						@search="searchEvent"
+						@change="selectChange2"
+					></zqs-select>	
+				</view>	
+								
 
 			</view>
 
@@ -136,8 +157,30 @@
 	import revenueListService from '@/api/revenue/revenueListService'
 	import loginService from '@/api/auth/loginService.js'
 	export default {
+		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()
+			
+			loginService.getDictList({
+				dictTypeId:"1907700775364263937"
+			}).then(({data}) => {
+				this.pickerData = data		
+				this.pickerDataOld = data	
+				//默认第一个选项
+				//this.checkUserList=this.pickerData[0].value;		
+				
+			}).catch(e => {
+			})
 		},
 		data() {
 			return {
@@ -166,11 +209,15 @@
 					height: 90
 				},
 				parkList: [ "用工人才", "资金需求", "土地厂房", "订单及配套", "政策兑现", "创新及品牌", "审批手续", "水电气供应", "安全环保消防", "其他（需详细说明）"],
-				questionList:[{qname:"",qtype:"",qTypeindex:"",gaps:"",des:"",t1:"",t1s:""}],
+				questionList:[{qname:"",qtype:"",qTypeindex:"",gaps:"",des:"",t1:"",t1s:"",checkUserList:[]}],
 				
 				index:0,
 				ischeck: false,
 				canedit:true,
+				
+
+				pickerData: [],
+				pickerDataOld: []
 			}
 		},
 		created() {
@@ -190,6 +237,16 @@
 				this.inputForm.lxr = data2.data.qyFzr;
 				this.inputForm.phone = data2.data.phone;
 				this.inputForm.bz5 = data2.data.officer;
+				
+				for (let i = 0; i < data2.data.dzfQuestionDetilDTOList.length; i++) {
+					data2.data.dzfQuestionDetilDTOList[i].checkUserList=[];
+					if (data2.data.dzfQuestionDetilDTOList[i].des7 != ''&&data2.data.dzfQuestionDetilDTOList[i].des7 != undefined) {
+						
+						data2.data.dzfQuestionDetilDTOList[i].checkUserList=data2.data.dzfQuestionDetilDTOList[i].des7.split(",");
+									
+					}
+				}
+				
 				this.questionList=data2.data.dzfQuestionDetilDTOList;
 				
 				//不是暂存时不可以修改
@@ -207,8 +264,26 @@
 			
 		},
 		methods: {
+			
+			//交办单位
+			selectChange2() {
+			  // 此处为点击的事件
+			  this.pickerData=this.pickerDataOld;
+			},
+			searchEvent(val) {
+			  this.pickerData=this.filteredItems(val);
+			},
+			filteredItems(searchQuery) {
+			  const query = searchQuery.trim();
+			  if (!query) return this.pickerDataOld;
+			  return this.pickerDataOld.filter(item => {
+				return item.label.toString().includes(query);
+			  });
+			},
+			//交办单位结束
+			
 			addp(){
-				this.questionList.push({qname:"",qtype:"",qTypeindex:"",gaps:"",des:"",t1:"",t1s:""})
+				this.questionList.push({qname:"",qtype:"",qTypeindex:"",gaps:"",des:"",t1:"",t1s:"",checkUserList:[]})
 				
 			},
 			del(index2){
@@ -316,14 +391,35 @@
 			},
 			save(){
 				this.inputForm.des10="";
+				this.getJBBM();
 				this.inputForm.dzfQuestionDetilDTOList=this.questionList;
+				
 				this.checkinput();
 			},
 			formSubmit: function(e) {						
 				this.inputForm.des10="submit";
+				this.getJBBM();
 				this.inputForm.dzfQuestionDetilDTOList=this.questionList;
 				this.checkinput();				
 			},
+			
+			getJBBM(){
+				//将交办单位的名称带出
+				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(",");
+				}
+			},
+			
 			checkinput(){
 				if(this.hasDuplicateQName(this.questionList)){
 					uni.showToast({

jp-mobile/pages/question/questionInfo.vue

@@ -106,12 +106,23 @@
 					<input style="width: 200rpx;" v-model="item.gaps" :placeholder="item.t1s" disabled="true"></input>{{item.t1d}}
 				</view>
 
-				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;">
+				<view class="cu-form-group margin-top" >
 					<view class="title">
 						问题描述
 					</view>
 					<textarea v-model="item.des" placeholder="请填写问题描述" disabled="true" ></textarea>
 				</view>
+				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;" v-if="item.des8">
+					<view class="title">
+						涉及单位
+					</view>					
+				
+						<view class="input2">{{item.des8||''}}</view>
+								
+				</view>
+				
+				
+				
 				<!-- 挂钩干部 -->
 				<view class="cu-form-group margin-top" v-if="roleIds=='1910141956174053377'" >
 					<view class="title">
@@ -226,13 +237,16 @@
 				
 				
 				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;" v-if="roleIds=='1910175386924417025'||roleIds=='1910141956174053377'||roleIds=='1910175949166673921'">
-					<uni-file-picker style="margin-bottom: 10px;" limit="3" ref="picFile" v-model="item.fj"
+					<uni-file-picker style="margin-bottom: 10px;" limit="9" ref="picFile" v-model="item.des6"
 						fileMediatype="all" mode="grid" title="附件上传" :auto-upload="autoUpload" @select="select"
 						@progress="progress" @success="success" @fail="fail" @delete="deleteFile"
-						:imageStyles="imageStyles" :disabled="ischeck">
+						:imageStyles="imageStyles" :disabled="!item.cansubmit">
 					</uni-file-picker>
 				</view>
 				
+
+				
+				
 				<!-- 流程展示 -->
 				<view v-for="(record, index4) in item.oplist" :key="index4" class="record-item" @click="viewDetails(record)" style="border-bottom: 2px solid #eee;">
 					
@@ -453,10 +467,12 @@
 									
 					data2.data.dzfQuestionDetilDTOList[i].showpjedit=false	
 					for (let j = 0; j < opsize; j++) {
-						
+						data2.data.dzfQuestionDetilDTOList[i].showjbdw=false;
+						data2.data.dzfQuestionDetilDTOList[i].showjbdw2=false;
 						//当前登录人
 						if (data2.data.dzfQuestionDetilDTOList[i].oplist[j].createBy.id === this.uid) {
 							//问题处理
+							console.log("问题："+data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType)
 							
 							if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='3'){
 								data2.data.dzfQuestionDetilDTOList[i].current=0
@@ -534,7 +550,7 @@
 				}
 				
 				this.questionList=data2.data.dzfQuestionDetilDTOList;
-				
+				console.log(this.questionList)
 				
 				if(query.ischeck=='2'){
 					this.title="诉求办理评价";
@@ -581,6 +597,7 @@
 						this.questionList[index2].delyj="";
 					}else if(evt.detail.value=='交办'){
 						this.questionList[index2].showjbdw=true;
+						console.log(this.questionList[index2])
 						this.questionList[index2].delyj="请2日内回应，10内反馈办理结果，如办结请上传加盖公章的书面材料";
 						
 						
@@ -712,6 +729,7 @@
 						return;
 					}
 					var item = e.tempFiles[i]
+					e.tempFiles[i].progress = 100
 					uni.showLoading({
 						title: "上传中",
 						mask: true
@@ -726,7 +744,9 @@
 						header: {
 							'token': _this.$auth.getUserToken()
 						},
+
 						success: (res) => {
+							
 							var data = res.data
 							if (typeof data['error'] != "undefined") {
 								uni.showToast({
@@ -740,6 +760,11 @@
 									uuid: item.uuid
 								})
 								i++;
+								// _this.$refs.picFile.setProgress(100)	
+								//e.tempFiles[i].progress = 100
+								console.log(_this.$refs.picFile)
+
+								
 								upload()
 							}
 						},
@@ -898,7 +923,7 @@
 		font-size: 30upx;
 		color: #555;
 		padding-right: 20upx;
-		width: 500rpx;
+		width: 100%;
 	}
 	.uni-input{
 		

jp-ui/src/views/modules/enterpriseelectricity/EnterpriseElectricityForm.vue

@@ -76,6 +76,15 @@
            </el-form-item>
         </el-col>
 
+
+        <el-col :span="24">
+            <el-form-item label="政策要点" prop="content"
+                :rules="[
+                 ]">
+            <WangEditor ref="contentEditor2" v-model="inputForm.des6"/>
+           </el-form-item>
+        </el-col>
+
         <!-- <el-col :span="24">
             <el-form-item label="图片" prop="des5"
                 :rules="[
@@ -146,6 +155,7 @@
           des2: '',
           des3: '',
           des4: '',
+          des6: '',
         }
       }
     },
@@ -169,6 +179,7 @@
         this.$nextTick(() => {
           this.$refs.inputForm.resetFields()
           this.$refs.contentEditor.init('')
+          this.$refs.contentEditor2.init('')
           if (method === 'edit' || method === 'view') { // 修改或者查看
             this.loading = true
             enterpriseElectricityService.queryById(this.inputForm.id).then(({data}) => {
@@ -177,6 +188,7 @@
               console.log(data.stime)
               this.inputForm = this.recover(this.inputForm, data)
               this.$refs.contentEditor.init(this.inputForm.des4)
+              this.$refs.contentEditor2.init(this.inputForm.des6)
               this.loading = false
             })
           }