From 7790aa0ad0f37fab2700d35c0d9e2ee869ecba9c Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期二, 03 六月 2025 09:09:47 +0800
Subject: [PATCH] 入库新增
---
src/views/tms/modules/inboundOrder/InboundOrderModel.vue | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/src/views/tms/modules/inboundOrder/InboundOrderModel.vue b/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
index 3118a1e..6aae13c 100644
--- a/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
+++ b/src/views/tms/modules/inboundOrder/InboundOrderModel.vue
@@ -109,9 +109,9 @@
</a-row>
</a-form>
</a-spin>
- <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="returnShow && !disableSubmit">閫夋嫨鍊熺敤鍑哄簱鍗�</a-button>
+ <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">閫夋嫨鍊熷嚭宸ュ叿</a-button>
<a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="toolingShow && !disableSubmit">閫夋嫨宸ュ叿</a-button>
- <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="sharpenShow && !disableSubmit">閫夋嫨鍒冪（鍑哄簱鍗�</a-button>
+ <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectSharpenList()" v-show="sharpenShow && !disableSubmit">閫夋嫨鍒冪（宸ュ叿</a-button>
<a-table
ref="table"
bordered
@@ -235,7 +235,7 @@
barcodeCurrentType: false,
inboundOrderId:'',
validatorRules: {
- type: {
+ inStorehouseType: {
rules: [
{
required: true,
@@ -243,19 +243,19 @@
},
],
},
- inboundDate: {
+ inboundTime: {
rules: [
{
required: true,
- message: '璇烽�夋嫨鐢宠鍏ュ簱鏃ユ湡!',
+ message: '璇烽�夋嫨鐢宠鍏ュ簱鏃堕棿!',
},
],
},
- applicant: {
+ applicationReason: {
rules: [
{
required: true,
- message: '璇烽�夋嫨鐢宠浜�!',
+ message: '璇峰～鍐欑敵璇峰師鍥�!',
},
],
},
@@ -263,11 +263,9 @@
url: {
add: '/tms/inboundOrder/add',
edit: '/tms/inboundOrder/edit',
- queryByUserName: '/sys/user/queryByUserName',
toolingList:'/tms/baseTools/list',
- queryAccountList:'/tms/baseTools/list',
- querySharpenList:'/tms/baseTools/list',
- queryReturnList:'/tms/baseTools/list',
+ querySharpenList:'/tms/toolLedgerDetail/list',
+ queryReturnList:'/tms/toolLedgerDetail/list',
detailList:'/tms/inboundDetail/list',
},
toolingOptions:[],
@@ -556,15 +554,12 @@
for (let i = 0; i < data.length; i++) {
this.dataSource.push({
toolCodeId:data[i].id,
- toolingId: data[i].toolingId || data[i].id,
toolCode: data[i].toolCode,
- chineseName: data[i].chineseName,
+ chineseName: data[i].chineseName || data[i].toolName,
toolModel: data[i].toolModel,
applicationType: data[i].applicationTypeName,
- unitName: data[i].unitName || data[i].unitId_dictText,
- onlyCode:data[i].onlyCode,
- noAccountQuantity:data[i].noAccountQuantity,
- inStorageQuantity:data[i].storageQuantity
+ onlyCode:data[i].toolNum,
+ inStorageQuantity:data[i].storageQuantity || data[i].quantity
})
}
//this.ipaginationm.total = this.dataSource.length
--
Gitblit v1.9.3