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/mes/MesProductionOrderList.vue | 185 +++++++++++++---------------------------------
1 files changed, 53 insertions(+), 132 deletions(-)
diff --git a/src/views/mes/MesProductionOrderList.vue b/src/views/mes/MesProductionOrderList.vue
index db5a4c0..27c23e8 100644
--- a/src/views/mes/MesProductionOrderList.vue
+++ b/src/views/mes/MesProductionOrderList.vue
@@ -11,7 +11,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="璁㈠崟绫诲瀷">
- <j-dict-select-tag dictCode="orderCategory" placeholder="璇疯緭鍏ヨ鍗曠被鍨�"
+ <j-dict-select-tag dictCode="production_order_category" placeholder="璇烽�夋嫨璁㈠崟绫诲瀷"
v-model="queryParam.orderCategory"></j-dict-select-tag>
</a-form-item>
</a-col>
@@ -27,67 +27,20 @@
</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>
+ <j-dict-select-tag dictCode="production_order_status" placeholder="璇烽�夋嫨璁㈠崟鐘舵��"
+ v-model="queryParam.orderStatus"></j-dict-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>
+ <a-button type="info" @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-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>
@@ -110,47 +63,11 @@
: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>
+ <a @click="handleDetail(record)">璇︽儏</a>
</span>
-
</a-table>
</div>
@@ -164,7 +81,6 @@
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',
@@ -185,22 +101,26 @@
align: 'center',
customRender: function(t, r, index) {
return parseInt(index) + 1
- }
+ },
+ fixed: 'left',
},
{
title: '鐢熶骇璁㈠崟鍙�',
align: 'center',
- dataIndex: 'orderCode'
+ dataIndex: 'orderCode',
+ fixed: 'left',
},
{
title: '璁㈠崟绫诲瀷',
align: 'center',
- dataIndex: 'orderCategory'
+ dataIndex: 'orderCategory_dictText',
+ fixed: 'left',
},
{
title: '鐗╂枡缂栧彿',
align: 'center',
- dataIndex: 'materialNumber'
+ dataIndex: 'materialNumber',
+ fixed: 'left',
},
{
title: '鐗╂枡鍚嶇О',
@@ -223,19 +143,24 @@
dataIndex: 'orderQuantity'
},
{
- title: '浜у搧鍗曚綅',
+ title: '鍩烘湰璁￠噺鍗曚綅',
align: 'center',
- dataIndex: 'productionUnit_dictText'
+ dataIndex: 'productionUnit'
},
{
title: '璁㈠崟鐘舵��',
align: 'center',
- dataIndex: 'orderStatus_dictText'
+ dataIndex: 'orderStatus'
+ },
+ {
+ title: '璁㈠崟鐘舵�佹弿杩�',
+ align: 'center',
+ dataIndex: 'orderStatusName'
},
{
title: '浼樺厛绾�',
align: 'center',
- dataIndex: 'priority_dictText'
+ dataIndex: 'priority'
},
{
title: '璁″垝宸ヨ壓璺嚎',
@@ -256,6 +181,36 @@
title: '宸ュ巶鍚嶇О',
align: 'center',
dataIndex: 'factoryName'
+ },
+ {
+ title: '璋冨害鍛樼紪鍙�',
+ align: 'center',
+ dataIndex: 'dispatcherCode'
+ },
+ {
+ title: '璋冨害鍛樺悕绉�',
+ align: 'center',
+ dataIndex: 'dispatcherName'
+ },
+ {
+ title: '璁㈠崟鍒涘缓鏃ユ湡',
+ align: 'center',
+ dataIndex: 'orderCreateDate'
+ },
+ {
+ title: '璁㈠崟鏇存柊鏃ユ湡',
+ align: 'center',
+ dataIndex: 'orderUpdateDate'
+ },
+ {
+ title: '璁㈠崟鏇存柊鏃堕棿',
+ align: 'center',
+ dataIndex: 'orderUpdateTime'
+ },
+ {
+ title: '璁㈠崟淇敼浜�',
+ align: 'center',
+ dataIndex: 'orderUpdateUser'
},
{
title: '瀹㈡埛鍨嬪彿',
@@ -282,50 +237,16 @@
}
],
url: {
- list: '/mesproductionwork/mesProductionOrder/list',
- delete: '/mesproductionwork/mesProductionOrder/delete',
- deleteBatch: '/mesproductionwork/mesProductionOrder/deleteBatch',
- exportXlsUrl: '/mesproductionwork/mesProductionOrder/exportXls',
- importExcelUrl: 'mesproductionwork/mesProductionOrder/importExcel'
-
+ list: '/mes/productionOrder/list',
},
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: '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>
--
Gitblit v1.9.3