From e27722cc75b3090ed3eca54fc5651fa636b40453 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 03 六月 2025 09:11:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue | 76 ++++++------------
src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue | 58 +++++---------
src/views/tms/modules/inbound/InboundListRight.vue | 2
src/views/tms/modules/inbound/InboundModel.vue | 44 ++---------
src/views/tms/modules/inboundOrder/InboundOrderModel.vue | 29 +++----
5 files changed, 68 insertions(+), 141 deletions(-)
diff --git a/src/views/tms/modules/inbound/InboundListRight.vue b/src/views/tms/modules/inbound/InboundListRight.vue
index d8c422b..66bb9f3 100644
--- a/src/views/tms/modules/inbound/InboundListRight.vue
+++ b/src/views/tms/modules/inbound/InboundListRight.vue
@@ -305,7 +305,7 @@
}
// 鎵撳紑鏂板妯℃�佹锛屽苟浼犻�掑綋鍓嶉�変腑鐨勮妭鐐�
this.$refs.modalForm.add(this.nodeSelected);
- this.$refs.modalForm.title = "鏂板閫氱敤鍙傛暟绫诲瀷宸ュ叿";
+ this.$refs.modalForm.title = "鏂板宸ュ叿鍏ュ簱";
this.$refs.modalForm.disableSubmit = false;
},
handleDelete(id) {
diff --git a/src/views/tms/modules/inbound/InboundModel.vue b/src/views/tms/modules/inbound/InboundModel.vue
index 006a1c1..5692855 100644
--- a/src/views/tms/modules/inbound/InboundModel.vue
+++ b/src/views/tms/modules/inbound/InboundModel.vue
@@ -34,19 +34,11 @@
</a-form-item>
</a-col>
</a-row>
- <a-row style="width: 100%">
- <a-col :span="24 / 2">
- <a-form-item label="鍏ュ簱鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input placeholder="璇疯緭鍏ュ叆搴撴暟閲�" :disabled="disableSubmit" v-decorator="['in_number', validatorRules.applicationReason]" />
- </a-form-item>
- </a-col>
- </a-row>
-
</a-form>
</a-spin>
- <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" 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="selectSharpenList()" 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
@@ -170,7 +162,7 @@
barcodeCurrentType: false,
inboundOrderId:'',
validatorRules: {
- type: {
+ inStorehouseType: {
rules: [
{
required: true,
@@ -178,7 +170,7 @@
},
],
},
- inboundDate: {
+ inboundTime: {
rules: [
{
required: true,
@@ -186,23 +178,12 @@
},
],
},
- applicant: {
- rules: [
- {
- required: true,
- message: '璇烽�夋嫨鐢宠浜�!',
- },
- ],
- },
},
url: {
- add: '/tms/inboundOrder/add',
- edit: '/tms/inboundOrder/edit',
- queryByUserName: '/sys/user/queryByUserName',
+ addInStorage: '/tms/inboundOrder/addInStorage',
toolingList:'/tms/baseTools/list',
- queryAccountList:'/tooling/storage/queryAccountList',
- querySharpenList:'/sharpen/sharpenDetail/querySharpenList',
- queryReturnList:'/returnInventory/queryReturnList',
+ querySharpenList:'/tms/toolLedgerDetail/list',
+ queryReturnList:'/tms/toolLedgerDetail/list',
detailList:'/tms/inboundDetail/list',
},
toolingOptions:[],
@@ -325,13 +306,7 @@
that.confirmLoading = true
let formData = Object.assign(this.model, values)
formData.detailData = this.dataSource
- let http = ''
- if(this.model.id){
- http = this.url.edit
- }else{
- http = this.url.add
- }
- postAction(http, formData)
+ postAction(this.url.addInStorage, formData)
.then((res) => {
if (res.success) {
that.$message.success(res.message)
@@ -491,14 +466,11 @@
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,
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
})
}
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
diff --git a/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue b/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue
index 369a4ec..56cbcf2 100644
--- a/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue
+++ b/src/views/tms/modules/inboundOrder/JSelectReturnListModal.vue
@@ -78,43 +78,37 @@
{
title: '宸ュ叿缂栫爜',
align: 'center',
- dataIndex: 'toolingNum',
+ dataIndex: 'toolCode',
+ sorter: true,
+ },
+ {
+ title: '宸ュ叿缂栧彿',
+ align: 'center',
+ dataIndex: 'toolNum',
sorter: true,
},
{
title: '宸ュ叿鍚嶇О',
align: 'center',
- dataIndex: 'toolingName',
+ dataIndex: 'toolName',
sorter: true,
},
{
- title: '鍞竴缂栫爜',
+ title: '宸ュ叿绫诲瀷',
align: 'center',
- dataIndex: 'onlyCode',
+ dataIndex: 'applicationTypeName',
sorter: true,
},
{
- title: '鍏ュ簱鏁伴噺',
+ title: '鍨嬪彿/鍥惧彿',
align: 'center',
- dataIndex: 'inStorageQuantity',
+ dataIndex: 'toolModel',
sorter: true,
},
- {
- title: '宸ュ叿鍒嗙被',
+ {
+ title: '鏁伴噺',
align: 'center',
- dataIndex: 'toolingCategoryName',
- sorter: true,
- },
- {
- title: '瑙勬牸鍨嬪彿',
- align: 'center',
- dataIndex: 'model',
- sorter: true,
- },
- {
- title: '鍗曚綅',
- align: 'center',
- dataIndex: 'unitName',
+ dataIndex: 'quantity',
sorter: true,
},
],
@@ -135,16 +129,12 @@
showSizeChanger: true,
total: 0,
},
- isorter: {
- column: 'num',
- order: 'desc',
- },
departTree: [],
visible: false,
loading: false,
url: {
// list: '/base/tooling/list',
- list: '/tms/baseTools/list',
+ list: '/tms/toolLedgerDetail/list',
queryKnifeBom:'/toolingStorage/mesToolingOutbounds/queryKnifeBom'
},
}
@@ -176,6 +166,7 @@
let that = this
this.loading = true
let params = this.getQueryParams() //鏌ヨ鏉′欢
+ params["status"] = "2"
await getAction(this.url.list, params).then((res) => {
if (res.success) {
for (let i = 0; i < res.result.records.length; i++) {
@@ -200,7 +191,7 @@
this.loadData(1)
},
getQueryParams() {
- let param = Object.assign({}, this.queryParam, this.isorter)
+ let param = Object.assign({}, this.queryParam)
param.field = this.getQueryField()
param.pageNo = this.ipagination.current
param.pageSize = this.ipagination.pageSize
@@ -228,34 +219,17 @@
},
handleTableChange(pagination, filters, sorter) {
//TODO 绛涢��
- if (Object.keys(sorter).length > 0) {
- this.isorter.column = sorter.field
- this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
- }
+ // if (Object.keys(sorter).length > 0) {
+ // this.isorter.column = sorter.field
+ // this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
+ // }
this.ipagination = pagination
this.loadData()
},
handleSubmit() {
- if (this.selectionRows.length > 0) {
- let params = this.getQueryParams() //鏌ヨ鏉′欢
- params['onlyCode'] = this.selectionRows[0].onlyCode;
- getAction(this.url.queryKnifeBom, params).then((res) => {
- if (res.success) {
- this.prepareKnifeDetailList = res.result
- this.$bus.$emit('selectionRows', this.prepareKnifeDetailList)
- }
-
- if (res.code === 510) {
- this.$message.warning(res.message)
- }
- this.loading = false
-
- })
- this.searchReset(0)
- this.close()
- } else {
- this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- }
+ this.$bus.$emit('selectionRows', this.selectionRows)
+ this.searchReset(0)
+ this.close()
},
onSelectChange(selectionRows) {
this.selectionRows = selectionRows
diff --git a/src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue b/src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue
index f83c694..317b880 100644
--- a/src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue
+++ b/src/views/tms/modules/inboundOrder/JSelectSharpenListModal.vue
@@ -78,43 +78,37 @@
{
title: '宸ュ叿缂栫爜',
align: 'center',
- dataIndex: 'toolingNum',
+ dataIndex: 'toolCode',
+ sorter: true,
+ },
+ {
+ title: '宸ュ叿缂栧彿',
+ align: 'center',
+ dataIndex: 'toolNum',
sorter: true,
},
{
title: '宸ュ叿鍚嶇О',
align: 'center',
- dataIndex: 'toolingName',
+ dataIndex: 'toolName',
+ sorter: true,
+ },
+ {
+ title: '宸ュ叿绫诲瀷',
+ align: 'center',
+ dataIndex: 'applicationTypeName',
sorter: true,
},
{
- title: '鍞竴缂栫爜',
+ title: '鍨嬪彿/鍥惧彿',
align: 'center',
- dataIndex: 'onlyCode',
+ dataIndex: 'toolModel',
sorter: true,
},
- {
- title: '鍏ュ簱鏁伴噺',
+ {
+ title: '鏁伴噺',
align: 'center',
- dataIndex: 'inStorageQuantity',
- sorter: true,
- },
- {
- title: '宸ュ叿鍒嗙被',
- align: 'center',
- dataIndex: 'toolingCategoryName',
- sorter: true,
- },
- {
- title: '瑙勬牸鍨嬪彿',
- align: 'center',
- dataIndex: 'model',
- sorter: true,
- },
- {
- title: '鍗曚綅',
- align: 'center',
- dataIndex: 'unitName',
+ dataIndex: 'quantity',
sorter: true,
},
],
@@ -135,16 +129,12 @@
showSizeChanger: true,
total: 0,
},
- isorter: {
- column: 'num',
- order: 'desc',
- },
departTree: [],
visible: false,
loading: false,
url: {
// list: '/base/tooling/list',
- list: '/sharpen/sharpenDetail/querySharpenList',
+ list: '/tms/toolLedgerDetail/list',
},
}
},
@@ -175,7 +165,7 @@
let that = this
this.loading = true
let params = this.getQueryParams() //鏌ヨ鏉′欢
- params["sharpenStatus"] = 1
+ params["status"] = "5"
await getAction(this.url.list, params).then((res) => {
if (res.success) {
for (let i = 0; i < res.result.records.length; i++) {
@@ -200,7 +190,7 @@
this.loadData(1)
},
getQueryParams() {
- let param = Object.assign({}, this.queryParam, this.isorter)
+ let param = Object.assign({}, this.queryParam)
param.field = this.getQueryField()
param.pageNo = this.ipagination.current
param.pageSize = this.ipagination.pageSize
@@ -228,10 +218,6 @@
},
handleTableChange(pagination, filters, sorter) {
//TODO 绛涢��
- if (Object.keys(sorter).length > 0) {
- this.isorter.column = sorter.field
- this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
- }
this.ipagination = pagination
this.loadData()
},
--
Gitblit v1.9.3