Merge branch 'master' into sso

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

@@ -11,7 +11,9 @@
         />
       </el-form-item>
       <el-form-item label="新办企业数" prop="newEnterprises">
-        <el-input
+        <el-input-number
+          :min="0"
+          :max="1000000"
           v-model="queryParams.newEnterprises"
           placeholder="请输入新办企业数"
           clearable
@@ -117,7 +119,7 @@
           <el-input v-model="form.month" placeholder="请输入月份" maxlength="10"/>
         </el-form-item>
         <el-form-item label="新办企业数" prop="newEnterprises">
-          <el-input v-model="form.newEnterprises" placeholder="请输入新办企业数" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.newEnterprises" placeholder="请输入新办企业数" maxlength="10"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

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

@@ -2,7 +2,9 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="即办件数" prop="instantProcessingQuantity">
-        <el-input
+        <el-input-number
+          :min="0"
+          :max="1000000"
           v-model="queryParams.instantProcessingQuantity"
           placeholder="请输入即办件数"
           clearable
@@ -11,7 +13,9 @@
         />
       </el-form-item>
       <el-form-item label="承诺件数" prop="promisedQuantity">
-        <el-input
+        <el-input-number
+          :min="0"
+          :max="1000000"
           v-model="queryParams.promisedQuantity"
           placeholder="请输入承诺件数"
           clearable
@@ -20,7 +24,9 @@
         />
       </el-form-item>
       <el-form-item label="即办率" prop="immediateRate">
-        <el-input
+        <el-input-number
+          :min="0"
+          :max="1000000"
           v-model="queryParams.immediateRate"
           placeholder="请输入即办率"
           clearable
@@ -124,13 +130,13 @@
     <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="instantProcessingQuantity">
-          <el-input v-model="form.instantProcessingQuantity" placeholder="请输入即办件数" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.instantProcessingQuantity" placeholder="请输入即办件数" maxlength="10"/>
         </el-form-item>
         <el-form-item label="承诺件数" prop="promisedQuantity">
-          <el-input v-model="form.promisedQuantity" placeholder="请输入承诺件数" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000"v-model="form.promisedQuantity" placeholder="请输入承诺件数" maxlength="10"/>
         </el-form-item>
         <el-form-item label="即办率" prop="immediateRate">
-          <el-input v-model="form.immediateRate" placeholder="请输入即办率" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.immediateRate" placeholder="请输入即办率" maxlength="10"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="建设用地" prop="buildLandUse">
-        <el-input
+        <el-input-number :min="0" :max="1000000"
           v-model="queryParams.buildLandUse"
           placeholder="请输入建设用地"
           clearable
@@ -11,7 +11,7 @@
         />
       </el-form-item>
       <el-form-item label="建设工程" prop="architecturalEngineering">
-        <el-input
+        <el-input-number :min="0" :max="1000000"
           v-model="queryParams.architecturalEngineering"
           placeholder="请输入建设工程"
           clearable
@@ -118,34 +118,34 @@
     />
 
     <!-- 添加或修改大厅办件对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="建设用地" prop="buildLandUse">
-          <el-input v-model="form.buildLandUse" placeholder="请输入建设用地" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.buildLandUse" placeholder="请输入建设用地" maxlength="10"/>
         </el-form-item>
         <el-form-item label="建设工程" prop="architecturalEngineering">
-          <el-input v-model="form.architecturalEngineering" placeholder="请输入建设工程" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.architecturalEngineering" placeholder="请输入建设工程" maxlength="10"/>
         </el-form-item>
         <el-form-item label="施工许可证" prop="architecturalLicence">
-          <el-input v-model="form.architecturalLicence" placeholder="请输入建筑工程施工许可证" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.architecturalLicence" placeholder="请输入建筑工程施工许可证" maxlength="10"/>
         </el-form-item>
         <el-form-item label="项目用时" prop="projectTime">
-          <el-input v-model="form.projectTime" placeholder="请输入项目用时" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.projectTime" placeholder="请输入项目用时" maxlength="10"/>
         </el-form-item>
         <el-form-item label="立项用地阶段" prop="projectApprovalStage">
-          <el-input v-model="form.projectApprovalStage" placeholder="请输入立项用地阶段" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.projectApprovalStage" placeholder="请输入立项用地阶段" maxlength="10"/>
         </el-form-item>
         <el-form-item label="工程规划阶段" prop="planStage">
-          <el-input v-model="form.planStage" placeholder="请输入工程规划阶段" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.planStage" placeholder="请输入工程规划阶段" maxlength="10"/>
         </el-form-item>
         <el-form-item label="施工许可阶段" prop="permitStage">
-          <el-input v-model="form.permitStage" placeholder="请输入施工许可阶段" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.permitStage" placeholder="请输入施工许可阶段" maxlength="10"/>
         </el-form-item>
         <el-form-item label="竣工验收阶段" prop="acceptancePhase">
