From cc4e197fe80f5c72840fc6d81e4d93ccbe6276e5 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 30 五月 2024 16:56:58 +0800
Subject: [PATCH] 1.递交
---
src/views/systemSetting/processSetting.vue | 17 +++++++++++------
src/views/basicSettings/meterPrice.vue | 21 ++++++++++++++-------
2 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/views/basicSettings/meterPrice.vue b/src/views/basicSettings/meterPrice.vue
index 3c94848..cbd0587 100644
--- a/src/views/basicSettings/meterPrice.vue
+++ b/src/views/basicSettings/meterPrice.vue
@@ -57,10 +57,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-if="mesSetting.route" label="鍏宠仈宸ュ簭" style=" display: flex;">
+ <el-form-item label="鍏宠仈宸ュ簭" style=" display: flex;">
<el-select
v-model="form.stepcode"
- :disabled="form.routecode===''"
+ :disabled="mesSetting.route?form.routecode==='':form.partcode===''"
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -318,6 +318,7 @@
directives: { elDragDialog, waves },
data() {
return {
+ mesSetting: JSON.parse(localStorage.getItem('mesSetting')),
mainHeight: 0,
tableHeight: 0,
form: {
@@ -458,9 +459,7 @@
editPartName: '', // 缂栬緫鏃朵骇鍝佸悕绉�
editRouteName: '', // 缂栬緫鏃跺伐鑹鸿矾绾垮悕绉�
editStepName: '', // 缂栬緫鏃跺姞宸ュ伐搴忓悕绉�
- operation: '',
-
- mesSetting: JSON.parse(localStorage.getItem('mesSetting'))
+ operation: ''
}
},
@@ -471,6 +470,10 @@
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
+
+ if (!this.mesSetting.route) {
+ this.tableColumnSettingsArray = this.tableColumnSettingsArray.filter(i => i.prop !== 'route_name')
+ }
},
methods: {
tableColumnUpdate(val, isCopyTrue) {
@@ -524,8 +527,12 @@
},
async partChange(val) {
const { data: res } = await PartSelectRpute({ partcode: val })
- this.routeArr = res
- this.form.routecode = ''
+ if (this.mesSetting.route) {
+ this.routeArr = res
+ this.form.routecode = ''
+ } else {
+ this.stepArr = res
+ }
this.form.stepcode = ''
},
async routeChange(val) {
diff --git a/src/views/systemSetting/processSetting.vue b/src/views/systemSetting/processSetting.vue
index f38544d..ddfcad7 100644
--- a/src/views/systemSetting/processSetting.vue
+++ b/src/views/systemSetting/processSetting.vue
@@ -194,29 +194,34 @@
</script>
<style scoped>
-.main{
+.main {
display: flex;
flex-direction: column;
}
-.block{
+
+.block {
height: 100px;
}
-.block-title{
+
+.block-title {
}
-.block-content{
+
+.block-content {
padding: 20px;
display: flex;
align-items: center;
-
}
-.font{
+.font {
color: #606266;
font-size: 14px;
display: flex;
align-items: center;
width: 200px;
+}
+.el-icon-question {
+ cursor: pointer;
}
</style>
--
Gitblit v1.9.3