From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新

---
 admin/src/views/Inspection/plan.vue |  234 +++++++++++++++++++++++++--------------------------------
 1 files changed, 103 insertions(+), 131 deletions(-)

diff --git a/admin/src/views/Inspection/plan.vue b/admin/src/views/Inspection/plan.vue
index 0a92ff6..31bd4c2 100644
--- a/admin/src/views/Inspection/plan.vue
+++ b/admin/src/views/Inspection/plan.vue
@@ -2,134 +2,79 @@
   <TableLayout :permissions="['business:ywpatrolscheme:query']">
     <!-- 鎼滅储琛ㄥ崟 -->
     <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-      <el-form-item label="涓婚敭" prop="id">
-        <el-input v-model="searchForm.id" placeholder="璇疯緭鍏ヤ富閿�" @keypress.enter.native="search"></el-input>
+      <el-form-item label="寮�濮嬫棩鏈�" prop="selDate">
+        <el-date-picker type="daterange" v-model="searchForm.selDate"  @change="changeSelDate" clearable value-format="yyyy-MM-dd"
+        />
       </el-form-item>
-      <el-form-item label="鍒涘缓浜虹紪鐮�" prop="creator">
-        <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏ュ垱寤轰汉缂栫爜" @keypress.enter.native="search"></el-input>
+      <el-form-item label="缁撴潫鏃ユ湡" prop="selDateSec">
+        <el-date-picker type="daterange" v-model="searchForm.selDateSec"  @change="changeSelDateSec" clearable value-format="yyyy-MM-dd"
+         />
       </el-form-item>
-      <el-form-item label="鍒涘缓鏃堕棿" prop="createDate">
-        <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ垱寤烘椂闂�" @change="search"/>
-      </el-form-item>
-      <el-form-item label="鏇存柊浜虹紪鐮�" prop="editor">
-        <el-input v-model="searchForm.editor" placeholder="璇疯緭鍏ユ洿鏂颁汉缂栫爜" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="鏇存柊鏃堕棿" prop="editDate">
-        <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ユ洿鏂版椂闂�" @change="search"/>
-      </el-form-item>
-      <el-form-item label="鏄惁鍒犻櫎0鍚� 1鏄�" prop="isdeleted">
-        <el-input v-model="searchForm.isdeleted" placeholder="璇疯緭鍏ユ槸鍚﹀垹闄�0鍚� 1鏄�" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="鏍囬" prop="title">
-        <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="澶囨敞" prop="remark">
-        <el-input v-model="searchForm.remark" placeholder="璇疯緭鍏ュ娉�" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="鐘舵�� 0鍚敤 1绂佺敤" prop="status">
-        <el-input v-model="searchForm.status" placeholder="璇疯緭鍏ョ姸鎬� 0鍚敤 1绂佺敤" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="鎺掑簭鐮�" prop="sortnum">
-        <el-input v-model="searchForm.sortnum" placeholder="璇疯緭鍏ユ帓搴忕爜" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_line)" prop="lineId">
-        <el-input v-model="searchForm.lineId" placeholder="璇疯緭鍏ュ贰妫�鐐圭紪鐮�(鍏宠仈yw_patrol_line)" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="宸℃璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" prop="userIds">
-        <el-input v-model="searchForm.userIds" placeholder="璇疯緭鍏ュ贰妫�璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" prop="dealUserId">
-        <el-input v-model="searchForm.dealUserId" placeholder="璇疯緭鍏ュ鐞嗕汉缂栫爜(鍏宠仈system_user)" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="澶勭悊鏃堕棿" prop="dealDate">
-        <el-date-picker v-model="searchForm.dealDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ鐞嗘椂闂�" @change="search"/>
-      </el-form-item>
-      <el-form-item label="澶勭悊澶囨敞" prop="dealInfo">
-        <el-input v-model="searchForm.dealInfo" placeholder="璇疯緭鍏ュ鐞嗗娉�" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="寰幆鍛ㄦ湡  0姣忓ぉ 1姣忓懆 2姣忓ぉ" prop="circleType">
-        <el-input v-model="searchForm.circleType" placeholder="璇疯緭鍏ュ惊鐜懆鏈�  0姣忓ぉ 1姣忓懆 2姣忓ぉ" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="寰幆閲嶅瑙勫垯 1-31锛屽涓嫳鏂囬�楀彿闅斿紑" prop="circleDays">
-        <el-input v-model="searchForm.circleDays" placeholder="璇疯緭鍏ュ惊鐜噸澶嶈鍒� 1-31锛屽涓嫳鏂囬�楀彿闅斿紑" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="寮�濮嬫棩鏈�" prop="startDate">
-        <el-date-picker v-model="searchForm.startDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�" @change="search"/>
-      </el-form-item>
-      <el-form-item label="缁撴潫鏃ユ湡" prop="endDate">
-        <el-date-picker v-model="searchForm.endDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�" @change="search"/>
-      </el-form-item>
-      <el-form-item label="寮�濮嬫椂闂寸偣" prop="startTime">
-        <el-input v-model="searchForm.startTime" placeholder="璇疯緭鍏ュ紑濮嬫椂闂寸偣" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="缁撴潫鏃堕棿鐐�" prop="endTime">
-        <el-input v-model="searchForm.endTime" placeholder="璇疯緭鍏ョ粨鏉熸椂闂寸偣" @keypress.enter.native="search"></el-input>
-      </el-form-item>
-      <el-form-item label="鎵ц杩涘害 0寰呭紑濮� 1杩涜涓� 2瓒呮湡 3宸插畬鎴�" prop="processStatus">
-        <el-input v-model="searchForm.processStatus" placeholder="璇疯緭鍏ユ墽琛岃繘搴� 0寰呭紑濮� 1杩涜涓� 2瓒呮湡 3宸插畬鎴�" @keypress.enter.native="search"></el-input>
+      <el-form-item label="璁″垝鍚嶇О" prop="title">
+        <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ヨ鍒掑悕绉�" @keypress.enter.native="search"></el-input>
       </el-form-item>
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
-        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:ywpatrolscheme:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
         <el-button @click="reset">閲嶇疆</el-button>
       </section>
     </el-form>
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
       <ul class="toolbar" v-permissions="['business:ywpatrolscheme:create', 'business:ywpatrolscheme:delete']">
