From 2f45123bb9911c4dacf08b527482e4f855c988b8 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 05 十二月 2023 16:07:47 +0800
Subject: [PATCH] 1.大小写修改
---
src/views/systemSetting/encodingRules.vue | 13 ++++++++-----
src/views/produce/stepReport.vue | 4 ++--
src/views/systemSetting/dataImport.vue | 6 +++---
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 008b90c..2603673 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -1322,8 +1322,8 @@
return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鍙敹鏁伴噺!')
}
- if (this.dialogForm.list.find(i => i.name === this.dialogForm.wxcode)) {
- if (this.dialogForm.list.find(i => i.name === this.dialogForm.wxcode).acceptQty < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
+ if (this.dialogForm.list.find(i => i.Name === this.dialogForm.wxcode)) {
+ if (this.dialogForm.list.find(i => i.Name === this.dialogForm.wxcode).acceptQty < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庤渚涘簲鍟嗗彲鏀舵暟閲�!')
}
} else {
diff --git a/src/views/systemSetting/dataImport.vue b/src/views/systemSetting/dataImport.vue
index 7ff29d6..e094185 100644
--- a/src/views/systemSetting/dataImport.vue
+++ b/src/views/systemSetting/dataImport.vue
@@ -12,9 +12,9 @@
>
<el-option
v-for="item in excelArr"
- :key="item.fileCode"
- :label="item.fileName"
- :value="item.fileCode"
+ :key="item.FileCode"
+ :label="item.FileName"
+ :value="item.FileCode"
/>
</el-select>
diff --git a/src/views/systemSetting/encodingRules.vue b/src/views/systemSetting/encodingRules.vue
index 7efcb65..104f823 100644
--- a/src/views/systemSetting/encodingRules.vue
+++ b/src/views/systemSetting/encodingRules.vue
@@ -88,7 +88,7 @@
sortable="custom"
/>
<el-table-column
- prop="type"
+ prop="Type"
label="鑿滃崟绫诲瀷"
sortable="custom"
/>
@@ -335,10 +335,11 @@
customID: 'menucode',
childrenProperty: 'children'
})
- this.menuOptions = this.menuOptionsAll.filter(i => i.type === this.dialogForm.type)
+ // this.menuOptions = this.menuOptionsAll.filter(i => i.Type === this.dialogForm.type)
+
},
radioChange() {
- this.menuOptions = this.menuOptionsAll.filter(i => i.type === this.dialogForm.type)
+ this.menuOptions = this.menuOptionsAll.filter(i => i.Type === this.dialogForm.type)
},
async getEncodingRules() {
const res = await EncodingRules(this.form)
@@ -374,8 +375,10 @@
this.operation = operation
this.dialogVisible = true
+
this.$nextTick(() => {
- this.dialogForm.type = row.type
+ this.dialogForm.type = row.Type
+ this.radioChange()
let parentCode = ''
this.menuOptions.forEach(item => {
@@ -387,7 +390,7 @@
})
}
})
-
+ console.log(parentCode,row.menucode)
this.$refs.cascader.checkedValue = [parentCode, row.menucode]
this.dialogForm.rightcode = row.menucode
this.dialogForm.incbit = row.incbit
--
Gitblit v1.9.3