From 8ac30411bb33e406e0ed5a2b6e2edaf7ab59f11f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue | 69 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue b/admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue
index 2f13c0e..0f933b6 100644
--- a/admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue
+++ b/admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue
@@ -1,38 +1,37 @@
<template>
- <GlobalWindow
- :title="title"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
+ <GlobalWindow width="520px" :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
<el-form :model="form" ref="form" :rules="rules">
-
- <el-form-item label="鏍囬" prop="title">
- <el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
+ <el-form-item label="璁″垝鍚嶇О" prop="title">
+ <el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim />
</el-form-item>
-
-
- <el-form-item label="宸℃璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" prop="userIds">
- <el-input v-model="form.userIds" placeholder="璇疯緭鍏ュ贰妫�璐熻矗浜虹紪鐮侀泦鍚堬紝澶氫釜浣跨敤鑻辨枃閫楀彿闅斿紑" v-trim/>
+ <el-form-item label="宸℃绾胯矾">
+ <el-select v-model="form.status" filterable clearable>
+ <el-option value="0" label="姣忓ぉ"></el-option>
+ <el-option value="1" label="姣忓懆"></el-option>
+ <el-option value="2" label="姣忔湀"></el-option>
+ </el-select>
</el-form-item>
-
- <el-form-item label="寰幆鍛ㄦ湡 0姣忓ぉ 1姣忓懆 2姣忓ぉ" prop="circleType">
- <el-input v-model="form.circleType" placeholder="璇疯緭鍏ュ惊鐜懆鏈� 0姣忓ぉ 1姣忓懆 2姣忓ぉ" v-trim/>
+ <el-form-item label="宸℃璐熻矗浜�">
+ <el-select v-model="form.userIds" filterable clearable>
+ <el-option value="0" label="姣忓ぉ"></el-option>
+ <el-option value="1" label="姣忓懆"></el-option>
+ <el-option value="2" label="姣忔湀"></el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="寰幆閲嶅瑙勫垯 1-31锛屽涓嫳鏂囬�楀彿闅斿紑" prop="circleDays">
- <el-input v-model="form.circleDays" placeholder="璇疯緭鍏ュ惊鐜噸澶嶈鍒� 1-31锛屽涓嫳鏂囬�楀彿闅斿紑" v-trim/>
+ <el-form-item label="璁″垝寮�濮嬫棩鏈�-缁撴潫鏃ユ湡">
+ <el-date-picker v-model="form.selDate" is-range range-separator="-" value-format="yyyy-MM-dd" type="daterange"
+ start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" class="w400" />
</el-form-item>
- <el-form-item label="寮�濮嬫棩鏈�" prop="startDate">
- <el-date-picker v-model="form.startDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ュ紑濮嬫棩鏈�"></el-date-picker>
+ <el-form-item label="璁″垝鎵ц鏃堕棿">
+ <el-time-picker v-model="form.selTime" is-range range-separator="-" format="HH:mm" value-format="HH:mm:ss"
+ start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿" placeholder="閫夋嫨鏃堕棿鑼冨洿" class="w400" />
</el-form-item>
- <el-form-item label="缁撴潫鏃ユ湡" prop="endDate">
- <el-date-picker v-model="form.endDate" value-format="yyyy-MM-dd" placeholder="璇疯緭鍏ョ粨鏉熸棩鏈�"></el-date-picker>
- </el-form-item>
- <el-form-item label="寮�濮嬫椂闂寸偣" prop="startTime">
- <el-input v-model="form.startTime" placeholder="璇疯緭鍏ュ紑濮嬫椂闂寸偣" v-trim/>
- </el-form-item>
- <el-form-item label="缁撴潫鏃堕棿鐐�" prop="endTime">
- <el-input v-model="form.endTime" placeholder="璇疯緭鍏ョ粨鏉熸椂闂寸偣" v-trim/>
+ <el-form-item label="寰幆鍛ㄦ湡">
+ <el-select v-model="form.circleType" filterable clearable>
+ <el-option value="0" label="姣忓ぉ"></el-option>
+ <el-option value="1" label="姣忓懆"></el-option>
+ <el-option value="2" label="姣忔湀"></el-option>
+ </el-select>
</el-form-item>
</el-form>
</GlobalWindow>
@@ -45,7 +44,7 @@
name: 'OperaYwPatrolSchemeWindow',
extends: BaseOpera,
components: { GlobalWindow },
- data () {
+ data() {
return {
// 琛ㄥ崟鏁版嵁
form: {
@@ -70,18 +69,26 @@
endDate: '',
startTime: '',
endTime: '',
- processStatus: ''
+ processStatus: '',
+ selDate: [],
+ selTime: [],
},
// 楠岃瘉瑙勫垯
rules: {
}
}
},
- created () {
+ created() {
this.config({
api: '/Inspection/ywPatrolScheme',
'field.id': 'id'
})
+ },
+ methods: {
+ initData() {
+
+ }
}
+
}
</script>
--
Gitblit v1.9.3