From c95e7e5af5e80d6603b8dfc922201079b27b9056 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 09 九月 2025 19:29:03 +0800
Subject: [PATCH] art: 上料列表、新增页面
---
src/views/mes/MesMaterialLoadingList.vue | 317 ++++++++++++++++++++++++++--------------------------
1 files changed, 161 insertions(+), 156 deletions(-)
diff --git a/src/views/mes/MesMaterialLoadingList.vue b/src/views/mes/MesMaterialLoadingList.vue
index 06cd945..cedc37d 100644
--- a/src/views/mes/MesMaterialLoadingList.vue
+++ b/src/views/mes/MesMaterialLoadingList.vue
@@ -4,6 +4,44 @@
<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-dict-select-tag placeholder="璇烽�夋嫨浜х嚎" v-model="queryParam.factoryId"
+ dictCode="base_factory,factory_name,id,del_flag=0 and factory_category='3'"></j-dict-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.category" :dict-options="categoryDictOptions"></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 placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" v-model="queryParam.materialNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ <template v-if="toggleSearchStatus">
+ <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-input placeholder="璇疯緭鍏ユ壒娆″彿" v-model="queryParam.batchNumber"></j-input>
+ </a-form-item>
+ </a-col>
+ </template>
+ <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="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a @click="handleToggleSearch" style="margin-left: 8px">
+ {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
+ <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+ </a>
+ </span>
+ </a-col>
</a-row>
</a-form>
</div>
@@ -11,25 +49,14 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<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>
+ <a-button @click="handleAdd" type="primary" icon="plus">涓婃枡</a-button>
</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>
@@ -46,46 +73,19 @@
: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 slot="categorySlot" slot-scope="text, record">
+ <a-tag color="orange" v-if="record.category === 'LOADING'">涓婃枡</a-tag>
+ <a-tag color="blue" v-else-if="record.category === 'UNLOADING'">涓嬫枡</a-tag>
</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>
+ </span>
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">涓嬫枡</a>
+ <a-divider type="vertical" />
+ <a @click="handleDetail(record)">璇︽儏</a>
+ </span>
</a-table>
</div>
@@ -95,113 +95,118 @@
<script>
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import MesMaterialLoadingModal from './modules/MesMaterialLoadingModal'
+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: '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: "/mesmaterialloading/mesMaterialLoading/list",
- delete: "/mesmaterialloading/mesMaterialLoading/delete",
- deleteBatch: "/mesmaterialloading/mesMaterialLoading/deleteBatch",
- exportXlsUrl: "/mesmaterialloading/mesMaterialLoading/exportXls",
- importExcelUrl: "mesmaterialloading/mesMaterialLoading/importExcel",
-
+export default {
+ name: 'MesMaterialLoadingList',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {
+ MesMaterialLoadingModal
+ },
+ data() {
+ return {
+ description: '涓婃枡绠＄悊椤甸潰',
+ categoryDictOptions: [
+ {
+ value: 'LOADING',
+ text: '涓婃枡'
},
- 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
+ {
+ value: 'UNLOADING',
+ text: '涓嬫枡'
+ },
+ ],
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '浜х嚎',
+ align: 'center',
+ dataIndex: 'factoryId_dictText'
+ },
+ {
+ title: '绾胯竟搴�',
+ align: 'center',
+ dataIndex: 'warehouseId_dictText'
+ },
+ {
+ 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: '閽㈢悆灏哄',
+ align: 'center',
+ dataIndex: 'steelBallSize_dictText'
+ },
+ {
+ title: '绫诲瀷',
+ align: 'center',
+ dataIndex: 'category',
+ scopedSlots: {
+ customRender: 'categorySlot'
+ },
+ },
+ {
+ title: '涓嬫枡鏍囪',
+ align: 'center',
+ dataIndex: 'unloadingFlag',
+ scopedSlots: {
+ customRender: 'unloadingFlagSlot'
+ },
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ fixed: 'right',
+ width: 147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: '/mes/mesMaterialLoading/list'
}
}
- }
+ },
+ created() {
+ },
+ computed: {},
+ methods: {}
+}
</script>
<style scoped>
- @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3