From ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 07 八月 2025 10:30:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/pms/PmsProcessBillMaterialsList.vue | 310 +++++++++++++++++++++-----------------------------
1 files changed, 131 insertions(+), 179 deletions(-)
diff --git a/src/views/pms/PmsProcessBillMaterialsList.vue b/src/views/pms/PmsProcessBillMaterialsList.vue
index 8e8f6bd..ec47455 100644
--- a/src/views/pms/PmsProcessBillMaterialsList.vue
+++ b/src/views/pms/PmsProcessBillMaterialsList.vue
@@ -5,19 +5,24 @@
<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="璁㈠崟鍙�">
+ <a-input placeholder="璇疯緭鍏ヨ鍗曞彿" v-model="queryParam.orderCode" allowClear></a-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-input placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" v-model="queryParam.materialNumber" allowClear></a-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-input placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" v-model="queryParam.materialName" allowClear></a-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>
+ <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</span>
</a-col>
</a-row>
@@ -25,24 +30,8 @@
</div>
<!-- 鏌ヨ鍖哄煙-END -->
- <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <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"
@@ -53,189 +42,152 @@
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
+ :expandedRowKeys.sync="expandedRowKeys"
+ @expand="handleExpand"
@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>
-
+ <a-table
+ slot="expandedRowRender"
+ slot-scope="text"
+ :scroll="{x:true}"
+ :columns="innerColumns"
+ :data-source="innerData"
+ :pagination="false"
+ ></a-table>
<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>
- <span slot="figureNum" slot-scope="text, record">
- <span v-if="record.materialNumber == null || '' == record.materialNumber">鏃犳暟鎹�</span>
- <span v-else>
- <a-popover placement="top" :title="'鐗╂枡鍩烘湰淇℃伅:'" arrow-point-at-center>
- <template slot="content">
- </template>
- <a-button class="fontweight" style="font-weight: bold;color: inherit;" @click="handleMaterialClick(record)">
- {{ record.materialNumber }}
- </a-button>
- </a-popover>
- </span>
+ <a @click="handleDetail(record)">璇︽儏</a>
</span>
</a-table>
</div>
-
<pms-process-bill-materials-modal ref="modalForm" @ok="modalFormOk"></pms-process-bill-materials-modal>
- <PmsProcessBillMaterialsDetailModal ref="PmsProcessBillMaterialsDetailModal"></PmsProcessBillMaterialsDetailModal>
</a-card>
</template>
<script>
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import PmsProcessBillMaterialsModal from './modules/PmsProcessBillMaterialsModal'
- import PmsProcessBillMaterialsDetailModal from './modules/PmsProcessBillMaterialsDetailModal.vue'
- import { getAction } from '@api/manage'
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import PmsProcessBillMaterialsModal from './modules/PmsProcessBillMaterialsModal'
+import { getAction } from '@api/manage'
- export default {
- name: 'PmsProcessBillMaterialsList',
- mixins:[JeecgListMixin, mixinDevice],
- components: {
- PmsProcessBillMaterialsModal,
- PmsProcessBillMaterialsDetailModal
- },
- data () {
- return {
- description: '璁㈠崟BOM绠＄悊椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title:'鐢熸垚璁㈠崟ID',
- align:"center",
- dataIndex: 'orderId'
- },
- {
- title:'鐗╂枡缂栫爜',
- align:"center",
- dataIndex: 'materialNumber',
- defaultSortOrder: 'descend',
- scopedSlots: { customRender: 'figureNum', },
- },
- {
- title:'鐗╂枡鍚嶇О',
- align:"center",
- dataIndex: 'materialName'
- },
- {
- title:'BOM浠ｇ爜',
- align:"center",
- dataIndex: 'billMaterialsCode'
- },
- {
- title:'鍩烘湰鍗曚綅',
- align:"center",
- dataIndex: 'productionUnit'
- },
- {
- title:'璁㈠崟鏁伴噺',
- align:"center",
- dataIndex: 'productionQuantity'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- fixed:"right",
- width:147,
- scopedSlots: { customRender: 'action' }
+export default {
+ name: 'PmsProcessBillMaterialsList',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {
+ PmsProcessBillMaterialsModal
+ },
+ data() {
+ return {
+ description: '璁㈠崟BOM绠＄悊椤甸潰',
+ innerData: [],
+ expandedRowKeys: [],
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
}
- ],
- url: {
- list: "/pmsprocessbillmaterials/pmsProcessBillMaterials/list",
- delete: "/pmsprocessbillmaterials/pmsProcessBillMaterials/delete",
- deleteBatch: "/pmsprocessbillmaterials/pmsProcessBillMaterials/deleteBatch",
- exportXlsUrl: "/pmsprocessbillmaterials/pmsProcessBillMaterials/exportXls",
- importExcelUrl: "pmsprocessbillmaterials/pmsProcessBillMaterials/importExcel",
- queryByMaterialId:'/pms/pmsProcessBillMaterialsDetail/queryByMaterialId'
},
- dictOptions:{},
- superFieldList:[],
- }
- },
- created() {
- this.getSuperFieldList();
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ {
+ title: '璁㈠崟鍙�',
+ align: 'center',
+ dataIndex: 'orderCode'
+ },
+ {
+ title: '鐗╂枡缂栫爜',
+ align: 'center',
+ dataIndex: 'materialNumber'
+ },
+ {
+ title: '鐗╂枡鍚嶇О',
+ align: 'center',
+ dataIndex: 'materialName'
+ },
+ {
+ title: '鍩烘湰鍗曚綅',
+ align: 'center',
+ dataIndex: 'productionUnit'
+ },
+ {
+ title: '璁㈠崟鏁伴噺',
+ align: 'center',
+ dataIndex: 'productionQuantity'
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: 'center',
+ width: 147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ innerColumns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '鐗╂枡缂栫爜',
+ align: 'center',
+ dataIndex: 'materialNumber'
+ },
+ {
+ title: '鐗╂枡鍚嶇О',
+ align: 'center',
+ dataIndex: 'materialName'
+ },
+ {
+ title: '鍩烘湰鍗曚綅',
+ align: 'center',
+ dataIndex: 'productionUnit'
+ },
+ {
+ title: '闇�姹傛暟閲�',
+ align: 'center',
+ dataIndex: 'usageQuantity'
+ }
+ ],
+ url: {
+ list: '/pms/processBillMaterials/list',
+ queryByMaterialId: '/pms/processBillMaterialsDetail/queryByMaterialId'
},
- },
- methods: {
- handleMaterialClick(record){
- console.log('record----->',record)
- getAction(this.url.queryByMaterialId,{'materialId':record.id}).then(res=>{
+ }
+ },
+ created() {
+ },
+ computed: {},
+ methods: {
+ handleExpand(expanded, record) {
+ let that = this
+ if(expanded) {
+ this.expandedRowKeys = [record.id];
+ getAction(that.url.queryByMaterialId, {materialId: record.id}).then((res)=>{
if(res.success){
- this.$refs.PmsProcessBillMaterialsDetailModal.edit(res.result);
- this.$refs.PmsProcessBillMaterialsDetailModal.title="鐗╂枡娓呭崟";
- this.$refs.PmsProcessBillMaterialsDetailModal.disableSubmit = true;
+ this.innerData = [...res.result];
}else{
- this.$message.error('娌℃煡鍒版暟鎹紝璇疯仈绯荤鐞嗗憳')
+ that.$message.warning(res.message);
+ this.innerData = [];
}
})
- },
- initDictConfig(){
- },
- getSuperFieldList(){
- let fieldList=[];
- fieldList.push({type:'int',value:'delFlag',text:'鍒犻櫎鏍囪',dictCode:''})
- fieldList.push({type:'string',value:'orderId',text:'鐢熸垚璁㈠崟ID',dictCode:''})
- fieldList.push({type:'string',value:'materialNumber',text:'鐗╂枡缂栫爜',dictCode:''})
- fieldList.push({type:'string',value:'materialName',text:'鐗╂枡鍚嶇О',dictCode:''})
- fieldList.push({type:'string',value:'billMaterialsCode',text:'BOM浠ｇ爜',dictCode:''})
- fieldList.push({type:'string',value:'productionUnit',text:'鍩烘湰鍗曚綅',dictCode:''})
- fieldList.push({type:'double',value:'productionQuantity',text:'璁㈠崟鏁伴噺',dictCode:''})
- this.superFieldList = fieldList
+ } else {
+ this.expandedRowKeys = [];
}
}
}
+}
</script>
<style scoped>
- @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3