社区政策

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/service/dto/EnterpriseElectricityDTO.java

@@ -126,6 +126,7 @@ public class EnterpriseElectricityDTO extends BaseDTO {
 	/**
      * 备注8
      */
+	@Query(type = QueryType.LIKE)
 	@ExcelProperty("备注8")
 	private String des8;
 

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.53:8071'
+	APP_SERVER_URL = 'http://192.168.139.35:8071'
 }else{
     // 生产环境
     APP_SERVER_URL = '/yd_qycpfb'

jp-mobile/pages/policy/policyInfo.vue

@@ -44,6 +44,12 @@
 						政策级别：{{inputForm.des3}}
 					</view>		
 				</view>
+				
+				<view class="textbg">
+					<view class="text2">
+						类别：{{inputForm.des8}}
+					</view>		
+				</view>
 			</view>
 
 			<view class="titlebg2">
@@ -118,6 +124,7 @@
 					des4: '',
 					des6: '',
 					des7: '',
+					des8: '',
 				},
 				text1:'',
 				text2:'',
@@ -428,6 +435,14 @@
 					data.des3="区级";
 				}
 				
+				if(data.des8=="1"){
+					data.des8="政策法规";
+				}else if(data.des8=="2"){
+					data.des8="品牌申报";
+				}else if(data.des8=="3"){
+					data.des8="展会活动";
+				}
+				
 				//替换图片样式
 				if(data.des6!=undefined){
 					data.des6=data.des6.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ')

jp-mobile/pages/policy/policyList.vue

@@ -17,7 +17,7 @@
 			<view class="search-box1">
 				<view class="choose-box">
 															
-					<jp-picker2 class="choose-boxp" v-model="searchForm.des2" empty="选择政策类型" rangeKey="label" rangeValue="value"
+					<jp-picker2 class="choose-boxp" v-model="searchForm.des2" empty="政策类型" rangeKey="label" rangeValue="value"
 						:range="parkList2" @change="picker2change" >						
 					</jp-picker2>
 
@@ -25,11 +25,18 @@
 				</view>
 				<view class="choose-box">
 																				
-					<jp-picker2 class="choose-boxp" v-model="searchForm.des3" empty="选择政策级别" rangeKey="label" rangeValue="value"
+					<jp-picker2 class="choose-boxp" v-model="searchForm.des3" empty="政策级别" rangeKey="label" rangeValue="value"
 						:range="parkList"  @change="picker2change">
 					</jp-picker2>
 					
 				</view>
+				<view class="choose-box">
+																				
+					<jp-picker2 class="choose-boxp" v-model="searchForm.des8" empty="类别" rangeKey="label" rangeValue="value"
+						:range="parkList3"  @change="picker2change">
+					</jp-picker2>
+					
+				</view>
 			</view>
 			
 			
@@ -61,11 +68,19 @@
 								<span class="color-cheng" v-else-if="item.des2 === '3'">【发改】</span>
 								<span class="color-cheng" v-else-if="item.des2 === '4'">【商务】</span>
 								<span class="color-cheng" v-else-if="item.des2 === '5'">【人才政策】</span>
+								<span class="color-cheng" v-else-if="item.des2 === '6'">【其他】</span>
 								
+
 								<span class="color-lan" v-if="item.des3 === '1'">【国家】</span>
 								<span class="color-lan" v-else-if="item.des3 === '2'">【省级】</span>
 								<span class="color-lan" v-else-if="item.des3 === '3'">【市级】</span>
 								<span class="color-lan" v-else-if="item.des3 === '4'">【区级】</span>
+								
+								<span class="color-cheng" v-if="item.des8 === '1'">【政策法规】</span>
+								<span class="color-cheng" v-else-if="item.des8 === '2'">【品牌申报】</span>
+								<span class="color-cheng" v-else-if="item.des8 === '3'">【展会活动】</span>
+								
+								
 								{{item.des1}}
 							</view>
 
@@ -113,13 +128,16 @@
 					des1:"",
 					des2:"",
 					des3:"",
+					des8:"",
 				},
 				picture:["https://miniapp.huidutech.com.cn/yd_qycpfbH5/bg1.jpg",
 				"https://miniapp.huidutech.com.cn/yd_qycpfbH5/bg2.jpg",
 				"https://miniapp.huidutech.com.cn/yd_qycpfbH5/bg3.jpg",
 				"https://miniapp.huidutech.com.cn/yd_qycpfbH5/bg4.jpg"],
 				parkList2: [ {label: '全部',value: ''},{label: '工业',value: '1'},{label: '科技',value: '2'}
-				,{label: '发改',value: '3'},{label: '商务',value: '4'},{label: '人才政策',value: '5'}
+				,{label: '发改',value: '3'},{label: '商务',value: '4'},{label: '人才政策',value: '5'},{label: '其他',value: '6'},{label: '政策法规',value: '7'},{label: '品牌申报',value: '8'},{label: '展会活动',value: '9'}
+				],
+				parkList3: [{label: '全部',value: ''}, {label: '政策法规',value: '1'},{label: '品牌申报',value: '2'},{label: '展会活动',value: '3'}
 				],
 				curWord: "", //当前搜索关键词
 				dataList: [], // 数据列表
@@ -261,6 +279,7 @@
 				this.doSearch() ;
 			},
 			
+			
 			// 输入监听
 			inputWord(e) {
 				

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

@@ -67,6 +67,21 @@
                       </el-select>
            </el-form-item>
         </el-col>
+        <el-col :span="12">
+            <el-form-item label="类别" prop="des8"
+                :rules="[
+                  {required: true, message:'类别不能为空', trigger:'blur'}
+                 ]">
+                <el-select v-model="inputForm.des8" placeholder="请选择"  style="width: 100%;">
+                          <el-option
+                            v-for="item in $dictUtils.getDictList('sys_zclb')"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                      </el-select>
+           </el-form-item>
+        </el-col>
 
         <el-col :span="24">
             <el-form-item label="政策内容" prop="content"
@@ -170,6 +185,7 @@
           des3: '',
           des4: '',
           des6: '',
+          des8: '',
         }
       }
     },

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

@@ -29,6 +29,16 @@
                </el-option>
              </el-select>
           </el-form-item>
+          <el-form-item prop="des8">
+             <el-select v-model="searchForm.des8" placeholder="类别" size="small" style="width: 100%;">
+               <el-option
+                 v-for="item in $dictUtils.getDictList('sys_zclb')"
+                 :key="item.value"
+                 :label="item.label"
+                 :value="item.value">
+               </el-option>
+             </el-select>
+          </el-form-item>
           <el-form-item prop="stime">
                 <el-date-picker
                   v-model="searchForm.stime"
@@ -121,7 +131,14 @@
               {{ $dictUtils.getDictLabel("sys_zcjb", scope.row.des3, '-') }}
         </template>
       </vxe-column>
-
+    <vxe-column
+        field="des8"
+        sortable
+        title="类别">
+        <template slot-scope="scope">
+              {{ $dictUtils.getDictLabel("sys_zclb", scope.row.des8, '-') }}
+        </template>
+      </vxe-column>
 
     <vxe-column
         field="stime"