From b599374e54fcb8fc56e6ccc8efe5f2b3f3d20716 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期一, 29 九月 2025 13:40:54 +0800 Subject: [PATCH] 新问题 25-9-28 --- src/views/system/point/index.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 7 deletions(-) diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue index 93f2536..fd85d22 100644 --- a/src/views/system/point/index.vue +++ b/src/views/system/point/index.vue @@ -47,6 +47,7 @@ <el-button type="primary" plain icon="el-icon-top" v-loading="download" size="mini" @click="handleExport" v-hasPermi="['point:export']">瀵煎嚭鐐逛綅</el-button> </el-col> + <el-col :span="1.5"> <el-popover> <div class="bottom_"> @@ -76,6 +77,7 @@ size="small" v-model="ywTimes" type="daterange" + value-format="yyyy-MM-dd" range-separator="鑷�" start-placeholder="鏇存崲杩愮淮鏃堕棿" end-placeholder="鏇存崲杩愮淮鏃堕棿"> @@ -99,7 +101,7 @@ <el-button class="bottom_" type="primary" size="small" v-loading="upload" @click="handleImport" v-hasPermi="['point:import']">瀵煎叆</el-button> </div> - <el-button type="primary" size="mini" plain icon="el-icon-bottom" slot="reference" v-hasPermi="['point:import']">瀵煎叆鐐逛綅</el-button> + <el-button type="primary" size="mini" plain icon="el-icon-bottom" slot="reference" v-hasPermi="['point:import']"></el-button> </el-popover> </el-col> <!-- <el-col :span="1.5">--> @@ -157,7 +159,7 @@ </el-cascader> </el-form-item> <el-form-item label="杩愮淮鍗曚綅" prop="unitId"> - <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅"> + <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅" clearable @clear = "clearTime"> <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id"> </el-option> </el-select> @@ -171,6 +173,12 @@ start-placeholder="杩愮淮寮�濮嬫椂闂�" end-placeholder="杩愮淮缁撴潫鏃堕棿"> </el-date-picker> + </el-form-item> + <el-form-item label="鐢ㄦ埛鍚�" prop="remark"> + <el-input v-model="form.username"/> + </el-form-item> + <el-form-item label="瀵嗙爜" prop="remark"> + <el-input v-model="form.password"/> </el-form-item> <el-form-item label="鐐逛綅澶囨敞" prop="remark"> <el-input type="textarea" v-model="form.remark"/> @@ -188,9 +196,27 @@ inactive-text="鏅�氱偣浣�"> </el-switch> </el-form-item> - <el-form-item label="鐪佸巺:" prop="provinceTag"> + <el-form-item label="瑙嗛:" prop="provinceTagVideo"> <el-switch - v-model="form.provinceTag" + v-model="form.provinceTagVideo" + active-color="#13ce66" + inactive-color="gray" + active-text="鐪佸巺鐐逛綅" + inactive-text="鏅�氱偣浣�"> + </el-switch> + </el-form-item> + <el-form-item label="杞﹁締:" prop="provinceTagCar"> + <el-switch + v-model="form.provinceTagCar" + active-color="#13ce66" + inactive-color="gray" + active-text="鐪佸巺鐐逛綅" + inactive-text="鏅�氱偣浣�"> + </el-switch> + </el-form-item> + <el-form-item label="浜鸿劯:" prop="provinceTagFace"> + <el-switch + v-model="form.provinceTagFace" active-color="#13ce66" inactive-color="gray" active-text="鐪佸巺鐐逛綅" @@ -272,7 +298,7 @@ provinceTag: false, importantCommandImageTag: false, timeList: [], - timezone: [], + timezone: null, ywTimes: [], fileList: [], importFile: null, @@ -353,6 +379,10 @@ this.getDyColumn(); }, methods: { + clearTime() { + console.log("鐢熸晥") + this.timezone = ''; + }, getDyColumn() { // 鏌ヨ鍔ㄦ�佸垪 let params = { @@ -373,7 +403,9 @@ // 妫�鏌ユ瘡涓爣绛撅紝濡傛灉涓簍rue锛屽垯娣诲姞鍒皌ext涓� if (row.importantTag) text += '閲嶇偣鐐逛綅銆�'; - if (row.provinceTag) text += '鐪佸巺鐐逛綅銆�'; + if (row.provinceTagVideo) text += '鐪佸巺瑙嗛銆�'; + if (row.provinceTagCar) text += '鐪佸巺杞﹁締銆�'; + if (row.provinceTagFace) text += '鐪佸巺浜鸿劯銆�'; if (row.importantCommandImageTag) text += '閲嶇偣鎸囨尌鍥惧儚銆�'; if (row.deptTag) text += '閮ㄧ骇銆�'; text === '' ? '鏅�氱偣浣�' : text @@ -505,7 +537,9 @@ updateTime: null, deleted: null, importantTag: false, - provinceTag: false, + provinceTagVideo: false, + provinceTagCar: false, + provinceTagFace: false, deptTag: false, }; this.resetForm("form"); @@ -550,6 +584,13 @@ submitForm() { this.$refs['form'].validate(valid => { if (valid) { + if (this.timezone && this.timezone.length > 0) { + this.form.startTime = this.timezone[0] + this.form.endTime = this.timezone[1] + } else { + this.form.startTime = null + this.form.endTime = null + } if (this.form.deptId && this.form.deptId.length > 0) { this.form.deptId = this.form.deptId[this.form.deptId.length - 1] } -- Gitblit v1.8.0