-        <li><el-button type="primary" @click="$refs.operaYwPatrolSchemeWindow.open('鏂板缓杩愮淮宸℃璁″垝淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:ywpatrolscheme:create']">鏂板缓</el-button></li>
-        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:ywpatrolscheme:delete']">鍒犻櫎</el-button></li>
+        <li><el-button type="primary" @click="editClick()" icon="el-icon-plus"
+            v-permissions="['business:ywpatrolscheme:create']">鏂板缓</el-button></li>
+        <el-button type="primary" plain :loading="isWorking.export"
+          v-permissions="['business:ywpatrolscheme:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
+        <!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
+            v-permissions="['business:ywpatrolscheme:delete']">鍒犻櫎</el-button></li> -->
       </ul>
-      <el-table
-        v-loading="isWorking.search"
-        :data="tableData.list"
-        stripe
-        @selection-change="handleSelectionChange"
-      >
+      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="id" label="涓婚敭" min-width="100px"></el-table-column>
-        <el-table-column prop="creator" label="鍒涘缓浜虹紪鐮�" min-width="100px"></el-table-column>
-        <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
-        <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
-        <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
-        <el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
-        <el-table-column prop="title" label="鏍囬" min-width="100px"></el-table-column>
-        <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
-        <el-table-column prop="status" label="鐘舵�� 0鍚敤 1绂佺敤" min-width="100px"></el-table-column>
-        <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
-        <el-table-column prop="lineId" label="宸℃鐐圭紪鐮�(鍏宠仈yw_patrol_line)" min-width="100px"></el-table-column>
-        <el-table-column prop="userIds" label="宸℃璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" min-width="100px"></el-table-column>
-        <el-table-column prop="dealUserId" label="澶勭悊浜虹紪鐮�(鍏宠仈system_user)" min-width="100px"></el-table-column>
-        <el-table-column prop="dealDate" label="澶勭悊鏃堕棿" min-width="100px"></el-table-column>
-        <el-table-column prop="dealInfo" label="澶勭悊澶囨敞" min-width="100px"></el-table-column>
-        <el-table-column prop="circleType" label="寰幆鍛ㄦ湡  0姣忓ぉ 1姣忓懆 2姣忓ぉ" min-width="100px"></el-table-column>
-        <el-table-column prop="circleDays" label="寰幆閲嶅瑙勫垯 1-31锛屽涓嫳鏂囬�楀彿闅斿紑" min-width="100px"></el-table-column>
-        <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="100px"></el-table-column>
-        <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="100px"></el-table-column>
-        <el-table-column prop="startTime" label="寮�濮嬫椂闂寸偣" min-width="100px"></el-table-column>
-        <el-table-column prop="endTime" label="缁撴潫鏃堕棿鐐�" min-width="100px"></el-table-column>
-        <el-table-column prop="processStatus" label="鎵ц杩涘害 0寰呭紑濮� 1杩涜涓� 2瓒呮湡 3宸插畬鎴�" min-width="100px"></el-table-column>
-        <el-table-column
-          v-if="containPermissions(['business:ywpatrolscheme:update', 'business:ywpatrolscheme:delete'])"
-          label="鎿嶄綔"
-          min-width="120"
-          fixed="right"
-        >
+
+        <el-table-column prop="title" label="璁″垝鍚嶇О" min-width="100px"></el-table-column>
+        <el-table-column prop="code" label="璁″垝缂栧彿" min-width="100px"></el-table-column>
+        <el-table-column prop="userName" label="璐熻矗浜哄憳" min-width="100px"></el-table-column>
+
+        <el-table-column prop="startDate" label="璁″垝鏃ユ湡" min-width="150px">
+          <template v-slot="scope">
+            <span>{{ scope.row.startDate }} - {{ scope.row.endDate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="startDate" label="鎵ц鏃堕棿" min-width="130px">
+          <template v-slot="scope">
+            <span>{{ scope.row.startTime }} - {{ scope.row.endTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createUserName" label="鍒涘缓浜�" min-width="100px"></el-table-column>
+        <el-table-column prop="" label="鎵ц缁撴灉" min-width="100px">
+          <template v-slot="scope">
+            <span v-if="scope.row.schemeStatus == 0">寰呭紑濮�</span>
+            <span v-if="scope.row.schemeStatus == 1">杩涜涓�</span>
+            <span v-if="scope.row.schemeStatus == 2">宸茬粨鏉�</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="鐘舵��" min-width="100px">
+          <template v-slot="scope">
+            <el-switch v-model="scope.row.status" @change="e => changeStatus(scope.row)" :active-value="0"
+              :inactive-value="1">
+            </el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="containPermissions(['business:ywpatrolscheme:update', 'business:ywpatrolscheme:delete'])"
+          label="鎿嶄綔" min-width="120" fixed="right">
           <template slot-scope="{row}">
-            <el-button type="text" @click="$refs.operaYwPatrolSchemeWindow.open('缂栬緫杩愮淮宸℃璁″垝淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:ywpatrolscheme:update']">缂栬緫</el-button>
-            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:ywpatrolscheme:delete']">鍒犻櫎</el-button>
+            <el-button type="text" @click="editClick(row)" icon="el-icon-edit"
+              v-permissions="['business:ywpatrolscheme:update']">缂栬緫</el-button>
+            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"
+              v-permissions="['business:ywpatrolscheme:delete']">鍒犻櫎</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        @size-change="handleSizeChange"
-        @current-change="handlePageChange"
-        :pagination="tableData.pagination"
-      >
+      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
       </pagination>
     </template>
     <!-- 鏂板缓/淇敼 -->
-    <OperaYwPatrolSchemeWindow ref="operaYwPatrolSchemeWindow" @success="handlePageChange"/>
+    <OperaYwPatrolSchemeWindow ref="operaYwPatrolSchemeWindow" @success="handlePageChange" />
   </TableLayout>
 </template>
 
@@ -138,40 +83,23 @@
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
 import OperaYwPatrolSchemeWindow from './components/OperaYwPatrolSchemeWindow'
+import { updateStatusById } from '@/api/Inspection/ywPatrolScheme'
+import { Message } from 'element-ui'
 export default {
   name: 'YwPatrolScheme',
   extends: BaseTable,
   components: { TableLayout, Pagination, OperaYwPatrolSchemeWindow },
-  data () {
+  data() {
     return {
       // 鎼滅储
       searchForm: {
-        id: '',
-        creator: '',
-        createDate: '',
-        editor: '',
-        editDate: '',
-        isdeleted: '',
         title: '',
-        remark: '',
-        status: '',
-        sortnum: '',
-        lineId: '',
-        userIds: '',
-        dealUserId: '',
-        dealDate: '',
-        dealInfo: '',
-        circleType: '',
-        circleDays: '',
-        startDate: '',
-        endDate: '',
-        startTime: '',
-        endTime: '',
-        processStatus: ''
+        selDate:[],
+        selDateSec:[]
       }
     }
   },
-  created () {
+  created() {
     this.config({
       module: '杩愮淮宸℃璁″垝淇℃伅琛�',
       api: '/Inspection/ywPatrolScheme',
@@ -179,6 +107,50 @@
       'field.main': 'id'
     })
     this.search()
+  },
+  methods: {
+    changeStatus(e) {
+      console.log(e)
+      updateStatusById(e).then(res => {
+        this.search()
+        Message.success('鐘舵�佷慨鏀规垚鍔�')
+      }, () => {
+        this.search()
+      })
+    },
+
+    reset() {
+      this.searchForm = {}
+      this.search()
+    },
+    editClick(row) {
+      if (row && row.id) {
+        this.$refs.operaYwPatrolSchemeWindow.open('缂栬緫宸℃璁″垝')
+        this.$refs.operaYwPatrolSchemeWindow.getDetail(row.id)
+      } else {
+        this.$refs.operaYwPatrolSchemeWindow.open('鏂板缓宸℃璁″垝')
+      }
+      this.$refs.operaYwPatrolSchemeWindow.initData()
+
+    },
+    changeSelDate(e) {
+      if (e && e.length > 0) {
+        this.$set(this.searchForm, 'startDate', e[0] )
+        this.$set(this.searchForm, 'endDate', e[1]  )
+      } else {
+        this.$set(this.searchForm, 'startDate', '')
+        this.$set(this.searchForm, 'endDate', '')
+      }
+    },
+    changeSelDateSec(e) {
+      if (e && e.length > 0) {
+        this.$set(this.searchForm, 'startDateSec', e[0] )
+        this.$set(this.searchForm, 'endDateSec', e[1]  )
+      } else {
+        this.$set(this.searchForm, 'startDateSec', '')
+        this.$set(this.searchForm, 'endDateSec', '')
+      }
+    },
   }
 }
 </script>

--
Gitblit v1.9.3