Merge branch 'feature-0712' into 'dev'

Feature 0712

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

src/api/dike/index.js

@@ -286,6 +286,14 @@ export function postYhRecordaApproval(data) {
   })
 }
 
+// 删除计划
+export function delRunDzYhPlan(data) {
+  return request({
+    url: `/run/df/yh/plan/${data.id}`,
+    method: 'del'
+  })
+}
+
 // 修改维养记录状态
 export function updateYhRecordStatus(data) {
   return request({

src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue

@@ -153,6 +153,7 @@
             :http-request="handleUploadProject"
             :before-upload="beforeUploadProject"
             :on-remove="handleRemoveProject"
+            :on-preview="handlePreview"
             accept=".docx,.doc,.pdf"
             show-file-list
             :file-list="projectList"
@@ -234,6 +235,7 @@
               :http-request="handleUpload"
               :before-upload="beforeUpload"
               :on-remove="handleRemove"
+              :on-preview="handlePreview"
               accept=".docx,.doc,.pdf"
               show-file-list
               :file-list="filesList"
@@ -265,6 +267,15 @@
         </el-timeline>
       </div>
     </el-form>
+    <el-dialog
+      :title="dialog.title"
+      @close="closeDialog"
+      :visible.sync="dialog.visible"
+      width="80%"
+      append-to-body
+    >
+      <preview v-if="dialog.visible" :url="preViewFile"></preview>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -282,8 +293,10 @@ import {
 } from "@/api/dike";
 
 import { uploadFileData } from "@/api/system/upload";
+import preview from "@/views/dike/runManage/dispatch/plan/components/preview.vue";
 
 export default {
+  components: {preview},
   props: {
     id: String,
     auditId: String,
@@ -316,6 +329,12 @@ export default {
           audios: [],
         },
       },
+      dialog: {
+        title: '预览',
+        dom: '',
+        visible: false
+      },
+      preViewFile: '',
       activities: [],
       rules: {
         dikeName: [
@@ -368,6 +387,14 @@ export default {
     });
   },
   methods: {
+    // 关闭dialog
+    closeDialog() {
+      this.dialog.visible = false
+    },
+    handlePreview(file) {
+      this.preViewFile = file.url
+      this.dialog.visible = true
+    },
     handleRemove(file, fileList) {
       this.filesList = fileList
     },

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

@@ -1,13 +1,10 @@
 <!-- 巡查计划管理-堤防 -->
 <script>
-import {
-  deleteDFInspectionPlan,
-} from "@/api/management";
 import {
   postYhPlanApprovalReturn,
 } from "@/api/dike";
 
-import { deleteProjectCheckingPlan, getDikeYhPlanList, postYhPlanApproval } from "@/api/dike";
+import { delRunDzYhPlan, getDikeYhPlanList, postYhPlanApproval } from "@/api/dike";
 
 import TopBackTitle from "@/components/TopBackTitle/index.vue";
 import PlanDetail from "./components/PlanDetail.vue";
@@ -132,7 +129,7 @@ export default {
     },
     // 删除对应巡查项目
     deleteTableItem(row) {
-      deleteDFInspectionPlan(row.id).then((res) => {
+      delRunDzYhPlan({id: row.id}).then((res) => {
         this.getTableData();
         this.$message.success("删除成功");
       });
@@ -183,7 +180,7 @@ export default {
         .then(() => {
           console.log("删除");
           const ids = this.tableCheckData.map((item) => item.id);
-          deleteProjectCheckingPlan(ids.join(",")).then((res) => {
+          delRunDzYhPlan({id: ids.join(",")}).then((res) => {
             if (res) {
               this.$message.success("删除成功");
               this.getTableData();

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

@@ -446,7 +446,10 @@ export default {
         <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>
+              <span>
+                {{ scope.row.comment ? scope.row.comment.slice(0, 50) : '' }}
+                {{scope.row.comment && scope.row.comment.length > 50 ? '...' : ''}}
+              </span>
             </el-tooltip>
           </template>
         </el-table-column>

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

@@ -443,7 +443,10 @@ export default {
         <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>
+              <span>
+                {{ scope.row.comment ? scope.row.comment.slice(0, 50) : '' }}
+                {{scope.row.comment && scope.row.comment.length > 50 ? '...' : ''}}
+              </span>
             </el-tooltip>
           </template>
         </el-table-column>

src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue

@@ -157,6 +157,7 @@
           :http-request="handleUpload"
           :before-upload="beforeUpload"
           :on-remove="handleRemove"
+          :on-preview="handlePreview"
           accept=".docx,.doc,.pdf"
           show-file-list
           :file-list="filesList"
@@ -205,8 +206,7 @@
             :key="url"
           >
             <el-image
-              :src="url"
+              :src="url.url"
-              :preview-src-list="[url]"
               class="w-240 h-124"
             ></el-image>
             <i
@@ -241,6 +241,7 @@
               :http-request="handleUpload1"
               :before-upload="beforeUpload1"
               :on-remove="handleRemove1"
+              :on-preview="handlePreview"
               accept=".docx,.doc,.pdf"
               show-file-list
               :file-list="filesList1"
@@ -272,6 +273,15 @@
         </el-timeline>
       </div>
     </el-form>
+    <el-dialog
+      :title="dialog.title"
+      @close="closeDialog"
+      :visible.sync="dialog.visible"
+      width="80%"
+      append-to-body
+    >
+      <preview v-if="dialog.visible" :url="preViewFile"></preview>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -284,8 +294,10 @@ import {
 } from "@/api/management";
 import {uploadFileData} from "@/api/system/upload";
 import dayjs from "dayjs";
+import preview from "@/views/dike/runManage/dispatch/plan/components/preview.vue";
 
 export default {
+  components: {preview},
   props: {
     id: String,
     acceptId: String,
@@ -311,6 +323,12 @@ export default {
           },
         ],
       },
+      dialog: {
+        title: '预览',
+        dom: '',
+        visible: false
+      },
+      preViewFile: '',
       activities: [],
       rules: {
         planId: [
@@ -364,6 +382,14 @@ export default {
     },
   },
   methods: {
+    // 关闭dialog
+    closeDialog() {
+      this.dialog.visible = false
+    },
+    handlePreview(file) {
+      this.preViewFile = file.url
+      this.dialog.visible = true
+    },
     handleRemove(file, fileList) {
       this.filesList = fileList
     },
@@ -545,6 +571,7 @@ export default {
       fData.append("file", file);
       uploadFileData(fData)
         .then((res) => {
+          console.log(res)
           this.ledgerList.push({
             name: file.name,
             url: res.url,

src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue

@@ -153,6 +153,7 @@
             :http-request="handleUploadProject"
             :before-upload="beforeUploadProject"
             :on-remove="handleRemoveProject"
+            :on-preview="handlePreview"
             accept=".docx,.doc,.pdf"
             show-file-list
             :file-list="projectList"
@@ -234,6 +235,7 @@
               :http-request="handleUpload"
               :before-upload="beforeUpload"
               :on-remove="handleRemove"
+              :on-preview="handlePreview"
               accept=".docx,.doc,.pdf"
               show-file-list
               :file-list="filesList"
@@ -265,6 +267,15 @@
         </el-timeline>
       </div>
     </el-form>
+    <el-dialog
+      :title="dialog.title"
+      @close="closeDialog"
+      :visible.sync="dialog.visible"
+      width="80%"
+      append-to-body
+    >
+      <preview v-if="dialog.visible" :url="preViewFile"></preview>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -281,8 +292,10 @@ import {
 } from "@/api/sluice";
 
 import { uploadFileData } from "@/api/system/upload";
+import preview from "@/views/dike/runManage/dispatch/plan/components/preview.vue";
 
 export default {
+  components: {preview},
   props: {
     id: String,
     auditId: String,
@@ -315,6 +328,12 @@ export default {
           audios: [],
         },
       },
+      dialog: {
+        title: '预览',
+        dom: '',
+        visible: false
+      },
+      preViewFile: '',
       activities: [],
       rules: {
         wagaName: [
@@ -367,6 +386,14 @@ export default {
     });
   },
   methods: {
+    // 关闭dialog
+    closeDialog() {
+      this.dialog.visible = false
+    },
+    handlePreview(file) {
+      this.preViewFile = file.url
+      this.dialog.visible = true
+    },
     handleRemove(file, fileList) {
       this.filesList = fileList
     },

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

@@ -183,7 +183,7 @@ export default {
         .then(() => {
           console.log("删除");
           const ids = this.tableCheckData.map((item) => item.id);
-          delRunSzYhPlan(ids.join(",")).then((res) => {
+          delRunSzYhPlan({id: ids.join(",")}).then((res) => {
             if (res) {
               this.$message.success("删除成功");
               this.getTableData();
@@ -196,6 +196,7 @@ export default {
     },
     // 表格列表多选
     handleSelectionChange(e) {
+      console.log(e)
       this.tableCheckData = e || [];
     },
     // 搜索

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

@@ -439,7 +439,10 @@ export default {
         <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>
+              <span>
+                {{ scope.row.comment ? scope.row.comment.slice(0, 50) : '' }}
+                {{scope.row.comment && scope.row.comment.length > 50 ? '...' : ''}}
+              </span>
             </el-tooltip>
           </template>
         </el-table-column>

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

@@ -434,7 +434,10 @@ export default {
         <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>
+              <span>
+                {{ scope.row.comment ? scope.row.comment.slice(0, 50) : '' }}
+                {{scope.row.comment && scope.row.comment.length > 50 ? '...' : ''}}
+              </span>
             </el-tooltip>
           </template>
         </el-table-column>

src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue

@@ -157,6 +157,7 @@
           :http-request="handleUpload"
           :before-upload="beforeUpload"
           :on-remove="handleRemove"
+          :on-preview="handlePreview"
           accept=".docx,.doc,.pdf"
           show-file-list
           :file-list="filesList"
@@ -189,7 +190,7 @@
           action="#"
           :http-request="handleUploadLedger"
           :before-upload="beforeUploadLedger"
-          :on-remove="handleRemoveledger"
+          :on-preview="handlePreview"
           accept=".jpg,.png,.tif,.gif"
           :show-file-list="false"
           :file-list="ledgerList"
@@ -206,8 +207,8 @@
             :key="url"
           >
             <el-image
-              :src="url"
+              :src="url.url"
-              :preview-src-list="[url]"
+              :preview-src-list="[url.url]"
               class="w-240 h-124"
             ></el-image>
             <i
@@ -242,6 +243,7 @@
               :http-request="handleUpload1"
               :before-upload="beforeUpload1"
               :on-remove="handleRemove1"
+              :on-preview="handlePreview"
               accept=".docx,.doc,.pdf"
               show-file-list
               :file-list="filesList1"
@@ -273,6 +275,15 @@
         </el-timeline>
       </div>
     </el-form>
+    <el-dialog
+      :title="dialog.title"
+      @close="closeDialog"
+      :visible.sync="dialog.visible"
+      width="80%"
+      append-to-body
+    >
+      <preview v-if="dialog.visible" :url="preViewFile"></preview>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -282,8 +293,10 @@ import {
 } from "@/api/sluice";
 import {uploadFileData} from "@/api/system/upload";
 import dayjs from "dayjs";
+import preview from "@/views/dike/runManage/dispatch/plan/components/preview.vue";
 
 export default {
+  components: {preview},
   props: {
     id: String,
     acceptId: String,
@@ -309,6 +322,12 @@ export default {
           },
         ],
       },
+      dialog: {
+        title: '预览',
+        dom: '',
+        visible: false
+      },
+      preViewFile: '',
       activities: [],
       rules: {
         planId: [
@@ -362,6 +381,14 @@ export default {
     },
   },
   methods: {
+    // 关闭dialog
+    closeDialog() {
+      this.dialog.visible = false
+    },
+    handlePreview(file) {
+      this.preViewFile = file.url
+      this.dialog.visible = true
+    },
     handleRemove(file, fileList) {
       this.filesList = fileList
     },