From 17d7043f10d55429db919238fe639bff1b51ec0e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 二月 2025 15:59:37 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
admin/src/views/workorder/workorderList.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/workorder/workorderList.vue b/admin/src/views/workorder/workorderList.vue
index 2444c86..d22f32d 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>
@@ -103,11 +115,11 @@
showDetail: false,
searchForm: {
selDate: [],
- areaType: '',
areaIds: '',
projectId: '',
buildingId: '',
cateId: '',
+ origin: ''
},
projectList: [],
buildList: [],
@@ -168,6 +180,7 @@
buildingId: '',
cateId: '',
}
+ this.buildList = []
this.search()
},
changeSelDate(e) {
--
Gitblit v1.9.3