From 6817c96db53ac16f5d5eca72b73230d898f32126 Mon Sep 17 00:00:00 2001 From: ZhangXianQiang <1135831638@qq.com> Date: 星期四, 11 四月 2024 09:43:32 +0800 Subject: [PATCH] Merge branch 'master' into dev-threejs --- src/views/system/template/index.vue | 161 ++++++++++++++++++++++++----------------------------- 1 files changed, 72 insertions(+), 89 deletions(-) diff --git a/src/views/system/check-template/index.vue b/src/views/system/template/index.vue similarity index 78% copy from src/views/system/check-template/index.vue copy to src/views/system/template/index.vue index 227f892..9fe7f3c 100644 --- a/src/views/system/check-template/index.vue +++ b/src/views/system/template/index.vue @@ -1,7 +1,7 @@ <template> <div class="app-container"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> - <el-form-item label="鐘舵��" prop="status"> + <!-- <el-form-item label="鐘舵��" prop="status"> <el-input v-model="queryParams.status" placeholder="璇疯緭鍏ョ姸鎬�" @@ -27,7 +27,17 @@ start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" ></el-date-picker> - </el-form-item> + </el-form-item> --> + <el-form-item label="鑰冩牳绫诲瀷" prop="examineCategory"> + <el-select v-model="queryParams.status" placeholder="鑰冩牳绫诲瀷" clearable @keyup.enter.native="handleQuery"> + <el-option + v-for="dict in dict.type.platform_examine_category" + :key="dict.value" + :label="dict.label" + :value="parseInt(dict.value)" + /> + </el-select> + </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> @@ -44,7 +54,7 @@ @click="handleAdd" >鏂板</el-button> </el-col> - <el-col :span="1.5"> + <!-- <el-col :span="1.5"> <el-button type="success" plain @@ -63,7 +73,7 @@ :disabled="multiple" @click="handleDelete" >鍒犻櫎</el-button> - </el-col> + </el-col> --> <el-col :span="1.5"> <el-button type="warning" @@ -76,36 +86,19 @@ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> - <el-table v-loading="loading" :data="checkTemplateList" @selection-change="handleSelectionChange"> - <el-table-column type="selection" width="55" align="center" /> - <el-table-column label="妯℃澘鍚嶇О" align="center" prop="templateName" width="220px"/> - <el-table-column label="鑰冩牳绫诲瀷" align="center" prop="examineCategory" /> - <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="unitId" width="400px" > - <template slot-scope="scope"> - <div v-if="scope.row.unitId === 2">鎴愰兘x杩愮淮</div> - <div v-else-if="scope.row.unitId === 3">瀵岄『鍘�,鑽e幙,楂樻柊鍖�,鑷祦浜曞尯,璐′簳鍖�,澶у畨鍖�,娌挎哗鍖�</div> - </template> - </el-table-column> - <el-table-column label="璋冩暣绯绘暟" align="center" prop="adjustCoefficient" /> - <el-table-column label="璋冩暣绯绘暟璁$畻鏂瑰紡" align="center" prop="adjustWay"/> - <el-table-column label="鐘舵��" align="center" prop="status" /> - <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> - <template slot-scope="scope"> - <el-button - size="mini" - type="text" - icon="el-icon-edit" - @click="handleUpdate(scope.row)" - >淇敼</el-button> - <el-button - size="mini" - type="text" - icon="el-icon-delete" - @click="handleDelete(scope.row)" - >鍒犻櫎</el-button> - </template> - </el-table-column> - </el-table> + <el-card class="box-card" v-for="item in checkTemplateList" :key="item"> + <div class="text item">妯℃澘鍚嶇О锛歿{ item.templateName }}</div> + <div class="text item">鑰冩牳绫诲瀷锛歿{ item.examineCategory == 0 ? '鐪佸巺鑰冩牳' : '鍖哄煙鑰冩牳' }}</div> + <div class="text item">鑰冩牳瀵硅薄锛歿{ item.deptId }}</div> + <div class="text item">鍙戝竷鐘舵�侊細{{ item.status == 0 ? '鍚敤' : '鍋滅敤' }}</div> + <div class="bottom clearfix"> + <el-button type="text" class="button" @click="">瀹℃牳</el-button> + <el-button type="text" class="button" @click="">鍙戝竷</el-button> + <el-button type="text" class="button" @click="">澶嶅埗</el-button> + <el-button type="text" class="button" @click="handleUpdate(item)">淇敼</el-button> + <el-button type="text" class="button" @click="handleDelete(item)">鍒犻櫎</el-button> + </div> + </el-card> <pagination v-show="total>0" @@ -121,16 +114,25 @@ <el-form-item label="妯℃澘鍚嶇О" prop="templateName"> <el-input v-model="form.templateName" placeholder="璇疯緭鍏ユā鏉垮悕绉�" /> </el-form-item> - <el-form-item label="鑰冩牳瀵硅薄" prop="unitName"> - <div class="block"> - <span class="demonstration"></span> - <el-cascader - v-model="value" - :options="options" - :props = "props" - @change="handleChange"></el-cascader> - </div> - + <el-form-item label="鑰冩牳绫诲瀷" prop="examineCategory"> + <el-select v-model="form.examineCategory" placeholder="鑰冩牳绫诲瀷"> + <el-option + v-for="dict in dict.type.platform_examine_category" + :key="dict.value" + :label="dict.label" + :value="parseInt(dict.value)" + /> + </el-select> + </el-form-item> + <el-form-item label="鑰冩牳瀵硅薄" prop="deptId"> + <el-select v-model="form.deptId" multiple placeholder="璇烽�夋嫨"> + <el-option + v-for="item in areaList" + :key="item.id" + :label="item.value" + :value="item.id"> + </el-option> + </el-select> </el-form-item> <el-form-item label="鑰冩牳瑙勫垯" prop="tempRuleFormList"> <div class="row-warp"> @@ -193,53 +195,17 @@ <script> import { listCheckTemplate, getCheckTemplate, delCheckTemplate, addCheckTemplate, updateCheckTemplate } from "@/api/platform/check-template"; -import { ruleSelect } from '../../../api/platform/check-rule' -import { unitSelect } from '../../../api/platform/unit' +// import { ruleSelect } from '@/api/platform/check-rule' + import { areaSelect } from '@/api/system/dept' export default { name: "CheckTemplate", + dicts: ['platform_audit_state','platform_examine_category','platform_rule_category'], data() { return { props: { multiple: true }, value: [], - options: [{ - value: 'city', - label: '鍖哄幙', - children: [{ - value: 'fushun', - label: '瀵岄『鍘�', - }, { - value: 'rong', - label: '鑽e幙', - },{ - value: 'gaoxin', - label: '楂樻柊鍖�', - },{ - value: 'ziliujing', - label: '鑷祦浜曞尯', - },{ - value: 'gongjing', - label: '璐′簳鍖�', - },{ - value: 'daan', - label: '澶у畨鍖�', - },{ - value: 'yantan', - label: '娌挎哗鍖�', - }, - ] - }, { - value: 'company', - label: '鍏徃', - children: [{ - value: 'yunwei', - label: '鎴愰兘x杩愮淮', - }, { - value: 'yunwei2', - label: '鑷础x杩愮淮', - }, ] - }, - ], + areaList:[], ruleList: [], unitList: [], // 涓存椂瑙勫垯琛ㄥ崟 @@ -293,8 +259,11 @@ }, created() { this.getList(); + this.areaSelect(); this.selectCheckRule(); - this.selectUnit(); + if (typeof this.form.deptId === 'string' && this.form.deptId.length > 0) { + this.form.deptId = this.form.deptId.split(',').map(Number); // 鍋囪deptId鐨勫�兼槸浠ラ�楀彿鍒嗛殧鐨勬暟瀛楀瓧绗︿覆 + } }, methods: { handleChange(value) { @@ -322,9 +291,9 @@ }) }, // 杩愮淮鍏徃涓嬫媺鏁版嵁 - selectUnit() { - unitSelect().then(res => { - this.unitList = res.data; + areaSelect() { + areaSelect().then(res => { + this.areaList = res.data; }) }, /** 鏌ヨ鑰冩牳妯℃澘鍒楄〃 */ @@ -335,7 +304,7 @@ this.queryParams["end"] = this.daterangeCreateTime[1]; } listCheckTemplate(this.queryParams).then(response => { - this.checkTemplateList = response.data; + this.checkTemplateList = response.rows; this.total = response.total; this.loading = false; }); @@ -461,4 +430,18 @@ display: flex; flex-direction: row; } +.text { + font-size: 14px; + } + + .item { + margin-bottom: 18px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .box-card { + width: 20%; + } </style> -- Gitblit v1.8.0