From 84275ee8a44b1813585651230cfcb9fff0db1074 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 28 五月 2025 00:07:03 +0800
Subject: [PATCH] 工具管理-工具出库:新增方式出库页面
---
src/views/tms/modules/outBound/OutboundDetailSelectList.vue | 2
src/views/tms/modules/outBound/OutboundModal.vue | 312 ++++++++++++++++++++++++++++++++++
src/views/tms/modules/outBound/OutboundOrderSelectList.vue | 2
src/views/tms/modules/outBound/OutboundListRight.vue | 188 ++++----------------
src/views/tms/modules/outBound/JSelectOutboundToolModal.vue | 10 +
src/views/tms/modules/outBound/OutboundOrderModal.vue | 2
6 files changed, 368 insertions(+), 148 deletions(-)
diff --git a/src/views/tms/modules/outBound/JSelectOutboundToolModal.vue b/src/views/tms/modules/outBound/JSelectOutboundToolModal.vue
index 6282992..91b2cbb 100644
--- a/src/views/tms/modules/outBound/JSelectOutboundToolModal.vue
+++ b/src/views/tms/modules/outBound/JSelectOutboundToolModal.vue
@@ -170,7 +170,15 @@
this.loading = false
})
},
- showModal(oldSelectRow) {
+ showModal(oldSelectRow, classifyId) {
+ this.oldSelectRow = oldSelectRow
+ this.visible = true
+ this.queryParam.quantity = 0
+ this.queryParam.classifyId = classifyId
+ this.queryParam.excludeIds = oldSelectRow
+ this.loadData(1)
+ },
+ showOrderModal(oldSelectRow) {
this.oldSelectRow = oldSelectRow
this.visible = true
this.queryParam.quantity = 0
diff --git a/src/views/tms/modules/outBound/OutboundDetailSelectList.vue b/src/views/tms/modules/outBound/OutboundDetailSelectList.vue
index 6ba9e73..2d7a3d3 100644
--- a/src/views/tms/modules/outBound/OutboundDetailSelectList.vue
+++ b/src/views/tms/modules/outBound/OutboundDetailSelectList.vue
@@ -157,7 +157,7 @@
],
url: {
list: "/tms/outboundOrder/listOutboundDetailByMainId",
- outbound: "/tms/outboundOrder/outBound",
+ outbound: "/tms/outboundOrder/outBoundByApply",
delete: "/tms/outboundOrder/deleteOutboundDetail",
deleteBatch: "/tms/outboundOrder/deleteBatchOutboundDetail",
exportXlsUrl: "/tms/outboundOrder/exportOutboundDetail",
diff --git a/src/views/tms/modules/outBound/OutboundListRight.vue b/src/views/tms/modules/outBound/OutboundListRight.vue
index c12bce1..76e3f79 100644
--- a/src/views/tms/modules/outBound/OutboundListRight.vue
+++ b/src/views/tms/modules/outBound/OutboundListRight.vue
@@ -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: [
{
@@ -261,14 +257,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",
@@ -299,6 +295,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 +309,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 +349,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 +373,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 +392,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 = [];
diff --git a/src/views/tms/modules/outBound/OutboundModal.vue b/src/views/tms/modules/outBound/OutboundModal.vue
new file mode 100644
index 0000000..7123333
--- /dev/null
+++ b/src/views/tms/modules/outBound/OutboundModal.vue
@@ -0,0 +1,312 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="width"
+ :visible="visible"
+ :confirmLoading="confirmLoading"
+ switchFullscreen
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="鍏抽棴">
+ <a-spin :spinning="confirmLoading">
+ <a-form-model ref="form" :model="model" :rules="validatorRules">
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="classifyNum" label="宸ュ叿鍒嗙被缂栫爜">
+ <a-input placeholder="璇疯緭鍏ュ伐鍏峰垎绫荤紪鐮�" v-model="model.classifyNum" :disabled="true" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="classifyName" label="宸ュ叿鍒嗙被鍚嶇О">
+ <a-input placeholder="璇疯緭鍏ュ伐鍏峰垎绫诲悕绉�" v-model="model.classifyName" :disabled="true" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item label="鍑哄簱绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outStorehouseType">
+ <j-dict-select-tag :disabled="disableSubmit" @change="handleTypeChange" type="list" v-model="model.outStorehouseType" dictCode="out_storehouse_type" placeholder="璇烽�夋嫨鍑哄簱绫诲瀷" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </a-spin>
+
+ <a-button v-show="selectBorrowTool" type="primary" :style="{ marginBottom: '8px' }" @click="selectOutBoundTool">閫夋嫨鍑哄簱宸ュ叿</a-button>
+ <a-table
+ ref="table"
+ size="middle"
+ bordered
+ rowKey="id"
+ :scroll="{x:true}"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="null"
+ @change="handleTableChange">
+
+ <template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
+ <div :key="col.dataIndex">
+ <a-input-number
+ v-if="col.dataIndex === 'outboundQuantity'"
+ :disabled="record.quantity <= 1"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+ </div>
+ </template>
+ <span slot="action" v-if="disableSubmit === false" slot-scope="text, record, index">
+ <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record, index)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </span>
+ </a-table>
+ <template slot="footer" v-if="disableSubmit === false">
+ <a-button :style="{ marginRight: '8px' }" @click="handleCancel">鍏抽棴</a-button>
+ <a-button @click="handleOk" :disabled="isDisabled" type="primary">鍑哄簱</a-button>
+ </template>
+
+ <j-select-outbound-tool-modal ref="selectOutBoundToolModal"></j-select-outbound-tool-modal>
+ </j-modal>
+
+</template>
+
+<script>
+
+import { validateDuplicateValue } from '@/utils/util'
+import OutboundDetailList from '../../OutboundDetailList.vue'
+import JSelectOutboundToolModal from './JSelectOutboundToolModal.vue'
+import { postAction } from '../../../../api/manage'
+import title from 'ant-design-vue/lib/skeleton/Title'
+
+export default {
+ name: "OutboundOrderModal",
+ components: {
+ OutboundDetailList,
+ JSelectOutboundToolModal
+ },
+ data () {
+ return {
+ title: '',
+ width:1200,
+ visible: false,
+ disableSubmit: false,
+ isDisabled: false,
+ addShow: true,
+ selectBorrowTool: false,
+ model:{
+ },
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ //琛ㄦ牸鍙傛暟
+ ipagination: {
+ current: 1,
+ pageSize: 10,
+ total: 0,
+ },
+ dataSource: [],
+ loading: false,
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'宸ュ叿缂栫爜',
+ align:"center",
+ dataIndex: 'toolNum'
+ },
+ {
+ title:'宸ュ叿缂栧彿',
+ align:"center",
+ dataIndex: 'toolId'
+ },
+ {
+ title:'鍙敤搴撳瓨',
+ align:"center",
+ dataIndex: 'quantity'
+ },
+ {
+ title:'鍑哄簱鏁伴噺',
+ align:"center",
+ dataIndex: 'outboundQuantity',
+ scopedSlots: { customRender: 'outboundQuantity' },
+ },
+ {
+ title:'鍑哄簱浠撳簱',
+ align:"center",
+ dataIndex: 'warehouseName'
+ },
+ {
+ title:'鍑哄簱搴撲綅',
+ align:"center",
+ dataIndex: 'outboundLocation'
+ },
+ // {
+ // title:'鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
+ // align:"center",
+ // dataIndex: 'status'
+ // },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' },
+ }
+ ],
+ confirmLoading: false,
+ validatorRules: {
+ outStorehouseType: [
+ { required: true, message: '璇烽�夋嫨鍑哄簱绫诲瀷!'},
+ ]
+ },
+ url: {
+ outbound: "/tms/outboundOrder/outBoundByAdd",
+ list: "/tms/outboundOrder/listOutboundDetailByMainId",
+ add: "/tms/outboundOrder/addTotal",
+ edit: "/tms/outboundOrder/editTotal",
+ },
+ classifyId: ''
+ }
+ },
+ created () {
+ //澶囦唤model鍘熷鍊�
+ this.modelDefault = JSON.parse(JSON.stringify(this.model));
+ },
+ mounted() {
+ this.$bus.$on('selectionRows', (data) => {
+ for (let i = 0; i < data.length; i++) {
+ this.dataSource.push({
+ id: data[i].id,
+ toolCode:data[i].toolCode,
+ toolNum:data[i].toolNum,
+ toolId: data[i].toolId,
+ quantity: data[i].quantity,
+ outboundQuantity: data[i].quantity,
+ storageLocation: data[i].warehouseId,
+ warehouseName: data[i].warehouseName,
+ outboundLocation: data[i].positionCode
+ })
+ }
+ this.ipagination.total = this.dataSource.length
+ })
+ },
+ methods: {
+ handleTypeChange(value) {
+ if (value === '1') {
+ this.selectBorrowTool = true
+ }
+ if (value === '2') {
+ this.selectBorrowTool = false
+ }
+ if (value === '3') {
+ this.selectBorrowTool = false
+ }
+ if (value === '4') {
+ this.selectBorrowTool = false
+ }
+ },
+ handleDelete(record, index) {
+ this.dataSource.splice(index, 1)
+ },
+ handleChange(value, key, column, index) {
+ console.log(value, key, column, index)
+ const temp = [...this.dataSource]
+ const target = temp.filter(item => key === item.key)[index];
+ if (target) {
+ target[column.dataIndex] = value
+ this.dataSource = temp
+ if(column.dataIndex === 'outboundQuantity'){
+ if(target['quantity']<value){
+ this.$message.error('鍑哄簱鏁伴噺涓嶈兘澶т簬鍙敤搴撳瓨!')
+ this.isDisabled = true
+ }else{
+ this.isDisabled = false
+ }
+ }
+ this.dataSource = temp
+ }
+ },
+ selectOutBoundTool() {
+ console.log(this.dataSource)
+ let ids = this.dataSource.map(item => item.id).join(',')
+ this.$refs.selectOutBoundToolModal.showModal(ids, this.classifyId)
+ },
+ add (nodeSelected) {
+ this.addShow = false
+ this.classifyId = nodeSelected.key
+ this.model.classifyNum = nodeSelected.entity.classifyId
+ this.model.classifyName = nodeSelected.entity.typeName
+ this.dataSource = []
+ this.visible = true;
+ },
+ close () {
+ this.$emit('close');
+ this.addShow = true
+ this.visible = false;
+ this.$refs.form.clearValidate();
+ },
+ handleTableChange(pagination, filters, sorter) {
+ this.ipagination = pagination
+ },
+ handleOk () {
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ if (this.dataSource == null || this.dataSource.length === 0) {
+ this.$message.warning('璇烽�夋嫨鍑哄簱宸ュ叿!');
+ return
+ }
+ const params = this.dataSource.map(item => {
+ return {
+ toolLedgerDetailId: item.id,
+ toolCode: item.toolCode,
+ toolId: item.toolId,
+ outboundQuantity: item.outboundQuantity,
+ outStorehouseType: this.model.outStorehouseType,
+ storageLocation: item.storageLocation
+ }
+ })
+ console.log(params)
+ this.confirmLoading = true;
+ postAction(this.url.outbound, params).then((res)=>{
+ if(res.success){
+ this.$message.success(res.message)
+ this.$emit("ok")
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.confirmLoading = false;
+ this.close();
+ })
+ }else{
+ return false
+ }
+ })
+ },
+ handleCancel () {
+ this.close()
+ },
+
+
+ }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/tms/modules/outBound/OutboundOrderModal.vue b/src/views/tms/modules/outBound/OutboundOrderModal.vue
index 0d5c8e6..e098380 100644
--- a/src/views/tms/modules/outBound/OutboundOrderModal.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderModal.vue
@@ -305,7 +305,7 @@
if (this.title === '缂栬緫') {
ids = this.dataSource.map(item => item.toolLedgerDetailId).join(',')
}
- this.$refs.selectOutBoundToolModal.showModal(ids)
+ this.$refs.selectOutBoundToolModal.showOrderModal(ids)
},
add () {
this.addShow = false
diff --git a/src/views/tms/modules/outBound/OutboundOrderSelectList.vue b/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
index 00e1f3e..46b1eb2 100644
--- a/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
@@ -171,7 +171,7 @@
],
url: {
list: "/tms/outboundOrder/list",
- outbound: "/tms/outboundOrder/outBound",
+ outbound: "/tms/outboundOrder/outBoundByApply",
delete: "/tms/outboundOrder/delete",
submit: "/tms/outboundOrder/submit",
deleteBatch: "/tms/outboundOrder/deleteBatch",
--
Gitblit v1.9.3