From a9bf1966f94955f542d39147fb1539befe2b4eec Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 09 五月 2024 17:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/XhProductModel.vue | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index cada5bf..21e8f90 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -1,13 +1,13 @@
-<template xmlns="">
+<template>
<div>
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="5">
- <div class="fa-card-a">
- <product-model-tree @on-selected="onProductSelected"/>
+ <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
+ <product-model-tree @on-selected="onProductSelected" showXdy="true" ref="ProductModelTree"/>
</div>
</el-col>
<el-col :span="19">
- <div class="mod-basicInfo-xhProductModel}">
+ <div class="mod-basicInfo-xhProductModel fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/basicInfo/XhProductModel/page"
delete-url="/basicInfo/XhProductModel/ "
:paging='false'
@@ -17,14 +17,14 @@
<el-input v-model="dataForm.name" placeholder="璇疯緭鍏ュ悕绉�" clearable></el-input>
</el-form-item>
<el-form-item>
- <zt-button type="query" @click="table.query()"/>
- <zt-button type="add" @click="add()"/>
+ <zt-button v-if="productType && productType!=='10'" type="query" @click="table.query()"/>
+ <zt-button v-if="productType && productType!=='10'" type="add" @click="add()"/>
<zt-button v-if="productType==='3'" type="primary" @click="addCell()">鏂板铏氬崟鍏�</zt-button>
- <zt-button type="delete" @click="table.deleteHandle()"/>
+ <zt-button v-if="productType && productType!=='10'" type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
- border row-key="id"
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+ row-key="id"
@selection-change="table.selectionChangeHandle"
>
<el-table-column prop="name" label="鍚嶇О"/>
@@ -34,12 +34,12 @@
<el-image v-if="row.operatImg" :src="url+row.operatImg" style="height: 50px;width: 50px"></el-image>
</template>
</el-table-column>
- <el-table-column prop="sort" label="鎺掑簭"/>
- <zt-table-column-handle :table="table"/>
+ <el-table-column prop="sort" label="鎺掑簭" width="100px"/>
+ <zt-table-column-handle :table="table" width="150px"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
- <select-ty-model @refreshDataList="table.query" ref="SelectTyModel"/>
+ <add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/>
+ <select-ty-model @refreshDataList="refreshData" ref="SelectTyModel"/>
</zt-table-wraper>
</div>
</el-col>
@@ -99,12 +99,18 @@
return 'text-align: left !important;'
}
},
+ refreshData(){
+ this.$refs.tableObj.query()
+ this.$refs.ProductModelTree.getProductList()
+ },
onProductSelected(data) {
console.log(data)
this.dataForm.pid = data.id
this.dataForm.type = data.productType
this.productType = data.productType
- this.$refs.tableObj.query()
+ if(data.productType!=='10'){
+ this.$refs.tableObj.query()
+ }
}
}
}
--
Gitblit v1.9.1