From ea744c63bf10f14fe5a51addf37083c384093e21 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 17:16:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/SelectTyModel.vue | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/web/src/views/modules/basicInfo/SelectTyModel.vue b/web/src/views/modules/basicInfo/SelectTyModel.vue
index adb7a5f..19ca724 100644
--- a/web/src/views/modules/basicInfo/SelectTyModel.vue
+++ b/web/src/views/modules/basicInfo/SelectTyModel.vue
@@ -4,6 +4,7 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-tyProductModel-tyProductModel}">
<zt-table-wraper :query-url=url
+ :paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
</el-form>
@@ -12,6 +13,9 @@
@selection-change="changeRow">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="鍚嶇О"/>
+ <zt-table-column-dict v-if="!pageCode" prop="nodeType" label="鑺傜偣绫诲瀷" dict="product"/>
+ <zt-table-column-dict v-else prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
+ <el-table-column prop="sort" label="鎺掑簭"/>
</el-table>
</zt-table-wraper>
</div>
@@ -24,9 +28,10 @@
name: 'SelectTyModel',
data() {
return {
- url:'/basicInfo/TyProductModel/page',
+ url: '/basicInfo/XhProductModel/page',
selectList: [],
data: '',
+ pageCode:'',
dataForm: {
type: 'noTree',
nodeType: '',
@@ -42,14 +47,14 @@
},
components: {},
methods: {
- init(id,params) {
+ init(id, params) {
this.dataForm.nodeType = params.type
this.dataForm.pid = params.id
this.pageCode = params.pageCode
- if (this.pageCode ==='expect'||this.pageCode==='assign'){
- this.url='/basicInfo/XhProductModel/page'
+ if (!this.pageCode) {
+ this.url = '/basicInfo/TyProductModel/page'
}
- console.log(this.dataForm.pid, 'init()')
+ console.log(params, 'init()')
},
changeRow(selection) {
console.log(selection, ' changeRow(selection)')
@@ -59,24 +64,25 @@
item.pid = this.dataForm.pid
}
this.selectList = selection
+ this.selectList.forEach( item => {
+ item.pageCode = this.pageCode
+ })
},
async formSubmit() {
let res
- if (this.pageCode && this.pageCode === 'expect'){
- res = await this.$http.post('/basicInfo/ParamDataExpect/get', this.selectList)
- }else if(this.pageCode && this.pageCode === 'assign') {
- res = await this.$http.post('/basicInfo/ParamDataAssign/get', this.selectList)
- }else
- {
- res = await this.$http.post('/basicInfo/XhProductModel/get', this.selectList)
- }
-
- if (res.success) {
- await this.$tip.success()
- this.$refs.dialog.close()
- this.$emit('refreshDataList')
+ if (this.pageCode) {
+ if (this.pageCode === 'expect' || this.pageCode === 'assign') {
+ res = await this.$http.post('/basicInfo/ParamData/get', this.selectList)
+ }
+ } else {
+ res = await this.$http.post('/basicInfo/XhProductModel/get', this.selectList)
+ }
+ if (res.success) {
+ await this.$tip.success()
+ this.$refs.dialog.close()
+ this.$emit('refreshDataList')
+ }
}
}
}
- }
</script>
--
Gitblit v1.9.1