From 048754581793509a57481dfcb7c51f838cb7f576 Mon Sep 17 00:00:00 2001
From: houshuai <17802598606@163.com>
Date: 星期一, 07 七月 2025 20:49:33 +0800
Subject: [PATCH] 生产管控模块 基本搭建2
---
src/views/mes/MesMaterialLoadingList.vue | 50 +
src/views/mes/modules/MesMaterialTransferDetailForm.vue | 134 ++++
src/views/mes/modules/MesMaterialTransferDetailModal.vue | 60 ++
src/views/mes/modules/MesProductionOrderForm.vue | 9
src/views/mes/modules/MesProductionWorkOrderForm.vue | 7
src/views/mes/MesMaterialLoadingListView.vue | 244 +++++++++
src/views/mes/MesProductionWorkOrderListView.vue | 266 +++++++++
src/views/mes/MesKittingCompletenessCheckList.vue | 46 +
src/views/mes/MesProductionWorkOrderList.vue | 56 +
src/views/mes/MesProductionOrderList.vue | 412 ++++++++------
src/views/mes/MesWorkReportingList.vue | 74 ++
src/views/lsw/LswMaterialInboundList.vue | 4
src/views/mes/MesMaterialTransferDetailList.vue | 207 +++++++
src/views/lsw/LswMateriaView.vue | 1
src/views/mes/modules/MesMaterialLoadingForm.vue | 37
15 files changed, 1,338 insertions(+), 269 deletions(-)
diff --git a/src/views/lsw/LswMateriaView.vue b/src/views/lsw/LswMateriaView.vue
index 9dee24c..fdb4d69 100644
--- a/src/views/lsw/LswMateriaView.vue
+++ b/src/views/lsw/LswMateriaView.vue
@@ -58,7 +58,6 @@
<a-tabs v-model="activeKey" @change="handleChangeTabs">
<a-tab-pane tab="鐗╂枡搴撳瓨淇℃伅" :key="refKeys[0]" :forceRender="true">
<div style="display: flex; align-items: center; margin-bottom: 10px;">
- <span style="margin-right: 10px;">鐗╂枡搴撳瓨淇℃伅</span>
<a-tag color="green" style="font-weight: bold;">
搴撳瓨鎬婚噺锛歿{ totalInventoryQuantity }}
</a-tag>
diff --git a/src/views/lsw/LswMaterialInboundList.vue b/src/views/lsw/LswMaterialInboundList.vue
index a0e75c8..c5ca76e 100644
--- a/src/views/lsw/LswMaterialInboundList.vue
+++ b/src/views/lsw/LswMaterialInboundList.vue
@@ -1,8 +1,8 @@
<template>
<a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
- <div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <div class="table-page-search-wrapper" >
+ <a-form layout="inline" @keyup.enter.native="searchQuery" >
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="鐗╂枡缂栫爜">
diff --git a/src/views/mes/MesKittingCompletenessCheckList.vue b/src/views/mes/MesKittingCompletenessCheckList.vue
index f6842b9..01b09dd 100644
--- a/src/views/mes/MesKittingCompletenessCheckList.vue
+++ b/src/views/mes/MesKittingCompletenessCheckList.vue
@@ -4,6 +4,39 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ崟鍙�">
+ <j-search-select-tag placeholder="璇疯緭鍏ュ伐宸ュ崟鍙�" v-model="queryParam.workOrderId" dict="mes_production_work_order,work_order_code,id"></j-search-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐗╂枡缂栫爜">
+ <j-input dictCode="work_order_status" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" v-model="queryParam.materialNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐗╂枡鍚嶇О">
+ <j-input dictCode="work_order_status" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" v-model="queryParam.materialName"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鏄惁榻愬">
+ <a-select
+ placeholder="璇烽�夋嫨鏄惁榻愬"
+ v-model="queryParam.checkFlag"
+ allowClear
+ >
+ <a-select-option value="鏄�">鏄�</a-select-option>
+ <a-select-option value="鍚�">鍚�</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ </span>
+ </a-col>
</a-row>
</a-form>
</div>
@@ -11,13 +44,6 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('榻愬鎬ф鏌ヨ褰�')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
- <!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
@@ -122,9 +148,9 @@
}
},
{
- title:'宸ュ崟ID',
+ title:'宸ュ崟鍙�',
align:"center",
- dataIndex: 'workOrderId'
+ dataIndex: 'workOrderId_dictText'
},
{
title:'鐗╂枡缂栧彿',
@@ -166,7 +192,7 @@
deleteBatch: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/deleteBatch",
exportXlsUrl: "/meskittingcompletenesscheck/mesKittingCompletenessCheck/exportXls",
importExcelUrl: "meskittingcompletenesscheck/mesKittingCompletenessCheck/importExcel",
-
+
},
dictOptions:{},
superFieldList:[],
diff --git a/src/views/mes/MesMaterialLoadingList.vue b/src/views/mes/MesMaterialLoadingList.vue
index 06cd945..3a27577 100644
--- a/src/views/mes/MesMaterialLoadingList.vue
+++ b/src/views/mes/MesMaterialLoadingList.vue
@@ -127,9 +127,24 @@
dataIndex: 'delFlag'
},
{
- title:'鐢宠鍗旾D',
+ title:'宸ュ崟ID',
align:"center",
- dataIndex: 'requestId'
+ dataIndex: 'workOrderId'
+ },
+ {
+ title:'璁惧ID',
+ align:"center",
+ dataIndex: 'equipmentId'
+ },
+ {
+ title:'宸ュ簭缂栫爜',
+ align:"center",
+ dataIndex: 'processCode'
+ },
+ {
+ title:'宸ュ簭鍚嶇О',
+ align:"center",
+ dataIndex: 'processName'
},
{
title:'鐗╂枡缂栫爜',
@@ -142,17 +157,17 @@
dataIndex: 'materialName'
},
{
- title:'鐞嗚鎷夊姩鏁伴噺',
+ title:'鎵规鍙�',
align:"center",
- dataIndex: 'specifiedQuantity'
+ dataIndex: 'batchNumber'
},
{
- title:'瀹為檯鎷夊姩鏁伴噺',
+ title:'鏁伴噺',
align:"center",
- dataIndex: 'actualQuantity'
+ dataIndex: 'quantity'
},
{
- title:'杞﹂棿鍓╀綑鏁伴噺',
+ title:'鍓╀綑鏁伴噺',
align:"center",
dataIndex: 'remainingQuantity'
},
@@ -166,11 +181,11 @@
}
],
url: {
- list: "/mesmaterialloading/mesMaterialLoading/list",
- delete: "/mesmaterialloading/mesMaterialLoading/delete",
- deleteBatch: "/mesmaterialloading/mesMaterialLoading/deleteBatch",
- exportXlsUrl: "/mesmaterialloading/mesMaterialLoading/exportXls",
- importExcelUrl: "mesmaterialloading/mesMaterialLoading/importExcel",
+ list: "/mes/mesMaterialLoading/list",
+ delete: "/mes/mesMaterialLoading/delete",
+ deleteBatch: "/mes/mesMaterialLoading/deleteBatch",
+ exportXlsUrl: "/mes/mesMaterialLoading/exportXls",
+ importExcelUrl: "mes/mesMaterialLoading/importExcel",
},
dictOptions:{},
@@ -191,12 +206,15 @@
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:'workOrderId',text:'宸ュ崟ID',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentId',text:'璁惧ID',dictCode:''})
+ fieldList.push({type:'string',value:'processCode',text:'宸ュ簭缂栫爜',dictCode:''})
+ fieldList.push({type:'string',value:'processName',text:'宸ュ簭鍚嶇О',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:''})
+ fieldList.push({type:'string',value:'batchNumber',text:'鎵规鍙�',dictCode:''})
+ fieldList.push({type:'double',value:'quantity',text:'鏁伴噺',dictCode:''})
+ fieldList.push({type:'double',value:'remainingQuantity',text:'鍓╀綑鏁伴噺',dictCode:''})
this.superFieldList = fieldList
}
}
diff --git a/src/views/mes/MesMaterialLoadingListView.vue b/src/views/mes/MesMaterialLoadingListView.vue
new file mode 100644
index 0000000..25dd3fe
--- /dev/null
+++ b/src/views/mes/MesMaterialLoadingListView.vue
@@ -0,0 +1,244 @@
+<template>
+ <a-card :bordered="false" title="涓婃枡">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ崟鍙�">
+ <j-search-select-tag placeholder="璇疯緭鍏ュ伐宸ュ崟鍙�" v-model="queryParam.workOrderId" dict="mes_production_work_order,work_order_code,id"></j-search-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁惧ID">
+ <j-input placeholder="璇疯緭鍏ヨ澶嘔D" v-model="queryParam.equipmentId"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐗╂枡缂栫爜">
+ <j-input dictCode="work_order_status" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" v-model="queryParam.materialNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐗╂枡鍚嶇О">
+ <j-input dictCode="work_order_status" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" v-model="queryParam.materialName"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鎵规鍙�">
+ <j-input placeholder="璇疯緭鍏ユ壒娆″彿" v-model="queryParam.batchNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ </span>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </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-loading-modal ref="modalForm" @ok="modalFormOk"></mes-material-loading-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import MesMaterialLoadingModal from './modules/MesMaterialLoadingModal'
+
+ export default {
+ name: 'MesMaterialLoadingList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ MesMaterialLoadingModal
+ },
+ data () {
+ return {
+ description: '涓婃枡绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'宸ュ崟鍙�',
+ align:"center",
+ dataIndex: 'workOrderId_dictText'
+ },
+ {
+ title:'璁惧ID',
+ align:"center",
+ dataIndex: 'equipmentId'
+ },
+ {
+ title:'宸ュ簭缂栫爜',
+ align:"center",
+ dataIndex: 'processCode'
+ },
+ {
+ title:'宸ュ簭鍚嶇О',
+ align:"center",
+ dataIndex: 'processName'
+ },
+ {
+ title:'鐗╂枡缂栫爜',
+ align:"center",
+ dataIndex: 'materialNumber'
+ },
+ {
+ title:'鐗╂枡鍚嶇О',
+ align:"center",
+ dataIndex: 'materialName'
+ },
+ {
+ title:'鎵规鍙�',
+ align:"center",
+ dataIndex: 'batchNumber'
+ },
+ {
+ title:'鏁伴噺',
+ align:"center",
+ dataIndex: 'quantity'
+ },
+ {
+ title:'鍓╀綑鏁伴噺',
+ align:"center",
+ dataIndex: 'remainingQuantity'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/mes/mesMaterialLoading/list",
+ delete: "/mes/mesMaterialLoading/delete",
+ deleteBatch: "/mes/mesMaterialLoading/deleteBatch",
+ exportXlsUrl: "/mes/mesMaterialLoading/exportXls",
+ importExcelUrl: "mes/mesMaterialLoading/importExcel",
+
+ },
+ dictOptions:{},
+ superFieldList:[],
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ },
+ methods: {
+ initDictConfig(){
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'int',value:'delFlag',text:'鍒犻櫎鏍囪',dictCode:''})
+ fieldList.push({type:'string',value:'workOrderId',text:'宸ュ崟ID',dictCode:''})
+ fieldList.push({type:'string',value:'equipmentId',text:'璁惧ID',dictCode:''})
+ fieldList.push({type:'string',value:'processCode',text:'宸ュ簭缂栫爜',dictCode:''})
+ fieldList.push({type:'string',value:'processName',text:'宸ュ簭鍚嶇О',dictCode:''})
+ fieldList.push({type:'string',value:'materialNumber',text:'鐗╂枡缂栫爜',dictCode:''})
+ fieldList.push({type:'string',value:'materialName',text:'鐗╂枡鍚嶇О',dictCode:''})
+ fieldList.push({type:'string',value:'batchNumber',text:'鎵规鍙�',dictCode:''})
+ fieldList.push({type:'double',value:'quantity',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/MesMaterialTransferDetailList.vue b/src/views/mes/MesMaterialTransferDetailList.vue
new file mode 100644
index 0000000..c39b5eb
--- /dev/null
+++ b/src/views/mes/MesMaterialTransferDetailList.vue
@@ -0,0 +1,207 @@
+<template>
+ <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>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('鐗╂枡鎷夊姩鏄庣粏')">瀵煎嚭</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+ <a-button type="primary" icon="import">瀵煎叆</a-button>
+ </a-upload>
+ <!-- 楂樼骇鏌ヨ鍖哄煙 -->
+ <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </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>
+</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: '鐗╂枡鎷夊姩鏄庣粏绠＄悊椤甸潰',
+ // 琛ㄥご
+ 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: {
+ 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/MesProductionOrderList.vue b/src/views/mes/MesProductionOrderList.vue
index 03f21f5..db5a4c0 100644
--- a/src/views/mes/MesProductionOrderList.vue
+++ b/src/views/mes/MesProductionOrderList.vue
@@ -4,6 +4,69 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐢熶骇璁㈠崟鍙�">
+ <j-input placeholder="璇疯緭鍏ョ敓浜ц鍗曞彿" v-model="queryParam.orderCode"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁㈠崟绫诲瀷">
+ <j-dict-select-tag dictCode="orderCategory" placeholder="璇疯緭鍏ヨ鍗曠被鍨�"
+ v-model="queryParam.orderCategory"></j-dict-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐗╂枡缂栧彿">
+ <j-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" v-model="queryParam.materialNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐗╂枡鍚嶇О">
+ <j-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" v-model="queryParam.materialName"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁㈠崟鐘舵��">
+ <j-dict-select-tag dictCode="order_status" placeholder="璇疯緭鍏ヨ鍗曠姸鎬�"
+ v-model="queryParam.order_status"></j-dict-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁″垝宸ヨ壓璺嚎">
+ <j-input placeholder="璇疯緭鍏ヨ鍒掑伐鑹鸿矾绾�" v-model="queryParam.processRoute"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁″垝鐗╂枡娓呭崟">
+ <j-input placeholder="璇疯緭鍏ヨ鍒掔墿鏂欐竻鍗�" v-model="queryParam.materialListCode"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ巶缂栫爜">
+ <j-input placeholder="璇疯緭鍏ュ伐鍘傜紪鐮�" v-model="queryParam.factoryCode"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ巶鍚嶇О">
+ <j-input placeholder="璇疯緭鍏ュ伐鍘傚悕绉�" v-model="queryParam.factoryName"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="瀹㈡埛鍨嬪彿">
+ <j-input placeholder="璇疯緭鍏ュ鎴峰瀷鍙�" v-model="queryParam.customerOrderModel"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="瀹㈡埛鍚嶇О">
+ <j-input placeholder="璇疯緭鍏ュ鎴峰悕绉�" v-model="queryParam.customer"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ </span>
+ </a-col>
</a-row>
</a-form>
</div>
@@ -12,24 +75,25 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('SAP鐢熶骇璁㈠崟')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
<!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ <a-menu-item key="1" @click="batchDel">
+ <a-icon type="delete" />
+ 鍒犻櫎
+ </a-menu-item>
</a-menu>
- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
+ <a-icon type="down" />
+ </a-button>
</a-dropdown>
</div>
<!-- table鍖哄煙-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
- <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a
+ style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
<a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
</div>
@@ -52,7 +116,8 @@
</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;"/>
+ <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>
@@ -95,180 +160,175 @@
<script>
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import MesProductionOrderModal from './modules/MesProductionOrderModal'
- import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import MesProductionOrderModal from './modules/MesProductionOrderModal'
+import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
- export default {
- name: 'MesProductionOrderList',
- mixins:[JeecgListMixin, mixinDevice],
- components: {
- MesProductionOrderModal
- },
- data () {
- return {
- description: 'SAP鐢熶骇璁㈠崟绠＄悊椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title:'鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
- title:'鐢熶骇璁㈠崟鍙�',
- align:"center",
- dataIndex: 'orderCode'
- },
- {
- title:'璁㈠崟绫诲瀷',
- align:"center",
- dataIndex: 'orderCategory'
- },
- {
- title:'鐗╂枡缂栧彿',
- align:"center",
- dataIndex: 'materialNumber'
- },
- {
- title:'鐗╂枡鍚嶇О',
- align:"center",
- dataIndex: 'materialName'
- },
- {
- title:'璁″垝寮�濮嬫棩鏈�',
- align:"center",
- dataIndex: 'planStart'
- },
- {
- title:'璁″垝缁撴潫鏃ユ湡',
- align:"center",
- dataIndex: 'planEnd'
- },
- {
- title:'璁㈠崟鏁伴噺',
- align:"center",
- dataIndex: 'orderQuantity'
- },
- {
- title:'浜у搧鍗曚綅',
- align:"center",
- dataIndex: 'productionUnit_dictText'
- },
- {
- title:'璁㈠崟鐘舵��',
- align:"center",
- dataIndex: 'orderStatus_dictText'
- },
- {
- title:'浼樺厛绾�',
- align:"center",
- dataIndex: 'priority_dictText'
- },
- {
- title:'璁″垝宸ヨ壓璺嚎',
- align:"center",
- dataIndex: 'processRoute'
- },
- {
- title:'璁″垝鐗╂枡娓呭崟',
- align:"center",
- dataIndex: 'materialListCode'
- },
- {
- title:'宸ュ巶缂栫爜',
- align:"center",
- dataIndex: 'factoryCode'
- },
- {
- title:'宸ュ巶鍚嶇О',
- align:"center",
- dataIndex: 'factoryName'
- },
- {
- title:'瀹㈡埛鍨嬪彿',
- align:"center",
- dataIndex: 'customerOrderModel'
- },
- {
- title:'瀹㈡埛鍚嶇О',
- align:"center",
- dataIndex: 'customer'
- },
- {
- title:'澶囨敞',
- align:"center",
- dataIndex: 'remark'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' }
+export default {
+ name: 'MesProductionOrderList',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {
+ MesProductionOrderModal
+ },
+ data() {
+ return {
+ description: 'SAP鐢熶骇璁㈠崟绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
}
- ],
- url: {
- list: "/mesproductionwork/mesProductionOrder/list",
- delete: "/mesproductionwork/mesProductionOrder/delete",
- deleteBatch: "/mesproductionwork/mesProductionOrder/deleteBatch",
- exportXlsUrl: "/mesproductionwork/mesProductionOrder/exportXls",
- importExcelUrl: "mesproductionwork/mesProductionOrder/importExcel",
-
},
- dictOptions:{},
- superFieldList:[],
- }
- },
- created() {
- this.getSuperFieldList();
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ {
+ title: '鐢熶骇璁㈠崟鍙�',
+ align: 'center',
+ dataIndex: 'orderCode'
+ },
+ {
+ title: '璁㈠崟绫诲瀷',
+ align: 'center',
+ dataIndex: 'orderCategory'
+ },
+ {
+ title: '鐗╂枡缂栧彿',
+ align: 'center',
+ dataIndex: 'materialNumber'
+ },
+ {
+ title: '鐗╂枡鍚嶇О',
+ align: 'center',
+ dataIndex: 'materialName'
+ },
+ {
+ title: '璁″垝寮�濮嬫棩鏈�',
+ align: 'center',
+ dataIndex: 'planStart'
+ },
+ {
+ title: '璁″垝缁撴潫鏃ユ湡',
+ align: 'center',
+ dataIndex: 'planEnd'
+ },
+ {
+ title: '璁㈠崟鏁伴噺',
+ align: 'center',
+ dataIndex: 'orderQuantity'
+ },
+ {
+ title: '浜у搧鍗曚綅',
+ align: 'center',
+ dataIndex: 'productionUnit_dictText'
+ },
+ {
+ title: '璁㈠崟鐘舵��',
+ align: 'center',
+ dataIndex: 'orderStatus_dictText'
+ },
+ {
+ title: '浼樺厛绾�',
+ align: 'center',
+ dataIndex: 'priority_dictText'
+ },
+ {
+ title: '璁″垝宸ヨ壓璺嚎',
+ align: 'center',
+ dataIndex: 'processRoute'
+ },
+ {
+ title: '璁″垝鐗╂枡娓呭崟',
+ align: 'center',
+ dataIndex: 'materialListCode'
+ },
+ {
+ title: '宸ュ巶缂栫爜',
+ align: 'center',
+ dataIndex: 'factoryCode'
+ },
+ {
+ title: '宸ュ巶鍚嶇О',
+ align: 'center',
+ dataIndex: 'factoryName'
+ },
+ {
+ title: '瀹㈡埛鍨嬪彿',
+ align: 'center',
+ dataIndex: 'customerOrderModel'
+ },
+ {
+ title: '瀹㈡埛鍚嶇О',
+ align: 'center',
+ dataIndex: 'customer'
+ },
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ fixed: 'right',
+ width: 147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: '/mesproductionwork/mesProductionOrder/list',
+ delete: '/mesproductionwork/mesProductionOrder/delete',
+ deleteBatch: '/mesproductionwork/mesProductionOrder/deleteBatch',
+ exportXlsUrl: '/mesproductionwork/mesProductionOrder/exportXls',
+ importExcelUrl: 'mesproductionwork/mesProductionOrder/importExcel'
+
},
+ dictOptions: {},
+ superFieldList: []
+ }
+ },
+ created() {
+ this.getSuperFieldList()
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ }
+ },
+ methods: {
+ initDictConfig() {
},
- methods: {
- initDictConfig(){
- },
- getSuperFieldList(){
- let fieldList=[];
- fieldList.push({type:'int',value:'delFlag',text:'鍒犻櫎鏍囪',dictCode:''})
- fieldList.push({type:'string',value:'orderCode',text:'鐢熶骇璁㈠崟鍙�',dictCode:''})
- fieldList.push({type:'string',value:'orderCategory',text:'璁㈠崟绫诲瀷',dictCode:''})
- fieldList.push({type:'string',value:'materialNumber',text:'鐗╂枡缂栧彿',dictCode:''})
- fieldList.push({type:'string',value:'materialName',text:'鐗╂枡鍚嶇О',dictCode:''})
- fieldList.push({type:'datetime',value:'planStart',text:'璁″垝寮�濮嬫棩鏈�'})
- fieldList.push({type:'datetime',value:'planEnd',text:'璁″垝缁撴潫鏃ユ湡'})
- fieldList.push({type:'double',value:'orderQuantity',text:'璁㈠崟鏁伴噺',dictCode:''})
- fieldList.push({type:'string',value:'productionUnit',text:'浜у搧鍗曚綅',dictCode:'production_unit'})
- fieldList.push({type:'string',value:'orderStatus',text:'璁㈠崟鐘舵��',dictCode:'order_status'})
- fieldList.push({type:'string',value:'priority',text:'浼樺厛绾�',dictCode:'priority'})
- fieldList.push({type:'string',value:'processRoute',text:'璁″垝宸ヨ壓璺嚎',dictCode:''})
- fieldList.push({type:'string',value:'materialListCode',text:'璁″垝鐗╂枡娓呭崟',dictCode:''})
- fieldList.push({type:'string',value:'factoryCode',text:'宸ュ巶缂栫爜',dictCode:''})
- fieldList.push({type:'string',value:'factoryName',text:'宸ュ巶鍚嶇О',dictCode:''})
- fieldList.push({type:'string',value:'customerOrderModel',text:'瀹㈡埛鍨嬪彿',dictCode:''})
- fieldList.push({type:'string',value:'customer',text:'瀹㈡埛鍚嶇О',dictCode:''})
- fieldList.push({type:'string',value:'remark',text:'澶囨敞',dictCode:''})
- this.superFieldList = fieldList
- }
+ getSuperFieldList() {
+ let fieldList = []
+ fieldList.push({ type: 'int', value: 'delFlag', text: '鍒犻櫎鏍囪', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'orderCode', text: '鐢熶骇璁㈠崟鍙�', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'orderCategory', text: '璁㈠崟绫诲瀷', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'materialNumber', text: '鐗╂枡缂栧彿', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'materialName', text: '鐗╂枡鍚嶇О', dictCode: '' })
+ fieldList.push({ type: 'datetime', value: 'planStart', text: '璁″垝寮�濮嬫棩鏈�' })
+ fieldList.push({ type: 'datetime', value: 'planEnd', text: '璁″垝缁撴潫鏃ユ湡' })
+ fieldList.push({ type: 'double', value: 'orderQuantity', text: '璁㈠崟鏁伴噺', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'productionUnit', text: '浜у搧鍗曚綅', dictCode: 'production_unit' })
+ fieldList.push({ type: 'string', value: 'orderStatus', text: '璁㈠崟鐘舵��', dictCode: 'order_status' })
+ fieldList.push({ type: 'string', value: 'priority', text: '浼樺厛绾�', dictCode: 'priority' })
+ fieldList.push({ type: 'string', value: 'processRoute', text: '璁″垝宸ヨ壓璺嚎', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'materialListCode', text: '璁″垝鐗╂枡娓呭崟', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'factoryCode', text: '宸ュ巶缂栫爜', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'factoryName', text: '宸ュ巶鍚嶇О', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'customerOrderModel', text: '瀹㈡埛鍨嬪彿', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'customer', text: '瀹㈡埛鍚嶇О', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'remark', text: '澶囨敞', dictCode: '' })
+ this.superFieldList = fieldList
}
}
+}
</script>
<style scoped>
- @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
</style>
\ No newline at end of file
diff --git a/src/views/mes/MesProductionWorkOrderList.vue b/src/views/mes/MesProductionWorkOrderList.vue
index 46029a3..d81fb4d 100644
--- a/src/views/mes/MesProductionWorkOrderList.vue
+++ b/src/views/mes/MesProductionWorkOrderList.vue
@@ -4,20 +4,37 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ崟鍙�(浠诲姟鍙�)">
+ <j-input placeholder="璇疯緭鍏ュ伐鍗曞彿(浠诲姟鍙�)" v-model="queryParam.workOrderCode"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐗╂枡缂栧彿">
+ <j-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" v-model="queryParam.materialNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ崟鐘舵��">
+ <j-dict-select-tag dictCode="work_order_status" placeholder="璇疯緭鍏ュ伐鍗曠姸鎬�" v-model="queryParam.workOrderStatus"></j-dict-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="閲嶅彂甯冧汉">
+ <j-select-user-by-dep placeholder="璇疯緭鍏ラ噸鍙戝竷浜�" v-model="queryParam.republisher"></j-select-user-by-dep>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ </span>
+ </a-col>
</a-row>
</a-form>
</div>
- <!-- 鏌ヨ鍖哄煙-END -->
- <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('鎺掍骇宸ュ崟')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
- <!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
@@ -25,8 +42,6 @@
<a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
-
- <!-- table鍖哄煙-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
@@ -123,11 +138,6 @@
}
},
{
- title:'鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
title:'宸ュ崟鍙�(浠诲姟鍙�)',
align:"center",
dataIndex: 'workOrderCode'
@@ -148,19 +158,19 @@
dataIndex: 'planQuantity'
},
{
- title:'浜х嚎ID(鍐椾綑)',
+ title:'浜х嚎(鍐椾綑)',
align:"center",
- dataIndex: 'factoryId'
+ dataIndex: 'factoryId_dictText'
},
{
- title:'鐝粍ID',
+ title:'鐝粍',
align:"center",
- dataIndex: 'groupId'
+ dataIndex: 'groupId_dictText'
},
{
- title:'鐝ID(鍐椾綑)',
+ title:'鐝(鍐椾綑)',
align:"center",
- dataIndex: 'shiftId'
+ dataIndex: 'shiftId_dictText'
},
{
title:'鎺掍骇鏃ユ湡',
@@ -212,7 +222,7 @@
deleteBatch: "/mesproductionworkorder/mesProductionWorkOrder/deleteBatch",
exportXlsUrl: "/mesproductionworkorder/mesProductionWorkOrder/exportXls",
importExcelUrl: "mesproductionworkorder/mesProductionWorkOrder/importExcel",
-
+
},
dictOptions:{},
superFieldList:[],
diff --git a/src/views/mes/MesProductionWorkOrderListView.vue b/src/views/mes/MesProductionWorkOrderListView.vue
new file mode 100644
index 0000000..4225fef
--- /dev/null
+++ b/src/views/mes/MesProductionWorkOrderListView.vue
@@ -0,0 +1,266 @@
+<template>
+ <a-card :bordered="false" title="鎺掍骇宸ュ崟">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ崟鍙�(浠诲姟鍙�)">
+ <j-input placeholder="璇疯緭鍏ュ伐鍗曞彿(浠诲姟鍙�)" v-model="queryParam.workOrderCode"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鐗╂枡缂栧彿">
+ <j-input placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" v-model="queryParam.materialNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ崟鐘舵��">
+ <j-dict-select-tag dictCode="work_order_status" placeholder="璇疯緭鍏ュ伐鍗曠姸鎬�" v-model="queryParam.workOrderStatus"></j-dict-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="閲嶅彂甯冧汉">
+ <j-select-user-by-dep placeholder="璇疯緭鍏ラ噸鍙戝竷浜�" v-model="queryParam.republisher"></j-select-user-by-dep>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ </span>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+
+ <div class="table-operator">
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ </a-dropdown>
+ </div>
+ <div>
+ <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ </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-production-work-order-modal ref="modalForm" @ok="modalFormOk"></mes-production-work-order-modal>
+ </a-card>
+</template>
+
+<script>
+
+ import '@/assets/less/TableExpand.less'
+ import { mixinDevice } from '@/utils/mixin'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import MesProductionWorkOrderModal from './modules/MesProductionWorkOrderModal'
+ import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+ export default {
+ name: 'MesProductionWorkOrderList',
+ mixins:[JeecgListMixin, mixinDevice],
+ components: {
+ MesProductionWorkOrderModal
+ },
+ data () {
+ return {
+ description: '鎺掍骇宸ュ崟绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key:'rowIndex',
+ width:60,
+ align:"center",
+ customRender:function (t,r,index) {
+ return parseInt(index)+1;
+ }
+ },
+ {
+ title:'宸ュ崟鍙�(浠诲姟鍙�)',
+ align:"center",
+ dataIndex: 'workOrderCode'
+ },
+ {
+ title:'鐗╂枡缂栫爜',
+ align:"center",
+ dataIndex: 'materialNumber'
+ },
+ {
+ title:'鐗╂枡鍚嶇О',
+ align:"center",
+ dataIndex: 'materialName'
+ },
+ {
+ title:'璁″垝鐢熶骇鏁伴噺',
+ align:"center",
+ dataIndex: 'planQuantity'
+ },
+ {
+ title:'浜х嚎(鍐椾綑)',
+ align:"center",
+ dataIndex: 'factoryId_dictText'
+ },
+ {
+ title:'鐝粍',
+ align:"center",
+ dataIndex: 'groupId_dictText'
+ },
+ {
+ title:'鐝(鍐椾綑)',
+ align:"center",
+ dataIndex: 'shiftId_dictText'
+ },
+ {
+ title:'鎺掍骇鏃ユ湡',
+ align:"center",
+ dataIndex: 'workOrderDate'
+ },
+ {
+ title:'宸ュ崟鐘舵��',
+ align:"center",
+ dataIndex: 'workOrderStatus_dictText'
+ },
+ {
+ title:'瀹為檯鎶ュ伐鏁伴噺',
+ align:"center",
+ dataIndex: 'actualQuantity'
+ },
+ {
+ title:'鍙戝竷浜�',
+ align:"center",
+ dataIndex: 'publisher'
+ },
+ {
+ title:'鍙戝竷鏃堕棿',
+ align:"center",
+ dataIndex: 'publishTime'
+ },
+ {
+ title:'閲嶅彂甯冧汉',
+ align:"center",
+ dataIndex: 'republisher'
+ },
+ {
+ title:'閲嶅彂甯冩椂闂�',
+ align:"center",
+ dataIndex: 'republishTime'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align:"center",
+ fixed:"right",
+ width:147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/mesproductionworkorder/mesProductionWorkOrder/list",
+ delete: "/mesproductionworkorder/mesProductionWorkOrder/delete",
+ deleteBatch: "/mesproductionworkorder/mesProductionWorkOrder/deleteBatch",
+ exportXlsUrl: "/mesproductionworkorder/mesProductionWorkOrder/exportXls",
+ importExcelUrl: "mesproductionworkorder/mesProductionWorkOrder/importExcel",
+
+ },
+ dictOptions:{},
+ superFieldList:[],
+ }
+ },
+ created() {
+ this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function(){
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ },
+ methods: {
+ initDictConfig(){
+ },
+ getSuperFieldList(){
+ let fieldList=[];
+ fieldList.push({type:'int',value:'delFlag',text:'鍒犻櫎鏍囪',dictCode:''})
+ fieldList.push({type:'string',value:'workOrderCode',text:'宸ュ崟鍙�(浠诲姟鍙�)',dictCode:''})
+ fieldList.push({type:'string',value:'materialNumber',text:'鐗╂枡缂栫爜',dictCode:''})
+ fieldList.push({type:'string',value:'materialName',text:'鐗╂枡鍚嶇О',dictCode:''})
+ fieldList.push({type:'double',value:'planQuantity',text:'璁″垝鐢熶骇鏁伴噺',dictCode:''})
+ fieldList.push({type:'string',value:'factoryId',text:'浜х嚎ID(鍐椾綑)',dictCode:''})
+ fieldList.push({type:'string',value:'groupId',text:'鐝粍ID',dictCode:''})
+ fieldList.push({type:'string',value:'shiftId',text:'鐝ID(鍐椾綑)',dictCode:''})
+ fieldList.push({type:'datetime',value:'workOrderDate',text:'鎺掍骇鏃ユ湡'})
+ fieldList.push({type:'string',value:'workOrderStatus',text:'宸ュ崟鐘舵��',dictCode:'work_order_status'})
+ fieldList.push({type:'double',value:'actualQuantity',text:'瀹為檯鎶ュ伐鏁伴噺',dictCode:''})
+ fieldList.push({type:'string',value:'publisher',text:'鍙戝竷浜�',dictCode:''})
+ fieldList.push({type:'datetime',value:'publishTime',text:'鍙戝竷鏃堕棿'})
+ fieldList.push({type:'string',value:'republisher',text:'閲嶅彂甯冧汉',dictCode:''})
+ fieldList.push({type:'datetime',value:'republishTime',text:'閲嶅彂甯冩椂闂�'})
+ this.superFieldList = fieldList
+ }
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/mes/MesWorkReportingList.vue b/src/views/mes/MesWorkReportingList.vue
index 142f6f5..7c50ded 100644
--- a/src/views/mes/MesWorkReportingList.vue
+++ b/src/views/mes/MesWorkReportingList.vue
@@ -4,6 +4,58 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁㈠崟鍙�">
+ <j-search-select-tag placeholder="璇疯緭鍏ヨ鍗曞彿" v-model="queryParam.orderId"
+ dict="mes_production_order,order_code,id"
+ ></j-search-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ崟鍙�">
+ <j-search-select-tag placeholder="璇疯緭鍏ュ伐鍗曞彿" v-model="queryParam.workOrderId"
+ dict="mes_production_work_order,work_order_code,id"
+ ></j-search-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="浜х嚎鍚嶇О">
+ <j-search-select-tag
+ dict="base_factory,factory_name,id"
+ placeholder="璇烽�夋嫨浜х嚎鍚嶇О"
+ v-model="queryParam.factoryId"
+ display="factoryName"
+ codeField="id"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鎵规鍙�">
+ <j-input placeholder="璇疯緭鍏ユ壒娆″彿" v-model="queryParam.batchNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鎵樺彿">
+ <j-input placeholder="璇疯緭鍏ユ墭鍙�" v-model="queryParam.palletNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鎶ュ伐浜�">
+ <j-select-user-by-dep placeholder="璇疯緭鍏ユ姤宸ヤ汉" v-model="queryParam.reporter"></j-select-user-by-dep>
+ </a-form-item>
+ </a-col><a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="绾胯竟浠�">
+ <j-search-select-tag placeholder="璇疯緭鍏ョ嚎杈逛粨鍚嶇О" v-model="queryParam.warehouseId"
+ dict="base_line_side_warehouse,warehouse_name,id"
+ ></j-search-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ </span>
+ </a-col>
</a-row>
</a-form>
</div>
@@ -11,13 +63,6 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('宸ュ崟鎶ュ伐')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
- <a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload>
- <!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
@@ -123,24 +168,19 @@
}
},
{
- title:'鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
title:'璁㈠崟ID',
align:"center",
- dataIndex: 'orderId'
+ dataIndex: 'orderId_dictText'
},
{
title:'宸ュ崟ID',
align:"center",
- dataIndex: 'workOrderId'
+ dataIndex: 'workOrderId_dictText'
},
{
title:'浜х嚎ID',
align:"center",
- dataIndex: 'factoryId'
+ dataIndex: 'factoryId_dictText'
},
{
title:'鎵规鍙�',
@@ -170,7 +210,7 @@
{
title:'绾胯竟浠揑D',
align:"center",
- dataIndex: 'warehouseId'
+ dataIndex: 'warehouseId_dictText'
},
{
title:'鎴愬搧涓嬬嚎鎵撳嵃鐘舵��',
@@ -192,7 +232,7 @@
deleteBatch: "/mesworkreporting/mesWorkReporting/deleteBatch",
exportXlsUrl: "/mesworkreporting/mesWorkReporting/exportXls",
importExcelUrl: "mesworkreporting/mesWorkReporting/importExcel",
-
+
},
dictOptions:{},
superFieldList:[],
diff --git a/src/views/mes/modules/MesMaterialLoadingForm.vue b/src/views/mes/modules/MesMaterialLoadingForm.vue
index 5c2df9a..45114de 100644
--- a/src/views/mes/modules/MesMaterialLoadingForm.vue
+++ b/src/views/mes/modules/MesMaterialLoadingForm.vue
@@ -9,8 +9,23 @@
</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 label="宸ュ崟ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderId">
+ <a-input v-model="model.workOrderId" placeholder="璇疯緭鍏ュ伐鍗旾D" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="璁惧ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
+ <a-input v-model="model.equipmentId" placeholder="璇疯緭鍏ヨ澶嘔D" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="宸ュ簭缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processCode">
+ <a-input v-model="model.processCode" placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="宸ュ簭鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processName">
+ <a-input v-model="model.processName" placeholder="璇疯緭鍏ュ伐搴忓悕绉�" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
@@ -24,18 +39,18 @@
</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 label="鎵规鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batchNumber">
+ <a-input v-model="model.batchNumber" placeholder="璇疯緭鍏ユ壒娆″彿" ></a-input>
</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 label="鏁伴噺" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="quantity">
+ <a-input-number v-model="model.quantity" 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 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>
@@ -77,9 +92,9 @@
validatorRules: {
},
url: {
- add: "/mesmaterialloading/mesMaterialLoading/add",
- edit: "/mesmaterialloading/mesMaterialLoading/edit",
- queryById: "/mesmaterialloading/mesMaterialLoading/queryById"
+ add: "/mes/mesMaterialLoading/add",
+ edit: "/mes/mesMaterialLoading/edit",
+ queryById: "/mes/mesMaterialLoading/queryById"
}
}
},
diff --git a/src/views/mes/modules/MesMaterialTransferDetailForm.vue b/src/views/mes/modules/MesMaterialTransferDetailForm.vue
new file mode 100644
index 0000000..95452d7
--- /dev/null
+++ b/src/views/mes/modules/MesMaterialTransferDetailForm.vue
@@ -0,0 +1,134 @@
+<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
new file mode 100644
index 0000000..18bd961
--- /dev/null
+++ b/src/views/mes/modules/MesMaterialTransferDetailModal.vue
@@ -0,0 +1,60 @@
+<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
diff --git a/src/views/mes/modules/MesProductionOrderForm.vue b/src/views/mes/modules/MesProductionOrderForm.vue
index bd915ce..904fb55 100644
--- a/src/views/mes/modules/MesProductionOrderForm.vue
+++ b/src/views/mes/modules/MesProductionOrderForm.vue
@@ -4,18 +4,13 @@
<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="鐢熶骇璁㈠崟鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderCode">
<a-input v-model="model.orderCode" placeholder="璇疯緭鍏ョ敓浜ц鍗曞彿" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item label="璁㈠崟绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderCategory">
- <a-input v-model="model.orderCategory" placeholder="璇疯緭鍏ヨ鍗曠被鍨�" ></a-input>
+ <j-dict-select-tag v-model="model.orderCategory" dictCode="orderCategory" placeholder="璇疯緭鍏ヨ鍗曠被鍨�" ></j-dict-select-tag>
</a-form-model-item>
</a-col>
<a-col :span="12">
@@ -181,7 +176,7 @@
that.confirmLoading = false;
})
}
-
+
})
},
}
diff --git a/src/views/mes/modules/MesProductionWorkOrderForm.vue b/src/views/mes/modules/MesProductionWorkOrderForm.vue
index 54298b7..76de965 100644
--- a/src/views/mes/modules/MesProductionWorkOrderForm.vue
+++ b/src/views/mes/modules/MesProductionWorkOrderForm.vue
@@ -4,11 +4,6 @@
<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="宸ュ崟鍙�(浠诲姟鍙�)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderCode">
<a-input v-model="model.workOrderCode" placeholder="璇疯緭鍏ュ伐鍗曞彿(浠诲姟鍙�)" ></a-input>
</a-form-model-item>
@@ -166,7 +161,7 @@
that.confirmLoading = false;
})
}
-
+
})
},
}
--
Gitblit v1.9.3