From a36b834b2957440a755652ff17d067b18f4e9250 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 29 一月 2024 16:55:05 +0800
Subject: [PATCH] 工位终端
---
jcdm-ui/src/views/main/bs/formulaChild/index.vue | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/formulaChild/index.vue b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
index 67c79d1..95a80ea 100644
--- a/jcdm-ui/src/views/main/bs/formulaChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/formulaChild/index.vue
@@ -107,7 +107,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-descriptions class="margin-top" :column="4" :size="size" border>
+ <el-descriptions class="margin-top" :column="4" border>
<el-descriptions-item :span="1">
<template slot="label">
<i class="el-icon-user"></i>
@@ -150,26 +150,29 @@
</el-table-column>
<el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' width="150" align="center" prop="operationSteps">
</el-table-column>
- <el-table-column label="鎶�鏈姹�" width="150" :show-overflow-tooltip='true' align="center" prop="techRequirement">
+ <el-table-column label="鎶�鏈姹�" width="150" :show-overflow-tooltip='true' align="center" prop="techRequirement">
</el-table-column>
<el-table-column label="绫诲瀷" width="90" align="center" prop="operationType">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.operation_type" :value="scope.row.operationType"/>
+ </template>
</el-table-column>
<el-table-column label="鎺掑簭" width="90" align="center" prop="stepSort">
</el-table-column>
- <el-table-column label="鍙傛暟缂栫爜" width="130" align="center" prop="paramCode">
+ <el-table-column label="鍙傛暟缂栫爜" :show-overflow-tooltip='true' width="130" align="center" prop="paramCode">
</el-table-column>
- <el-table-column label="鐗╂枡缂栫爜" width="130" align="center" prop="materialCode">
+ <el-table-column label="鐗╂枡缂栫爜" :show-overflow-tooltip='true' width="130" align="center" prop="materialCode">
</el-table-column>
<el-table-column label="閰嶆柟缂栫爜" width="130" align="center" prop="formulaCode">
</el-table-column>
<el-table-column label="鍥剧墖" :show-overflow-tooltip='true' width="130" align="center" prop="picture">
- <template slot-scope="scope">
- <el-image
- style="width: 100px; height: 100px"
- :src="pjtUrl+scope.row.picture"
- :fit="fit">
- </el-image>
- </template>
+<!-- <template slot-scope="scope">-->
+<!-- <el-image-->
+<!-- style="width: 100px; height: 100px"-->
+<!-- :src="pjtUrl+scope.row.picture"-->
+<!-- :fit="fit">-->
+<!-- </el-image>-->
+<!-- </template>-->
</el-table-column>
<el-table-column label="澶囨敞" width="130" align="center" prop="remarks">
</el-table-column>
@@ -242,16 +245,16 @@
<el-form-item label="鎶�鏈姹�" prop="techRequirement">
<el-input v-model="form.techRequirement" placeholder="璇疯緭鍏ユ妧鏈姹�" />
</el-form-item>
-<!-- <el-form-item label="绫诲瀷" prop="operationType">-->
-<!-- <el-select v-model="form.operationType" placeholder="璇烽�夋嫨绫诲瀷">-->
-<!-- <el-option-->
-<!-- v-for="dict in dict.type.${dictType}"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="dict.value"-->
-<!-- ></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
+ <el-form-item label="绫诲瀷" prop="operationType">
+ <el-select style="width: 100%" v-model="form.operationType" placeholder="璇烽�夋嫨绫诲瀷">
+ <el-option
+ v-for="dict in dict.type.operation_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="鎺掑簭" prop="stepSort">
<el-input v-model="form.stepSort" placeholder="璇疯緭鍏ユ帓搴�" />
</el-form-item>
@@ -285,6 +288,7 @@
export default {
name: "FormulaChild",
+ dicts: ['operation_type'],
data() {
return {
pjtUrl: process.env.VUE_APP_BASE_API,
@@ -336,7 +340,7 @@
};
},
created() {
- const formulaCode = this.$route.params && this.$route.params.formulaCode;
+ let formulaCode = this.$route.query.formulaCode;
this.queryParams.formulaCode = formulaCode;
this.formulaCode = formulaCode;
this.headerInformation();
--
Gitblit v1.9.3