Merge remote-tracking branch 'origin/master'

zhsq_qk-system/src/main/resources/mapper/system/QkOptimizePublicizeMapper.xml

@@ -139,11 +139,13 @@
     <select id="visualizationPublicizeList" parameterType="QkOptimizePublicize" resultMap="QkOptimizePublicizeResult">
         SELECT
             id,
-            national_level,
-            provincial_level,
-            city_level,
+            sum(national_level) national_level,
+            sum(provincial_level) provincial_level,
+            sum(city_level) city_level,
             `month`
         FROM
             qk_optimize_publicize
+        GROUP BY `month`
+        ORDER BY id asc
     </select>
 </mapper>

zhsq_qk-ui/src/views/system/activity/index.vue

@@ -74,7 +74,6 @@
       <el-table-column label="序号" align="center" type="index"/>
       <el-table-column label="企业名称" align="center" prop="enterpriseName"/>
       <el-table-column label="活动数量" align="center" prop="activityNumber"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -110,10 +109,7 @@
           <el-input v-model="form.enterpriseName" placeholder="请输入企业名称"/>
         </el-form-item>
         <el-form-item label="活动数量" prop="activityNumber">
-          <el-input-number :min="0" v-model="form.activityNumber" placeholder="请输入活动数量"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.activityNumber" placeholder="请输入活动数量"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -159,7 +155,10 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        enterpriseName:[ {required: true, message: "企业名称不能为空", trigger: "blur"}],
+        activityNumber:[ {required: true, message: "活动数量不能为空", trigger: "blur"}]
+      }
     };
   },
   created() {

zhsq_qk-ui/src/views/system/credit/index.vue

@@ -84,7 +84,6 @@
       <el-table-column label="行政处罚" align="center" prop="administrativePenalty"/>
       <el-table-column label="信用承诺" align="center" prop="creditCommitment"/>
       <el-table-column label="信易贷入驻企业" align="center" prop="xinyiLoan"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -117,19 +116,16 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="行政许可" prop="administrativeLicense">
-          <el-input v-model="form.administrativeLicense" placeholder="请输入行政许可"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.administrativeLicense" placeholder="请输入行政许可"/>
         </el-form-item>
         <el-form-item label="行政处罚" prop="administrativePenalty">
-          <el-input v-model="form.administrativePenalty" placeholder="请输入行政处罚"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.administrativePenalty" placeholder="请输入行政处罚"/>
         </el-form-item>
         <el-form-item label="信用承诺" prop="creditCommitment">
-          <el-input v-model="form.creditCommitment" placeholder="请输入信用承诺"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.creditCommitment" placeholder="请输入信用承诺"/>
         </el-form-item>
         <el-form-item label="信易贷入驻企业" prop="xinyiLoan">
-          <el-input v-model="form.xinyiLoan" placeholder="请输入信易贷入驻企业"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.xinyiLoan" placeholder="请输入信易贷入驻企业"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -177,7 +173,12 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        administrativeLicense:[ {required: true, message: "行政许可不能为空", trigger: "blur"}],
+        administrativePenalty:[ {required: true, message: "行政处罚不能为空", trigger: "blur"}],
+        creditCommitment:[ {required: true, message: "信用承诺不能为空", trigger: "blur"}],
+        xinyiLoan:[ {required: true, message: "信易贷入驻企业不能为空", trigger: "blur"}]
+      }
     };
   },
   created() {

zhsq_qk-ui/src/views/system/doingBusiness/index.vue

@@ -76,7 +76,6 @@
       <el-table-column label="企业群众需求问题" align="center" prop="demandProblem"/>
       <el-table-column label="受理率" align="center" prop="acceptanceRate"/>
       <el-table-column label="办结率" align="center" prop="completionRate"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -107,21 +106,18 @@
 
     <!-- 添加或修改营商环境问题对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="125px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-form-item label="平台投诉举报问题" prop="reportProblem">
-          <el-input v-model="form.reportProblem" placeholder="请输入平台投诉举报问题"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.reportProblem" placeholder="请输入平台投诉举报问题"/>
         </el-form-item>
         <el-form-item label="企业群众需求问题" prop="demandProblem">
-          <el-input v-model="form.demandProblem" placeholder="请输入企业群众需求问题"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.demandProblem" placeholder="请输入企业群众需求问题"/>
         </el-form-item>
         <el-form-item label="受理率" prop="acceptanceRate">
-          <el-input v-model="form.acceptanceRate" placeholder="请输入受理率"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.acceptanceRate" placeholder="请输入受理率"/>
         </el-form-item>
         <el-form-item label="办结率" prop="completionRate">
-          <el-input v-model="form.completionRate" placeholder="请输入办结率"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.completionRate" placeholder="请输入办结率"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -169,7 +165,12 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        reportProblem:[ {required: true, message: "平台投诉举报问题不能为空", trigger: "blur"}],
+        demandProblem:[ {required: true, message: "企业群众需求问题不能为空", trigger: "blur"}],
+        acceptanceRate:[ {required: true, message: "受理率不能为空", trigger: "blur"}],
+        completionRate:[ {required: true, message: "办结率不能为空", trigger: "blur"}],
+      }
     };
   },
   created() {

zhsq_qk-ui/src/views/system/enterprise/index.vue

@@ -76,7 +76,6 @@
       <el-table-column label="免申即享" align="center" prop="enjoyWithoutApplication"/>
       <el-table-column label="惠及企业个人" align="center" prop="extendEnterprise"/>
       <el-table-column label="兑付金额" align="center" prop="redemptionAmount"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -109,19 +108,16 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="平台上线政策" prop="platformLaunch">
-          <el-input v-model="form.platformLaunch" placeholder="请输入平台上线政策"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.platformLaunch" placeholder="请输入平台上线政策"/>
         </el-form-item>
         <el-form-item label="免申即享" prop="enjoyWithoutApplication">
-          <el-input v-model="form.enjoyWithoutApplication" placeholder="请输入免申即享"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.enjoyWithoutApplication" placeholder="请输入免申即享"/>
         </el-form-item>
         <el-form-item label="惠及企业个人" prop="extendEnterprise">
-          <el-input v-model="form.extendEnterprise" placeholder="请输入惠及企业个人"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.extendEnterprise" placeholder="请输入惠及企业个人"/>
         </el-form-item>
         <el-form-item label="兑付金额" prop="redemptionAmount">
-          <el-input v-model="form.redemptionAmount" placeholder="请输入兑付金额"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.redemptionAmount" placeholder="请输入兑付金额"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -169,7 +165,12 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        platformLaunch:[ {required: true, message: "平台上线政策不能为空", trigger: "blur"}],
+        enjoyWithoutApplication:[ {required: true, message: "免申即享不能为空", trigger: "blur"}],
+        extendEnterprise:[ {required: true, message: "惠及企业个人不能为空", trigger: "blur"}],
+        redemptionAmount:[ {required: true, message: "兑付金额不能为空", trigger: "blur"}],
+      }
     };
   },
   created() {

zhsq_qk-ui/src/views/system/government/index.vue

@@ -86,7 +86,6 @@
       <el-table-column label="承诺时限压缩" align="center" prop="serviceCompress"/>
       <el-table-column label="行政许可事项即办件占比" align="center" prop="licenseProportion"/>
       <el-table-column label="承诺时限压缩" align="center" prop="licenseCompress"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -116,28 +115,25 @@
     />
 
     <!-- 添加或修改政务环境建设对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="170px">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
         <el-form-item label="政务服务好评率" prop="goodRate">
-          <el-input v-model="form.goodRate" placeholder="请输入政务服务好评率"/>
+          <el-input-number :min="0" :max="99999999"  v-model="form.goodRate" placeholder="请输入政务服务好评率"/>
         </el-form-item>
         <el-form-item label="按时办结数" prop="completionRate">
-          <el-input v-model="form.completionRate" placeholder="请输入按时办结数"/>
+          <el-input-number :min="0" :max="99999999"  v-model="form.completionRate" placeholder="请输入按时办结数"/>
         </el-form-item>
         <el-form-item label="政务服务事项即办件占比" prop="serviceProportion">
-          <el-input v-model="form.serviceProportion" placeholder="请输入政务服务事项即办件占比"/>
+          <el-input-number :min="0" :max="99999999"  v-model="form.serviceProportion" placeholder="请输入政务服务事项即办件占比"/>
         </el-form-item>
         <el-form-item label="承诺时限压缩" prop="serviceCompress">
-          <el-input v-model="form.serviceCompress" placeholder="请输入承诺时限压缩"/>
+          <el-input-number :min="0" :max="99999999"  v-model="form.serviceCompress" placeholder="请输入承诺时限压缩"/>
         </el-form-item>
         <el-form-item label="行政许可事项即办件占比" prop="licenseProportion">
-          <el-input v-model="form.licenseProportion" placeholder="请输入行政许可事项即办件占比"/>
+          <el-input-number :min="0" :max="99999999"  v-model="form.licenseProportion" placeholder="请输入行政许可事项即办件占比"/>
         </el-form-item>
         <el-form-item label="承诺时限压缩" prop="licenseCompress">
-          <el-input v-model="form.licenseCompress" placeholder="请输入承诺时限压缩"/>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+          <el-input-number :min="0" :max="99999999"  v-model="form.licenseCompress" placeholder="请输入承诺时限压缩"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -187,7 +183,14 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        goodRate:[ {required: true, message: "政务服务好评率不能为空", trigger: "blur"}],
+        completionRate:[ {required: true, message: "按时办结数不能为空", trigger: "blur"}],
+        serviceProportion:[ {required: true, message: "政务服务事项即办件占比不能为空", trigger: "blur"}],
+        serviceCompress:[ {required: true, message: "承诺时限压缩不能为空", trigger: "blur"}],
+        licenseProportion:[ {required: true, message: "行政许可事项即办件占比不能为空", trigger: "blur"}],
+        licenseCompress:[ {required: true, message: "承诺时限压缩不能为空", trigger: "blur"}],
+      }
     };
   },
   created() {

zhsq_qk-ui/src/views/system/publicize/index.vue

@@ -92,7 +92,6 @@
       <el-table-column label="省级" align="center" prop="provincialLevel"/>
       <el-table-column label="市级" align="center" prop="cityLevel"/>
       <el-table-column label="月份" align="center" prop="month"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -125,20 +124,17 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="国家级" prop="nationalLevel">
-          <el-input v-model="form.nationalLevel" placeholder="请输入国家级"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.nationalLevel" placeholder="请输入国家级"/>
         </el-form-item>
         <el-form-item label="省级" prop="provincialLevel">
-          <el-input v-model="form.provincialLevel" placeholder="请输入省级"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.provincialLevel" placeholder="请输入省级"/>
         </el-form-item>
         <el-form-item label="市级" prop="cityLevel">
-          <el-input v-model="form.cityLevel" placeholder="请输入市级"/>
+          <el-input-number :min="0" :max="99999999" v-model="form.cityLevel" placeholder="请输入市级"/>
         </el-form-item>
         <el-form-item label="月份" prop="month">
           <el-input v-model="form.month" placeholder="请输入月份"/>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -185,7 +181,12 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        nationalLevel:[ {required: true, message: "国家级不能为空", trigger: "blur"}],
+        provincialLevel:[ {required: true, message: "省级不能为空", trigger: "blur"}],
+        cityLevel:[ {required: true, message: "市级不能为空", trigger: "blur"}],
+        month:[ {required: true, message: "月份不能为空", trigger: "blur"}],
+      }
     };
   },
   created() {