From 7edd931aa33aa0f4fff9a89e1bc1a064c3709035 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 20 八月 2025 17:42:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 60 ------------------------------
src/views/mes/MesProductionWorkOrderListView.vue | 10 -----
2 files changed, 0 insertions(+), 70 deletions(-)
diff --git a/src/views/mes/MesMaterialTransferDetailList.vue b/src/views/mes/MesMaterialTransferDetailList.vue
deleted file mode 100644
index 1048ae3..0000000
--- a/src/views/mes/MesMaterialTransferDetailList.vue
+++ /dev/null
@@ -1,204 +0,0 @@
-<template>
- <j-modal
- :title="title"
- :width="width"
- :visible="visible"
- :confirmLoading="confirmLoading"
- switchFullscreen
- @cancel="handleCancel"
- :okButtonProps="{ style: { display: 'none' } }"
- cancelText="鍏抽棴">
- <a-card :bordered="false">
- <!-- 鏌ヨ鍖哄煙 -->
- <div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
- <a-row :gutter="24">
- </a-row>
- </a-form>
- </div>
-
- <!-- table鍖哄煙-begin -->
- <div>
- <a-table
- ref="table"
- size="middle"
- :scroll="{x:true}"
- bordered
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- class="j-table-force-nowrap"
- @change="handleTableChange">
-
- <template slot="htmlSlot" slot-scope="text">
- <div v-html="text"></div>
- </template>
- <template slot="imgSlot" slot-scope="text,record">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
- style="max-width:80px;font-size: 12px;font-style: italic;" />
- </template>
- <template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
- <a-button
- v-else
- :ghost="true"
- type="primary"
- icon="download"
- size="small"
- @click="downloadFile(text)">
- 涓嬭浇
- </a-button>
- </template>
-
- <span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
-
- <a-divider type="vertical" />
- <a-dropdown>
- <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a @click="handleDetail(record)">璇︽儏</a>
- </a-menu-item>
- <a-menu-item>
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
- </span>
-
- </a-table>
- </div>
-
- <mes-material-transfer-detail-modal ref="modalForm" @ok="modalFormOk"></mes-material-transfer-detail-modal>
- </a-card>
- </j-modal>
-</template>
-
-<script>
-
-import '@/assets/less/TableExpand.less'
-import { mixinDevice } from '@/utils/mixin'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import MesMaterialTransferDetailModal from './modules/MesMaterialTransferDetailModal'
-
-export default {
- name: 'MesMaterialTransferDetailList',
- mixins: [JeecgListMixin, mixinDevice],
- components: {
- MesMaterialTransferDetailModal
- },
- data() {
- return {
- description: '鐗╂枡鎷夊姩鏄庣粏绠＄悊椤甸潰',
- title: '鐗╂枡鎷夊姩鏄庣粏',
- width: 1000,
- toolsVisable: true,
- visible: false,
- confirmLoading: false,
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key: 'rowIndex',
- width: 60,
- align: 'center',
- customRender: function(t, r, index) {
- return parseInt(index) + 1
- }
- },
- // {
- // title: '鍒犻櫎鏍囪',
- // align: 'center',
- // dataIndex: 'delFlag'
- // },
- // {
- // title: '鐢宠鍗旾D',
- // align: 'center',
- // dataIndex: 'requestId'
- // },
- {
- title: '鐗╂枡缂栫爜',
- align: 'center',
- dataIndex: 'materialNumber'
- },
- {
- title: '鐗╂枡鍚嶇О',
- align: 'center',
- dataIndex: 'materialName'
- },
- {
- title: '鐞嗚鎷夊姩鏁伴噺',
- align: 'center',
- dataIndex: 'specifiedQuantity'
- },
- {
- title: '瀹為檯鎷夊姩鏁伴噺',
- align: 'center',
- dataIndex: 'actualQuantity'
- },
- {
- title: '杞﹂棿鍓╀綑鏁伴噺',
- align: 'center',
- dataIndex: 'remainingQuantity'
- },
- // {
- // title: '鎿嶄綔',
- // dataIndex: 'action',
- // align: 'center',
- // fixed: 'right',
- // width: 147,
- // scopedSlots: { customRender: 'action' }
- // }
- ],
- url: {
- list: '/mes/mesMaterialTransferDetail/list',
- delete: '/mes/mesMaterialTransferDetail/delete',
- deleteBatch: '/mes/mesMaterialTransferDetail/deleteBatch',
- exportXlsUrl: '/mes/mesMaterialTransferDetail/exportXls',
- importExcelUrl: 'mes/mesMaterialTransferDetail/importExcel'
-
- },
- dictOptions: {},
- superFieldList: []
- }
- },
- created() {
- this.getSuperFieldList()
- },
- computed: {
- importExcelUrl: function() {
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
- }
- },
- methods: {
- handleCancel(){
- this.visible=false
- this.dataSource = []
- },
- initDictConfig() {
- },
- getSuperFieldList() {
- let fieldList = []
- fieldList.push({ type: 'int', value: 'delFlag', text: '鍒犻櫎鏍囪', dictCode: '' })
- fieldList.push({ type: 'string', value: 'requestId', text: '鐢宠鍗旾D', dictCode: '' })
- fieldList.push({ type: 'string', value: 'materialNumber', text: '鐗╂枡缂栫爜', dictCode: '' })
- fieldList.push({ type: 'string', value: 'materialName', text: '鐗╂枡鍚嶇О', dictCode: '' })
- fieldList.push({ type: 'double', value: 'specifiedQuantity', text: '鐞嗚鎷夊姩鏁伴噺', dictCode: '' })
- fieldList.push({ type: 'double', value: 'actualQuantity', text: '瀹為檯鎷夊姩鏁伴噺', dictCode: '' })
- fieldList.push({ type: 'double', value: 'remainingQuantity', text: '杞﹂棿鍓╀綑鏁伴噺', dictCode: '' })
- this.superFieldList = fieldList
- }
- }
-}
-</script>
-<style scoped>
-@import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/src/views/mes/MesProductionWorkOrderListView.vue b/src/views/mes/MesProductionWorkOrderListView.vue
index 61084a8..ef4e254 100644
--- a/src/views/mes/MesProductionWorkOrderListView.vue
+++ b/src/views/mes/MesProductionWorkOrderListView.vue
@@ -195,7 +195,6 @@
<mes-production-work-order-modal ref="modalForm" @ok="modalFormOk"></mes-production-work-order-modal>
<mes-production-order-modal ref="MesProductionOrderModal"></mes-production-order-modal>
<MesMaterialUnloadingList ref="MesMaterialUnloadingList"></MesMaterialUnloadingList>
- <MesMaterialTransferDetailList ref="MesMaterialTransferDetailList"></MesMaterialTransferDetailList>
<MesProductionWorkOrderScheduleModal ref="MesProductionWorkOrderScheduleModal" @ok="modalFormOk"></MesProductionWorkOrderScheduleModal>
<MesProductionWorkOrderRepublishModal ref="MesProductionWorkOrderRepublishModal" @ok="modalFormOk"></MesProductionWorkOrderRepublishModal>
<MesProductionWorkOrderReportModal ref="MesProductionWorkOrderReportModal" @ok="modalFormOk"></MesProductionWorkOrderReportModal>
@@ -215,7 +214,6 @@
import { getAction, requestPut } from '@api/manage'
import MesProductionOrderModal from '@views/mes/modules/MesProductionOrderModal.vue'
import MesMaterialUnloadingList from '@views/mes/MesMaterialUnloadingList.vue'
-import MesMaterialTransferDetailList from '@views/mes/MesMaterialTransferDetailList.vue'
import MesProductionWorkOrderScheduleModal from '@views/mes/modules/MesProductionWorkOrderScheduleModal.vue'
import MesProductionWorkOrderRepublishModal from '@views/mes/modules/MesProductionWorkOrderRepublishModal.vue'
import MesProductionWorkOrderReportModal from '@views/mes/modules/MesProductionWorkOrderReportModal.vue'
@@ -228,7 +226,6 @@
MesProductionWorkOrderModal,
MesProductionOrderModal,
MesMaterialUnloadingList,
- MesMaterialTransferDetailList,
MesProductionWorkOrderScheduleModal,
MesProductionWorkOrderRepublishModal,
MesProductionWorkOrderReportModal,
@@ -583,7 +580,6 @@
queryCompletenessCheckByWorkOrderId:'/mes/mesKittingCompletenessCheck/queryCompletenessCheckByWorkOrderId',
queryOrderById:'/mes/productionOrder/queryById',
queryUnloadingByLoadingId:'/mes/mesMaterialUnloading/queryUnloadingByLoadingId',
- queryTransferDetailBy:'/mes/mesMaterialTransferDetail/queryTransferDetailBy',
publish: '/mes/mesProductionWorkOrder/publish',
execute: '/mes/mesProductionWorkOrder/execute',
},
@@ -631,12 +627,6 @@
},
handleCompletenessCheck(record) {
this.$refs.MesProductionWorkOrderCompletenessCheckModal.check(record)
- },
- async handleTransferDetail(row){
- console.log('row---->',row)
- const transferDetailResult = await getAction(this.url.queryTransferDetailBy,{'requestId':row.id})
- this.$refs.MesMaterialTransferDetailList.visible = true
- this.$refs.MesMaterialTransferDetailList.dataSource = transferDetailResult.result.records
},
async handleUnLoadingDetail(row){
console.log('row---->',row)
diff --git a/src/views/mes/modules/MesMaterialTransferDetailForm.vue b/src/views/mes/modules/MesMaterialTransferDetailForm.vue
deleted file mode 100644
index 95452d7..0000000
--- a/src/views/mes/modules/MesMaterialTransferDetailForm.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<template>
- <a-spin :spinning="confirmLoading">
- <j-form-container :disabled="formDisabled">
- <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒犻櫎鏍囪" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag">
- <a-input-number v-model="model.delFlag" placeholder="璇疯緭鍏ュ垹闄ゆ爣璁�" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鐢宠鍗旾D" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="requestId">
- <a-input v-model="model.requestId" placeholder="璇疯緭鍏ョ敵璇峰崟ID" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鐗╂枡缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialNumber">
- <a-input v-model="model.materialNumber" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鐗╂枡鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialName">
- <a-input v-model="model.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鐞嗚鎷夊姩鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specifiedQuantity">
- <a-input-number v-model="model.specifiedQuantity" placeholder="璇疯緭鍏ョ悊璁烘媺鍔ㄦ暟閲�" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="瀹為檯鎷夊姩鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="actualQuantity">
- <a-input-number v-model="model.actualQuantity" placeholder="璇疯緭鍏ュ疄闄呮媺鍔ㄦ暟閲�" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="杞﹂棿鍓╀綑鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remainingQuantity">
- <a-input-number v-model="model.remainingQuantity" placeholder="璇疯緭鍏ヨ溅闂村墿浣欐暟閲�" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- </a-row>
- </a-form-model>
- </j-form-container>
- </a-spin>
-</template>
-
-<script>
-
- import { httpAction, getAction } from '@/api/manage'
- import { validateDuplicateValue } from '@/utils/util'
-
- export default {
- name: 'MesMaterialTransferDetailForm',
- components: {
- },
- props: {
- //琛ㄥ崟绂佺敤
- disabled: {
- type: Boolean,
- default: false,
- required: false
- }
- },
- data () {
- return {
- model:{
- },
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
- },
- confirmLoading: false,
- validatorRules: {
- },
- url: {
- add: "/mes/mesMaterialTransferDetail/add",
- edit: "/mes/mesMaterialTransferDetail/edit",
- queryById: "/mes/mesMaterialTransferDetail/queryById"
- }
- }
- },
- computed: {
- formDisabled(){
- return this.disabled
- },
- },
- created () {
- //澶囦唤model鍘熷鍊�
- this.modelDefault = JSON.parse(JSON.stringify(this.model));
- },
- methods: {
- add () {
- this.edit(this.modelDefault);
- },
- edit (record) {
- this.model = Object.assign({}, record);
- this.visible = true;
- },
- submitForm () {
- const that = this;
- // 瑙﹀彂琛ㄥ崟楠岃瘉
- this.$refs.form.validate(valid => {
- if (valid) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
- if(!this.model.id){
- httpurl+=this.url.add;
- method = 'post';
- }else{
- httpurl+=this.url.edit;
- method = 'put';
- }
- httpAction(httpurl,this.model,method).then((res)=>{
- if(res.success){
- that.$message.success(res.message);
- that.$emit('ok');
- }else{
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- })
- }
-
- })
- },
- }
- }
-</script>
\ No newline at end of file
diff --git a/src/views/mes/modules/MesMaterialTransferDetailModal.vue b/src/views/mes/modules/MesMaterialTransferDetailModal.vue
deleted file mode 100644
index 18bd961..0000000
--- a/src/views/mes/modules/MesMaterialTransferDetailModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
- <j-modal
- :title="title"
- :width="width"
- :visible="visible"
- switchFullscreen
- @ok="handleOk"
- :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
- @cancel="handleCancel"
- cancelText="鍏抽棴">
- <mes-material-transfer-detail-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></mes-material-transfer-detail-form>
- </j-modal>
-</template>
-
-<script>
-
- import MesMaterialTransferDetailForm from './MesMaterialTransferDetailForm'
- export default {
- name: 'MesMaterialTransferDetailModal',
- components: {
- MesMaterialTransferDetailForm
- },
- data () {
- return {
- title:'',
- width:896,
- visible: false,
- disableSubmit: false
- }
- },
- methods: {
- add () {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.add();
- })
- },
- edit (record) {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.edit(record);
- })
- },
- close () {
- this.$emit('close');
- this.visible = false;
- },
- handleOk () {
- this.$refs.realForm.submitForm();
- },
- submitCallback(){
- this.$emit('ok');
- this.visible = false;
- },
- handleCancel () {
- this.close()
- }
- }
- }
-</script>
\ No newline at end of file
--
Gitblit v1.9.3