This commit is contained in:
parent
ea63ddba24
commit
971a4d73d9
|
|
@ -75,7 +75,7 @@
|
|||
v-model="queryParams.manufacturerId"
|
||||
placeholder="请选择生产厂家"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in manufacturerList"
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@
|
|||
v-model="searchParamsInDialog.qcCode"
|
||||
placeholder="请输入质检编码"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
style="width: 261px"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -266,11 +266,11 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" class="primary-lease" @click="getLeaseListDataInDialog">
|
||||
<el-form-item style="text-align: right;">
|
||||
<el-button type="primary" size="small" icon="el-icon-search" class="primary-lease" @click="getLeaseListDataInDialog">
|
||||
查询
|
||||
</el-button>
|
||||
<el-button icon="el-icon-refresh" class="primary-lease" @click="onResetInDialog">重置</el-button>
|
||||
<el-button icon="el-icon-refresh" size="small" class="primary-lease" @click="onResetInDialog">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@
|
|||
</el-form-item>
|
||||
|
||||
<!-- 按钮区域:固定在右侧 -->
|
||||
<div class="search-btns">
|
||||
<div class="search-btns" style="margin-right: 10px">
|
||||
<el-button @click="getEquipmentList" size="mini" icon="el-icon-search" type="primary" class="primary-lease">
|
||||
查询
|
||||
</el-button>
|
||||
|
|
@ -197,8 +197,8 @@
|
|||
custom-class="simple-dialog"
|
||||
>
|
||||
<el-form :inline="true" :model="searchParams" class="dialog-search-form">
|
||||
<el-row class="dialog-search-row">
|
||||
<el-form-item label="装备名称" prop="name" class="dialog-search-item">
|
||||
<el-row style="height: 36px">
|
||||
<el-form-item label="装备名称" prop="name" >
|
||||
<el-input
|
||||
v-model="searchParams.name"
|
||||
placeholder="请输入"
|
||||
|
|
@ -206,7 +206,7 @@
|
|||
style="width: 100%;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="specificationModel" class="dialog-search-item">
|
||||
<el-form-item label="规格型号" prop="specificationModel" >
|
||||
<el-input
|
||||
v-model="searchParams.specificationModel"
|
||||
placeholder="输入内容"
|
||||
|
|
@ -214,7 +214,7 @@
|
|||
style="width: 100%;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="装备编码" prop="code" class="dialog-search-item">
|
||||
<el-form-item label="装备编码" prop="code" >
|
||||
<el-input
|
||||
v-model="searchParams.code"
|
||||
placeholder="输入内容"
|
||||
|
|
@ -222,10 +222,10 @@
|
|||
style="width: 100%;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<div class="dialog-search-btns">
|
||||
<el-form-item style="margin-left: 543px">
|
||||
<el-button size="small" type="primary" @click="getListDownEquipment">查询</el-button>
|
||||
<el-button size="small" @click="handleReset">重置</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
|
|
|
|||
|
|
@ -168,14 +168,14 @@
|
|||
|
||||
>
|
||||
<!-- 搜索区域 -->
|
||||
<el-form :inline="true" :model="numberSearchParams" style="width: 100%; margin-bottom: 16px;">
|
||||
<el-row style="display: flex; align-items: center; gap: 10px;">
|
||||
<el-form :inline="true" :model="numberSearchParams" style="width: 100%; margin-bottom: 10px;">
|
||||
<el-row style="display: flex; justify-content: center; gap: 10px;">
|
||||
<el-form-item label="工具专业" prop="fourthParentName">
|
||||
<el-input
|
||||
v-model="numberSearchParams.fourthParentName"
|
||||
placeholder="请输入工具专业"
|
||||
clearable
|
||||
style="width: 180px;"
|
||||
style="width: 220px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="施工类型" prop="greatGrandparentName">
|
||||
|
|
@ -183,7 +183,7 @@
|
|||
v-model="numberSearchParams.greatGrandparentName"
|
||||
placeholder="请输入施工类型"
|
||||
clearable
|
||||
style="width: 180px;"
|
||||
style="width: 220px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="工具名称" prop="parentTypeName">
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
v-model="numberSearchParams.parentTypeName"
|
||||
placeholder="请输入工具名称"
|
||||
clearable
|
||||
style="width: 180px;"
|
||||
style="width: 220px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="typeName">
|
||||
|
|
@ -199,13 +199,13 @@
|
|||
v-model="numberSearchParams.typeName"
|
||||
placeholder="请输入规格型号"
|
||||
clearable
|
||||
style="width: 180px;"
|
||||
style="width: 220px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item style="text-align: right;">
|
||||
<el-button size="small" type="primary" @click="getListNumberTool">查询</el-button>
|
||||
<el-button size="small" @click="handleNumberReset">重置</el-button>
|
||||
|
||||
<div style="margin-left: auto;">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
|
|
@ -215,7 +215,7 @@
|
|||
>
|
||||
批量上架
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
|
|
@ -264,52 +264,52 @@
|
|||
custom-class="simple-dialog"
|
||||
>
|
||||
<!-- 搜索区域 -->
|
||||
<el-form :inline="true" :model="codeSearchParams" style="width: 100%; margin-bottom: 16px;">
|
||||
<el-row style="display: flex; align-items: center; gap: 10px;">
|
||||
<el-form-item label="工具专业" prop="fourthParentName">
|
||||
<el-form inline :model="codeSearchParams" label-width="auto">
|
||||
<el-row >
|
||||
<el-form-item label="工具专业" prop="fourthParentName" style="width: 300px;">
|
||||
<el-input
|
||||
v-model="codeSearchParams.fourthParentName"
|
||||
placeholder="请输入工具专业"
|
||||
clearable
|
||||
style="width: 160px;"
|
||||
style="width: 220px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="施工类型" prop="greatGrandparentName">
|
||||
<el-form-item label="施工类型" prop="greatGrandparentName" style="width: 300px;">
|
||||
<el-input
|
||||
v-model="codeSearchParams.greatGrandparentName"
|
||||
placeholder="请输入施工类型"
|
||||
clearable
|
||||
style="width: 160px;"
|
||||
style="width: 220px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="工具名称" prop="parentTypeName">
|
||||
<el-form-item label="工具名称" prop="parentTypeName" style="width: 300px;">
|
||||
<el-input
|
||||
v-model="codeSearchParams.parentTypeName"
|
||||
placeholder="请输入工具名称"
|
||||
clearable
|
||||
style="width: 160px;"
|
||||
style="width: 220px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="typeName">
|
||||
<el-form-item label="规格型号" prop="typeName" style="width: 300px;">
|
||||
<el-input
|
||||
v-model="codeSearchParams.typeName"
|
||||
placeholder="请输入规格型号"
|
||||
clearable
|
||||
style="width: 160px;"
|
||||
style="width: 220px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="工具编码" prop="toolCode">
|
||||
<el-form-item label="工具编码" prop="toolCode" style="width: 300px;">
|
||||
<el-input
|
||||
v-model="codeSearchParams.toolCode"
|
||||
placeholder="请输入工具编码"
|
||||
clearable
|
||||
style="width: 160px;"
|
||||
style="width: 220px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item style="float: right; width: 220px;">
|
||||
<el-button size="small" type="primary" @click="getListCodeTool">查询</el-button>
|
||||
<el-button size="small" @click="handleCodeReset">重置</el-button>
|
||||
|
||||
<div style="margin-left: auto;">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
|
|
@ -319,7 +319,8 @@
|
|||
>
|
||||
批量上架
|
||||
</el-button>
|
||||
</div>
|
||||
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@
|
|||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
</el-form>
|
||||
|
||||
</el-card>
|
||||
|
|
@ -136,31 +135,91 @@
|
|||
|
||||
<!-- 添加申请 -->
|
||||
<el-dialog title="添加申请" :visible.sync="openAdd" width="1200px" append-to-body>
|
||||
<el-form :model="addQuery" ref="addQueryForm" label-width="70px" inline>
|
||||
<el-form-item label="名称" prop="typeName">
|
||||
<el-input v-model="addQuery.typeName" maxlength="20" placeholder="请输入名称"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="typeModelName">
|
||||
<el-input v-model="addQuery.typeModelName" maxlength="20" placeholder="请输入规格型号"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="编码" prop="devCode">
|
||||
<el-input v-model="addQuery.devCode" maxlength="20" placeholder="请输入编码"/>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 新增:分类选择下拉框(装备/工具) -->
|
||||
<!-- 完善后的查询表单:支持类目查询 -->
|
||||
<el-form :model="addQuery" ref="addQueryForm" label-width="auto" inline class="query-form">
|
||||
<!-- 分类选择下拉框(装备/工具) -->
|
||||
<el-form-item label="分类" prop="devType">
|
||||
<el-select
|
||||
v-model="addQuery.devType"
|
||||
placeholder="请选择分类"
|
||||
clearable
|
||||
|
||||
@change="handleDevTypeChange"
|
||||
style="width: 200px"
|
||||
>
|
||||
<el-option label="装备" value="1"/>
|
||||
<el-option label="工具" value="2"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 新增:动态显示的管理模式下拉框 -->
|
||||
<!-- 动态显示:装备类目级联选择器 -->
|
||||
<el-form-item
|
||||
v-if="addQuery.devType === '1'"
|
||||
label="装备类目"
|
||||
prop="categoryPath"
|
||||
>
|
||||
<el-cascader
|
||||
v-model="addQuery.categoryPath"
|
||||
:options="processedTreeData"
|
||||
:props="cascaderProps"
|
||||
placeholder="请选择装备类目"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
filterable
|
||||
popper-class="six-level-cascader"
|
||||
@change="handleCategoryChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 动态显示:工具类目级联选择器 -->
|
||||
<el-form-item
|
||||
v-if="addQuery.devType === '2'"
|
||||
label="工具类目"
|
||||
prop="toolCategoryPath"
|
||||
>
|
||||
<el-cascader
|
||||
v-model="addQuery.toolCategoryPath"
|
||||
:options="toolTreeData"
|
||||
:props="toolCascaderProps"
|
||||
placeholder="请选择工具类目"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
filterable
|
||||
popper-class="six-level-cascader"
|
||||
@change="handleToolCategoryChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 名称查询 -->
|
||||
<el-form-item label="名称" prop="typeName">
|
||||
<el-input
|
||||
v-model="addQuery.typeName"
|
||||
maxlength="20"
|
||||
placeholder="请输入名称"
|
||||
style="width: 200px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 规格型号查询 -->
|
||||
<el-form-item label="规格型号" prop="typeModelName">
|
||||
<el-input
|
||||
v-model="addQuery.typeModelName"
|
||||
maxlength="20"
|
||||
placeholder="请输入规格型号"
|
||||
style="width: 200px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 编码查询 -->
|
||||
<el-form-item label="编码" prop="devCode">
|
||||
<el-input
|
||||
v-model="addQuery.devCode"
|
||||
maxlength="20"
|
||||
placeholder="请输入编码"
|
||||
style="width: 200px"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 管理模式(仅工具显示) -->
|
||||
<el-form-item
|
||||
v-if="addQuery.devType === '2'"
|
||||
label="管理模式"
|
||||
|
|
@ -170,54 +229,27 @@
|
|||
v-model="addQuery.manageType"
|
||||
placeholder="请选择管理模式"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
>
|
||||
<el-option label="编码设备" value="0"/>
|
||||
<el-option label="数量设备" value="1"/>
|
||||
<el-option label="编码工具" value="0"/>
|
||||
<el-option label="数量工具" value="1"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<!-- <el-form-item label="装备分类" prop="categoryPath">-->
|
||||
<!-- <el-cascader-->
|
||||
<!-- v-model="addQuery.categoryPath"-->
|
||||
<!-- :options="processedTreeData"-->
|
||||
<!-- :props="cascaderProps"-->
|
||||
<!-- placeholder="请选择装备分类(最多六级)"-->
|
||||
<!-- clearable-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- filterable-->
|
||||
<!-- popper-class="six-level-cascader"-->
|
||||
<!-- @change="handleCategoryChange"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
|
||||
<!-- <el-form-item label="工具分类" prop="toolCategoryPath">-->
|
||||
<!-- <el-cascader-->
|
||||
<!-- v-model="addQuery.toolCategoryPath"-->
|
||||
<!-- :options="toolTreeData"-->
|
||||
<!-- :props="toolCascaderProps"-->
|
||||
<!-- placeholder="请选择工具分类"-->
|
||||
<!-- clearable-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- filterable-->
|
||||
<!-- popper-class="six-level-cascader"-->
|
||||
<!-- @change="handleToolCategoryChange"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
|
||||
<el-form-item style="margin-left: 980px">
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleAddQuery">查询</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetAddQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<!-- 操作按钮行 -->
|
||||
<el-row :gutter="10" class="mb8" justify="end">
|
||||
<el-col style="display: flex; justify-content: flex-end">
|
||||
<el-button type="primary" @click="saveAdd">确定添加</el-button>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleAddQuery">查询</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetAddQuery">重置</el-button>
|
||||
<el-button type="primary" size="mini" @click="saveAdd">确定添加</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-table ref="addTable" :data="addList" height="500" @selection-change="handleSelectionChange">
|
||||
<!-- 设备列表表格 -->
|
||||
<el-table ref="addTable" :data="addList" height="500" @selection-change="handleSelectionChange" border stripe>
|
||||
<el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<template slot-scope="scope">
|
||||
|
|
@ -254,6 +286,7 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<!-- 分页组件 -->
|
||||
<pagination
|
||||
v-show="addTotal > 0"
|
||||
:total="addTotal"
|
||||
|
|
@ -264,7 +297,6 @@
|
|||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getListByApplyIdApi, deleteToolApi, updateToolApplyApi } from '@/api/toolsManage'
|
||||
import { getApplyListApi, addApplyApi, getApplyDetailsApi, editApplyApi } from '@/api/business'
|
||||
|
|
@ -338,7 +370,6 @@ export default {
|
|||
proLocation: [{ required: true, message: '请输入详细地址', trigger: 'blur' }],
|
||||
useUnit: [{ required: true, message: '请输入需求单位', trigger: 'blur' }],
|
||||
useTimeRange: [{ required: true, message: '请选择使用到期日期', trigger: 'change' }]
|
||||
|
||||
},
|
||||
|
||||
typeList: [
|
||||
|
|
@ -373,7 +404,10 @@ export default {
|
|||
addTempList: [], // 添加申请临时列表
|
||||
ids: [], // 选中的id
|
||||
single: false, // 单选标识
|
||||
multiple: false // 多选标识
|
||||
multiple: false, // 多选标识
|
||||
// 新增:当前选中的类目名称(用于显示)
|
||||
currentCategoryName: '',
|
||||
currentToolCategoryName: ''
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -546,7 +580,7 @@ export default {
|
|||
this.addQuery.pageNum = pageNum
|
||||
this.addQuery.pageSize = pageSize
|
||||
|
||||
// 构造完整的查询参数(包含devType)
|
||||
// 构造完整的查询参数(包含devType和类目筛选)
|
||||
const queryParams = {
|
||||
...this.filterParams,
|
||||
pageNum,
|
||||
|
|
@ -583,7 +617,85 @@ export default {
|
|||
},
|
||||
|
||||
/**
|
||||
* 添加申请查询(核心:处理devType筛选逻辑)
|
||||
* 分类切换事件(装备/工具)
|
||||
*/
|
||||
handleDevTypeChange(val) {
|
||||
// 切换分类时,清空对应的类目选择
|
||||
if (val === '1') {
|
||||
this.addQuery.toolCategoryPath = ''
|
||||
this.currentToolCategoryName = ''
|
||||
} else if (val === '2') {
|
||||
this.addQuery.categoryPath = ''
|
||||
this.currentCategoryName = ''
|
||||
} else {
|
||||
// 未选择分类时,清空所有类目
|
||||
this.addQuery.categoryPath = ''
|
||||
this.addQuery.toolCategoryPath = ''
|
||||
this.currentCategoryName = ''
|
||||
this.currentToolCategoryName = ''
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 装备类目选择变化
|
||||
*/
|
||||
handleCategoryChange(value) {
|
||||
if (value && value.length > 0) {
|
||||
// 获取选中的最后一级类目名称
|
||||
let currentNode = this.findNodeInTree(this.processedTreeData, value[value.length - 1])
|
||||
this.currentCategoryName = currentNode ? currentNode.name : ''
|
||||
} else {
|
||||
this.currentCategoryName = ''
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 工具类目选择变化
|
||||
*/
|
||||
handleToolCategoryChange(value) {
|
||||
if (value && value.length > 0) {
|
||||
// 获取选中的最后一级类目名称
|
||||
let currentNode = this.findNodeInToolTree(this.toolTreeData, value[value.length - 1])
|
||||
this.currentToolCategoryName = currentNode ? currentNode.typeName : ''
|
||||
} else {
|
||||
this.currentToolCategoryName = ''
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 在装备分类树中查找节点
|
||||
*/
|
||||
findNodeInTree(tree, nodeId) {
|
||||
for (let node of tree) {
|
||||
if (node.id === nodeId) {
|
||||
return node
|
||||
}
|
||||
if (node.children && node.children.length > 0) {
|
||||
let found = this.findNodeInTree(node.children, nodeId)
|
||||
if (found) return found
|
||||
}
|
||||
}
|
||||
return null
|
||||
},
|
||||
|
||||
/**
|
||||
* 在工具分类树中查找节点
|
||||
*/
|
||||
findNodeInToolTree(tree, nodeId) {
|
||||
for (let node of tree) {
|
||||
if (node.typeId === nodeId) {
|
||||
return node
|
||||
}
|
||||
if (node.children && node.children.length > 0) {
|
||||
let found = this.findNodeInToolTree(node.children, nodeId)
|
||||
if (found) return found
|
||||
}
|
||||
}
|
||||
return null
|
||||
},
|
||||
|
||||
/**
|
||||
* 添加申请查询(核心:处理devType和类目筛选逻辑)
|
||||
*/
|
||||
handleAddQuery() {
|
||||
this.addQuery.pageNum = 1 // 查询时重置页码为1
|
||||
|
|
@ -593,27 +705,33 @@ export default {
|
|||
// 1. 处理devType(直接使用选择的分类值:1=装备,2=工具)
|
||||
const devType = queryParams.devType || ''
|
||||
|
||||
// 2. 处理装备分类(仅当选择装备时生效)
|
||||
// 2. 处理装备类目(仅当选择装备时生效)
|
||||
let categoryEquipment = ''
|
||||
if (devType === '1' && queryParams.categoryPath && Array.isArray(queryParams.categoryPath) && queryParams.categoryPath.length > 0) {
|
||||
categoryEquipment = String(queryParams.categoryPath[queryParams.categoryPath.length - 1])
|
||||
if (devType === '1') {
|
||||
// 如果选择了类目路径,取最后一级ID作为查询条件
|
||||
if (queryParams.categoryPath && Array.isArray(queryParams.categoryPath) && queryParams.categoryPath.length > 0) {
|
||||
categoryEquipment = String(queryParams.categoryPath[queryParams.categoryPath.length - 1])
|
||||
}
|
||||
}
|
||||
|
||||
// 3. 处理工具分类(仅当选择工具时生效)
|
||||
// 3. 处理工具类目(仅当选择工具时生效)
|
||||
let toolTypeId = ''
|
||||
if (devType === '2' && queryParams.toolCategoryPath && Array.isArray(queryParams.toolCategoryPath) && queryParams.toolCategoryPath.length > 0) {
|
||||
toolTypeId = String(queryParams.toolCategoryPath[queryParams.toolCategoryPath.length - 1])
|
||||
if (devType === '2') {
|
||||
// 如果选择了类目路径,取最后一级ID作为查询条件
|
||||
if (queryParams.toolCategoryPath && Array.isArray(queryParams.toolCategoryPath) && queryParams.toolCategoryPath.length > 0) {
|
||||
toolTypeId = String(queryParams.toolCategoryPath[queryParams.toolCategoryPath.length - 1])
|
||||
}
|
||||
}
|
||||
|
||||
// 保存筛选条件(包含devType)
|
||||
// 保存筛选条件(包含devType和类目)
|
||||
this.filterParams = {
|
||||
typeName: queryParams.typeName,
|
||||
typeModelName: queryParams.typeModelName,
|
||||
devCode: queryParams.devCode,
|
||||
categoryEquipment,
|
||||
toolTypeId,
|
||||
devType, // 关键:将devType传递给后端筛选
|
||||
manageType: queryParams.manageType // 关键:将manageType传递给后端筛选
|
||||
typeName: queryParams.typeName.trim(),
|
||||
typeModelName: queryParams.typeModelName.trim(),
|
||||
devCode: queryParams.devCode.trim(),
|
||||
categoryEquipment, // 装备类目ID
|
||||
toolTypeId, // 工具类目ID
|
||||
devType, // 分类类型
|
||||
manageType: queryParams.manageType // 管理模式(仅工具)
|
||||
}
|
||||
|
||||
// 调用分页查询方法
|
||||
|
|
@ -624,7 +742,7 @@ export default {
|
|||
},
|
||||
|
||||
/**
|
||||
* 重置添加申请查询条件(包含devType)
|
||||
* 重置添加申请查询条件(包含devType和类目)
|
||||
*/
|
||||
resetAddQuery() {
|
||||
this.addQuery = {
|
||||
|
|
@ -632,12 +750,17 @@ export default {
|
|||
typeModelName: '',
|
||||
devCode: '',
|
||||
devType: '', // 重置分类选择
|
||||
categoryPath: '',
|
||||
toolCategoryPath: '',
|
||||
manageType: '',
|
||||
categoryPath: '', // 重置装备类目
|
||||
toolCategoryPath: '', // 重置工具类目
|
||||
pageNum: 1,
|
||||
pageSize: 10
|
||||
}
|
||||
|
||||
// 重置类目名称显示
|
||||
this.currentCategoryName = ''
|
||||
this.currentToolCategoryName = ''
|
||||
|
||||
// 同步重置筛选参数
|
||||
this.filterParams = {
|
||||
typeName: '',
|
||||
|
|
@ -645,7 +768,8 @@ export default {
|
|||
devCode: '',
|
||||
categoryEquipment: '',
|
||||
toolTypeId: '',
|
||||
devType: '' // 重置devType筛选
|
||||
devType: '',
|
||||
manageType: ''
|
||||
}
|
||||
|
||||
// 重置后触发一次查询
|
||||
|
|
@ -750,7 +874,6 @@ export default {
|
|||
},
|
||||
|
||||
// 提交申请(新增/编辑,devType随数据传递)
|
||||
// 提交
|
||||
async submit() {
|
||||
this.$refs.queryForm.validate(async(valid) => {
|
||||
if (!valid) return
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="auto">
|
||||
|
||||
<el-card class="search-box">
|
||||
<el-form-item label="厂家编号" prop="supplierCode">
|
||||
<el-input
|
||||
v-model="queryParams.supplierCode"
|
||||
|
|
@ -8,6 +10,7 @@
|
|||
clearable
|
||||
maxlength="64"
|
||||
@keyup.enter.native="handleQuery"
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
|
@ -18,6 +21,7 @@
|
|||
clearable
|
||||
maxlength="128"
|
||||
@keyup.enter.native="handleQuery"
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
|
@ -28,6 +32,7 @@
|
|||
clearable
|
||||
maxlength="64"
|
||||
@keyup.enter.native="handleQuery"
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
|
@ -38,21 +43,25 @@
|
|||
clearable
|
||||
maxlength="32"
|
||||
@keyup.enter.native="handleQuery"
|
||||
style="width: 200px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="状态" prop="status" >
|
||||
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 215px;">
|
||||
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable style="width: 200px;">
|
||||
<el-option label="启用" :value="1" />
|
||||
<el-option label="停用" :value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item style="margin-left: 10px">
|
||||
<el-form-item style="float: right">
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-form>
|
||||
|
||||
<el-card class="content-box">
|
||||
<div class="action-bar">
|
||||
<el-row :gutter="10" style="margin-bottom: 10px">
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -281,6 +290,7 @@
|
|||
<el-dialog :visible.sync="dialogVisible" width="600px" height="600px" >
|
||||
<img width="100%" height="500px" :src="dialogImageUrl" />
|
||||
</el-dialog>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -879,4 +889,24 @@
|
|||
gap: 10px; /* 统一设置内部元素的间距 */
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
||||
.search-box {
|
||||
margin-bottom: 20px;
|
||||
border-radius: 8px;
|
||||
padding: 0;
|
||||
|
||||
::v-deep .el-card__body {
|
||||
padding: 20px !important;
|
||||
}
|
||||
}
|
||||
|
||||
.table-container {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
margin-bottom: 0;
|
||||
min-height: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -78,6 +78,7 @@
|
|||
:inline="true"
|
||||
label-width="68px"
|
||||
@submit.native.prevent
|
||||
style="height: 32px;"
|
||||
>
|
||||
<el-form-item label="规格型号" prop="typeName">
|
||||
<el-input
|
||||
|
|
@ -359,7 +360,7 @@ export default {
|
|||
handleImageChange(val) {
|
||||
console.log('🚀 ~ val:', val)
|
||||
console.log('🚀 ~ val:', this.form.fileList)
|
||||
|
||||
|
||||
},
|
||||
|
||||
// 表单重置
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
:inline="true"
|
||||
v-show="showSearch"
|
||||
>
|
||||
<el-card class="search-box">
|
||||
<el-row style="height: 32px;">
|
||||
<el-form-item label="部门名称" prop="deptName">
|
||||
<el-input
|
||||
v-model="queryParams.deptName"
|
||||
|
|
@ -45,8 +47,11 @@
|
|||
>重置</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-form>
|
||||
|
||||
<el-card class="content-box">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<div class="action-bar">
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -279,6 +284,7 @@
|
|||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</el-card>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -496,5 +502,25 @@ export default {
|
|||
justify-content: flex-end; /* 关键:整体内容靠右对齐 */
|
||||
gap: 10px; /* 统一设置内部元素的间距 */
|
||||
width: 100%;
|
||||
|
||||
}
|
||||
|
||||
.search-box {
|
||||
margin-bottom: 20px;
|
||||
border-radius: 8px;
|
||||
padding: 0;
|
||||
|
||||
::v-deep .el-card__body {
|
||||
padding: 20px !important;
|
||||
}
|
||||
}
|
||||
|
||||
.table-container {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
margin-bottom: 0;
|
||||
min-height: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -26,28 +26,28 @@
|
|||
<div class="card-container">
|
||||
<div class="card-header query-header">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
|
||||
label-width="68px" class="query-form"
|
||||
class="query-form"
|
||||
>
|
||||
|
||||
<el-form-item label="用户名称" prop="userName">
|
||||
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
|
||||
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 230px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="手机号码" prop="phonenumber">
|
||||
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
|
||||
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 230px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
|
||||
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 230px">
|
||||
<el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间">
|
||||
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
|
||||
<el-date-picker v-model="dateRange" style="width: 230px" value-format="yyyy-MM-dd" type="daterange"
|
||||
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
<el-form-item class="button-group">
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<!-- 基础页面 -->
|
||||
<div class="app-container">
|
||||
<el-card v-show="showSearch" style="margin-bottom: 20px">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" inline @submit.native.prevent>
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" inline @submit.native.prevent style="height: 32px">
|
||||
<el-form-item label="工具名称" prop="parentTypeName">
|
||||
<el-input
|
||||
v-model="queryParams.parentTypeName"
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
</el-form-item>
|
||||
|
||||
<!-- 表单按钮 -->
|
||||
<el-form-item>
|
||||
<el-form-item style="float:right">
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
|
||||
<el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div>
|
||||
<el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="70%" :close-on-click-modal="false">
|
||||
<el-card style="margin-bottom: 20px">
|
||||
<el-form v-if="dialogVisible" ref="dialogForm" :model="dialogForm" size="small" inline @submit.native.prevent>
|
||||
<el-form v-if="dialogVisible" ref="dialogForm" :model="dialogForm" size="small" inline @submit.native.prevent style="height: 32px">
|
||||
<el-form-item label="规格型号">
|
||||
<el-cascader
|
||||
v-model="typeIdList"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<!-- 基础页面 -->
|
||||
<div class="app-container">
|
||||
<el-card v-show="showSearch" style="margin-bottom: 20px">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" inline @submit.native.prevent>
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" inline @submit.native.prevent style="height: 32px;">
|
||||
<el-form-item label="工具名称" prop="parentTypeName">
|
||||
<el-input
|
||||
v-model="queryParams.parentTypeName"
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
</el-form-item>
|
||||
|
||||
<!-- 表单按钮 -->
|
||||
<el-form-item>
|
||||
<el-form-item style="float: right">
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
|
||||
<el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
|
||||
</el-form-item>
|
||||
|
|
|
|||
Loading…
Reference in New Issue