From 3043aabc2e5dc72b1e76fd44a05edaa5c0f214fa Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期二, 19 八月 2025 09:38:01 +0800
Subject: [PATCH] 工具信息、工具台账增加高级查询功能
---
src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue | 299 ++++++
src/views/tms/modules/toolLedger/ToolLedgerDetailList.vue | 2
src/views/tms/modules/baseTools/ParaBladeSearchModal.vue | 279 +++++
src/views/tms/modules/toolLedger/ToolLedgerListLeft.vue | 2
src/views/tms/modules/baseTools/BaseToolsListRight.vue | 1124 +++++++++++++---------
src/views/tms/modules/baseTools/ParaCommonToolList.vue | 2
src/views/tms/modules/baseTools/BaseToolsListLeft.vue | 2
src/views/tms/modules/inbound/InboundListRight.vue | 2
src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue | 299 ++++++
src/views/tms/modules/toolLedger/ToolLedgerListRight.vue | 228 ++++
src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue | 299 ++++++
src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue | 244 +++++
12 files changed, 2,291 insertions(+), 491 deletions(-)
diff --git a/src/views/tms/modules/baseTools/BaseToolsListLeft.vue b/src/views/tms/modules/baseTools/BaseToolsListLeft.vue
index 03932f8..962f39b 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListLeft.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListLeft.vue
@@ -239,7 +239,7 @@
//鐩戝惉
watch: {
currSelected(val) {//鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
- this.$bus.$emit('getCurrSelected', val)
+ this.$bus.$emit('getBaseToolsListSelected', val)
},
}
}
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index e8ae474..78e0e0b 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -1,46 +1,41 @@
<template>
- <a-card :bordered="false" style="flex: 1;overflow:auto;max-height: 600px; min-height: 600px">
+ <a-card :bordered="false" style="flex: 1; overflow: auto; max-height: 600px; min-height: 600px">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col
- :md="6"
- :sm="8"
- >
- <a-form-item
- label="宸ュ叿缂栧彿"
- :labelCol="{span: 5}"
- :wrapperCol="{span: 18, offset: 1}"
- >
- <a-input
- placeholder="璇疯緭鍏ュ伐鍏风紪鍙锋绱�"
- v-model="queryParam.toolCode"
- ></a-input>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="宸ュ叿缂栧彿" :labelCol="{ span: 5 }" :wrapperCol="{ span: 18, offset: 1 }">
+ <a-input placeholder="璇疯緭鍏ュ伐鍏风紪鍙锋绱�" v-model="queryParam.toolCode"></a-input>
</a-form-item>
</a-col>
- <a-col
- :md="6"
- :sm="8"
- >
- <a-form-item
- label="鍨嬪彿/鍥惧彿"
- :labelCol="{span: 5}"
- :wrapperCol="{span: 18, offset: 1}"
- >
- <a-input
- placeholder="璇疯緭鍏ュ瀷鍙�/鍥惧彿妫�绱�"
- v-model="queryParam.toolModel"
- ></a-input>
+ <a-col :md="6" :sm="8">
+ <a-form-item label="鍨嬪彿/鍥惧彿" :labelCol="{ span: 5 }" :wrapperCol="{ span: 18, offset: 1 }">
+ <a-input placeholder="璇疯緭鍏ュ瀷鍙�/鍥惧彿妫�绱�" v-model="queryParam.toolModel"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="24">
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button
+ type="primary"
+ @click="searchHeightQuery"
+ icon="search"
+ style="margin-left: 8px"
+ :disabled="
+ !nodeSelected.key ||
+ nodeSelected.entity.leafFlag === '2' ||
+ (this.paraTypeFlag != '2' &&
+ this.paraTypeFlag != '3' &&
+ this.paraTypeFlag != '4' &&
+ this.paraTypeFlag != '5' &&
+ this.paraTypeFlag != '6')
+ "
+ >楂樼骇鏌ヨ</a-button
+ >
</span>
</a-col>
-
</a-row>
</a-form>
</div>
@@ -48,15 +43,34 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <Tooltip
- placement="top"
- title="閫夋嫨宸ュ叿鍥涚骇鍒嗙被鍚庡啀鎵ц鏂板"
- >
- <a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">鏂板</a-button>
+ <Tooltip placement="top" title="閫夋嫨宸ュ叿鍥涚骇鍒嗙被鍚庡啀鎵ц鏂板">
+ <a-button
+ @click="handleAdd(nodeSelected)"
+ type="primary"
+ icon="plus"
+ :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'"
+ >鏂板</a-button
+ >
</Tooltip>
- <a-button type="primary" @click="exportToExcel('鍒�鍏蜂俊鎭鍏ユā鏉�')" icon="export" style="margin-left: 8px" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">涓嬭浇瀵煎叆妯℃澘</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">瀵煎叆</a-button>
+ <a-button
+ type="primary"
+ @click="exportToExcel('鍒�鍏蜂俊鎭鍏ユā鏉�')"
+ icon="export"
+ style="margin-left: 8px"
+ :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'"
+ >涓嬭浇瀵煎叆妯℃澘</a-button
+ >
+ <a-upload
+ name="file"
+ :showUploadList="false"
+ :multiple="false"
+ :headers="tokenHeader"
+ :action="importExcelUrl"
+ @change="handleImportExcel"
+ >
+ <a-button type="primary" icon="import" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'"
+ >瀵煎叆</a-button
+ >
</a-upload>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('tms_tools_classify')">瀵煎嚭</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
@@ -66,36 +80,36 @@
<!-- table鍖哄煙-begin -->
<div>
-
<a-table
ref="table"
size="middle"
- :scroll="{x:true}"
+ :scroll="{ x: true }"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
+ :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio' }"
class="j-table-force-nowrap"
:customRow="customRow"
- @change="handleTableChange">
-
- <template slot='toolPicture' slot-scope='text, record, index'>
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" :preview="record.toolPicture" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ @change="handleTableChange"
+ >
+ <template slot="toolPicture" slot-scope="text, record, index">
+ <span v-if="!text" style="font-size: 12px; font-style: italic">鏃犲浘鐗�</span>
+ <img
+ v-else
+ :src="getImgView(text)"
+ :preview="record.toolPicture"
+ height="25px"
+ alt=""
+ style="max-width: 80px; font-size: 12px; font-style: italic"
+ />
</template>
<template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
- <a-button
- v-else
- :ghost="true"
- type="primary"
- icon="download"
- size="small"
- @click="downloadFile(text)">
+ <span v-if="!text" style="font-size: 12px; font-style: italic">鏃犳枃浠�</span>
+ <a-button v-else :ghost="true" type="primary" icon="download" size="small" @click="downloadFile(text)">
涓嬭浇
</a-button>
</template>
@@ -118,11 +132,10 @@
</a-menu>
</a-dropdown>
</span>
-
</a-table>
</div>
- <a-tabs defaultActiveKey="1">
+ <a-tabs defaultActiveKey="1">
<a-tab-pane key="1">
<span slot="tab">
<a-badge>鍙傛暟 </a-badge>
@@ -135,10 +148,7 @@
<para-common-tool-list ref="paraCommonToolList"></para-common-tool-list>
</a-tab-pane>
- <a-tab-pane
- key="2"
- forceRender
- >
+ <a-tab-pane key="2" forceRender>
<span slot="tab">
<a-badge>绠＄悊鍙傛暟 </a-badge>
</span>
@@ -147,397 +157,456 @@
</a-tabs>
<base-tools-modal ref="modalForm" @ok="modalFormOk" :nodeSelected="nodeSelected"></base-tools-modal>
- <para-hole-tools-modal ref="paraHoleToolsModal" @ok="modalFormOk" :nodeSelected="nodeSelected"></para-hole-tools-modal>
+ <para-hole-tools-modal
+ ref="paraHoleToolsModal"
+ @ok="modalFormOk"
+ :nodeSelected="nodeSelected"
+ ></para-hole-tools-modal>
<para-threading-tool-modal ref="paraThreadingToolModal"></para-threading-tool-modal>
<para-mill-tool-modal ref="paraMillToolModal"></para-mill-tool-modal>
<para-turning-tools-modal ref="paraTurningToolsModal"></para-turning-tools-modal>
<para-blade-modal ref="paraBladeModal"></para-blade-modal>
<para-common-tool-modal ref="paraCommonToolModal"></para-common-tool-modal>
+ <para-hole-tools-search-modal
+ ref="paraHoleToolsSearchModal"
+ @searchParams="paraHoleToolsOk"
+ ></para-hole-tools-search-modal>
+ <para-turning-tools-search-modal
+ ref="paraTurningToolsSearchModal"
+ @searchParams="paraTurningToolsOk"
+ ></para-turning-tools-search-modal>
+ <para-threading-tool-search-modal
+ ref="paraThreadingToolSearchModal"
+ @searchParams="paraThreadingToolOk"
+ ></para-threading-tool-search-modal>
+ <para-mill-tool-search-modal
+ ref="paraMillToolSearchModal"
+ @searchParams="paraMillToolOk"
+ ></para-mill-tool-search-modal>
+ <para-blade-search-modal ref="paraBladeSearchModal" @searchParams="paraBladeOk"></para-blade-search-modal>
</a-card>
</template>
<script>
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import BaseToolsModal from './BaseToolsModal'
+import Tooltip from 'ant-design-vue/es/tooltip'
+import { getAction, postAction, deleteAction, requestPut, downFile } from '@api/manage'
+import ParaHoleToolsModal from './ParaHoleToolsModal'
+import ParaMillToolModal from './ParaMillToolModal'
+import ParaThreadingToolModal from './ParaThreadingToolModal'
+import ParaTurningToolsModal from './ParaTurningToolsModal'
+import ToolsConfigPropertyModal from './ToolsConfigPropertyModal'
+import ParaCommonToolModal from './ParaCommonToolModal'
+import ParaBladeModal from './ParaBladeModal'
+import ParaHoleToolsList from './ParaHoleToolsList'
+import ToolsConfigPropertyList from './ToolsConfigPropertyList'
+import ParaMillToolList from './ParaMillToolList'
+import ParaThreadingToolList from './ParaThreadingToolList'
+import ParaTurningToolsList from './ParaTurningToolsList'
+import ParaCommonToolList from './ParaCommonToolList'
+import ParaBladeList from './ParaBladeList'
+import ParaHoleToolsSearchModal from './ParaHoleToolsSearchModal'
+import ParaMillToolSearchModal from './ParaMillToolSearchModal'
+import ParaThreadingToolSearchModal from './ParaThreadingToolSearchModal'
+import ParaTurningToolsSearchModal from './ParaTurningToolsSearchModal'
+import ParaBladeSearchModal from './ParaBladeSearchModal'
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import BaseToolsModal from './BaseToolsModal'
- import Tooltip from 'ant-design-vue/es/tooltip'
- import { getAction, postAction, deleteAction, requestPut,downFile } from '@api/manage'
- import ParaHoleToolsModal from './ParaHoleToolsModal'
- import ParaMillToolModal from './ParaMillToolModal'
- import ParaThreadingToolModal from './ParaThreadingToolModal'
- import ParaTurningToolsModal from './ParaTurningToolsModal'
- import ToolsConfigPropertyModal from './ToolsConfigPropertyModal'
- import ParaCommonToolModal from './ParaCommonToolModal'
- import ParaBladeModal from './ParaBladeModal'
- import ParaHoleToolsList from './ParaHoleToolsList'
- import ToolsConfigPropertyList from './ToolsConfigPropertyList'
- import ParaMillToolList from './ParaMillToolList'
- import ParaThreadingToolList from './ParaThreadingToolList'
- import ParaTurningToolsList from './ParaTurningToolsList'
- import ParaCommonToolList from './ParaCommonToolList'
- import ParaBladeList from './ParaBladeList'
-
- export default {
- name: 'BaseToolsListRight',
- mixins:[JeecgListMixin, mixinDevice],
- components: {
- BaseToolsModal,
- Tooltip,
- ParaHoleToolsModal,
- ParaMillToolModal,
- ParaThreadingToolModal,
- ParaTurningToolsModal,
- ToolsConfigPropertyModal,
- ParaCommonToolModal,
- ParaBladeModal,
- ParaHoleToolsList,
- ToolsConfigPropertyList,
- ParaMillToolList,
- ParaThreadingToolList,
- ParaTurningToolsList,
- ParaCommonToolList,
- ParaBladeList
- },
- data () {
- return {
- description: '宸ュ叿淇℃伅绠＄悊椤甸潰',
- /* 鍒嗛〉鍙傛暟 */
- ipagination:{
+export default {
+ name: 'BaseToolsListRight',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {
+ BaseToolsModal,
+ Tooltip,
+ ParaHoleToolsModal,
+ ParaMillToolModal,
+ ParaThreadingToolModal,
+ ParaTurningToolsModal,
+ ToolsConfigPropertyModal,
+ ParaCommonToolModal,
+ ParaBladeModal,
+ ParaHoleToolsList,
+ ToolsConfigPropertyList,
+ ParaMillToolList,
+ ParaThreadingToolList,
+ ParaTurningToolsList,
+ ParaCommonToolList,
+ ParaBladeList,
+ ParaHoleToolsSearchModal,
+ ParaMillToolSearchModal,
+ ParaThreadingToolSearchModal,
+ ParaTurningToolsSearchModal,
+ ParaBladeSearchModal,
+ },
+ data() {
+ return {
+ description: '宸ュ叿淇℃伅绠＄悊椤甸潰',
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
current: 1,
pageSize: 5,
pageSizeOptions: ['5', '10', '30'],
showTotal: (total, range) => {
- return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
},
showQuickJumper: true,
showSizeChanger: true,
- total: 0
+ total: 0,
},
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1
},
- {
- title:'宸ュ叿缂栫爜',
- align:"center",
- dataIndex: 'toolCode'
- },
- {
- title:'搴忓彿',
- align:"center",
- dataIndex: 'signCode'
- },
- {
- title:'涓枃鍚嶇О',
- align:"center",
- dataIndex: 'chineseName'
- },
- {
- title:'澶栨枃鍚嶇О',
- align:"center",
- dataIndex: 'foreignLanguageName'
- },
- {
- title:'鏍囨敞绾у埆',
- align:"center",
- dataIndex: 'standardLevel'
- },
- {
- title:'鏍囧噯鍙�',
- align:"center",
- dataIndex: 'standardCode'
- },
- {
- title:'鍨嬪彿/鍥惧彿',
- align:"center",
- dataIndex: 'toolModel'
- },
- {
+ },
+ {
+ title: '宸ュ叿缂栫爜',
+ align: 'center',
+ dataIndex: 'toolCode',
+ },
+ {
+ title: '搴忓彿',
+ align: 'center',
+ dataIndex: 'signCode',
+ },
+ {
+ title: '涓枃鍚嶇О',
+ align: 'center',
+ dataIndex: 'chineseName',
+ },
+ {
+ title: '澶栨枃鍚嶇О',
+ align: 'center',
+ dataIndex: 'foreignLanguageName',
+ },
+ {
+ title: '鏍囨敞绾у埆',
+ align: 'center',
+ dataIndex: 'standardLevel',
+ },
+ {
+ title: '鏍囧噯鍙�',
+ align: 'center',
+ dataIndex: 'standardCode',
+ },
+ {
+ title: '鍨嬪彿/鍥惧彿',
+ align: 'center',
+ dataIndex: 'toolModel',
+ },
+ {
title: '宸ュ叿鍥剧墖',
align: 'center',
width: 120,
dataIndex: 'toolPicture',
- scopedSlots: { customRender: 'toolPicture' }
+ scopedSlots: { customRender: 'toolPicture' },
},
- {
- title:'澶囨敞',
- align:"center",
- dataIndex: 'remark'
- },
- {
- title:'鍒涘缓浜�',
- align:"center",
- dataIndex: 'createBy'
- },
- {
- title:'鍒涘缓鏃堕棿',
- align:"center",
- dataIndex: 'createTime',
- customRender:function (text) {
- return !text?"":(text.length>10?text.substr(0,10):text)
- }
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' }
- }
- ],
- url: {
- list: "/tms/baseTools/list",
- paraHolesToolsList:"/tms/baseTools/paraHolesToolsList",
- paraCommonToolList:"/tms/baseTools/paraCommonToolList",
- paraThreadingToolList:"/tms/baseTools/paraThreadingToolList",
- paraMillToolList:"/tms/baseTools/paraMillToolList",
- paraTurningToolsList:"/tms/baseTools/paraTurningToolsList",
- paraBladeList:"/tms/baseTools/paraBladeList",
- delete: "/tms/baseTools/delete",
- deleteBatch: "/tms/baseTools/deleteBatch",
- edit: '/tms/baseTools/edit',
- exportXlsUrl: "/tms/baseTools/exportXls",
- importExcelUrl: "tms/baseTools/importExcel",
- queryParaByToolCode:"/tms/baseTools/queryByToolCode",
- queryByToolCode:"/tms/toolsConfigProperty/queryByToolCode",
- loadTemplate:"/tms/baseTools/loadTemplate",
- importBlade:"/tms/paraBlade/importExcel",
- importCommonTool:"/tms/paraCommonTool/importExcel",
- importHoleTools:"/tms/paraHoleTools/importExcel",
- importThreading:"/tms/paraThreadingTool/importExcel",
- importTurning:"/tms/paraTurningTools/importExcel",
- importMillTool:"/tms/paraMillTool/importExcel"
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark',
},
- dictOptions:{},
- superFieldList:[],
- nodeSelected: {}, // 褰撳墠閫変腑鐨勮妭鐐规暟鎹�
- paraTypeFlag:'',
- disableMixinCreated:true,
- loading:false
- }
- },
- created() {
- this.$bus.$on('getCurrSelected', (data) => {
+ {
+ title: '鍒涘缓浜�',
+ align: 'center',
+ dataIndex: 'createBy',
+ },
+ {
+ title: '鍒涘缓鏃堕棿',
+ align: 'center',
+ dataIndex: 'createTime',
+ customRender: function (text) {
+ return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
+ },
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ fixed: 'right',
+ width: 147,
+ scopedSlots: { customRender: 'action' },
+ },
+ ],
+ url: {
+ list: '/tms/baseTools/list',
+ paraHolesToolsList: '/tms/baseTools/paraHolesToolsList',
+ paraCommonToolList: '/tms/baseTools/paraCommonToolList',
+ paraThreadingToolList: '/tms/baseTools/paraThreadingToolList',
+ paraMillToolList: '/tms/baseTools/paraMillToolList',
+ paraTurningToolsList: '/tms/baseTools/paraTurningToolsList',
+ paraBladeList: '/tms/baseTools/paraBladeList',
+ delete: '/tms/baseTools/delete',
+ deleteBatch: '/tms/baseTools/deleteBatch',
+ edit: '/tms/baseTools/edit',
+ exportXlsUrl: '/tms/baseTools/exportXls',
+ importExcelUrl: 'tms/baseTools/importExcel',
+ queryParaByToolCode: '/tms/baseTools/queryByToolCode',
+ queryByToolCode: '/tms/toolsConfigProperty/queryByToolCode',
+ loadTemplate: '/tms/baseTools/loadTemplate',
+ importBlade: '/tms/paraBlade/importExcel',
+ importCommonTool: '/tms/paraCommonTool/importExcel',
+ importHoleTools: '/tms/paraHoleTools/importExcel',
+ importThreading: '/tms/paraThreadingTool/importExcel',
+ importTurning: '/tms/paraTurningTools/importExcel',
+ importMillTool: '/tms/paraMillTool/importExcel',
+ },
+ dictOptions: {},
+ superFieldList: [],
+ nodeSelected: {}, // 褰撳墠閫変腑鐨勮妭鐐规暟鎹�
+ paraTypeFlag: '',
+ disableMixinCreated: true,
+ loading: false,
+ }
+ },
+ created() {
+ this.$bus.$on('getBaseToolsListSelected', (data) => {
//getCurrSelected 浜嬩欢 鎺ユ敹缁勪欢浼犻�掔殑鍙傛暟
- this.nodeType = (data.type == undefined ? 0 : data.type);
- this.paraTypeFlag = (data.entity == undefined ? 0 : data.entity.paraTypeFlag)
- this.nodeSelected = data;
+ this.nodeType = data.type == undefined ? 0 : data.type
+ this.paraTypeFlag = data.entity == undefined ? 0 : data.entity.paraTypeFlag
+ this.nodeSelected = data
this.loadData()
this.clearPara()
})
+ },
+ computed: {
+ importExcelUrl: function () {
+ if (this.paraTypeFlag === '1') {
+ return `${window._CONFIG['domianURL']}/${this.url.importCommonTool}`
+ } else if (this.paraTypeFlag === '2') {
+ return `${window._CONFIG['domianURL']}/${this.url.importHoleTools}`
+ } else if (this.paraTypeFlag === '3') {
+ return `${window._CONFIG['domianURL']}/${this.url.importThreading}`
+ } else if (this.paraTypeFlag === '4') {
+ return `${window._CONFIG['domianURL']}/${this.url.importMillTool}`
+ } else if (this.paraTypeFlag === '5') {
+ return `${window._CONFIG['domianURL']}/${this.url.importTurning}`
+ } else if (this.paraTypeFlag === '6') {
+ return `${window._CONFIG['domianURL']}/${this.url.importBlade}`
+ }
},
- computed: {
- importExcelUrl: function(){
- if(this.paraTypeFlag === "1"){
- return `${window._CONFIG['domianURL']}/${this.url.importCommonTool}`;
- }else if(this.paraTypeFlag === "2"){
- return `${window._CONFIG['domianURL']}/${this.url.importHoleTools}`;
- }else if(this.paraTypeFlag === "3"){
- return `${window._CONFIG['domianURL']}/${this.url.importThreading}`;
- }else if(this.paraTypeFlag === "4"){
- return `${window._CONFIG['domianURL']}/${this.url.importMillTool}`;
- }else if(this.paraTypeFlag === "5"){
- return `${window._CONFIG['domianURL']}/${this.url.importTurning}`;
- }else if(this.paraTypeFlag === "6"){
- return `${window._CONFIG['domianURL']}/${this.url.importBlade}`;
- }
- },
+ },
+ methods: {
+ handleAdd(entity) {
+ if (!this.nodeSelected) {
+ this.$message.warning('璇峰厛閫夋嫨涓�涓伐鍏峰垎绫�')
+ return
+ }
+ // 鎵撳紑鏂板妯℃�佹锛屽苟浼犻�掑綋鍓嶉�変腑鐨勮妭鐐�
+ if (this.paraTypeFlag === '1') {
+ this.$refs.paraCommonToolModal.add(this.nodeSelected)
+ this.$refs.paraCommonToolModal.title = '鏂板閫氱敤鍙傛暟绫诲瀷宸ュ叿'
+ this.$refs.paraCommonToolModal.disableSubmit = false
+ } else if (this.paraTypeFlag === '2') {
+ this.$refs.paraHoleToolsModal.add(this.nodeSelected)
+ this.$refs.paraHoleToolsModal.title = '鏂板瀛斿姞宸ュ伐鍏�'
+ this.$refs.paraHoleToolsModal.disableSubmit = false
+ } else if (this.paraTypeFlag === '3') {
+ this.$refs.paraThreadingToolModal.add(this.nodeSelected)
+ this.$refs.paraThreadingToolModal.title = '鏂板铻虹汗宸ュ叿'
+ this.$refs.paraThreadingToolModal.disableSubmit = false
+ } else if (this.paraTypeFlag === '4') {
+ this.$refs.paraMillToolModal.add(this.nodeSelected)
+ this.$refs.paraMillToolModal.title = '鏂板閾ｅ墛宸ュ叿'
+ this.$refs.paraMillToolModal.disableSubmit = false
+ } else if (this.paraTypeFlag === '5') {
+ this.$refs.paraTurningToolsModal.add(this.nodeSelected)
+ this.$refs.paraTurningToolsModal.title = '鏂板杞﹀墛宸ュ叿'
+ this.$refs.paraTurningToolsModal.disableSubmit = false
+ } else if (this.paraTypeFlag === '6') {
+ this.$refs.paraBladeModal.add(this.nodeSelected)
+ this.$refs.paraBladeModal.title = '鏂板鍒�鐗�'
+ this.$refs.paraBladeModal.disableSubmit = false
+ }
},
- methods: {
-
- handleAdd(entity) {
- if (!this.nodeSelected ) {
- this.$message.warning('璇峰厛閫夋嫨涓�涓伐鍏峰垎绫�');
- return;
+ handleDelete(id) {
+ deleteAction(this.url.delete, { id: id }).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ this.loadData()
+ this.$message.success(res.message)
+ this.$bus.$emit('queryTreeData')
+ this.clearPara()
+ } else {
+ this.$message.warning(res.message)
}
- // 鎵撳紑鏂板妯℃�佹锛屽苟浼犻�掑綋鍓嶉�変腑鐨勮妭鐐�
- if(this.paraTypeFlag === "1"){
- this.$refs.paraCommonToolModal.add(this.nodeSelected);
- this.$refs.paraCommonToolModal.title = "鏂板閫氱敤鍙傛暟绫诲瀷宸ュ叿";
- this.$refs.paraCommonToolModal.disableSubmit = false;
- }else if(this.paraTypeFlag === "2"){
- this.$refs.paraHoleToolsModal.add(this.nodeSelected);
- this.$refs.paraHoleToolsModal.title = "鏂板瀛斿姞宸ュ伐鍏�";
- this.$refs.paraHoleToolsModal.disableSubmit = false;
- }else if(this.paraTypeFlag === "3"){
- this.$refs.paraThreadingToolModal.add(this.nodeSelected);
- this.$refs.paraThreadingToolModal.title = "鏂板铻虹汗宸ュ叿";
- this.$refs.paraThreadingToolModal.disableSubmit = false;
- }else if(this.paraTypeFlag === "4"){
- this.$refs.paraMillToolModal.add(this.nodeSelected);
- this.$refs.paraMillToolModal.title = "鏂板閾ｅ墛宸ュ叿";
- this.$refs.paraMillToolModal.disableSubmit = false;
- }else if(this.paraTypeFlag === "5"){
- this.$refs.paraTurningToolsModal.add(this.nodeSelected);
- this.$refs.paraTurningToolsModal.title = "鏂板杞﹀墛宸ュ叿";
- this.$refs.paraTurningToolsModal.disableSubmit = false;
- }else if(this.paraTypeFlag === "6"){
- this.$refs.paraBladeModal.add(this.nodeSelected);
- this.$refs.paraBladeModal.title = "鏂板鍒�鐗�";
- this.$refs.paraBladeModal.disableSubmit = false;
- }
- },
- handleDelete(id) {
- deleteAction(this.url.delete, {id: id}).then((res) => {
- if (res.success) {
- //閲嶆柊璁＄畻鍒嗛〉闂
- this.loadData()
- this.$message.success(res.message);
- this.$bus.$emit('queryTreeData')
- this.clearPara()
- } else {
- this.$message.warning(res.message);
- }
- });
- },
- modalFormOk() {
- this.loadData(); // 鍒锋柊琛ㄦ牸鏁版嵁
- this.$bus.$emit('queryTreeData') //鍒锋柊宸︿晶鏍�
- },
+ })
+ },
+ modalFormOk() {
+ this.loadData() // 鍒锋柊琛ㄦ牸鏁版嵁
+ this.$bus.$emit('queryTreeData') //鍒锋柊宸︿晶鏍�
+ },
- onSelectChange(selectedRowKeys,selectionRows) {
- this.selectedRowKeys = selectedRowKeys;
- this.selectionRows = selectionRows;
- //閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => {
- if (res.success) {
- if(this.selectionRows[0].paraTypeFlag === "1"){
- this.$refs.paraCommonToolList.getPara(res.result);
- }else if(this.selectionRows[0].paraTypeFlag === "2"){
- this.$refs.paraHoleToolsList.getPara(res.result);
- }else if(this.selectionRows[0].paraTypeFlag === "3"){
- this.$refs.paraThreadingToolList.getPara(res.result);
- }else if(this.selectionRows[0].paraTypeFlag === "4"){
- this.$refs.paraMillToolList.getPara(res.result);
- }else if(this.selectionRows[0].paraTypeFlag === "5"){
- this.$refs.paraTurningToolsList.getPara(res.result);
- }else if(this.selectionRows[0].paraTypeFlag === "6"){
- this.$refs.paraBladeList.getPara(res.result);
- }
- } else {
- this.$message.warning(res.message);
+ onSelectChange(selectedRowKeys, selectionRows) {
+ this.selectedRowKeys = selectedRowKeys
+ this.selectionRows = selectionRows
+ //閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
+ getAction(this.url.queryParaByToolCode, {
+ toolCode: this.selectedRowKeys[0],
+ paraTypeFlag: this.selectionRows[0].paraTypeFlag,
+ }).then((res) => {
+ if (res.success) {
+ if (this.selectionRows[0].paraTypeFlag === '1') {
+ //鏄剧ず褰撳墠閫変腑绫诲瀷鍙傛暟
+ this.$refs.paraCommonToolList.getPara(res.result)
+ //闅愯棌鍏朵粬绫诲瀷鍙傛暟
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ } else if (this.selectionRows[0].paraTypeFlag === '2') {
+ this.$refs.paraHoleToolsList.getPara(res.result)
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ } else if (this.selectionRows[0].paraTypeFlag === '3') {
+ this.$refs.paraThreadingToolList.getPara(res.result)
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ } else if (this.selectionRows[0].paraTypeFlag === '4') {
+ this.$refs.paraMillToolList.getPara(res.result)
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ } else if (this.selectionRows[0].paraTypeFlag === '5') {
+ this.$refs.paraTurningToolsList.getPara(res.result)
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraBladeList.visable = false
+ } else if (this.selectionRows[0].paraTypeFlag === '6') {
+ this.$refs.paraBladeList.getPara(res.result)
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
}
- })
- getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0]}).then((res) => {
- if (res.success) {
- this.$refs.toolsConfigPropertyList.getPara(res.result);
- } else {
- this.$message.warning(res.message);
- }
- })
-
- },
- // 澶勭悊缂栬緫鎸夐挳鐐瑰嚮浜嬩欢
- handleEditSelected() {
- if (this.selectedRowKeys.length === 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曡繘琛岀紪杈�');
- return;
+ } else {
+ this.$message.warning(res.message)
}
- const selectedRecord = this.dataSource.find(item => item.id === this.selectedRowKeys[0]);
- if (selectedRecord) {
- this.handleEdit(selectedRecord);
+ })
+ getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0] }).then((res) => {
+ if (res.success) {
+ this.$refs.toolsConfigPropertyList.getPara(res.result)
+ } else {
+ this.$message.warning(res.message)
}
- },
- //缂栬緫
- handleEdit(record) {
- if(record.paramaTableName === "1"){
- this.$refs.paraCommonToolModal.edit(record);
- this.$refs.paraCommonToolModal.title = "缂栬緫";
- this.$refs.paraCommonToolModal.disableSubmit = false;
- }else if(record.paramaTableName === "2"){
- this.$refs.paraHoleToolsModal.edit(record);
- this.$refs.paraHoleToolsModal.title = "缂栬緫";
- this.$refs.paraHoleToolsModal.disableSubmit = false;
- }else if(record.paramaTableName === "3"){
- this.$refs.paraThreadingToolModal.edit(record);
- this.$refs.paraThreadingToolModal.title = "缂栬緫";
- this.$refs.paraThreadingToolModal.disableSubmit = false;
- }else if(record.paramaTableName === "4"){
- this.$refs.paraMillToolModal.edit(record);
- this.$refs.paraMillToolModal.title = "缂栬緫";
- this.$refs.paraMillToolModal.disableSubmit = false;
- }else if(record.paramaTableName === "5"){
- this.$refs.paraTurningToolsModal.edit(record);
- this.$refs.paraTurningToolsModal.title = "缂栬緫";
- this.$refs.paraTurningToolsModal.disableSubmit = false;
- }else if(record.paramaTableName === "6"){
- this.$refs.paraBladeModal.edit(record);
- this.$refs.paraBladeModal.title = "缂栬緫";
- this.$refs.paraBladeModal.disableSubmit = false;
- }
- },
- //璇︽儏
- handleDetail:function(record){
- if(record.paramaTableName === "1"){
- this.$refs.paraCommonToolModal.edit(record);
- this.$refs.paraCommonToolModal.title="璇︽儏";
- this.$refs.paraCommonToolModal.disableSubmit = true;
-
- }else if(record.paramaTableName === "2"){
- this.$refs.paraHoleToolsModal.edit(record);
- this.$refs.paraHoleToolsModal.title="璇︽儏";
- this.$refs.paraHoleToolsModal.disableSubmit = true;
-
- }else if(record.paramaTableName === "3"){
- this.$refs.paraThreadingToolModal.edit(record);
- this.$refs.paraThreadingToolModal.title="璇︽儏";
- this.$refs.paraThreadingToolModal.disableSubmit = true;
-
- }else if(record.paramaTableName === "4"){
- this.$refs.paraMillToolModal.edit(record);
- this.$refs.paraMillToolModal.title="璇︽儏";
- this.$refs.paraMillToolModal.disableSubmit = true;
-
- }else if(record.paramaTableName === "5"){
- this.$refs.paraTurningToolsModal.edit(record);
- this.$refs.paraTurningToolsModal.title="璇︽儏";
- this.$refs.paraTurningToolsModal.disableSubmit = true;
-
- }else if(record.paramaTableName === "6"){
- this.$refs.paraBladeModal.edit(record);
- this.$refs.paraBladeModal.title="璇︽儏";
- this.$refs.paraBladeModal.disableSubmit = true;
-
- }
+ })
},
- //绂佺敤鐘舵�佹牱寮�
- tableRowClass(record, index) {
- if (record.status != "1") {
- return "frozenRowClass";
- }
- return "";
- },
- loadData() {
- let params = this.getQueryParams();
- if (this.nodeSelected) {
- // 鍔犺浇閫変腑鑺傜偣鐨勫瓙绫�
- params.classifyId = this.nodeSelected.key;
- this.loading = true;
+ // 澶勭悊缂栬緫鎸夐挳鐐瑰嚮浜嬩欢
+ handleEditSelected() {
+ if (this.selectedRowKeys.length === 0) {
+ this.$message.warning('璇烽�夋嫨涓�鏉¤褰曡繘琛岀紪杈�')
+ return
+ }
+ const selectedRecord = this.dataSource.find((item) => item.id === this.selectedRowKeys[0])
+ if (selectedRecord) {
+ this.handleEdit(selectedRecord)
+ }
+ },
+ //缂栬緫
+ handleEdit(record) {
+ if (record.paramaTableName === '1') {
+ this.$refs.paraCommonToolModal.edit(record)
+ this.$refs.paraCommonToolModal.title = '缂栬緫'
+ this.$refs.paraCommonToolModal.disableSubmit = false
+ } else if (record.paramaTableName === '2') {
+ this.$refs.paraHoleToolsModal.edit(record)
+ this.$refs.paraHoleToolsModal.title = '缂栬緫'
+ this.$refs.paraHoleToolsModal.disableSubmit = false
+ } else if (record.paramaTableName === '3') {
+ this.$refs.paraThreadingToolModal.edit(record)
+ this.$refs.paraThreadingToolModal.title = '缂栬緫'
+ this.$refs.paraThreadingToolModal.disableSubmit = false
+ } else if (record.paramaTableName === '4') {
+ this.$refs.paraMillToolModal.edit(record)
+ this.$refs.paraMillToolModal.title = '缂栬緫'
+ this.$refs.paraMillToolModal.disableSubmit = false
+ } else if (record.paramaTableName === '5') {
+ this.$refs.paraTurningToolsModal.edit(record)
+ this.$refs.paraTurningToolsModal.title = '缂栬緫'
+ this.$refs.paraTurningToolsModal.disableSubmit = false
+ } else if (record.paramaTableName === '6') {
+ this.$refs.paraBladeModal.edit(record)
+ this.$refs.paraBladeModal.title = '缂栬緫'
+ this.$refs.paraBladeModal.disableSubmit = false
+ }
+ },
+ //璇︽儏
+ handleDetail: function (record) {
+ if (record.paramaTableName === '1') {
+ this.$refs.paraCommonToolModal.edit(record)
+ this.$refs.paraCommonToolModal.title = '璇︽儏'
+ this.$refs.paraCommonToolModal.disableSubmit = true
+ } else if (record.paramaTableName === '2') {
+ this.$refs.paraHoleToolsModal.edit(record)
+ this.$refs.paraHoleToolsModal.title = '璇︽儏'
+ this.$refs.paraHoleToolsModal.disableSubmit = true
+ } else if (record.paramaTableName === '3') {
+ this.$refs.paraThreadingToolModal.edit(record)
+ this.$refs.paraThreadingToolModal.title = '璇︽儏'
+ this.$refs.paraThreadingToolModal.disableSubmit = true
+ } else if (record.paramaTableName === '4') {
+ this.$refs.paraMillToolModal.edit(record)
+ this.$refs.paraMillToolModal.title = '璇︽儏'
+ this.$refs.paraMillToolModal.disableSubmit = true
+ } else if (record.paramaTableName === '5') {
+ this.$refs.paraTurningToolsModal.edit(record)
+ this.$refs.paraTurningToolsModal.title = '璇︽儏'
+ this.$refs.paraTurningToolsModal.disableSubmit = true
+ } else if (record.paramaTableName === '6') {
+ this.$refs.paraBladeModal.edit(record)
+ this.$refs.paraBladeModal.title = '璇︽儏'
+ this.$refs.paraBladeModal.disableSubmit = true
+ }
+ },
+ //绂佺敤鐘舵�佹牱寮�
+ tableRowClass(record, index) {
+ if (record.status != '1') {
+ return 'frozenRowClass'
+ }
+ return ''
+ },
+ loadData() {
+ let params = this.getQueryParams()
+ if (this.nodeSelected) {
+ this.clearPara()
+ // 鍔犺浇閫変腑鑺傜偣鐨勫瓙绫�
+ params.classifyId = this.nodeSelected.key
+ this.loading = true
let httpUrl = ''
- if(this.paraTypeFlag === '1'){
- httpUrl = this.url.paraCommonToolList
- }else if(this.paraTypeFlag === '2'){
- httpUrl = this.url.paraHolesToolsList
- }else if(this.paraTypeFlag === '3'){
- httpUrl = this.url.paraThreadingToolList
- }else if(this.paraTypeFlag === '4'){
- httpUrl = this.url.paraMillToolList
- }else if(this.paraTypeFlag === '5'){
- httpUrl = this.url.paraTurningToolsList
- }else if(this.paraTypeFlag === '6'){
- httpUrl = this.url.paraBladeList
- }else{
+ if (this.paraTypeFlag === '1') {
+ httpUrl = this.url.paraCommonToolList
+ } else if (this.paraTypeFlag === '2') {
+ httpUrl = this.url.paraHolesToolsList
+ } else if (this.paraTypeFlag === '3') {
+ httpUrl = this.url.paraThreadingToolList
+ } else if (this.paraTypeFlag === '4') {
+ httpUrl = this.url.paraMillToolList
+ } else if (this.paraTypeFlag === '5') {
+ httpUrl = this.url.paraTurningToolsList
+ } else if (this.paraTypeFlag === '6') {
+ httpUrl = this.url.paraBladeList
+ } else {
//this.dataSource = [];
// this.clearPara()
// this.loading = false;
@@ -547,89 +616,208 @@
getAction(httpUrl, params)
.then((res) => {
if (res.success) {
- this.dataSource = res.result.records; // 鏇存柊琛ㄦ牸鏁版嵁
+ this.dataSource = res.result.records // 鏇存柊琛ㄦ牸鏁版嵁
this.ipagination.total = res.result.total
//榛樿閫変腑绗竴鏉℃暟鎹�
this.selectedRowKeys[0] = res.result.records[0].id
this.selectionRows[0] = res.result.records[0]
- this.onSelectChange(this.selectedRowKeys,this.selectionRows)
+ this.onSelectChange(this.selectedRowKeys, this.selectionRows)
} else {
//this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
this.ipagination.total = 0
}
})
.finally(() => {
- this.loading = false;
- });
- } else {
- //this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
- }
- },
- onClearSelected() {
- this.selectedKeys = [];
- this.nodeSelected = {}; // 娓呯┖閫変腑鐨勮妭鐐�
- this.dataSource = []; // 娓呯┖琛ㄦ牸鏁版嵁
- },
- //閲嶇疆
- searchReset() {
- this.queryParam = {}
- this.loadData(1);
- this.clearPara()
- },
- //娓呯┖閫変腑鍙婂弬鏁�
- clearPara(){
- this.selectedRowKeys = []
- this.$refs.paraCommonToolList.visable = false
- this.$refs.paraHoleToolsList.visable = false
- this.$refs.paraThreadingToolList.visable = false
- this.$refs.paraMillToolList.visable = false
- this.$refs.paraTurningToolsList.visable = false
- this.$refs.paraBladeList.visable = false
- this.$refs.toolsConfigPropertyList.visable = false
- },
- customRow(record) {
- return {
- on: {
- click: () => {
- this.onSelectChange(record.id.split(","), [record]);
- }
- }
- }
- },
- exportToExcel(fileName) {
+ this.loading = false
+ })
+ } else {
+ //this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
+ }
+ },
+ onClearSelected() {
+ this.selectedKeys = []
+ this.nodeSelected = {} // 娓呯┖閫変腑鐨勮妭鐐�
+ this.dataSource = [] // 娓呯┖琛ㄦ牸鏁版嵁
+ },
+ //閲嶇疆
+ searchReset() {
+ this.queryParam = {}
+ this.loadData(1)
+ this.clearPara()
+ },
+ //娓呯┖閫変腑鍙婂弬鏁�
+ clearPara() {
+ this.selectedRowKeys = []
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable = false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ this.$refs.toolsConfigPropertyList.visable = false
+ },
+ customRow(record) {
+ return {
+ on: {
+ click: () => {
+ this.onSelectChange(record.id.split(','), [record])
+ },
+ },
+ }
+ },
+ exportToExcel(fileName) {
this.loading = true // 鏄剧ず鍔犺浇閬僵
this.queryParam.paraTypeFlag = this.paraTypeFlag
var params = this.getQueryParams()
- downFile(this.url.loadTemplate,params).then((data)=>{
+ downFile(this.url.loadTemplate, params).then((data) => {
if (!data) {
- this.$message.warning("鏂囦欢涓嬭浇澶辫触")
+ this.$message.warning('鏂囦欢涓嬭浇澶辫触')
return
}
if (typeof window.navigator.msSaveBlob !== 'undefined') {
- window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'}), fileName+'.xlsx')
- }else{
- let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'}))
+ window.navigator.msSaveBlob(
+ new Blob([data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }),
+ fileName + '.xlsx'
+ )
+ } else {
+ let url = window.URL.createObjectURL(
+ new Blob([data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
+ )
let link = document.createElement('a')
link.style.display = 'none'
link.href = url
- link.setAttribute('download', fileName+'.xlsx')
+ link.setAttribute('download', fileName + '.xlsx')
document.body.appendChild(link)
link.click()
- document.body.removeChild(link); //涓嬭浇瀹屾垚绉婚櫎鍏冪礌
- window.URL.revokeObjectURL(url); //閲婃斁鎺塨lob瀵硅薄
+ document.body.removeChild(link) //涓嬭浇瀹屾垚绉婚櫎鍏冪礌
+ window.URL.revokeObjectURL(url) //閲婃斁鎺塨lob瀵硅薄
}
this.loading = false // 闅愯棌閬僵
})
},
+ searchHeightQuery() {
+ if (this.paraTypeFlag === '2') {
+ this.$refs.paraHoleToolsSearchModal.show()
+ } else if (this.paraTypeFlag === '3') {
+ this.$refs.paraThreadingToolSearchModal.show()
+ } else if (this.paraTypeFlag === '4') {
+ this.$refs.paraMillToolSearchModal.show()
+ } else if (this.paraTypeFlag === '5') {
+ this.$refs.paraTurningToolsSearchModal.show()
+ } else if (this.paraTypeFlag === '6') {
+ this.$refs.paraBladeSearchModal.show()
+ }
},
- }
+ paraHoleToolsOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.diameter = data.diameter
+ this.queryParam.coneAngle = data.coneAngle
+ this.queryParam.edgeLength = data.edgeLength
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.toolPattern = data.toolPattern
+ this.queryParam.handleSpecifications = data.handleSpecifications
+ this.queryParam.coolingMethod = data.coolingMethod
+ this.queryParam.bladeCount = data.bladeCount
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData()
+ },
+ paraBladeOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.bladeShape = data.bladeShape
+ this.queryParam.bladeLength = data.bladeLength
+ this.queryParam.cuttingEdgeCount = data.cuttingEdgeCount
+ this.queryParam.bladeThickness = data.bladeThickness
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.clampingType = data.clampingType
+ this.queryParam.noseAngleR = data.noseAngleR
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData()
+ },
+ paraThreadingToolOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.threadCode = data.threadCode
+ this.queryParam.pitch = data.pitch
+ this.queryParam.rotationDirection = data.rotationDirection
+ this.queryParam.tolerancezoneLevel = data.tolerancezoneLevel
+ this.queryParam.edgeLength = data.edgeLength
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.externalDimensions = data.externalDimensions
+ this.queryParam.handleSpecifications = data.handleSpecifications
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData()
+ },
+ paraMillToolOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.diameter = data.diameter
+ this.queryParam.noseAngleR = data.noseAngleR
+ this.queryParam.edgeLength = data.edgeLength
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.toolPattern = data.toolPattern
+ this.queryParam.clampingSpecifications = data.clampingSpecifications
+ this.queryParam.coolingMethod = data.coolingMethod
+ this.queryParam.numberOfTeeth = data.numberOfTeeth
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData()
+ },
+ paraTurningToolsOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.headSpecifications = data.headSpecifications
+ this.queryParam.matchingNumber = data.matchingNumber
+ this.queryParam.leadAngle = data.leadAngle
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.toolPattern = data.toolPattern
+ this.queryParam.crossSectionalSize = data.crossSectionalSize
+ this.queryParam.coolingMethod = data.coolingMethod
+ this.queryParam.cuttingDirection = data.cuttingDirection
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData()
+ },
+ },
+}
</script>
<style scoped>
- @import '~@assets/less/common.less';
- .enable {
- color: green;
- }
- .disable {
- color: red;
- }
+@import '~@assets/less/common.less';
+.enable {
+ color: green;
+}
+.disable {
+ color: red;
+}
</style>
\ No newline at end of file
diff --git a/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue b/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
new file mode 100644
index 0000000..96a0880
--- /dev/null
+++ b/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
@@ -0,0 +1,279 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="800"
+ :visible="visible"
+ centered
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @cancel="handleCancel"
+ cancelText="鍏抽棴"
+ >
+ <a-spin :spinning="confirmLoading">
+ <a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
+ <a-input
+ :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'"
+ v-model="model.chineseName"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'"
+ v-model="model.foreignLanguageName"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
+ <a-input
+ :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
+ v-model="model.standardLevel"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input
+ :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'"
+ v-model="model.standardCode"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
+ v-model="model.toolModel"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鐗囧舰鐘�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
+ <a-input
+ v-model="model.bladeShape"
+ :placeholder="'璇疯緭鍏ュ垁鐗囧舰鐘�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鐗囬暱搴�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeLength">
+ <a-input
+ v-model="model.bladeLength"
+ :placeholder="'璇疯緭鍏ュ垁鐗囬暱搴�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒囧墛鍒冩暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeCount">
+ <a-input
+ v-model="model.cuttingEdgeCount"
+ :placeholder="'璇疯緭鍏ュ垏鍓婂垉鏁�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鐗囧帤搴�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeThickness">
+ <a-input
+ v-model="model.bladeThickness"
+ :placeholder="'璇疯緭鍏ュ垁鐗囧帤搴�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <a-input
+ v-model="model.toolMaterial"
+ :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
+ <a-input
+ v-model="model.partMaterial"
+ :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group
+ v-model="model.paintcoatFlag"
+ :placeholder="'璇烽�夋嫨鏄惁娑傚眰'"
+ >
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="澶瑰浐鍨嬪紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingType">
+ <a-input
+ v-model="model.clampingType"
+ :placeholder="'璇疯緭鍏ュす鍥哄瀷寮�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="鍒�灏朢"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="noseAngleR"
+ >
+ <a-input
+ v-model="model.noseAngleR"
+ :placeholder="'璇疯緭鍏ュ垁灏朢'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="technicalConditions"
+ >
+ <a-input
+ v-model="model.technicalConditions"
+ :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠惰鏄�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="conditionsInfo"
+ >
+ <a-input
+ v-model="model.conditionsInfo"
+ :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </a-spin>
+ <template slot="footer">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button :style="{ marginRight: '8px' }" @click="handleCancel">鍏抽棴</a-button>
+ </template>
+ </j-modal>
+</template>
+
+<script>
+
+export default {
+ name: 'ParaHoleToolsSearchModal',
+ data() {
+ return {
+ title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ visible: false,
+ confirmLoading: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 9 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 14 },
+ },
+ searchParams:{}
+ }
+ },
+ created() {
+ },
+ mounted() {
+
+ },
+ methods: {
+ show() {
+ this.visible = true
+ },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+ handleCancel() {
+ this.close()
+ },
+
+ searchQuery(){
+ this.searchParams.chineseName = this.model.chineseName
+ this.searchParams.foreignLanguageName = this.model.foreignLanguageName
+ this.searchParams.standardLevel = this.model.standardLevel
+ this.searchParams.standardCode = this.model.standardCode
+ this.searchParams.bladeShape = this.model.bladeShape
+ this.searchParams.bladeLength = this.model.bladeLength
+ this.searchParams.cuttingEdgeCount = this.model.cuttingEdgeCount
+ this.searchParams.bladeThickness = this.model.bladeThickness
+ this.searchParams.toolMaterial = this.model.toolMaterial
+ this.searchParams.partMaterial = this.model.partMaterial
+ this.searchParams.paintcoatFlag = this.model.paintcoatFlag
+ this.searchParams.clampingType = this.model.clampingType
+ this.searchParams.noseAngleR = this.model.noseAngleR
+ this.searchParams.technicalConditions = this.model.technicalConditions
+ this.searchParams.conditionsInfo = this.model.conditionsInfo
+ this.searchParams.toolModel = this.model.toolModel
+ this.close()
+ this.$emit('searchParams',this.searchParams)
+ },
+ searchReset(){
+ this.model = {}
+ }
+ },
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .ant-modal-body {
+ padding: 0 24px;
+}
+
+/deep/ .ant-upload {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .img {
+ display: flex;
+ justify-content: center;
+
+ .ant-upload-picture-card-wrapper {
+ width: auto;
+ }
+}
+
+/deep/ .ant-upload-list-picture-card-container {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .ant-upload-list-item {
+ width: 185px;
+ height: 185px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tms/modules/baseTools/ParaCommonToolList.vue b/src/views/tms/modules/baseTools/ParaCommonToolList.vue
index c3234c9..79cba93 100644
--- a/src/views/tms/modules/baseTools/ParaCommonToolList.vue
+++ b/src/views/tms/modules/baseTools/ParaCommonToolList.vue
@@ -3,7 +3,7 @@
<!-- 褰撳墠椤甸潰涓氬姟閮ㄥ垎 -->
<a-card :bordered="false" :title="title" v-show="visable">
<a-descriptions title="宸ュ叿鍙傛暟璇︽儏">
- <a-descriptions-item label="宸ュ叿缂栧彿">{{ this.para == null || this.para.toolCode == null ? '' : this.para.toolCode }}</a-descriptions-item>
+ <!-- <a-descriptions-item label="宸ュ叿缂栧彿">{{ this.para == null || this.para.toolCode == null ? '' : this.para.toolCode }}</a-descriptions-item> -->
<a-descriptions-item label="搴忓彿">{{ this.para == null || this.para.signCode == null ? '' : this.para.signCode }}</a-descriptions-item>
<a-descriptions-item label="涓枃鍚嶇О">{{ this.para == null || this.para.chineseName == null ? '' : this.para.chineseName }}</a-descriptions-item>
<a-descriptions-item label="澶栨枃鍚嶇О">{{ this.para == null || this.para.foreignLanguageName == null ? '' : this.para.foreignLanguageName }}</a-descriptions-item>
diff --git a/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue b/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue
new file mode 100644
index 0000000..4802e5e
--- /dev/null
+++ b/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue
@@ -0,0 +1,299 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="800"
+ :visible="visible"
+ centered
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @cancel="handleCancel"
+ cancelText="鍏抽棴"
+ >
+ <a-spin :spinning="confirmLoading">
+ <a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
+ <a-input
+ :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'"
+ v-model="model.chineseName"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'"
+ v-model="model.foreignLanguageName"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
+ <a-input
+ :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
+ v-model="model.standardLevel"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input
+ :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'"
+ v-model="model.standardCode"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
+ v-model="model.toolModel"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鐩村緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
+ <a-input
+ v-model="model.diameter"
+ :placeholder="'璇疯緭鍏ョ洿寰�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒囧墛鍒冮敟瑙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coneAngle">
+ <a-input
+ v-model="model.coneAngle"
+ :placeholder="'璇疯緭鍏ュ垏鍓婂垉閿ヨ'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒囧墛鍒冮暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="edgeLength">
+ <a-input
+ v-model="model.edgeLength"
+ :placeholder="'璇疯緭鍏ュ垏鍓婂垉闀�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
+ <a-input
+ v-model="model.totalLength"
+ :placeholder="'璇疯緭鍏ュ垁鍏锋�婚暱'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <a-input
+ v-model="model.toolMaterial"
+ :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
+ <a-input
+ v-model="model.partMaterial"
+ :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group
+ v-model="model.paintcoatFlag"
+ :placeholder="'璇烽�夋嫨鏄惁娑傚眰'"
+ >
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
+ <a-input
+ v-model="model.toolPattern"
+ :placeholder="'璇疯緭鍏ュ垁鍏峰瀷寮�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="鏌勯儴瑙勬牸"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="handleSpecifications"
+ >
+ <a-input
+ v-model="model.handleSpecifications"
+ :placeholder="'璇疯緭鍏ユ焺閮ㄨ鏍�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
+ <a-input
+ v-model="model.coolingMethod"
+ :placeholder="'璇疯緭鍏ュ喎鍗存柟寮�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒冩暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeCount">
+ <a-input
+ v-model="model.bladeCount"
+ :placeholder="'璇疯緭鍏ュ垉鏁�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="technicalConditions"
+ >
+ <a-input
+ v-model="model.technicalConditions"
+ :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠惰鏄�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="conditionsInfo"
+ >
+ <a-input
+ v-model="model.conditionsInfo"
+ :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </a-spin>
+ <template slot="footer">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button :style="{ marginRight: '8px' }" @click="handleCancel">鍏抽棴</a-button>
+ </template>
+ </j-modal>
+</template>
+
+<script>
+
+export default {
+ name: 'ParaHoleToolsSearchModal',
+ data() {
+ return {
+ title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ visible: false,
+ confirmLoading: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 9 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 14 },
+ },
+ searchParams:{}
+ }
+ },
+ created() {
+ },
+ mounted() {
+
+ },
+ methods: {
+ show() {
+ this.visible = true
+ },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+ handleCancel() {
+ this.close()
+ },
+
+ searchQuery(){
+ this.searchParams.chineseName = this.model.chineseName
+ this.searchParams.foreignLanguageName = this.model.foreignLanguageName
+ this.searchParams.standardLevel = this.model.standardLevel
+ this.searchParams.standardCode = this.model.standardCode
+ this.searchParams.diameter = this.model.diameter
+ this.searchParams.coneAngle = this.model.coneAngle
+ this.searchParams.edgeLength = this.model.edgeLength
+ this.searchParams.totalLength = this.model.totalLength
+ this.searchParams.toolMaterial = this.model.toolMaterial
+ this.searchParams.partMaterial = this.model.partMaterial
+ this.searchParams.paintcoatFlag = this.model.paintcoatFlag
+ this.searchParams.toolPattern = this.model.toolPattern
+ this.searchParams.handleSpecifications = this.model.handleSpecifications
+ this.searchParams.coolingMethod = this.model.coolingMethod
+ this.searchParams.bladeCount = this.model.bladeCount
+ this.searchParams.technicalConditions = this.model.technicalConditions
+ this.searchParams.conditionsInfo = this.model.conditionsInfo
+ this.searchParams.toolModel = this.model.toolModel
+ this.close()
+ this.$emit('searchParams',this.searchParams)
+ },
+ searchReset(){
+ this.model = {}
+ }
+ },
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .ant-modal-body {
+ padding: 0 24px;
+}
+
+/deep/ .ant-upload {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .img {
+ display: flex;
+ justify-content: center;
+
+ .ant-upload-picture-card-wrapper {
+ width: auto;
+ }
+}
+
+/deep/ .ant-upload-list-picture-card-container {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .ant-upload-list-item {
+ width: 185px;
+ height: 185px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue b/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
new file mode 100644
index 0000000..715986d
--- /dev/null
+++ b/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
@@ -0,0 +1,299 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="800"
+ :visible="visible"
+ centered
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @cancel="handleCancel"
+ cancelText="鍏抽棴"
+ >
+ <a-spin :spinning="confirmLoading">
+ <a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
+ <a-input
+ :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'"
+ v-model="model.chineseName"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'"
+ v-model="model.foreignLanguageName"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
+ <a-input
+ :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
+ v-model="model.standardLevel"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input
+ :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'"
+ v-model="model.standardCode"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
+ v-model="model.toolModel"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鐩村緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
+ <a-input
+ v-model="model.diameter"
+ :placeholder="'璇疯緭鍏ョ洿寰�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="榻挎暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberOfTeeth">
+ <a-input
+ v-model="model.numberOfTeeth"
+ :placeholder="'璇疯緭鍏ラ娇鏁�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒囧墛鍒冮暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="edgeLength">
+ <a-input
+ v-model="model.edgeLength"
+ :placeholder="'璇疯緭鍏ュ垏鍓婂垉闀�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
+ <a-input
+ v-model="model.totalLength"
+ :placeholder="'璇疯緭鍏ュ垁鍏锋�婚暱'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <a-input
+ v-model="model.toolMaterial"
+ :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
+ <a-input
+ v-model="model.partMaterial"
+ :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group
+ v-model="model.paintcoatFlag"
+ :placeholder="'璇烽�夋嫨鏄惁娑傚眰'"
+ >
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
+ <a-input
+ v-model="model.toolPattern"
+ :placeholder="'璇疯緭鍏ュ垁鍏峰瀷寮�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="瑁呭す瑙勬牸"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="clampingSpecifications"
+ >
+ <a-input
+ v-model="model.clampingSpecifications"
+ :placeholder="'璇疯緭鍏ヨ澶硅鏍�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
+ <a-input
+ v-model="model.coolingMethod"
+ :placeholder="'璇疯緭鍏ュ喎鍗存柟寮�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�灏栬R" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleR">
+ <a-input
+ v-model="model.noseAngleR"
+ :placeholder="'璇疯緭鍏ュ垁灏栬R'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="technicalConditions"
+ >
+ <a-input
+ v-model="model.technicalConditions"
+ :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠惰鏄�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="conditionsInfo"
+ >
+ <a-input
+ v-model="model.conditionsInfo"
+ :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </a-spin>
+ <template slot="footer">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button :style="{ marginRight: '8px' }" @click="handleCancel">鍏抽棴</a-button>
+ </template>
+ </j-modal>
+</template>
+
+<script>
+
+export default {
+ name: 'ParaHoleToolsSearchModal',
+ data() {
+ return {
+ title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ visible: false,
+ confirmLoading: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 9 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 14 },
+ },
+ searchParams:{}
+ }
+ },
+ created() {
+ },
+ mounted() {
+
+ },
+ methods: {
+ show() {
+ this.visible = true
+ },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+ handleCancel() {
+ this.close()
+ },
+
+ searchQuery(){
+ this.searchParams.chineseName = this.model.chineseName
+ this.searchParams.foreignLanguageName = this.model.foreignLanguageName
+ this.searchParams.standardLevel = this.model.standardLevel
+ this.searchParams.standardCode = this.model.standardCode
+ this.searchParams.diameter = this.model.diameter
+ this.searchParams.noseAngleR = this.model.noseAngleR
+ this.searchParams.edgeLength = this.model.edgeLength
+ this.searchParams.totalLength = this.model.totalLength
+ this.searchParams.toolMaterial = this.model.toolMaterial
+ this.searchParams.partMaterial = this.model.partMaterial
+ this.searchParams.paintcoatFlag = this.model.paintcoatFlag
+ this.searchParams.toolPattern = this.model.toolPattern
+ this.searchParams.clampingSpecifications = this.model.clampingSpecifications
+ this.searchParams.coolingMethod = this.model.coolingMethod
+ this.searchParams.numberOfTeeth = this.model.numberOfTeeth
+ this.searchParams.technicalConditions = this.model.technicalConditions
+ this.searchParams.conditionsInfo = this.model.conditionsInfo
+ this.searchParams.toolModel = this.model.toolModel
+ this.close()
+ this.$emit('searchParams',this.searchParams)
+ },
+ searchReset(){
+ this.model = {}
+ }
+ },
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .ant-modal-body {
+ padding: 0 24px;
+}
+
+/deep/ .ant-upload {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .img {
+ display: flex;
+ justify-content: center;
+
+ .ant-upload-picture-card-wrapper {
+ width: auto;
+ }
+}
+
+/deep/ .ant-upload-list-picture-card-container {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .ant-upload-list-item {
+ width: 185px;
+ height: 185px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
new file mode 100644
index 0000000..460d748
--- /dev/null
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
@@ -0,0 +1,244 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="800"
+ :visible="visible"
+ centered
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @cancel="handleCancel"
+ cancelText="鍏抽棴"
+ >
+ <a-spin :spinning="confirmLoading">
+ <a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
+ <a-input :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
+ <a-input :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'" v-model="model.foreignLanguageName" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'" v-model="model.standardLevel" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'" v-model="model.standardCode" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
+ <a-input :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="铻虹汗浠ｅ彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadCode">
+ <a-input v-model="model.threadCode" :placeholder="'璇疯緭鍏ヨ灪绾逛唬鍙�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="铻鸿窛" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
+ <a-input v-model="model.pitch" :placeholder="'璇疯緭鍏ヨ灪璺�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="铻虹汗鏃嬪悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rotationDirection">
+ <a-input v-model="model.rotationDirection" :placeholder="'璇疯緭鍏ヨ灪绾规棆鍚�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item
+ label="铻虹汗鍏樊甯︿唬鍙�/绮惧害绛夌骇"
+ :labelCol="{span:12}"
+ :wrapperCol="{span:10}"
+ prop="tolerancezoneLevel"
+ >
+ <a-input v-model="model.tolerancezoneLevel" :placeholder="'璇疯緭鍏ヨ灪绾瑰叕宸甫浠ｅ彿/绮惧害绛夌骇'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒囧墛鍒冮暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="edgeLength">
+ <a-input v-model="model.edgeLength" :placeholder="'璇疯緭鍏ュ垏鍓婂垉闀�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
+ <a-input v-model="model.totalLength" :placeholder="'璇疯緭鍏ュ垁鍏锋�婚暱'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group v-model="model.paintcoatFlag" :placeholder="'璇烽�夋嫨鏄惁娑傚眰'">
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <a-input v-model="model.toolMaterial" :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
+ <a-input v-model="model.partMaterial" :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="澶栧瀷灏哄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="externalDimensions">
+ <a-input v-model="model.externalDimensions" :placeholder="'璇疯緭鍏ュ鍨嬪昂瀵�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="鏌勯儴瑙勬牸"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="handleSpecifications"
+ >
+ <a-input v-model="model.handleSpecifications" :placeholder="'璇疯緭鍏ユ焺閮ㄨ鏍�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="technicalConditions"
+ >
+ <a-input v-model="model.technicalConditions" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠惰鏄�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="conditionsInfo"
+ >
+ <a-input v-model="model.conditionsInfo" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </a-spin>
+ <template slot="footer">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button :style="{ marginRight: '8px' }" @click="handleCancel">鍏抽棴</a-button>
+ </template>
+ </j-modal>
+</template>
+
+<script>
+export default {
+ name: 'ParaHoleToolsSearchModal',
+ data() {
+ return {
+ title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ visible: false,
+ confirmLoading: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 9 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 14 },
+ },
+ searchParams: {},
+ }
+ },
+ created() {},
+ mounted() {},
+ methods: {
+ show() {
+ this.visible = true
+ },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+ handleCancel() {
+ this.close()
+ },
+
+ searchQuery() {
+ this.searchParams.chineseName = this.model.chineseName
+ this.searchParams.foreignLanguageName = this.model.foreignLanguageName
+ this.searchParams.threadCode = this.model.threadCode
+ this.searchParams.pitch = this.model.pitch
+ this.searchParams.rotationDirection = this.model.rotationDirection
+ this.searchParams.tolerancezoneLevel = this.model.tolerancezoneLevel
+ this.searchParams.edgeLength = this.model.edgeLength
+ this.searchParams.totalLength = this.model.totalLength
+ this.searchParams.toolMaterial = this.model.toolMaterial
+ this.searchParams.partMaterial = this.model.partMaterial
+ this.searchParams.paintcoatFlag = this.model.paintcoatFlag
+ this.searchParams.externalDimensions = this.model.externalDimensions
+ this.searchParams.handleSpecifications = this.model.handleSpecifications
+ this.searchParams.technicalConditions = this.model.technicalConditions
+ this.searchParams.conditionsInfo = this.model.conditionsInfo
+ this.searchParams.toolModel = this.model.toolModel
+ this.close()
+ this.$emit('searchParams', this.searchParams)
+ },
+ searchReset() {
+ this.model = {}
+ },
+ },
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .ant-modal-body {
+ padding: 0 24px;
+}
+
+/deep/ .ant-upload {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .img {
+ display: flex;
+ justify-content: center;
+
+ .ant-upload-picture-card-wrapper {
+ width: auto;
+ }
+}
+
+/deep/ .ant-upload-list-picture-card-container {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .ant-upload-list-item {
+ width: 185px;
+ height: 185px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue b/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue
new file mode 100644
index 0000000..2f8b0d6
--- /dev/null
+++ b/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue
@@ -0,0 +1,299 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="800"
+ :visible="visible"
+ centered
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @cancel="handleCancel"
+ cancelText="鍏抽棴"
+ >
+ <a-spin :spinning="confirmLoading">
+ <a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
+ <a-input
+ :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'"
+ v-model="model.chineseName"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'"
+ v-model="model.foreignLanguageName"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
+ <a-input
+ :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
+ v-model="model.standardLevel"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input
+ :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'"
+ v-model="model.standardCode"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
+ v-model="model.toolModel"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�澶磋鏍�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headSpecifications">
+ <a-input
+ v-model="model.headSpecifications"
+ :placeholder="'璇疯緭鍏ュ垁澶磋鏍�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="閰嶅鍒�鐗囧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="matchingNumber">
+ <a-input
+ v-model="model.matchingNumber"
+ :placeholder="'璇疯緭鍏ラ厤濂楀垁鐗囧彿'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="涓诲亸瑙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leadAngle">
+ <a-input
+ v-model="model.leadAngle"
+ :placeholder="'璇疯緭鍏ヤ富鍋忚'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
+ <a-input
+ v-model="model.totalLength"
+ :placeholder="'璇疯緭鍏ュ垁鍏锋�婚暱'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <a-input
+ v-model="model.toolMaterial"
+ :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
+ <a-input
+ v-model="model.partMaterial"
+ :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group
+ v-model="model.paintcoatFlag"
+ :placeholder="'璇烽�夋嫨鏄惁娑傚眰'"
+ >
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
+ <a-input
+ v-model="model.toolPattern"
+ :placeholder="'璇疯緭鍏ュ垁鍏峰瀷寮�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="鍒�鍏锋埅闈㈠昂瀵�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="crossSectionalSize"
+ >
+ <a-input
+ v-model="model.crossSectionalSize"
+ :placeholder="'璇疯緭鍏ュ垁鍏锋埅闈㈠昂瀵�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鍒囧墛鏂瑰悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
+ <a-input
+ v-model="model.cuttingDirection"
+ :placeholder="'璇疯緭鍏ュ垏鍓婃柟鍚�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
+ <a-input
+ v-model="model.coolingMethod"
+ :placeholder="'璇疯緭鍏ュ喎鍗存柟寮�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="technicalConditions"
+ >
+ <a-input
+ v-model="model.technicalConditions"
+ :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠惰鏄�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="conditionsInfo"
+ >
+ <a-input
+ v-model="model.conditionsInfo"
+ :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </a-spin>
+ <template slot="footer">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button :style="{ marginRight: '8px' }" @click="handleCancel">鍏抽棴</a-button>
+ </template>
+ </j-modal>
+</template>
+
+<script>
+
+export default {
+ name: 'ParaHoleToolsSearchModal',
+ data() {
+ return {
+ title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ visible: false,
+ confirmLoading: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 9 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 14 },
+ },
+ searchParams:{}
+ }
+ },
+ created() {
+ },
+ mounted() {
+
+ },
+ methods: {
+ show() {
+ this.visible = true
+ },
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+ handleCancel() {
+ this.close()
+ },
+
+ searchQuery(){
+ this.searchParams.chineseName = this.model.chineseName
+ this.searchParams.foreignLanguageName = this.model.foreignLanguageName
+ this.searchParams.standardLevel = this.model.standardLevel
+ this.searchParams.standardCode = this.model.standardCode
+ this.searchParams.headSpecifications = this.model.headSpecifications
+ this.searchParams.matchingNumber = this.model.matchingNumber
+ this.searchParams.leadAngle = this.model.leadAngle
+ this.searchParams.totalLength = this.model.totalLength
+ this.searchParams.toolMaterial = this.model.toolMaterial
+ this.searchParams.partMaterial = this.model.partMaterial
+ this.searchParams.paintcoatFlag = this.model.paintcoatFlag
+ this.searchParams.toolPattern = this.model.toolPattern
+ this.searchParams.crossSectionalSize = this.model.crossSectionalSize
+ this.searchParams.coolingMethod = this.model.coolingMethod
+ this.searchParams.cuttingDirection = this.model.cuttingDirection
+ this.searchParams.technicalConditions = this.model.technicalConditions
+ this.searchParams.conditionsInfo = this.model.conditionsInfo
+ this.searchParams.toolModel = this.model.toolModel
+ this.close()
+ this.$emit('searchParams',this.searchParams)
+ },
+ searchReset(){
+ this.model = {}
+ }
+ },
+}
+</script>
+
+<style lang="less" scoped>
+/deep/ .ant-modal-body {
+ padding: 0 24px;
+}
+
+/deep/ .ant-upload {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .img {
+ display: flex;
+ justify-content: center;
+
+ .ant-upload-picture-card-wrapper {
+ width: auto;
+ }
+}
+
+/deep/ .ant-upload-list-picture-card-container {
+ width: 185px;
+ height: 185px;
+}
+
+/deep/ .ant-upload-list-item {
+ width: 185px;
+ height: 185px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tms/modules/inbound/InboundListRight.vue b/src/views/tms/modules/inbound/InboundListRight.vue
index c08e06e..6735275 100644
--- a/src/views/tms/modules/inbound/InboundListRight.vue
+++ b/src/views/tms/modules/inbound/InboundListRight.vue
@@ -351,6 +351,7 @@
},
onSelectChange(selectedRowKeys,selectionRows) {
+ this.qrList = []
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
@@ -548,6 +549,7 @@
.finally(() => {
this.loading = false
this.close()
+ this.qrList = []
})
},
// 鎵ц鎵撳嵃
diff --git a/src/views/tms/modules/toolLedger/ToolLedgerDetailList.vue b/src/views/tms/modules/toolLedger/ToolLedgerDetailList.vue
index 60432f6..13903e7 100644
--- a/src/views/tms/modules/toolLedger/ToolLedgerDetailList.vue
+++ b/src/views/tms/modules/toolLedger/ToolLedgerDetailList.vue
@@ -60,7 +60,7 @@
{
title: '宸ュ叿鍒嗙被',
- dataIndex: 'applicationType',
+ dataIndex: 'typeName',
align: 'center',
}
],
diff --git a/src/views/tms/modules/toolLedger/ToolLedgerListLeft.vue b/src/views/tms/modules/toolLedger/ToolLedgerListLeft.vue
index 4c6c91e..e3ff18c 100644
--- a/src/views/tms/modules/toolLedger/ToolLedgerListLeft.vue
+++ b/src/views/tms/modules/toolLedger/ToolLedgerListLeft.vue
@@ -241,7 +241,7 @@
//鐩戝惉
watch: {
currSelected(val) {//鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
- this.$bus.$emit('getCurrSelected', val)
+ this.$bus.$emit('getToolLedgerListSelected', val)
},
}
}
diff --git a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
index c270a49..fb9e03e 100644
--- a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
+++ b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
@@ -38,6 +38,21 @@
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button
+ type="primary"
+ @click="searchHeightQuery"
+ icon="search"
+ style="margin-left: 8px"
+ :disabled="
+ !nodeSelected.key ||
+ nodeSelected.entity.leafFlag === '2' ||
+ (this.paraTypeFlag != '2' &&
+ this.paraTypeFlag != '3' &&
+ this.paraTypeFlag != '4' &&
+ this.paraTypeFlag != '5' &&
+ this.paraTypeFlag != '6')
+ "
+ >楂樼骇鏌ヨ</a-button>
</span>
</a-col>
@@ -171,6 +186,23 @@
<stocktaking-list ref="stocktakingList"></stocktaking-list>
</a-tab-pane>
</a-tabs>
+ <para-hole-tools-search-modal
+ ref="paraHoleToolsSearchModal"
+ @searchParams="paraHoleToolsOk"
+ ></para-hole-tools-search-modal>
+ <para-turning-tools-search-modal
+ ref="paraTurningToolsSearchModal"
+ @searchParams="paraTurningToolsOk"
+ ></para-turning-tools-search-modal>
+ <para-threading-tool-search-modal
+ ref="paraThreadingToolSearchModal"
+ @searchParams="paraThreadingToolOk"
+ ></para-threading-tool-search-modal>
+ <para-mill-tool-search-modal
+ ref="paraMillToolSearchModal"
+ @searchParams="paraMillToolOk"
+ ></para-mill-tool-search-modal>
+ <para-blade-search-modal ref="paraBladeSearchModal" @searchParams="paraBladeOk"></para-blade-search-modal>
</a-card>
</template>
@@ -194,6 +226,11 @@
import StocktakingList from './StocktakingList'
import InStoreDetailList from './InStoreDetailList'
import OutStoreDetailList from './OutStoreDetailList'
+ import ParaHoleToolsSearchModal from '../baseTools/ParaHoleToolsSearchModal'
+import ParaMillToolSearchModal from '../baseTools/ParaMillToolSearchModal'
+import ParaThreadingToolSearchModal from '../baseTools/ParaThreadingToolSearchModal'
+import ParaTurningToolsSearchModal from '../baseTools/ParaTurningToolsSearchModal'
+import ParaBladeSearchModal from '../baseTools/ParaBladeSearchModal'
export default {
name: 'ToolLedgerListRight',
@@ -212,7 +249,12 @@
ToolSharpenList,
StocktakingList,
InStoreDetailList,
- OutStoreDetailList
+ OutStoreDetailList,
+ ParaHoleToolsSearchModal,
+ ParaMillToolSearchModal,
+ ParaThreadingToolSearchModal,
+ ParaTurningToolsSearchModal,
+ ParaBladeSearchModal,
},
data () {
return {
@@ -282,9 +324,9 @@
dataIndex: 'applicationType'
},
{
- title:'绠＄悊绛夌骇',
+ title:'绮惧害绛夌骇',
align:"center",
- dataIndex: 'accuracyClass'
+ dataIndex: 'accuracyClassName'
},
// {
// title:'瀛樺偍浣嶇疆',
@@ -386,12 +428,12 @@
}
},
created() {
- this.$bus.$on('getCurrSelected', (data) => {
- //getCurrSelected 浜嬩欢 鎺ユ敹缁勪欢浼犻�掔殑鍙傛暟
+ this.$bus.$on('getToolLedgerListSelected', (data) => {
+ //getToolLedgerListSelected 浜嬩欢 鎺ユ敹缁勪欢浼犻�掔殑鍙傛暟
this.nodeType = (data.type == undefined ? 0 : data.type);
this.paraTypeFlag = (data.entity == undefined ? 0 : data.entity.paraTypeFlag)
this.nodeSelected = data;
- this.loadData()
+ this.loadData(1)
this.clearPara()
})
},
@@ -403,35 +445,66 @@
methods: {
modalFormOk() {
- this.loadData(); // 鍒锋柊琛ㄦ牸鏁版嵁
+ this.loadData(1); // 鍒锋柊琛ㄦ牸鏁版嵁
this.$bus.$emit('queryTreeData') //鍒锋柊宸︿晶鏍�
},
onSelectChange(selectedRowKeys,selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows
- console.log("22222",selectedRowKeys)
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.paraTypeFlag}).then((res) => {
+ getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => {
if (res.success) {
- if(this.paraTypeFlag === "1"){
+ if(this.selectionRows[0].paraTypeFlag === "1"){
this.$refs.paraCommonToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "2"){
+ //闅愯棌鍏朵粬绫诲瀷鍙傛暟
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "2"){
this.$refs.paraHoleToolsList.getPara(res.result);
- }else if(this.paraTypeFlag === "3"){
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "3"){
this.$refs.paraThreadingToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "4"){
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "4"){
this.$refs.paraMillToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "5"){
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "5"){
this.$refs.paraTurningToolsList.getPara(res.result);
- }else if(this.paraTypeFlag === "6"){
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "6"){
this.$refs.paraBladeList.getPara(res.result);
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
}
} else {
this.$message.warning(res.message);
}
})
- getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0]}).then((res) => {
+ getAction(this.url.queryByToolCode, { toolCode: this.selectionRows[0].toolCodeId}).then((res) => {
if (res.success) {
this.$refs.toolsConfigPropertyList.getPara(res.result);
} else {
@@ -447,7 +520,11 @@
}
return "";
},
- loadData() {
+ loadData(arg) {
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1;
+ }
let params = this.getQueryParams();
if (this.nodeSelected && this.nodeSelected.key !== '-1') {
// 鍔犺浇閫変腑鑺傜偣鐨勫瓙绫�
@@ -461,8 +538,8 @@
this.ipagination.total = res.result.total
//榛樿閫変腑绗竴鏉℃暟鎹�
this.selectedRowKeys[0] = res.result.records[0].id
+ this.selectionRows[0] = res.result.records[0]
this.onSelectChange(this.selectedRowKeys,this.selectionRows)
- console.log("1111111",this.selectedRowKeys,this.selectionRows)
} else {
//this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
this.ipagination.total = 0
@@ -506,7 +583,120 @@
}
}
},
-
+ searchHeightQuery() {
+ if (this.paraTypeFlag === '2') {
+ this.$refs.paraHoleToolsSearchModal.show()
+ } else if (this.paraTypeFlag === '3') {
+ this.$refs.paraThreadingToolSearchModal.show()
+ } else if (this.paraTypeFlag === '4') {
+ this.$refs.paraMillToolSearchModal.show()
+ } else if (this.paraTypeFlag === '5') {
+ this.$refs.paraTurningToolsSearchModal.show()
+ } else if (this.paraTypeFlag === '6') {
+ this.$refs.paraBladeSearchModal.show()
+ }
+ },
+ paraHoleToolsOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.diameter = data.diameter
+ this.queryParam.coneAngle = data.coneAngle
+ this.queryParam.edgeLength = data.edgeLength
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.toolPattern = data.toolPattern
+ this.queryParam.handleSpecifications = data.handleSpecifications
+ this.queryParam.coolingMethod = data.coolingMethod
+ this.queryParam.bladeCount = data.bladeCount
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
+ paraBladeOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.bladeShape = data.bladeShape
+ this.queryParam.bladeLength = data.bladeLength
+ this.queryParam.cuttingEdgeCount = data.cuttingEdgeCount
+ this.queryParam.bladeThickness = data.bladeThickness
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.clampingType = data.clampingType
+ this.queryParam.noseAngleR = data.noseAngleR
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
+ paraThreadingToolOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.threadCode = data.threadCode
+ this.queryParam.pitch = data.pitch
+ this.queryParam.rotationDirection = data.rotationDirection
+ this.queryParam.tolerancezoneLevel = data.tolerancezoneLevel
+ this.queryParam.edgeLength = data.edgeLength
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.externalDimensions = data.externalDimensions
+ this.queryParam.handleSpecifications = data.handleSpecifications
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
+ paraMillToolOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.diameter = data.diameter
+ this.queryParam.noseAngleR = data.noseAngleR
+ this.queryParam.edgeLength = data.edgeLength
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.toolPattern = data.toolPattern
+ this.queryParam.clampingSpecifications = data.clampingSpecifications
+ this.queryParam.coolingMethod = data.coolingMethod
+ this.queryParam.numberOfTeeth = data.numberOfTeeth
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
+ paraTurningToolsOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.headSpecifications = data.headSpecifications
+ this.queryParam.matchingNumber = data.matchingNumber
+ this.queryParam.leadAngle = data.leadAngle
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.toolPattern = data.toolPattern
+ this.queryParam.crossSectionalSize = data.crossSectionalSize
+ this.queryParam.coolingMethod = data.coolingMethod
+ this.queryParam.cuttingDirection = data.cuttingDirection
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
},
}
</script>
--
Gitblit v1.9.3