From 0d0968ec2d1a39c21e15e447c4f2227f70d6a11b Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期一, 11 十二月 2023 10:38:37 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/GoodManage/MixingScreen.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/web/src/views/GoodManage/MixingScreen.vue b/web/src/views/GoodManage/MixingScreen.vue
index 0b2382f..38ccb70 100644
--- a/web/src/views/GoodManage/MixingScreen.vue
+++ b/web/src/views/GoodManage/MixingScreen.vue
@@ -1,4 +1,4 @@
-<!-- 物资管理 ==> 拌合站屏管理-->
+<!-- 物资管理 ==> 拌和站屏管理-->
<template>
<div class="main">
<div class="main_header">
@@ -87,8 +87,8 @@
<el-dialog class="prop_dialog" v-if="isRenderDialog" :title="dialogTitle" :visible.sync="asyncVisible"
@close="closeDialog">
<el-form ref="ruleForm" class="rule_form" :model="ruleForm" :rules="rules" label-width="auto">
- <el-form-item label="拌合站屏:" prop="name">
- <el-select size="mini" v-model="ruleForm.name" :disabled="isUpdate" placeholder="请选择拌合站屏"
+ <el-form-item label="拌和站屏:" prop="name">
+ <el-select size="mini" v-model="ruleForm.name" :disabled="isUpdate" placeholder="请选择拌和站屏"
@change="changeSelectForm($event)">
<el-option v-for="item in selects.screenNames" :key="item.value" :label="item.label"
:value="item.value"></el-option>
@@ -149,8 +149,8 @@
submitMode: '', // add update
dataLists: [], // [[],[],[]]
selects: {
- screenNames: [], // 拌合站屏
- screenNameIds: {}, // 拌合站屏id map
+ screenNames: [], // 拌和站屏
+ screenNameIds: {}, // 拌和站屏id map
}, // 下拉框状态选择汇总
ruleForm: {
name: '', // 下拉框屏名称
@@ -187,7 +187,7 @@
pageNum: 1,
pageSize: 9999,
stata: '', // 录入方式
- types: '', // 拌合站屏
+ types: '', // 拌和站屏
strTime: '',
endTime: '',
},
@@ -203,7 +203,7 @@
},
beforeCreate() {
this.rules = {
- name: [{required: true, message: '请选择拌合站屏', trigger: 'change'}],
+ name: [{required: true, message: '请选择拌和站屏', trigger: 'change'}],
infos: [{
num: [{required: true, message: '请输入', trigger: 'blur'}],
spec: [{required: true, message: '请输入', trigger: 'blur'}],
--
Gitblit v1.9.3