From c74dcb8dca7b9e3eded0d20299f19a26a6b70974 Mon Sep 17 00:00:00 2001 From: wujian <14790700720@163.com> Date: 星期三, 31 一月 2024 12:48:45 +0800 Subject: [PATCH] add 追溯报表 --- jcdm-ui/src/views/main/da/tileMatchRules/index.vue | 63 +++++++++++++++++-------------- 1 files changed, 35 insertions(+), 28 deletions(-) diff --git a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue index 30db3cc..3812ffb 100644 --- a/jcdm-ui/src/views/main/da/tileMatchRules/index.vue +++ b/jcdm-ui/src/views/main/da/tileMatchRules/index.vue @@ -21,12 +21,14 @@ </el-form-item> <el-form-item label="鐘舵��" prop="state"> - <el-input - v-model="queryParams.state" - placeholder="璇疯緭鍏ョ姸鎬�" - clearable - @keyup.enter.native="handleQuery" - /> + <el-select v-model="queryParams.state" placeholder="璇烽�夋嫨鐘舵��" clearable> + <el-option + v-for="dict in dict.type.sys_normal_disable" + :key="dict.value" + :label="dict.label" + :value="dict.value" + /> + </el-select> </el-form-item> <el-form-item style="float: right"> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button> @@ -94,38 +96,30 @@ <el-table border v-loading="loading" :data="tileMatchRulesList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column label="涓婚敭id" align="center" prop="id" />--> - <el-table-column label="浜у搧绯诲垪" align="center" prop="productSeries"> - + <el-table-column label="浜у搧绯诲垪" align="center" prop="productSeries" width="90"> </el-table-column> - <el-table-column label="鎵爜瀵硅薄1" align="center" prop="scanObject1" width="100"> - + <el-table-column label="鎵爜瀵硅薄1" align="center" prop="scanObject1" width="90"> </el-table-column> - <el-table-column label="鎵爜瀵硅薄2" align="center" prop="scanObject2" width="100"> - + <el-table-column label="鎵爜瀵硅薄2" align="center" prop="scanObject2" width="90"> </el-table-column> <el-table-column label="杞村悕绉�" align="center" prop="axisName"> - </el-table-column> <el-table-column label="棰堝悕绉�" align="center" prop="neckName"> - </el-table-column> <el-table-column label="鐡﹀悕绉�" align="center" prop="tileName"> - </el-table-column> - <el-table-column label="杞村弬鏁颁綅缃�" align="center" prop="axisParameterNoPosition" width="100"> - + <el-table-column label="杞村弬鏁颁綅缃�" align="center" prop="axisParameterNoPosition" width="90"> </el-table-column> - <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="100"> - + <el-table-column label="棰堝弬鏁颁綅缃�" align="center" prop="neckParameterPosition" width="90"> </el-table-column> <el-table-column label="杞村��" align="center" prop="axisValue"> - </el-table-column> <el-table-column label="棰堝��" align="center" prop="neckValue"> - </el-table-column> - <el-table-column label="鐡﹂鑹�" align="center" prop="tileColor"> - + <el-table-column label="鐡﹂鑹�" align="center" prop="tileColor" > + <template slot-scope="scope"> + <dict-tag :options="dict.type.colour_hex" :value="scope.row.tileColor" :style="{ backgroundColor: scope.row.tileColor }"/> + </template> </el-table-column> <!-- <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">--> @@ -172,7 +166,7 @@ /> <!-- 娣诲姞鎴栦慨鏀归厤鐡﹁鍒欏璇濇 --> - <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="650px" append-to-body> + <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body> <span slot="title"> <i class="el-icon-s-order"></i> {{titleName}} @@ -208,8 +202,21 @@ <el-form-item label="棰堝��" prop="neckValue"> <el-input v-model="form.neckValue" placeholder="璇疯緭鍏ラ鍊�" /> </el-form-item> - <el-form-item label="鐡﹂鑹�" prop="tileColor"> +<!-- <el-form-item label="鐡﹂鑹�" prop="tileColor"> <el-input v-model="form.tileColor" placeholder="璇疯緭鍏ョ摝棰滆壊" /> + </el-form-item>--> +<!-- <el-form-item label="鐡﹂鑹�" prop="tileColor" required> + <el-color-picker v-model="form.tileColor" size="medium"></el-color-picker> + </el-form-item>--> + <el-form-item label="鐡﹂鑹�" prop="tileColor"> + <el-select v-model="form.tileColor" placeholder="璇烽�夋嫨鐘舵��"> + <el-option + v-for="dict in dict.type.colour_hex" + :key="dict.value" + :label="dict.label" + :value="dict.value" + ></el-option> + </el-select> </el-form-item> <!-- <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">--> <!-- <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />--> @@ -218,12 +225,12 @@ <!-- <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />--> <!-- </el-form-item>--> <el-form-item label="鐘舵��" prop="state"> - <el-select v-model="form.state" placeholder="璇烽�夋嫨鐘舵��" > + <el-select v-model="form.state" placeholder="璇烽�夋嫨鐘舵��"> <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" - :value="dict.value" + :value="parseInt(dict.value)" ></el-option> </el-select> </el-form-item> @@ -241,7 +248,7 @@ export default { name: "TileMatchRules", - dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'], + dicts: ['subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable','colour_hex'], data() { return { advancedShowSearch: false, -- Gitblit v1.9.3