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 | 81 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 052fc11..21e8f90 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -1,56 +1,45 @@
-<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}">
- <zt-table-wraper ref="tableObj" query-url="/basicInfo/XhProductModel/page"
+ <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'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<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 type="delete" @click="table.deleteHandle()"/>
+ <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 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="鍚嶇О"/>
- <zt-table-column-dict prop="nodeType" label="鑺傜偣绫诲瀷" dict="product"/>
- <el-table-column prop="operationalStatus" label="杩愯鐘舵�佸浘" align="center">
+ <zt-table-column-dict prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
+ <el-table-column prop="operatImg" label="杩愯鍥剧墖" align="center">
<template v-slot="{ row }">
- <el-image v-if="row.operationalStatus" :src="getPath(row.operationalStatus)"
- style="height: 50px;width: 50px"></el-image>
+ <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="standbyState" label="寰呮満鐘舵�佸浘" align="center">
- <template v-slot="{ row }">
- <el-image v-if="row.standbyState" :src="getPath(row.standbyState)"
- style="height: 50px;width: 50px"></el-image>
- </template>
- </el-table-column>
- <el-table-column prop="faultState" label="鏁呴殰鐘舵�佸浘" align="center">
- <template v-slot="{ row }">
- <el-image v-if="row.faultState" :src="getPath(row.faultState)"
- 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"/>
- <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>
@@ -62,31 +51,36 @@
import AddOrUpdate from './XhProductModel-AddOrUpdate'
import SelectTyModel from './SelectTyModel'
import ProductModelTree from "./ProductModelTree";
+ import Cookies from "js-cookie";
+ import TyProductModel from "./TyProductModel-AddOrUpdate";
export default {
data() {
return {
+ url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=`,
+ productType: '',
dataForm: {
name: '',
- nodeType: '',
type:'',
pid: '',
- srcId:''
+ srcId:'',
}
}
},
components: {
+ TyProductModel,
ProductModelTree,
AddOrUpdate,
SelectTyModel
},
methods: {
add() {
- if (this.dataForm.type !== '4') {
+ this.dataForm.type=this.productType
+ if (this.dataForm.type !== '3') {
console.log(1111)
console.log(this.dataForm.type,'add() {')
this.dataForm.type = this.dataForm.type - 1
- } else if (this.dataForm.type === '4') {
+ } else if (this.dataForm.type === '3') {
console.log(2222)
console.log(this.dataForm.type,'add() {')
this.dataForm.type = this.dataForm.type - 2
@@ -97,19 +91,26 @@
}
this.$refs.SelectTyModel.$refs.dialog.init(null,{type:this.dataForm.type,id:this.dataForm.pid})
},
+ addCell(){
+ this.$refs.AddOrUpdate.$refs.dialog.init(null,{type:10,pid:this.dataForm.pid})
+ },
cellStyle({column}) {
if (column.label === '鍚嶇О') {
return 'text-align: left !important;'
}
},
- getPath(id) {
- console.log(id, 'path')
- return `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${id}`
+ refreshData(){
+ this.$refs.tableObj.query()
+ this.$refs.ProductModelTree.getProductList()
},
onProductSelected(data) {
+ console.log(data)
this.dataForm.pid = data.id
- this.dataForm.type = data.nodeType
- this.$refs.tableObj.query()
+ this.dataForm.type = data.productType
+ this.productType = data.productType
+ if(data.productType!=='10'){
+ this.$refs.tableObj.query()
+ }
}
}
}
--
Gitblit v1.9.1