From cccb1f0822ca3883c13cac0338638c2a7bd7094a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 18 七月 2024 08:49:00 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/basicInfo/XhProductModel.vue | 109 ++++++++++++++++++++++++++++--------------------------
1 files changed, 57 insertions(+), 52 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 30c7c5e..c0a06ae 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -1,56 +1,52 @@
-<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">
+ :header-cell-style="{'text-align':'center'}">
+ <el-table-column prop="name" label="鍚嶇О" />
+ <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">
+ <el-table-column prop="sort" label="鎺掑簭" width="100px" align="center"/>
+ <zt-table-column-handle :table="table" width="180px">
<template v-slot="{ row }">
- <el-image v-if="row.standbyState" :src="getPath(row.standbyState)"
- style="height: 50px;width: 50px"></el-image>
+ <zt-table-button v-if="productType==='1'" size="small" type="primary"
+ @click="importData(row)">瀵煎叆
+ </zt-table-button>
</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"/>
+ </zt-table-column-handle>
</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"/>
+ <product-import @refreshDataList="refreshData" ref="ProductImport" />
</zt-table-wraper>
</div>
</el-col>
@@ -62,55 +58,64 @@
import AddOrUpdate from './XhProductModel-AddOrUpdate'
import SelectTyModel from './SelectTyModel'
import ProductModelTree from "./ProductModelTree";
+ import Cookies from "js-cookie";
+ import TyProductModel from "./TyProductModel-AddOrUpdate";
+ import ProductImport from "./ProductImport";
export default {
data() {
return {
+ url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=`,
+ productType: '',
dataForm: {
name: '',
- nodeType: '',
- type:'',
+ type: '',
pid: '',
- srcId:''
+ srcId: '',
}
}
},
components: {
+ ProductImport,
+ TyProductModel,
ProductModelTree,
AddOrUpdate,
SelectTyModel
},
methods: {
add() {
- if (this.dataForm.type !== '4') {
- console.log(1111)
- console.log(this.dataForm.type,'add() {')
- this.dataForm.type = this.dataForm.type - 1
- } else if (this.dataForm.type === '4') {
- console.log(2222)
- console.log(this.dataForm.type,'add() {')
- this.dataForm.type = this.dataForm.type - 2
- }else if (this.dataForm.type === '0'){
- console.log(this.dataForm.type,'add() {')
- this.$alert("褰撳墠鑺傜偣涓嶅彲鏂板瀛愯妭鐐癸紝璇烽噸鏂拌缃�")
- return
+ this.dataForm.type = this.productType
+ if (this.dataForm.type !== '1') {
+ this.$refs.SelectTyModel.$refs.dialog.init(null, {type: this.dataForm.type, id: this.dataForm.pid})
+ } else {
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid})
}
- 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)
+ console.log(data,'onProductSelected')
this.dataForm.pid = data.id
this.dataForm.type = data.productType
- this.$refs.tableObj.query()
+ this.productType = data.productType
+ if (data.productType !== '10') {
+ this.$refs.tableObj.query()
+ }
+ console.log(data.productType,' data.productType')
+ console.log(this.productType,' data.productType')
+ },
+ importData(row) {
+ this.$refs.ProductImport.$refs.dialog.init(row)
}
}
}
--
Gitblit v1.9.1