部分调整

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/controller/EnterpriseInfoController.java

@@ -676,6 +676,7 @@ public class EnterpriseInfoController {
 			if(olduserDTO!=null){//有账号就编辑
 				olduserDTO.setLoginName(enterpriseInfoDTO.getPhone());
 				olduserDTO.setMobile(enterpriseInfoDTO.getPhone());
+				olduserDTO.setName(enterpriseInfoDTO.getLxr());
 				userService.saveOrUpdate ( olduserDTO );
 			}else{//没账号就新增
 				int re=enterpriseInfoService.generateAccount ( enterpriseInfoDTO);

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

@@ -37,7 +37,7 @@
 	</sql>
 
 	<sql id="dzfQuestionJoins">
-
+		LEFT JOIN dzf_question_detil b on b.qid=a.id
 		LEFT JOIN sys_user qyName ON qyName.id = a.qy_name
 		LEFT JOIN ly_enterprise_info ei ON ei.id = a.qy_id
 	</sql>

jp-mobile/pages/index/Dzfindex.vue

@@ -73,7 +73,7 @@
 						<p>进度统计</p>
 					</view>		
 								
-					<view class="btn-Imbox" @click="totongxunlu7">
+					<view  v-if="isLogin!=null" class="btn-Imbox" @click="totongxunlu7">
 						<image  class="center-img" src="/static/img/setting.png"></image>
 						<p>个人信息</p>
 					</view>							

jp-mobile/pages/progress/ProgressQuestionList.vue

@@ -59,15 +59,14 @@
 				bgColor: 'bg-blue', // 背景颜色
 				finish:true,
 				curWord: "", //当前搜索关键词
+				//全部、已办结、交办、正在办理、难以化解、持续跟踪
 				range: [
 				          { value: 999, text: "全部" },
-						  { value: 1, text: "提交" },
-				          { value: 4, text: "反馈大走访" },
-				          { value: 5, text: "正在办理" },
-						  { value: 6, text: "难以化解" },
-						  { value: 7, text: "持续跟踪" },
-						  { value: 8, text: "提请会办" },
+						  //{ value: 3, text: "已办结" },
 						  { value: 9, text: "交办" },
+						  { value: 5, text: "正在办理" },
+						  { value: 6, text: "难以化解" },
+						  { value: 7, text: "持续跟踪" },						  
 				        ],
 				dataList: [], // 数据列表
 				modalName: null,

jp-mobile/pages/question/questionInfo.vue

@@ -332,6 +332,12 @@
 			</view> -->
 						
 			<view style="height: 40rpx;"></view>
+			
+			<view class="flexC" v-if="roleIds=='1910175386924417025'">
+				<button v-if="roleIds=='1910175386924417025'" @click="del" class="bt1  block  margin-tb-sm lg bg-red">删除</button>
+	
+			</view>
+			
 			<view class="flexC" v-if="cansubmit">
 				<button v-if="roleIds=='38a14f1f42ed424eab4cb5d489596b0d'" @click="save" class="bt1  block  margin-tb-sm lg">暂存</button>
 				<button v-if="roleIds=='1910175386924417025'" @click="del" class="bt1  block  margin-tb-sm lg bg-red">删除</button>