Merge branch 'feature-0712' into 'dev'

Feature 0712

See merge request project/water/shuili-vue!145

src/views/dike/runManage/maintenance/maintenancePlan/index.vue

@@ -331,7 +331,11 @@ export default {
       <div class="line"></div>
       <div class="flex justify-end mb-16">
         <div>
-          <el-button type="primary" size="small" @click="handleAdd"
+          <el-button
+            type="primary"
+            size="small"
+            @click="handleAdd"
+            v-hasPermi="['df:run:inspection:plan:add']"
             >新增</el-button
           >
           <el-button
@@ -410,6 +414,7 @@ export default {
               type="text"
               size="small"
               @click="handleCheck(scope.row)"
+              v-hasPermi="['df:run:inspection:plan:item:check']"
               >查看</el-button
             >
             <el-button
@@ -418,6 +423,7 @@ export default {
               type="text"
               size="small"
               @click="handleSubmit(scope.row)"
+              v-hasPermi="['df:run:inspection:plan:item:submit']"
               >提交审批</el-button
             >
             <el-button
@@ -426,6 +432,7 @@ export default {
               type="text"
               size="small"
               @click="handleReturn(scope.row)"
+              v-hasPermi="['df:run:inspection:plan:item:return']"
               >撤回</el-button
             >
             <el-button
@@ -486,7 +493,11 @@ export default {
         ></PlanDetail>
       </div>
       <div class="drawer-footer p-16">
-        <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+        <el-button
+          size="mini"
+          type="primary"
+          v-hasPermi="['df:run:inspection:plan:item:edit']"
+          @click="handleEdit(currentRow)"
           >编辑</el-button
         >
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>

src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue

@@ -331,7 +331,7 @@ export default {
       <div class="flex justify-between mb-16">
         <el-radio-group
           v-model="paramsData.status"
-          @tab-click="handleChangeQuery"
+          @input="handleChangeQuery"
         >
           <el-radio-button label="">全部</el-radio-button>
           <el-radio-button label="1">待验收</el-radio-button>
@@ -449,11 +449,13 @@ export default {
               type="text"
               size="small"
               @click="handleCheck(scope.row)"
+              v-hasPermi="['df:run:inspection:accept:item:check']"
               >查看</el-button
             >
             <el-button
               style="margin-right: 16px"
               v-if="scope.row.status == '1'"
+              v-hasPermi="['df:run:inspection:accept:item:submit']"
               @click="handlePassed(scope.row)"
               type="text"
               size="small"
@@ -463,6 +465,7 @@ export default {
             <el-button
               style="margin-right: 16px; color: red"
               v-if="scope.row.status == '1'"
+              v-hasPermi="['df:run:inspection:accept:item:submit']"
               @click="handleReject(scope.row)"
               type="text"
               size="small"
@@ -501,6 +504,7 @@ export default {
       </div>
       <div class="drawer-footer p-16">
         <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+                   v-hasPermi="['df:run:inspection:accept:item:edit']"
           >编辑</el-button
         >
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>

src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue

@@ -446,6 +446,7 @@ export default {
               style="margin-right: 16px"
               type="text"
               size="small"
+              v-hasPermi="['df:run:inspection:audit:item:check']"
               @click="handleCheck(scope.row)"
               >查看</el-button
             >
@@ -453,6 +454,7 @@ export default {
               style="margin-right: 16px"
               v-if="scope.row.status == '1'"
               @click="handlePass(scope.row)"
+              v-hasPermi="['df:run:inspection:audit:item:submit']"
               type="text"
               size="small"
               >通过</el-button
@@ -461,6 +463,7 @@ export default {
             <el-button
               style="margin-right: 16px; color: red"
               v-if="scope.row.status == '1'"
+              v-hasPermi="['df:run:inspection:audit:item:submit']"
               @click="handleEdit(scope.row)"
               type="text"
               size="small"
@@ -500,6 +503,7 @@ export default {
       </div>
       <div class="drawer-footer p-16">
         <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+                   v-hasPermi="['df:run:inspection:audit:item:edit']"
           >编辑</el-button
         >
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>

src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@@ -363,10 +363,20 @@ export default {
       <div class="line"></div>
       <div class="flex justify-end mb-16">
         <div>
-          <el-button type="primary" size="small" @click="handleAdd"
-            >新增</el-button
+          <el-button
+            type="primary"
+            size="small"
+            v-hasPermi="['df:run:inspection:record:add']"
+            @click="handleAdd"
             >
-          <el-button type="danger" size="small" @click="handleDelAll" :disabled="tableCheckData.length === 0"
+            新增
+          </el-button>
+          <el-button
+            type="danger"
+            size="small"
+            @click="handleDelAll"
+            v-hasPermi="['df:run:inspection:record:delAll']"
+            :disabled="tableCheckData.length === 0"
             >删除</el-button
           >
         </div>
@@ -448,29 +458,26 @@ export default {
           <template slot-scope="scope">
             <el-button
               style="margin-right: 16px; margin-left: 10px;"
+              v-hasPermi="['df:run:inspection:record:check']"
               @click="handleCheck(scope.row)"
               type="text"
               size="small"
               >查看</el-button
             >
-            <el-popconfirm
-              style="margin-right: 16px;"
-              v-if="scope.row.status == '0'"
-              confirm-button-text="确定"
-              cancel-button-text="取消"
-              icon="el-icon-info"
-              icon-color="red"
-              title="确认提交吗？"
-              class="ml-10"
-              @confirm="handleConfirmAccept(scope.row)"
-            >
-              <el-button type="text" size="small" slot="reference"
-                >提交验收</el-button
+
+            <el-button
+              style="margin-right: 16px"
+              v-if="scope.row.status == 0"
+              type="text"
+              size="small"
+              v-hasPermi="['df:run:inspection:record:item:submit']"
+              @click="handleConfirmAccept(scope.row)"
             >
-            </el-popconfirm>
+              提交验收</el-button>
             <el-button
               style="color: red; margin-right: 16px"
               v-if="scope.row.status == 1"
+              v-hasPermi="['df:run:inspection:record:item:return']"
               type="text"
               size="small"
               @click="handleReturn(scope.row)"
@@ -481,11 +488,13 @@ export default {
               @click="handleEdit(scope.row)"
               type="text"
               v-if="scope.row.status == '0'"
+              v-hasPermi="['df:run:inspection:record:item:edit']"
               size="small"
             >编辑</el-button
             >
             <el-popconfirm
               v-if="scope.row.status == '0'"
+              v-hasPermi="['df:run:inspection:record:item:del']"
               confirm-button-text="确定"
               cancel-button-text="取消"
               icon="el-icon-info"
@@ -533,6 +542,7 @@ export default {
       </div>
       <div class="drawer-footer p-16">
         <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+                   v-hasPermi="['df:run:inspection:record:item:edit']"
         >编辑</el-button
         >
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>

src/views/sluice/runManage/maintenance/maintenancePlan/index.vue

@@ -331,6 +331,7 @@ export default {
       <div class="flex justify-end mb-16">
         <div>
           <el-button type="primary" size="small" @click="handleAdd"
+                     v-hasPermi="['sz:run:inspection:plan:add']"
             >新增</el-button
           >
           <el-button
@@ -338,7 +339,7 @@ export default {
             size="small"
             @click="handleDelAll"
             :disabled="tableCheckData.length === 0"
-            v-hasPermi="['df:run:inspection:plan:delAll']"
+            v-hasPermi="['sz:run:inspection:plan:delAll']"
             >删除</el-button
           >
         </div>
@@ -409,11 +410,13 @@ export default {
               type="text"
               size="small"
               @click="handleCheck(scope.row)"
+              v-hasPermi="['sz:run:inspection:plan:item:check']"
               >查看</el-button
             >
             <el-button
               style="margin-right: 16px"
               v-if="scope.row.status == 0"
+              v-hasPermi="['sz:run:inspection:plan:item:submit']"
               type="text"
               size="small"
               @click="handleSubmit(scope.row)"
@@ -422,6 +425,7 @@ export default {
             <el-button
               style="color: red; margin-right: 16px"
               v-if="scope.row.status == 1"
+              v-hasPermi="['sz:run:inspection:plan:item:return']"
               type="text"
               size="small"
               @click="handleReturn(scope.row)"
@@ -433,7 +437,7 @@ export default {
               @click="handleEdit(scope.row)"
               type="text"
               size="small"
-              v-hasPermi="['df:run:inspection:plan:item:edit']"
+              v-hasPermi="['sz:run:inspection:plan:item:edit']"
               >编辑</el-button
             >
             <el-popconfirm
@@ -450,7 +454,7 @@ export default {
                 type="text"
                 size="small"
                 slot="reference"
-                v-hasPermi="['df:run:inspection:plan:item:del']"
+                v-hasPermi="['sz:run:inspection:plan:item:del']"
                 >删除</el-button
               >
             </el-popconfirm>
@@ -486,6 +490,7 @@ export default {
       </div>
       <div class="drawer-footer p-16">
         <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+                   v-hasPermi="['sz:run:inspection:plan:item:edit']"
           >编辑</el-button
         >
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>

src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue

@@ -325,7 +325,7 @@ export default {
       <div class="flex justify-between mb-16">
         <el-radio-group
           v-model="paramsData.status"
-          @tab-click="handleChangeQuery"
+          @input="handleChangeQuery"
         >
           <el-radio-button label="">全部</el-radio-button>
           <el-radio-button label="1">待验收</el-radio-button>
@@ -443,11 +443,13 @@ export default {
               type="text"
               size="small"
               @click="handleCheck(scope.row)"
+              v-hasPermi="['sz:run:inspection:accept:item:check']"
               >查看</el-button
             >
             <el-button
               style="margin-right: 16px"
               v-if="scope.row.status == '1'"
+              v-hasPermi="['sz:run:inspection:accept:item:submit']"
               @click="handlePassed(scope.row)"
               type="text"
               size="small"
@@ -457,6 +459,7 @@ export default {
             <el-button
               style="margin-right: 16px; color: red"
               v-if="scope.row.status == '1'"
+              v-hasPermi="['sz:run:inspection:accept:item:submit']"
               @click="handleReject(scope.row)"
               type="text"
               size="small"
@@ -495,6 +498,7 @@ export default {
       </div>
       <div class="drawer-footer p-16">
         <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+                   v-hasPermi="['sz:run:inspection:accept:item:edit']"
           >编辑</el-button
         >
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>

src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue

@@ -438,11 +438,13 @@ export default {
               type="text"
               size="small"
               @click="handleCheck(scope.row)"
+              v-hasPermi="['sz:run:inspection:audit:item:check']"
               >查看</el-button
             >
             <el-button
               style="margin-right: 16px"
               v-if="scope.row.status == '1'"
+              v-hasPermi="['sz:run:inspection:audit:item:submit']"
               @click="handlePass(scope.row)"
               type="text"
               size="small"
@@ -452,6 +454,7 @@ export default {
             <el-button
               style="margin-right: 16px; color: red"
               v-if="scope.row.status == '1'"
+              v-hasPermi="['sz:run:inspection:audit:item:submit']"
               @click="handleEdit(scope.row)"
               type="text"
               size="small"
@@ -491,6 +494,7 @@ export default {
       </div>
       <div class="drawer-footer p-16">
         <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
+                   v-hasPermi="['sz:run:inspection:audit:item:edit']"
           >编辑</el-button
         >
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>

src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

@@ -349,13 +349,15 @@ export default {
             class="flex-shrink-0 myml-12"
             type="success"
             @click="handleChangeQuery"
-            >查询</el-button
+          >查询
+          </el-button
           >
           <el-button
             class="flex-shrink-0"
             size="small"
             @click="handleResetQuery"
-            >重置</el-button
+          >重置
+          </el-button
           >
         </div>
       </div>
@@ -363,10 +365,14 @@ export default {
       <div class="flex justify-end mb-16">
         <div>
           <el-button type="primary" size="small" @click="handleAdd"
-            >新增</el-button
+                     v-hasPermi="['sz:run:inspection:record:add']"
+          >新增
+          </el-button
           >
           <el-button type="danger" size="small" @click="handleDelAll" :disabled="tableCheckData.length === 0"
-            >删除</el-button
+                     v-hasPermi="['sz:run:inspection:record:delAll']"
+          >删除
+          </el-button
           >
         </div>
       </div>
@@ -404,8 +410,10 @@ export default {
         </el-table-column>
         <el-table-column align="center" label="维养负责人">
           <template slot-scope="scope">
-            <span>{{ scope.row.plan.responsiblePerson &&
-            scope.row.plan.responsiblePerson.name }}</span>
+            <span>{{
+                scope.row.plan.responsiblePerson &&
+                scope.row.plan.responsiblePerson.name
+              }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="supplements" align="center" label="资金来源/万元">
@@ -448,43 +456,45 @@ export default {
             <el-button
               style="margin-right: 16px; margin-left: 10px;"
               @click="handleCheck(scope.row)"
+              v-hasPermi="['sz:run:inspection:record:item:check']"
               type="text"
               size="small"
-              >查看</el-button
+            >查看
+            </el-button
             >
-            <el-popconfirm
-              style="margin-right: 16px;"
-              v-if="scope.row.status == '0'"
-              confirm-button-text="确定"
-              cancel-button-text="取消"
-              icon="el-icon-info"
-              icon-color="red"
-              title="确认提交吗？"
-              class="ml-10"
-              @confirm="handleConfirmAccept(scope.row)"
-            >
-              <el-button type="text" size="small" slot="reference"
-                >提交验收</el-button
+            <el-button
+              style="margin-right: 16px"
+              v-if="scope.row.status == 0"
+              type="text"
+              size="small"
+              v-hasPermi="['sz:run:inspection:record:item:submit']"
+              @click="handleConfirmAccept(scope.row)"
             >
-            </el-popconfirm>
+              提交验收
+            </el-button>
             <el-button
               style="color: red; margin-right: 16px"
               v-if="scope.row.status == 1"
+              v-hasPermi="['sz:run:inspection:record:item:return']"
               type="text"
               size="small"
               @click="handleReturn(scope.row)"
-            >撤回</el-button
+            >撤回
+            </el-button
             >
             <el-button
               style="margin-right: 16px"
               @click="handleEdit(scope.row)"
               type="text"
               v-if="scope.row.status == '0'"
+              v-hasPermi="['sz:run:inspection:record:item:edit']"
               size="small"
-            >编辑</el-button
+            >编辑
+            </el-button
             >
             <el-popconfirm
               v-if="scope.row.status == '0'"
+              v-hasPermi="['sz:run:inspection:record:item:del']"
               confirm-button-text="确定"
               cancel-button-text="取消"
               icon="el-icon-info"
@@ -497,7 +507,8 @@ export default {
                 type="text"
                 size="small"
                 slot="reference"
-                >删除</el-button
+              >删除
+              </el-button
               >
             </el-popconfirm>
           </template>
@@ -532,7 +543,9 @@ export default {
       </div>
       <div class="drawer-footer p-16">
         <el-button size="mini" type="primary" @click="handleEdit(currentRow)"
-        >编辑</el-button
+                   v-hasPermi="['sz:run:inspection:record:item:edit']"
+        >编辑
+        </el-button
         >
         <el-button size="mini" @click="dialogVisible = false">取消</el-button>
       </div>
@@ -544,6 +557,7 @@ export default {
 .search-form {
   .search-item {
     margin-bottom: 16px;
+
     .search-label {
       width: 100px;
       text-align: right;
@@ -551,6 +565,7 @@ export default {
     }
   }
 }
+
 .line {
   background: #e5e5e5;
   width: 100%;
@@ -570,9 +585,11 @@ export default {
 .w-160 {
   width: 170px;
 }
+
 .w-240 {
   width: 240px;
 }
+
 .w-360 {
   width: 360px;
 }