-          <el-input v-model="form.acceptancePhase" placeholder="请输入竣工验收阶段" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.acceptancePhase" placeholder="请输入竣工验收阶段" maxlength="10"/>
         </el-form-item>
         <el-form-item label="大厅办件总数" prop="hallTotal">
-          <el-input v-model="form.hallTotal" placeholder="请输入大厅办件总数" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.hallTotal" placeholder="请输入大厅办件总数" maxlength="10"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

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

@@ -11,7 +11,9 @@
         />
       </el-form-item>
       <el-form-item label="事项件数" prop="eventCount">
-        <el-input
+        <el-input-number
+          :min="0"
+          :max="1000000"
           v-model="queryParams.eventCount"
           placeholder="请输入事项件数"
           clearable
@@ -117,7 +119,7 @@
           <el-input v-model="form.eventName" placeholder="请输入事项名称" maxlength="10"/>
         </el-form-item>
         <el-form-item label="事项件数" prop="eventCount">
-          <el-input v-model="form.eventCount" placeholder="请输入事项件数" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.eventCount" placeholder="请输入事项件数" maxlength="10"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

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

@@ -133,16 +133,16 @@
     <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="passport">
-          <el-input v-model="form.passport" placeholder="请输入护" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.passport" placeholder="请输入护" maxlength="10"/>
         </el-form-item>
         <el-form-item label="港" prop="hongKong">
-          <el-input v-model="form.hongKong" placeholder="请输入港" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.hongKong" placeholder="请输入港" maxlength="10"/>
         </el-form-item>
         <el-form-item label="台" prop="taiwan">
-          <el-input v-model="form.taiwan" placeholder="请输入台" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.taiwan" placeholder="请输入台" maxlength="10"/>
         </el-form-item>
         <el-form-item label="外国人" prop="foreigners">
-          <el-input v-model="form.foreigners" placeholder="请输入外国人" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.foreigners" placeholder="请输入外国人" maxlength="10"/>
         </el-form-item>
         <el-form-item label="月份" prop="month">
           <el-input v-model="form.month" placeholder="请输入月份" maxlength="10"/>
@@ -212,6 +212,9 @@ export default {
           { required: true, message: "外国人不能为空", trigger: "change" },
           {validator: checkNonnegativeInteger, trigger: 'blur'}
         ],
+        month: [
+          { required: true, message: "月份不能为空", trigger: "change" },
+        ],
       }
     };
   },

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="办件数" prop="numberOfProcessedItems">
-        <el-input
+        <el-input-number :min="0" :max="1000000"
           v-model="queryParams.numberOfProcessedItems"
           placeholder="请输入办件数"
           clearable
@@ -11,7 +11,7 @@
         />
       </el-form-item>
       <el-form-item label="办结数" prop="completedQuantity">
-        <el-input
+        <el-input-number :min="0" :max="1000000"
           v-model="queryParams.completedQuantity"
           placeholder="请输入办结数"
           clearable
@@ -20,7 +20,7 @@
         />
       </el-form-item>
       <el-form-item label="办结率" prop="completionRate">
-        <el-input
+        <el-input-number :min="0" :max="1000000"
           v-model="queryParams.completionRate"
           placeholder="请输入办结率"
           clearable
@@ -124,13 +124,13 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="自然人办件数" prop="numberOfProcessedItems">
-          <el-input v-model="form.numberOfProcessedItems" placeholder="请输入自然人办件数" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.numberOfProcessedItems" placeholder="请输入自然人办件数" maxlength="10"/>
         </el-form-item>
         <el-form-item label="自然人办结数" prop="completedQuantity">
-          <el-input v-model="form.completedQuantity" placeholder="请输入自然人办结数" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.completedQuantity" placeholder="请输入自然人办结数" maxlength="10"/>
         </el-form-item>
         <el-form-item label="办结率" prop="completionRate">
-          <el-input v-model="form.completionRate" placeholder="请输入办结率" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.completionRate" placeholder="请输入办结率" maxlength="10"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

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

@@ -139,7 +139,7 @@
           <el-input v-model="form.verySatisfied" placeholder="请输入满意度" maxlength="10"/>
         </el-form-item>
         <el-form-item label="数量" prop="satisfiedNum">
-          <el-input v-model="form.satisfiedNum" placeholder="请输入数量" maxlength="10"/>
+          <el-input-number :min="0" :max="1000000" v-model="form.satisfiedNum" placeholder="请输入数量" maxlength="10"/>
         </el-form-item>
 
       </el-form>
@@ -188,6 +188,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        verySatisfied: [
+          { required: true, message: "满意度不能为空", trigger: "change" },
+        ],
         satisfiedNum: [
           { required: true, message: "数量不能为空", trigger: "change" },
           {validator: checkNonnegativeInteger, trigger: 'blur'}