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/workorder/workorderList.vue |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/admin/src/views/workorder/workorderList.vue b/admin/src/views/workorder/workorderList.vue
index 2444c86..6d497de 100644
--- a/admin/src/views/workorder/workorderList.vue
+++ b/admin/src/views/workorder/workorderList.vue
@@ -19,14 +19,20 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="cateId" label="宸ュ崟鍒嗙被">
-        <el-cascader v-model="searchForm.areaIds" @change="changeSel" placeholder="璇烽�夋嫨宸℃鍖哄煙" clearable
+        <el-cascader v-model="searchForm.areaIds" @change="changeSel" placeholder="璇烽�夋嫨宸ュ崟鍒嗙被" clearable
           :options="cateList" :props="{
             label: 'name',
             value: 'id',
             children: 'childCategoryList'
           }"></el-cascader>
       </el-form-item>
-      <el-form-item label="鎻愪氦鏃ユ湡">
+      <el-form-item label="鏉ユ簮" prop="origin">
+        <el-select v-model="searchForm.origin" clearable filterable>
+          <el-option label="鑷缓" :value="0" />
+          <el-option label="闂杞伐鍗�" :value="1" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="涓婃姤鏃堕棿">
         <el-date-picker v-model="searchForm.selDate" @change="changeSelDate" format="yyyy-MM-dd"
           value-format="yyyy-MM-dd" type="daterange"></el-date-picker>
       </el-form-item>
@@ -58,6 +64,12 @@
           </template>
         </el-table-column>
         <el-table-column prop="categoryName" label="宸ュ崟鍒嗙被" min-width="100px"></el-table-column>
+        <el-table-column label="鏉ユ簮" min-width="100px">
+          <template slot-scope="{row}">
+            <span v-if="row.origin == 0">鑷缓</span>
+            <span v-if="row.origin == 1">闂杞伐鍗�</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="creatorName" label="涓婃姤浜�" min-width="80px"></el-table-column>
         <el-table-column prop="createDate" label="涓婃姤鏃堕棿" min-width="100px"></el-table-column>
         <el-table-column prop="dealUserName" label="澶勭悊浜�" min-width="80px"></el-table-column>
@@ -78,7 +90,7 @@
       <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
       </pagination>
     </template>
-    <Detail v-if="showDetail" ref="DetailRef" @close="showDetail = false" @success="search" />
+    <Detail v-if="openDetail" ref="DetailRef" @close="openDetail = false" @success="search" />
     <!-- 鏂板缓/淇敼 -->
     <OperaYwWorkorderWindow ref="operaYwWorkorderWindow" @success="handlePageChange" />
   </TableLayout>
@@ -100,14 +112,14 @@
   data() {
     return {
       // 鎼滅储
-      showDetail: false,
+      openDetail: false,
       searchForm: {
         selDate: [],
-        areaType: '',
         areaIds: '',
         projectId: '',
         buildingId: '',
         cateId: '',
+        origin: ''
       },
       projectList: [],
       buildList: [],
@@ -126,11 +138,13 @@
   },
   methods: {
     handleDetail(row) {
-      this.showDetail = true
+      this.openDetail = true
       this.$nextTick(() => {
-        this.$refs.DetailRef.visible = true
-        this.$refs.DetailRef.id = row.id
-        this.$refs.DetailRef.getDetail()
+        this.$refs.DetailRef.open('宸ュ崟璇︽儏', { workorderId: row.id }, true)
+        // this.$refs.DetailRef.isShow = true
+        // this.$refs.DetailRef.visible = true
+        // this.$refs.DetailRef.id = row.id
+        // this.$refs.DetailRef.getDetail()
 
       })
     },
@@ -168,6 +182,7 @@
         buildingId: '',
         cateId: '',
       }
+      this.buildList = []
       this.search()
     },
     changeSelDate(e) {

--
Gitblit v1.9.3