From 8ff8b4dbccd93d4dbc7976b50148088fef77af0b Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期五, 08 十二月 2023 08:56:26 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/GoodManage/MixRatioScreen.vue | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/web/src/views/GoodManage/MixRatioScreen.vue b/web/src/views/GoodManage/MixRatioScreen.vue
index af1f047..16cdfa1 100644
--- a/web/src/views/GoodManage/MixRatioScreen.vue
+++ b/web/src/views/GoodManage/MixRatioScreen.vue
@@ -110,10 +110,11 @@
<div style="display: flex;">
<div style="margin-right: 10px;" v-for="(item, index) in ruleForm.infos " :key="index">
<el-form-item :label="index === 0 ? '材料名称' : ''" :prop="`infos.${index}.dictId`">
- <el-select v-model="item.dictId" size="mini" placeholder="请选择材料名称">
+ <!-- <el-select v-model="item.dictId" size="mini" placeholder="请选择材料名称">
<el-option v-for="item in selects.materials" :key="item.value" :label="item.label"
:value="item.value"></el-option>
- </el-select>
+ </el-select> -->
+ <el-input v-model="item.dictId" size="mini" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item :label="index === 0 ? '规格型号' : ''" :prop="`infos.${index}.spec`">
<el-input v-model="item.spec" size="mini" placeholder="请输入" clearable></el-input>
@@ -153,7 +154,7 @@
times: [], // 时间范围
selects: {
screenNames: [], // 配合比屏
- materials: [] // 材料名称
+ // materials: [] // 材料名称[先改成输入,,字典表材料不匹配]
}, // 下拉框状态选择汇总
tableData: [{
inType: '', // 录入方式
@@ -166,7 +167,7 @@
construction: '', // 施工部位
mixingConsumeId: '', // 每个材料id
dataLists: [
- {name: '材料名称', type: 'dictName', value: []}, // 材料名称
+ {name: '材料名称', type: 'dictId', value: []}, // 材料名称
{name: '规格型号', type: 'spec', value: []}, // 规格型号
{name: '生产厂家', type: 'manufacturer', value: []}, // 生产厂家
{name: '材料含水率(%)', type: 'watFull', value: []}, // 含水率
@@ -252,7 +253,7 @@
construction: '', // 施工部位
mixingConsumeId: '', // 每个材料id
dataLists: [
- {name: '材料名称', type: 'dictName', value: []}, // 材料名称
+ {name: '材料名称', type: 'dictId', value: []}, // 材料名称
{name: '规格型号', type: 'spec', value: []}, // 规格型号
{name: '生产厂家', type: 'manufacturer', value: []}, // 生产厂家
{name: '材料含水率(%)', type: 'watFull', value: []}, // 含水率
@@ -307,18 +308,18 @@
})
},
//获取字典表材料名称
- async getDicFilteredData() {
- let params = {pageNum: 1, pageSize: 100000000}
- let {data} = await this.$api.Dictionary.searchDictionary(params)
- data.list.forEach(item => {
- if (item.dictType === 'pipe_materials') {
- this.selects.materials.push({
- label: item.dictName,
- value: item.dictId,
- })
- }
- })
- },
+ // async getDicFilteredData() {
+ // let params = {pageNum: 1, pageSize: 100000000}
+ // let {data} = await this.$api.Dictionary.searchDictionary(params)
+ // data.list.forEach(item => {
+ // if (item.dictType === 'pipe_materials') {
+ // this.selects.materials.push({
+ // label: item.dictName,
+ // value: item.dictId,
+ // })
+ // }
+ // })
+ // },
// 获取配比屏名称
async getScreenNames() {
const params = {pageNum: 1, pageSize: 9999}
@@ -351,9 +352,9 @@
if (!this.isRenderDialog) {
this.isRenderDialog = true
}
- if (!this.selects.materials.length) {
- await this.getDicFilteredData()
- }
+ // if (!this.selects.materials.length) {
+ // await this.getDicFilteredData()
+ // }
this.asyncVisible = true
this.$nextTick(() => {
resolve()
@@ -372,7 +373,6 @@
this.submitMode = 'update'
this.showDialog().then(() => {
const {mixingSignboardId, proName, constructionUnit, saveStamp, construction, dataListFlat} = this.tableData[i]
- console.log(constructionUnit)
this.ruleForm = Object.assign(this.ruleForm, {
mixingSignboardId,
proName,
@@ -543,8 +543,11 @@
justify-content: center;
align-items: center;
flex: 1;
+ padding: 0 4px;
+ line-height: 24px;
margin: -1px -1px -1px 0;
border: 1px solid #01B3EF;
+ word-break: break-all;
}
}
}
--
Gitblit v1.9.3