From 6c6b811b2a5267764c8aa5c7b7ed2d6094f65061 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 15 八月 2025 17:15:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mes/MesMaterialUnloadingList.vue | 318 +++++++++++++++++++++++++---------------------------
1 files changed, 153 insertions(+), 165 deletions(-)
diff --git a/src/views/mes/MesMaterialUnloadingList.vue b/src/views/mes/MesMaterialUnloadingList.vue
index c4eb7a3..8c8bc4f 100644
--- a/src/views/mes/MesMaterialUnloadingList.vue
+++ b/src/views/mes/MesMaterialUnloadingList.vue
@@ -1,73 +1,60 @@
<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>
+ <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>
+ <!-- 鏌ヨ鍖哄煙-END -->
+ <!-- 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">
- <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>
- <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">
+ <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">缂栬緫</a>
<a-divider type="vertical" />
@@ -86,116 +73,117 @@
</a-dropdown>
</span>
- </a-table>
- </div>
-
- <mes-material-unloading-modal ref="modalForm" @ok="modalFormOk"></mes-material-unloading-modal>
- </a-card>
+ </a-table>
+ </div>
+ <mes-material-unloading-modal ref="modalForm" @ok="modalFormOk"></mes-material-unloading-modal>
+ </a-card>
+ </j-modal>
</template>
<script>
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import MesMaterialUnloadingModal from './modules/MesMaterialUnloadingModal'
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import MesMaterialUnloadingModal from './modules/MesMaterialUnloadingModal'
- export default {
- name: 'MesMaterialUnloadingList',
- mixins:[JeecgListMixin, mixinDevice],
- components: {
- MesMaterialUnloadingModal
- },
- 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:'涓婃枡id',
- align:"center",
- dataIndex: 'loadingId'
- },
- {
- title:'鐗╂枡缂栫爜',
- align:"center",
- dataIndex: 'materialNumber'
- },
- {
- title:'鐗╂枡鍚嶇О',
- align:"center",
- dataIndex: 'materialName'
- },
- {
- title:'鎵规鍙�',
- align:"center",
- dataIndex: 'batchNumber'
- },
- {
- title:'鏁伴噺',
- align:"center",
- dataIndex: 'quantity'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' }
+export default {
+ name: 'MesMaterialUnloadingList',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {
+ MesMaterialUnloadingModal
+ },
+ 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
}
- ],
- url: {
- list: "/mes/mesMaterialUnloading/list",
- delete: "/mes/mesMaterialUnloading/delete",
- deleteBatch: "/mes/mesMaterialUnloading/deleteBatch",
- exportXlsUrl: "/mes/mesMaterialUnloading/exportXls",
- importExcelUrl: "mes/mesMaterialUnloading/importExcel",
-
},
- dictOptions:{},
- superFieldList:[],
- }
- },
- created() {
- this.getSuperFieldList();
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ // {
+ // title: '鍒犻櫎鏍囪',
+ // align: 'center',
+ // dataIndex: 'delFlag'
+ // },
+ // {
+ // title: '涓婃枡id',
+ // align: 'center',
+ // dataIndex: 'loadingId'
+ // },
+ {
+ title: '鐗╂枡缂栫爜',
+ align: 'center',
+ dataIndex: 'materialNumber'
+ },
+ {
+ title: '鐗╂枡鍚嶇О',
+ align: 'center',
+ dataIndex: 'materialName'
+ },
+ {
+ title: '鎵规鍙�',
+ align: 'center',
+ dataIndex: 'batchNumber'
+ },
+ {
+ title: '鏁伴噺',
+ align: 'center',
+ dataIndex: 'quantity'
+ },
+ ],
+ url: {
+ list: '/mes/mesMaterialUnloading/list',
+ delete: '/mes/mesMaterialUnloading/delete',
+ deleteBatch: '/mes/mesMaterialUnloading/deleteBatch',
+ exportXlsUrl: '/mes/mesMaterialUnloading/exportXls',
+ importExcelUrl: 'mes/mesMaterialUnloading/importExcel'
+
},
+ dictOptions: {},
+ superFieldList: []
+ }
+ },
+ created() {
+ this.getSuperFieldList()
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ }
+ },
+ methods: {
+ handleCancel(){
+ this.visible=false
+ this.dataSource = []
},
- methods: {
- initDictConfig(){
- },
- getSuperFieldList(){
- let fieldList=[];
- fieldList.push({type:'int',value:'delFlag',text:'鍒犻櫎鏍囪',dictCode:''})
- fieldList.push({type:'string',value:'loadingId',text:'涓婃枡id',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:''})
- this.superFieldList = fieldList
- }
+ initDictConfig() {
+ },
+ getSuperFieldList() {
+ let fieldList = []
+ fieldList.push({ type: 'int', value: 'delFlag', text: '鍒犻櫎鏍囪', dictCode: '' })
+ fieldList.push({ type: 'string', value: 'loadingId', text: '涓婃枡id', 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: '' })
+ this.superFieldList = fieldList
}
}
+}
</script>
<style scoped>
- @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3