统计调整；手机问题列表调整；网页端调整；

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

@@ -145,12 +145,37 @@
 
 	<select id="findList4" resultType="com.jeeplus.question.service.dto.DzfQuestionDTO" >
 		SELECT
-		<include refid="dzfQuestionColumns"/>
+		a.id AS "id",
+		a.qy_id AS "qyId",
+		a.qy_name AS "qyName",
+		a.qy_sd AS "qySd",
+		a.qy_fzr AS "qyFzr",
+		a.phone AS "phone",
+		a.officer AS "officer",
+		a.office_name AS "officeName",
+		a.states AS "states",
+		a.finish_time AS "finishTime",
+		a.remark AS "remark",
+		a.des1 AS "des1",
+		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
 		(SELECT a.qid
 		FROM
 		(SELECT record_id FROM dzf_question_op_record
-		WHERE del_flag = 0 AND FIND_IN_SET(#{userName},des3)
+		WHERE del_flag = 0 AND FIND_IN_SET(#{loginName},des3)
 		AND DATE_FORMAT(create_date, '%Y-%m-%d') >= #{start}  AND DATE_FORMAT(create_date, '%Y-%m-%d') &lt;= #{end}
 		GROUP BY record_id) b
 		LEFT JOIN dzf_question_detil a ON a.id = b.record_id

jp-mobile/components/jp-datetime-picker/jp-datetime-picker.vue

@@ -39,7 +39,7 @@
 		methods:{
 			TimeChange(e) {
 				if(this.mode === 'date'){
-					this.label = moment(e.detail.value).format('YYYY-MM-DD HH:mm:ss')
+					this.label = moment(e.detail.value).format('YYYY-MM-DD')
 				}
 				this.$emit('input', this.label)
 			}

jp-mobile/pages/policy/policyInfo.vue

@@ -70,6 +70,19 @@
 				</view>			
 			</view>
 			
+			<view class="titlebg2">
+				<view class="titlet1" ></view>
+				<view class="titlet2" >附件</view>								
+			</view>
+			
+			
+			<view class="textbg">
+				<view class="text12">
+					 <view v-for="(attachment, indexfj) in swiperList" :key="indexfj" style="margin-left: 20rpx;padding-bottom: 20rpx;">
+					   <view @click="viewAttachment(attachment)" style="width: 100%;color: blue;">{{ attachment.name }}</view>
+					 </view>
+				</view>			
+			</view>
 				
 			<view  style="height: 50rpx;background-color: white;"></view>
 
@@ -104,6 +117,7 @@
 					des3: '',
 					des4: '',
 					des6: '',
+					des7: '',
 				},
 				text1:'',
 				text2:'',
@@ -115,6 +129,7 @@
 				lyIndex: '',
 				showLYList: [],
 				showfx:false,
+				swiperList: [],
 			}
 		},
 		created() {
@@ -197,12 +212,61 @@
 				}) => {
 
 					this.setData(data);
+					
+					
+					let pics=this.inputForm.des7.split(",");
+					for (let j = 0; j < pics.length; j++) {
+						let aa=pics[j].split("&name=")
+						this.swiperList.push({
+							'url': "http://47.97.69.114:8089/yd_qycpfbWeb"+pics[j],
+							'uuid': pics[j],
+							'name': aa[1]
+						})
+						
+					}
+					
+					
 
 				}).catch((e) => {
 				
 				})
 			},
 			
+			viewAttachment(attachment) {
+				let aa=this.checkFileTypeByExtension(attachment.url);
+				if(aa=='Image'){
+					uni.previewImage({
+						  urls: [attachment.url], // 图片链接列表
+						  indicator: 'number', // 显示页码
+						  loop: true // 是否循环播放
+					});
+					
+				}else{
+					this.downloadFile(attachment.url);
+				} 
+			  
+			},
+			checkFileTypeByExtension(url) {
+			    const extension = url.substring(url.lastIndexOf('.') + 1).toLowerCase();
+			    if (['jpg', 'jpeg', 'png', 'gif'].includes(extension)) {
+			        return 'Image';
+			    } else if (['doc', 'docx', 'xls', 'xlsx', 'pdf'].includes(extension)) {
+			        return 'Document';
+			    } else {
+			        return 'Unknown';
+			    }
+			},
+					
+			
+			downloadFile(url) {
+				
+				const a = document.createElement('a');
+				a.href = url; //filePath 这里的地址是 uni.downloadFile 中的返回值里的地址
+				let aa=url.split("&name=")
+				a.download = aa[1]; // 可以设置下载文件名，如果是空字符串，则使用服务器端设置的文件名
+				a.click();
+			},
+			
 			
 			//账号分享
 			sharezz(){

jp-mobile/pages/question/questionInfo.vue

@@ -333,7 +333,7 @@
 						
 			<view style="height: 40rpx;"></view>
 			
-			<view class="flexC" v-if="roleIds=='1910175386924417025'">
+			<view class="flexC" v-if="roleIds=='1910175386924417025'&&!cansubmit">
 				<button v-if="roleIds=='1910175386924417025'" @click="del" class="bt1  block  margin-tb-sm lg bg-red">删除</button>
 	
 			</view>

jp-mobile/pages/service/addService.vue

@@ -87,8 +87,9 @@
 			</view>
 			<view class="titlebg2" style="margin-top:10rpx ;">
 				<view class="titlet2" style="width: 20%;">记录时间</view>
-				<uni-datetime-picker type="date" :v-model="inputForm.contactDate" placeholder="请选择近期与企业沟通时间"
-					@change="changeLog" />
+				<!-- <uni-datetime-picker type="date" :v-model="inputForm.contactDate" placeholder="请选择近期与企业沟通时间"
+					@change="changeLog" /> -->
+				<jp-datetime-picker v-model="inputForm.contactDate" mode="date" :disabled="ischeck" placeholder="请选择近期与企业沟通时间"></jp-datetime-picker>
 			</view>
 			<view style="height: 40rpx;"></view>
 			<view class="flexC" v-if="canedit">

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

@@ -85,6 +85,20 @@
            </el-form-item>
         </el-col>
 
+        <el-col :span="24">
+            <el-form-item label="附件" prop="files">
+              <file-upload
+        				v-model="inputForm.des7"
+        				:limit="9"
+        				tip="最多上传9个文件,单个文件不要超过10M,请上传xlsx/docx格式文件"
+        			>
+        				<el-button type="primary" icon="el-icon-upload"
+        					>上传附件</el-button
+        				>
+        			</file-upload>
+           </el-form-item>
+        </el-col>
+
         <!-- <el-col :span="24">
             <el-form-item label="图片" prop="des5"
                 :rules="[

jp-ui/src/views/modules/sys/dashboard/analysis/questionInfo.vue

@@ -86,14 +86,14 @@
             value: 999,
             text: "未办结全部"
           },
-          {
-            value: 1,
-            text: "提交"
-          },
-          {
-            value: 4,
-            text: "反馈大走访"
-          },
+          // {
+          //   value: 1,
+          //   text: "提交"
+          // },
+          // {
+          //   value: 4,
+          //   text: "反馈大走访"
+          // },
           {
             value: 5,
             text: "正在办理"
@@ -106,10 +106,10 @@
             value: 7,
             text: "持续跟踪"
           },
-          {
-            value: 8,
-            text: "提请会办"
-          },
+          // {
+          //   value: 8,
+          //   text: "提请会办"
+          // },
           {
             value: 9,
             text: "交办"