From aa2f510e46e826b9851f9b5d21e642134d63e956 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:50:10 +0800
Subject: [PATCH] 刀具寿命
---
src/views/tms/modules/baseTools/BaseToolsListRight.vue | 30 ++--------
src/views/tms/modules/outBound/OutboundDetailSelectList.vue | 48 +++++++++++++++
src/views/tms/modules/outBound/OutboundModal.vue | 30 +++++++++
src/views/tms/modules/outBound/OutboundOrderSelectList.vue | 4 +
src/views/tms/modules/outBound/OutboundOrderModal.vue | 29 +++++++++
5 files changed, 112 insertions(+), 29 deletions(-)
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index 61d747a..70774c8 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -482,50 +482,32 @@
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()
- }
+
}
},
//绂佺敤鐘舵�佹牱寮�
diff --git a/src/views/tms/modules/outBound/OutboundDetailSelectList.vue b/src/views/tms/modules/outBound/OutboundDetailSelectList.vue
index 2d7a3d3..f0e82a2 100644
--- a/src/views/tms/modules/outBound/OutboundDetailSelectList.vue
+++ b/src/views/tms/modules/outBound/OutboundDetailSelectList.vue
@@ -14,6 +14,26 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
@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 === 'ratedLife'"
+ :disabled="record.outboundQuantity > 1"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+ <a-input-number
+ v-if="col.dataIndex === 'useLife'"
+ :disabled="record.outboundQuantity > 1"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+ </div>
+ </template>
+
<span slot="action" slot-scope="text, record">
<a @click="handleOutbound(record)">鍑哄簱</a>
</span>
@@ -101,6 +121,18 @@
align:"left",
dataIndex: 'outboundQuantity'
},
+ {
+ title:'棰濆畾瀵垮懡',
+ align:"center",
+ dataIndex: 'ratedLife',
+ scopedSlots: { customRender: 'ratedLife' },
+ },
+ {
+ title:'浣跨敤瀵垮懡',
+ align:"center",
+ dataIndex: 'useLife',
+ scopedSlots: { customRender: 'useLife' },
+ },
// {
// title:'宸插嚭搴撴暟閲�',
// align:"left",
@@ -193,7 +225,9 @@
{
outBoundOrderId: this.mainId,
outboundDetailId: record.id,
- outboundQuantity: record.outboundQuantity
+ outboundQuantity: record.outboundQuantity,
+ ratedLife:record.ratedLife,
+ useLife:record.useLife
}
]
postAction(this.url.outbound, params).then(res=>{
@@ -205,7 +239,17 @@
this.$message
}
})
- }
+ },
+ 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
+ }
+ },
+
}
}
diff --git a/src/views/tms/modules/outBound/OutboundModal.vue b/src/views/tms/modules/outBound/OutboundModal.vue
index a0e748a..7c8b4ec 100644
--- a/src/views/tms/modules/outBound/OutboundModal.vue
+++ b/src/views/tms/modules/outBound/OutboundModal.vue
@@ -56,6 +56,20 @@
@change="(e) => handleChange(e, record.key, col, index)"
:min="1"
/>
+ <a-input-number
+ v-if="col.dataIndex === 'ratedLife'"
+ :disabled="record.quantity > 1"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+ <a-input-number
+ v-if="col.dataIndex === 'useLife'"
+ :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">
@@ -161,6 +175,18 @@
title:'鍑哄簱搴撲綅',
align:"center",
dataIndex: 'outboundLocation'
+ },
+ {
+ title:'棰濆畾瀵垮懡',
+ align:"center",
+ dataIndex: 'ratedLife',
+ scopedSlots: { customRender: 'ratedLife' },
+ },
+ {
+ title:'浣跨敤瀵垮懡',
+ align:"center",
+ dataIndex: 'useLife',
+ scopedSlots: { customRender: 'useLife' },
},
// {
// title:'鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
@@ -302,7 +328,9 @@
toolId: item.toolId,
outboundQuantity: item.outboundQuantity,
outStorehouseType: this.model.outStorehouseType,
- storageLocation: item.storageLocation
+ storageLocation: item.storageLocation,
+ ratedLife:item.ratedLife,
+ useLife:item.useLife
}
})
this.confirmLoading = true;
diff --git a/src/views/tms/modules/outBound/OutboundOrderModal.vue b/src/views/tms/modules/outBound/OutboundOrderModal.vue
index 9d1a4e7..b5bf43e 100644
--- a/src/views/tms/modules/outBound/OutboundOrderModal.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderModal.vue
@@ -18,7 +18,7 @@
</a-col>
<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="璇烽�夋嫨鍑哄簱绫诲瀷" disabled/>
+ <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>
@@ -95,6 +95,21 @@
<a-input-number
v-if="col.dataIndex === 'outboundQuantity'"
:disabled="record.quantity <= 1"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+
+ <a-input-number
+ v-if="col.dataIndex === 'ratedLife'"
+ :disabled="record.quantity > 1"
+ :value="text"
+ @change="(e) => handleChange(e, record.key, col, index)"
+ :min="1"
+ />
+ <a-input-number
+ v-if="col.dataIndex === 'useLife'"
+ :disabled="record.quantity > 1"
:value="text"
@change="(e) => handleChange(e, record.key, col, index)"
:min="1"
@@ -206,6 +221,18 @@
align:"center",
dataIndex: 'outboundLocation'
},
+ // {
+ // title:'棰濆畾瀵垮懡',
+ // align:"center",
+ // dataIndex: 'ratedLife',
+ // scopedSlots: { customRender: 'ratedLife' },
+ // },
+ // {
+ // title:'浣跨敤瀵垮懡',
+ // align:"center",
+ // dataIndex: 'useLife',
+ // scopedSlots: { customRender: 'useLife' },
+ // },
// {
// title:'鍑哄簱鐘舵��;1.鏈嚭搴擄紱2.閮ㄥ垎鍑哄簱锛�3.鍑哄簱瀹屾垚',
// align:"center",
diff --git a/src/views/tms/modules/outBound/OutboundOrderSelectList.vue b/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
index 7d53488..000dd79 100644
--- a/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
+++ b/src/views/tms/modules/outBound/OutboundOrderSelectList.vue
@@ -256,7 +256,9 @@
return {
outBoundOrderId: this.selectedMainId,
outboundDetailId: item.id,
- outboundQuantity: item.outboundQuantity
+ outboundQuantity: item.outboundQuantity,
+ ratedLife:item.ratedLife,
+ useLife:item.useLife
}
})
postAction(this.url.outbound, params).then(res=>{
--
Gitblit v1.9.3