From ddc1e26925637775ee50ed9bb67e54ae760da1d3 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 10 九月 2025 11:44:52 +0800
Subject: [PATCH] art: 下料功能修改
---
src/views/mes/MesMaterialLoadingList.vue | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/views/mes/MesMaterialLoadingList.vue b/src/views/mes/MesMaterialLoadingList.vue
index cedc37d..a4c65f2 100644
--- a/src/views/mes/MesMaterialLoadingList.vue
+++ b/src/views/mes/MesMaterialLoadingList.vue
@@ -79,17 +79,16 @@
</span>
<span slot="unloadingFlagSlot" slot-scope="text, record">
<a-tag color="green" v-if="record.unloadingFlag === '0'">姝ｅ父</a-tag>
- <a-tag color="red" v-else-if="record.unloadingFlag === '1'">宸蹭笅鏂�</a-tag>
+ <a-tag color="red" v-else-if="record.unloadingFlag === '1' && record.category === 'LOADING'">宸蹭笅鏂�</a-tag>
</span>
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">涓嬫枡</a>
- <a-divider type="vertical" />
- <a @click="handleDetail(record)">璇︽儏</a>
+ <a @click="handleUnloading(record)" v-if="record.category === 'LOADING' && record.unloadingFlag === '0' && record.remainingQuantity > 0">涓嬫枡</a>
</span>
</a-table>
</div>
<mes-material-loading-modal ref="modalForm" @ok="modalFormOk"></mes-material-loading-modal>
+ <mes-material-unloading-modal ref="unloadingModalForm" @ok="modalFormOk" ></mes-material-unloading-modal>
</a-card>
</template>
@@ -99,12 +98,14 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import MesMaterialLoadingModal from './modules/MesMaterialLoadingModal'
+import MesMaterialUnloadingModal from './modules/MesMaterialUnloadingModal'
export default {
name: 'MesMaterialLoadingList',
mixins: [JeecgListMixin, mixinDevice],
components: {
- MesMaterialLoadingModal
+ MesMaterialLoadingModal,
+ MesMaterialUnloadingModal
},
data() {
return {
@@ -188,6 +189,16 @@
},
},
{
+ title: '鎿嶄綔浜�',
+ align: 'center',
+ dataIndex: 'createBy_dictText'
+ },
+ {
+ title: '鎿嶄綔鏃堕棿',
+ align: 'center',
+ dataIndex: 'createTime'
+ },
+ {
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
@@ -204,7 +215,13 @@
created() {
},
computed: {},
- methods: {}
+ methods: {
+ handleUnloading(record) {
+ this.$refs.unloadingModalForm.edit(record);
+ this.$refs.unloadingModalForm.title = "涓嬫枡";
+ this.$refs.unloadingModalForm.disableSubmit = false;
+ }
+ }
}
</script>
<style scoped>
--
Gitblit v1.9.3