From 7207ef22748a8fecfde5e7ded828dc9b6bcfefe7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 15:37:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/cms/CuttingReceiveDetailList.vue | 173 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 91 insertions(+), 82 deletions(-)
diff --git a/src/views/cms/CuttingReceiveDetailList.vue b/src/views/cms/CuttingReceiveDetailList.vue
index ebb39c0..5522cb7 100644
--- a/src/views/cms/CuttingReceiveDetailList.vue
+++ b/src/views/cms/CuttingReceiveDetailList.vue
@@ -3,7 +3,8 @@
<!-- 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>
@@ -25,7 +26,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>
@@ -68,93 +70,100 @@
<script>
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- export default {
- name: 'CuttingReceiveDetailList',
- mixins:[JeecgListMixin, mixinDevice],
- components: {
- },
- 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: 'cuttingCode'
- },
- {
- title:'鍒�鍏峰悕绉�',
- align:"center",
- dataIndex: 'cuttingName'
- },
- {
- title:'宸ヤ欢鏉愯川',
- align:"center",
- dataIndex: 'workpieceMaterial'
- },
- {
- title:'浣跨敤瀵垮懡',
- align:"center",
- dataIndex: 'usedLife'
- },
- ],
- url: {
- list: "/cms/cuttingReceive/detailList",
- delete: "/cms/cuttingReceiveDetail/delete",
- deleteBatch: "/cms/cuttingReceiveDetail/deleteBatch",
- exportXlsUrl: "/cms/cuttingReceiveDetail/exportXls",
- importExcelUrl: "cms/cuttingReceiveDetail/importExcel",
-
+export default {
+ name: 'CuttingReceiveDetailList',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {},
+ data() {
+ return {
+ description: '棰嗙敤鍗曟槑缁嗙鐞嗛〉闈�',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
},
- dictOptions:{},
- superFieldList:[],
- disableMixinCreated:true
- }
- },
- created() {
- this.getSuperFieldList();
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ {
+ title: '鍒�鍏风紪鐮�',
+ align: 'center',
+ dataIndex: 'cuttingCode'
+ },
+ {
+ title: '鍒�鍏峰悕绉�',
+ align: 'center',
+ dataIndex: 'cuttingName'
+ },
+ {
+ title: '鍒�鍏锋潯鐮�',
+ align: 'center',
+ dataIndex: 'cuttingBarcode'
+ },
+ {
+ title: '宸ヤ欢鏉愯川',
+ align: 'center',
+ dataIndex: 'workpieceMaterial'
+ },
+ {
+ title: '浣跨敤瀵垮懡',
+ align: 'center',
+ dataIndex: 'usedLife'
+ }
+ ],
+ url: {
+ list: '/cms/cuttingReceive/detailList',
+ delete: '/cms/cuttingReceiveDetail/delete',
+ deleteBatch: '/cms/cuttingReceiveDetail/deleteBatch',
+ exportXlsUrl: '/cms/cuttingReceiveDetail/exportXls',
+ importExcelUrl: 'cms/cuttingReceiveDetail/importExcel'
+
},
+ dictOptions: {},
+ superFieldList: [],
+ disableMixinCreated: true
+ }
+ },
+ created() {
+ this.getSuperFieldList()
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ }
+ },
+ methods: {
+ initDictConfig() {
},
- methods: {
- initDictConfig(){
- },
- getSuperFieldList(){
- let fieldList=[];
- fieldList.push({type:'string',value:'orderId',text:'棰嗙敤鍗旾D'})
- fieldList.push({type:'string',value:'cuttingId',text:'鍒�鍏稩D'})
- fieldList.push({type:'string',value:'inventoryId',text:'搴撳瓨ID'})
- fieldList.push({type:'string',value:'workpieceMaterial',text:'宸ヤ欢鏉愯川'})
- fieldList.push({type:'int',value:'usedLife',text:'浣跨敤瀵垮懡'})
- this.superFieldList = fieldList
- }
- },
- mounted() {
+ getSuperFieldList() {
+ let fieldList = []
+ fieldList.push({ type: 'string', value: 'orderId', text: '棰嗙敤鍗旾D' })
+ fieldList.push({ type: 'string', value: 'cuttingId', text: '鍒�鍏稩D' })
+ fieldList.push({ type: 'string', value: 'cuttingCode', text: '鍒�鍏风紪鐮�' }) // 娣诲姞杩欎竴琛�
+ fieldList.push({ type: 'string', value: 'cuttingName', text: '鍒�鍏峰悕绉�' }) // 娣诲姞杩欎竴琛�
+ fieldList.push({ type: 'string', value: 'cuttingBarcode', text: '鍒�鍏锋潯鐮�' }) // 娣诲姞杩欎竴琛�
+ fieldList.push({ type: 'string', value: 'inventoryId', text: '搴撳瓨ID' })
+ fieldList.push({ type: 'string', value: 'workpieceMaterial', text: '宸ヤ欢鏉愯川' })
+ fieldList.push({ type: 'int', value: 'usedLife', text: '浣跨敤瀵垮懡' })
+ this.superFieldList = fieldList
+ }
+ },
+ mounted() {
this.$bus.$on('getToolingStorageData', (data) => {
- this.queryParam.orderId = data.id;
- this.searchQuery();
+ this.queryParam.orderId = data.id
+ this.searchQuery()
})
}
- }
+}
</script>
<style scoped>
- @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
</style>
\ No newline at end of file
--
Gitblit v1.9.3