Merge branch 'feature-0712' into 'dev'

fix: 修改水闸巡查按钮权限，解决2次提测问题

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

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

@@ -15,7 +15,6 @@ import { getAreasData } from "@/api/areas/index";
 
 import { reqCountMixins } from "@/mixins/reqCount";
 import { paginationMixins } from "@/mixins/commonPagination";
-
 export default {
   name: "InspectionItems",
   components: {
@@ -32,12 +31,24 @@ export default {
         name: "",
         planDateArr: [],
       },
-      pickerOption: {
-        disabledDate(time) {//只能选择5年数据
+      choiceDate: '',
+      pickerOption: { // 设置不能选择的日期
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime()
+          if (maxDate) {
+            this.choiceDate = '';
+          }
+        },
+        disabledDate: (time) => {//只能选择5年数据
           let curDate = (new Date()).getTime();
           let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let threeMonths = curDate - three;
-          return time.getTime() > Date.now() || time.getTime() < threeMonths;
+          let min = curDate + three;
+          let max = curDate - three;
+          if (this.choiceDate) {
+            return time.getTime() < max || time.getTime() > min;
+          } else {
+            return false;
+          }
         }
       },
       currentRow: {},
@@ -430,7 +441,7 @@ export default {
             >
             <el-button
               style="margin-right: 16px"
-              v-if="scope.row.status == 0"
+              v-if="scope.row.status == 0 || scope.row.status == 3"
               type="text"
               size="small"
               @click="handleSubmit(scope.row)"
@@ -448,7 +459,7 @@ export default {
             >
             <el-button
               style="margin-right: 16px"
-              v-if="scope.row.status == 0"
+              v-if="scope.row.status == 0 || scope.row.status == 3"
               @click="handleEdit(scope.row)"
               type="text"
               size="small"

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

@@ -34,12 +34,24 @@ export default {
         name: "",
         planDateArr: [],
       },
-      pickerOption: {
-        disabledDate(time) {//只能选择5年数据
+      choiceDate: '',
+      pickerOption: { // 设置不能选择的日期
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime()
+          if (maxDate) {
+            this.choiceDate = '';
+          }
+        },
+        disabledDate: (time) => {//只能选择5年数据
           let curDate = (new Date()).getTime();
           let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let threeMonths = curDate - three;
-          return time.getTime() > Date.now() || time.getTime() < threeMonths;
+          let min = curDate + three;
+          let max = curDate - three;
+          if (this.choiceDate) {
+            return time.getTime() < max || time.getTime() > min;
+          } else {
+            return false;
+          }
         }
       },
       dialog: {
@@ -433,6 +445,11 @@ export default {
         <el-table-column prop="approvalTime" align="center" label="验收时间">
         </el-table-column>
         <el-table-column prop="comment" align="center" label="审批意见">
+          <template #default="scope">
+            <el-tooltip class="item" :content="scope.row.comment" placement="top">
+              <span>{{ scope.row.comment.slice(0, 50) }}{{scope.row.comment.length > 50 ? '...' : ''}}</span>
+            </el-tooltip>
+          </template>
         </el-table-column>
         <el-table-column prop="auditContent" align="center" label="审批材料">
           <template #default="scope">

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

@@ -38,12 +38,24 @@ export default {
         name: "",
         planDateArr: [],
       },
-      pickerOption: {
-        disabledDate(time) {//只能选择5年数据
+      choiceDate: '',
+      pickerOption: { // 设置不能选择的日期
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime()
+          if (maxDate) {
+            this.choiceDate = '';
+          }
+        },
+        disabledDate: (time) => {//只能选择5年数据
           let curDate = (new Date()).getTime();
           let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let threeMonths = curDate - three;
-          return time.getTime() > Date.now() || time.getTime() < threeMonths;
+          let min = curDate + three;
+          let max = curDate - three;
+          if (this.choiceDate) {
+            return time.getTime() < max || time.getTime() > min;
+          } else {
+            return false;
+          }
         }
       },
       dialog: {
@@ -430,6 +442,11 @@ export default {
         <el-table-column prop="approvalTime" align="center" label="审批时间">
         </el-table-column>
         <el-table-column prop="comment" align="center" label="审批意见">
+          <template #default="scope">
+            <el-tooltip class="item" :content="scope.row.comment" placement="top">
+              <span>{{ scope.row.comment.slice(0, 50) }}{{scope.row.comment.length > 50 ? '...' : ''}}</span>
+            </el-tooltip>
+          </template>
         </el-table-column>
         <el-table-column prop="auditContent" align="center" label="审批材料">
           <template #default="scope">

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

@@ -32,12 +32,24 @@ export default {
         name: "",
         planDateArr: [],
       },
-      pickerOption: {
-        disabledDate(time) {//只能选择5年数据
+      choiceDate: '',
+      pickerOption: { // 设置不能选择的日期
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime()
+          if (maxDate) {
+            this.choiceDate = '';
+          }
+        },
+        disabledDate: (time) => {//只能选择5年数据
           let curDate = (new Date()).getTime();
           let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let threeMonths = curDate - three;
-          return time.getTime() > Date.now() || time.getTime() < threeMonths;
+          let min = curDate + three;
+          let max = curDate - three;
+          if (this.choiceDate) {
+            return time.getTime() < max || time.getTime() > min;
+          } else {
+            return false;
+          }
         }
       },
       areasOptions: [],
@@ -477,7 +489,7 @@ export default {
 
             <el-button
               style="margin-right: 16px"
-              v-if="scope.row.status == 0"
+              v-if="scope.row.status == 0 || scope.row.status == 3"
               type="text"
               size="small"
               v-hasPermi="['df:run:inspection:record:item:submit']"
@@ -497,7 +509,7 @@ export default {
               style="margin-right: 16px"
               @click="handleEdit(scope.row)"
               type="text"
-              v-if="scope.row.status == '0'"
+              v-if="scope.row.status == '0' || scope.row.status == 3"
               v-hasPermi="['df:run:inspection:record:item:edit']"
               size="small"
             >编辑</el-button

src/views/sluice/runManage/enginerring/inspectionPlan/index.vue

@@ -442,7 +442,7 @@ export default {
             type="danger"
             size="small"
             @click="handleDelAll"
-            v-hasPermi="['df:run:inspection:plan:delAll']"
+            v-hasPermi="['sz:run:inspection:plan:delAll']"
             >删除</el-button
           >
         </div>
@@ -516,7 +516,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
@@ -532,7 +532,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>

src/views/sluice/runManage/enginerring/inspectionRecords/index.vue

@@ -479,7 +479,7 @@ export default {
           <el-button
             size="small"
             v-if="tableCheckData.length"
-            v-hasPermi="['df:run:inspection:record:export']"
+            v-hasPermi="['sz:run:inspection:record:export']"
             @click="handleExport"
             >导出</el-button
           >
@@ -487,7 +487,7 @@ export default {
             type="danger"
             size="small"
             @click="handleDelAll"
-            v-hasPermi="['df:run:inspection:record:delAll']"
+            v-hasPermi="['sz:run:inspection:record:delAll']"
             >删除</el-button
           >
         </div>
@@ -582,7 +582,7 @@ export default {
               size="small"
               @click="handleEdit(scope.row)"
               :disabled="scope.row.status != '0'"
-              v-hasPermi="['df:run:inspection:record:item:edit']"
+              v-hasPermi="['sz:run:inspection:record:item:edit']"
               >编辑</el-button
             >
             <el-button
@@ -591,7 +591,7 @@ export default {
               :disabled="
                 scope.row.status == '0' || scope.row.handleStatus != '1'
               "
-              v-hasPermi="['df:run:inspection:record:item:deal']"
+              v-hasPermi="['sz:run:inspection:record:item:deal']"
               @click="handleCheckDetails(scope.row, true)"
               >处置</el-button
             >
@@ -599,7 +599,7 @@ export default {
               type="text"
               size="small"
               @click="handleDel(scope.row)"
-              v-hasPermi="['df:run:inspection:record:item:del']"
+              v-hasPermi="['sz:run:inspection:record:item:del']"
               >删除</el-button
             >
           </template>

src/views/sluice/runManage/enginerring/inspectionRouteManage/index.vue

@@ -136,14 +136,14 @@
             size="small"
             v-if="tableCheckData.length"
             @click="handleExport"
-            v-hasPermi="['df:run:inspection:line:export']"
+            v-hasPermi="['sz:run:inspection:line:export']"
             >导出</el-button
           >
           <el-button
             type="danger"
             size="small"
             @click="handleDelAll"
-            v-hasPermi="['df:run:inspection:line:delAll']"
+            v-hasPermi="['sz:run:inspection:line:delAll']"
             >删除</el-button
           >
         </div>
@@ -354,14 +354,14 @@
                 class="custom-btn"
                 type="text"
                 @click="handleEdit(scope.row)"
-                v-hasPermi="['df:run:inspection:line:item:edit']"
+                v-hasPermi="['sz:run:inspection:line:item:edit']"
                 >编辑</el-button
               >
               <el-button
                 class="custom-btn"
                 type="text"
                 @click="handleDel(scope.row)"
-                v-hasPermi="['df:run:inspection:line:item:del']"
+                v-hasPermi="['sz:run:inspection:line:item:del']"
                 >删除</el-button
               >
             </template>

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

@@ -31,12 +31,24 @@ export default {
         name: "",
         planDateArr: [],
       },
-      pickerOption: {
-        disabledDate(time) {//只能选择5年数据
+      choiceDate: '',
+      pickerOption: { // 设置不能选择的日期
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime()
+          if (maxDate) {
+            this.choiceDate = '';
+          }
+        },
+        disabledDate: (time) => {//只能选择5年数据
           let curDate = (new Date()).getTime();
           let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let threeMonths = curDate - three;
-          return time.getTime() > Date.now() || time.getTime() < threeMonths;
+          let min = curDate + three;
+          let max = curDate - three;
+          if (this.choiceDate) {
+            return time.getTime() < max || time.getTime() > min;
+          } else {
+            return false;
+          }
         }
       },
       currentRow: {},
@@ -425,7 +437,7 @@ export default {
             >
             <el-button
               style="margin-right: 16px"
-              v-if="scope.row.status == 0"
+              v-if="scope.row.status == 0 || scope.row.status == 3"
               v-hasPermi="['sz:run:inspection:plan:item:submit']"
               type="text"
               size="small"
@@ -443,7 +455,7 @@ export default {
             >
             <el-button
               style="margin-right: 16px"
-              v-if="scope.row.status == 0"
+              v-if="scope.row.status == 0 || scope.row.status == 3"
               @click="handleEdit(scope.row)"
               type="text"
               size="small"

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

@@ -32,12 +32,24 @@ export default {
         name: "",
         planDateArr: [],
       },
-      pickerOption: {
-        disabledDate(time) {//只能选择5年数据
+      choiceDate: '',
+      pickerOption: { // 设置不能选择的日期
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime()
+          if (maxDate) {
+            this.choiceDate = '';
+          }
+        },
+        disabledDate: (time) => {//只能选择5年数据
           let curDate = (new Date()).getTime();
           let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let threeMonths = curDate - three;
-          return time.getTime() > Date.now() || time.getTime() < threeMonths;
+          let min = curDate + three;
+          let max = curDate - three;
+          if (this.choiceDate) {
+            return time.getTime() < max || time.getTime() > min;
+          } else {
+            return false;
+          }
         }
       },
       dialog: {
@@ -426,6 +438,11 @@ export default {
         <el-table-column prop="approvalTime" align="center" label="验收时间">
         </el-table-column>
         <el-table-column prop="comment" align="center" label="审批意见">
+          <template #default="scope">
+            <el-tooltip class="item" :content="scope.row.comment" placement="top">
+              <span>{{ scope.row.comment.slice(0, 50) }}{{scope.row.comment.length > 50 ? '...' : ''}}</span>
+            </el-tooltip>
+          </template>
         </el-table-column>
         <el-table-column prop="auditContent" align="center" label="审批材料">
           <template #default="scope">

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

@@ -29,12 +29,24 @@ export default {
         name: "",
         planDateArr: [],
       },
-      pickerOption: {
-        disabledDate(time) {//只能选择5年数据
+      choiceDate: '',
+      pickerOption: { // 设置不能选择的日期
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime()
+          if (maxDate) {
+            this.choiceDate = '';
+          }
+        },
+        disabledDate: (time) => {//只能选择5年数据
           let curDate = (new Date()).getTime();
           let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let threeMonths = curDate - three;
-          return time.getTime() > Date.now() || time.getTime() < threeMonths;
+          let min = curDate + three;
+          let max = curDate - three;
+          if (this.choiceDate) {
+            return time.getTime() < max || time.getTime() > min;
+          } else {
+            return false;
+          }
         }
       },
       dialog: {
@@ -421,6 +433,11 @@ export default {
         <el-table-column prop="approvalTime" align="center" label="审批时间">
         </el-table-column>
         <el-table-column prop="comment" align="center" label="审批意见">
+          <template #default="scope">
+            <el-tooltip class="item" :content="scope.row.comment" placement="top">
+              <span>{{ scope.row.comment.slice(0, 50) }}{{scope.row.comment.length > 50 ? '...' : ''}}</span>
+            </el-tooltip>
+          </template>
         </el-table-column>
         <el-table-column prop="auditContent" align="center" label="审批材料">
           <template #default="scope">

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

@@ -31,12 +31,24 @@ export default {
         name: "",
         planDateArr: [],
       },
-      pickerOption: {
-        disabledDate(time) {//只能选择5年数据
+      choiceDate: '',
+      pickerOption: { // 设置不能选择的日期
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime()
+          if (maxDate) {
+            this.choiceDate = '';
+          }
+        },
+        disabledDate: (time) => {//只能选择5年数据
           let curDate = (new Date()).getTime();
           let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let threeMonths = curDate - three;
-          return time.getTime() > Date.now() || time.getTime() < threeMonths;
+          let min = curDate + three;
+          let max = curDate - three;
+          if (this.choiceDate) {
+            return time.getTime() < max || time.getTime() > min;
+          } else {
+            return false;
+          }
         }
       },
       areasOptions: [],
@@ -474,7 +486,7 @@ export default {
             >
             <el-button
               style="margin-right: 16px"
-              v-if="scope.row.status == 0"
+              v-if="scope.row.status == 0 || scope.row.status == 3"
               type="text"
               size="small"
               v-hasPermi="['sz:run:inspection:record:item:submit']"
@@ -496,7 +508,7 @@ export default {
               style="margin-right: 16px"
               @click="handleEdit(scope.row)"
               type="text"
-              v-if="scope.row.status == '0'"
+              v-if="scope.row.status == '0' || scope.row.status == 3"
               v-hasPermi="['sz:run:inspection:record:item:edit']"
               size="small"
             >编辑