From 8b6b7aa7e4f2ae6ec14514875b559aa6890f3b1e Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 29 七月 2025 11:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/outBound/OutboundListRight.vue | 205 +++++++++++++-------------------------------------
1 files changed, 55 insertions(+), 150 deletions(-)
diff --git a/src/views/tms/modules/outBound/OutboundListRight.vue b/src/views/tms/modules/outBound/OutboundListRight.vue
index c12bce1..ecea874 100644
--- a/src/views/tms/modules/outBound/OutboundListRight.vue
+++ b/src/views/tms/modules/outBound/OutboundListRight.vue
@@ -55,10 +55,10 @@
<a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">鏂板</a-button>
</Tooltip>
<a-button type="primary" @click="selectOutboundOrder">鐢宠鍗曞嚭搴�</a-button>
- <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">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
+ <a-button type="primary" icon="download" @click="handleExportXls('宸ュ叿鍑哄簱娴佹按')">瀵煎嚭</a-button>
+<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!-- <a-button type="primary" icon="import">瀵煎叆</a-button>-->
+<!-- </a-upload>-->
</div>
<!-- table鍖哄煙-begin -->
@@ -75,6 +75,7 @@
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
+ :customRow="handleRowClick"
class="j-table-force-nowrap"
@change="handleTableChange">
@@ -129,14 +130,9 @@
</a-tab-pane>
</a-tabs>
+ <outbound-modal ref="outboundModal" @ok="selectListOK"></outbound-modal>
<OutboundOrderSelectList ref="outboundOrderSelectList" @ok="selectListOK"></OutboundOrderSelectList>
<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-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>
</a-card>
</template>
@@ -148,14 +144,8 @@
import BaseToolsModal from '../baseTools/BaseToolsModal'
import Tooltip from 'ant-design-vue/es/tooltip'
import { getAction, postAction, deleteAction, requestPut } from '@api/manage'
+ import OutboundModal from './OutboundModal'
import OutboundOrderSelectList from './OutboundOrderSelectList'
- import ParaHoleToolsModal from '../baseTools/ParaHoleToolsModal'
- import ParaMillToolModal from '../baseTools/ParaMillToolModal'
- import ParaThreadingToolModal from '../baseTools/ParaThreadingToolModal'
- import ParaTurningToolsModal from '../baseTools/ParaTurningToolsModal'
- import ToolsConfigPropertyModal from '../baseTools/ToolsConfigPropertyModal'
- import ParaCommonToolModal from '../baseTools/ParaCommonToolModal'
- import ParaBladeModal from '../baseTools/ParaBladeModal'
import ParaHoleToolsList from '../baseTools/ParaHoleToolsList'
import ToolsConfigPropertyList from '../baseTools/ToolsConfigPropertyList'
import ParaMillToolList from '../baseTools/ParaMillToolList'
@@ -168,16 +158,10 @@
name: 'OutboundListRight',
mixins:[JeecgListMixin, mixinDevice],
components: {
+ OutboundModal,
OutboundOrderSelectList,
BaseToolsModal,
Tooltip,
- ParaHoleToolsModal,
- ParaMillToolModal,
- ParaThreadingToolModal,
- ParaTurningToolsModal,
- ToolsConfigPropertyModal,
- ParaCommonToolModal,
- ParaBladeModal,
ParaHoleToolsList,
ToolsConfigPropertyList,
ParaMillToolList,
@@ -188,7 +172,19 @@
},
data () {
return {
- description: '宸ュ叿淇℃伅绠＄悊椤甸潰',
+ description: '宸ュ叿鍑哄簱椤甸潰',
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination:{
+ current: 1,
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '20', '30'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
// 琛ㄥご
columns: [
{
@@ -214,7 +210,7 @@
{
title:'宸ュ叿绫诲瀷',
align:"center",
- dataIndex: 'signCode'
+ dataIndex: 'applicationType'
},
{
title:'涓枃鍚嶇О',
@@ -242,6 +238,11 @@
dataIndex: 'outStorehouseType_dictText'
},
{
+ title:'鍑哄簱鏂瑰紡',
+ align:"center",
+ dataIndex: 'operateType'
+ },
+ {
title:'搴撲綅鍙�',
align:"center",
dataIndex: 'goodsShelvesCode'
@@ -261,14 +262,14 @@
align:"center",
dataIndex: 'createTime'
},
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' }
- }
+ // {
+ // title: '鎿嶄綔',
+ // dataIndex: 'action',
+ // align:"center",
+ // fixed:"right",
+ // width:147,
+ // scopedSlots: { customRender: 'action' }
+ // }
],
url: {
list: "/tms/outStoreDetail/list",
@@ -281,7 +282,7 @@
delete: "/tms/baseTools/delete",
deleteBatch: "/tms/baseTools/deleteBatch",
edit: '/tms/baseTools/edit',
- exportXlsUrl: "/tms/baseTools/exportXls",
+ exportXlsUrl: "/tms/outStoreDetail/exportXls",
importExcelUrl: "tms/baseTools/importExcel",
queryParaByToolCode:"/tms/baseTools/queryByToolCode",
queryByToolCode:"/tms/toolsConfigProperty/queryByToolCode"
@@ -299,6 +300,7 @@
this.nodeType = (data.type == undefined ? 0 : data.type);
this.paraTypeFlag = (data.entity == undefined ? 0 : data.entity.paraTypeFlag)
this.nodeSelected = data;
+ this.queryParam.classifyId = data.key
this.loadData()
this.clearPara()
})
@@ -312,37 +314,25 @@
selectOutboundOrder() {
this.$refs.outboundOrderSelectList.openSelect();
},
+ handleRowClick(record) {
+ return {
+ on: {
+ click: () => {
+ console.log(record)
+ this.onSelectChange(record.id.split(","), [record]);
+ }
+ }
+ }
+ },
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;
- }
+ this.$refs.outboundModal.add(this.nodeSelected);
+ this.$refs.outboundModal.title = "鏂板宸ュ叿鍑哄簱";
+ this.$refs.outboundModal.disableSubmit = false;
},
handleDelete(id) {
deleteAction(this.url.delete, {id: id}).then((res) => {
@@ -364,10 +354,12 @@
this.loadData(); // 鍒锋柊琛ㄦ牸鏁版嵁
this.$bus.$emit('queryTreeData') //鍒锋柊宸︿晶鏍�
},
- onSelectChange(selectedRowKeys) {
+ onSelectChange(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
+ this.selectionRows = selectionRows;
+ const toolCode = this.selectionRows[0].toolCode
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.paraTypeFlag}).then((res) => {
+ getAction(this.url.queryParaByToolCode, { toolCode: toolCode,paraTypeFlag:this.paraTypeFlag}).then((res) => {
if (res.success) {
if(this.paraTypeFlag === "1"){
this.$refs.paraCommonToolList.getPara(res.result);
@@ -386,7 +378,7 @@
this.$message.warning(res.message);
}
})
- getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0]}).then((res) => {
+ getAction(this.url.queryByToolCode, { toolCode: toolCode}).then((res) => {
if (res.success) {
this.$refs.toolsConfigPropertyList.getPara(res.result);
} else {
@@ -405,93 +397,6 @@
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;
- this.$refs.paraCommonToolModal.disSeach = true;
- if(this.$refs.paraCommonToolModal.removeValidate) {
- this.$refs.paraCommonToolModal.removeValidate()
- }
- }else if(record.paramaTableName === "2"){
- this.$refs.paraHoleToolsModal.edit(record);
- this.$refs.paraHoleToolsModal.title="璇︽儏";
- this.$refs.paraHoleToolsModal.disableSubmit = true;
- this.$refs.paraHoleToolsModal.disSeach = true;
- if(this.$refs.paraHoleToolsModal.removeValidate) {
- this.$refs.paraHoleToolsModal.removeValidate()
- }
- }else if(record.paramaTableName === "3"){
- this.$refs.paraThreadingToolModal.edit(record);
- this.$refs.paraThreadingToolModal.title="璇︽儏";
- this.$refs.paraThreadingToolModal.disableSubmit = true;
- this.$refs.paraThreadingToolModal.disSeach = true;
- if(this.$refs.paraThreadingToolModal.removeValidate) {
- this.$refs.paraThreadingToolModal.removeValidate()
- }
- }else if(record.paramaTableName === "4"){
- this.$refs.paraMillToolModal.edit(record);
- this.$refs.paraMillToolModal.title="璇︽儏";
- this.$refs.paraMillToolModal.disableSubmit = true;
- this.$refs.paraMillToolModal.disSeach = true;
- if(this.$refs.paraMillToolModal.removeValidate) {
- this.$refs.paraMillToolModal.removeValidate()
- }
- }else if(record.paramaTableName === "5"){
- this.$refs.paraTurningToolsModal.edit(record);
- this.$refs.paraTurningToolsModal.title="璇︽儏";
- this.$refs.paraTurningToolsModal.disableSubmit = true;
- this.$refs.paraTurningToolsModal.disSeach = true;
- if(this.$refs.paraTurningToolsModal.removeValidate) {
- this.$refs.paraTurningToolsModal.removeValidate()
- }
- }else if(record.paramaTableName === "6"){
- this.$refs.paraBladeModal.edit(record);
- this.$refs.paraBladeModal.title="璇︽儏";
- this.$refs.paraBladeModal.disableSubmit = true;
- this.$refs.paraBladeModal.disSeach = true;
- if(this.$refs.paraBladeModal.removeValidate) {
- this.$refs.paraBladeModal.removeValidate()
- }
- }
- },
- //绂佺敤鐘舵�佹牱寮�
- tableRowClass(record, index) {
- if (record.status != "1") {
- return "frozenRowClass";
- }
- return "";
},
onClearSelected() {
this.selectedKeys = [];
--
Gitblit v1.9.3