From 4b6b64e1a679815c793c5caf28ad8bfaa26ab479 Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期一, 25 十二月 2023 13:46:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/northglass-erp/src/router/index.js | 16 +++++++-
north-glass-erp/northglass-erp/src/views/pp/BOM/SelectBOM.vue | 10 +++-
north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue | 2
north-glass-erp/.idea/workspace.xml | 2
north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue | 2
north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOMDetails.vue | 10 +++-
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue | 8 +++
north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue | 2
north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue | 7 +++
north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue | 2
north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue | 10 +++-
north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue | 2
north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue | 2
18 files changed, 61 insertions(+), 24 deletions(-)
diff --git a/north-glass-erp/.idea/workspace.xml b/north-glass-erp/.idea/workspace.xml
index 559c132..28febcd 100644
--- a/north-glass-erp/.idea/workspace.xml
+++ b/north-glass-erp/.idea/workspace.xml
@@ -212,7 +212,7 @@
<workItem from="1702631535326" duration="205000" />
<workItem from="1702858329054" duration="9016000" />
<workItem from="1703031064839" duration="55055000" />
- <workItem from="1703463546867" duration="1756000" />
+ <workItem from="1703463546867" duration="5864000" />
</task>
<task id="LOCAL-00001" summary="绗竴娆℃帹閫�">
<option name="closed" value="true" />
diff --git a/north-glass-erp/northglass-erp/src/router/index.js b/north-glass-erp/northglass-erp/src/router/index.js
index 323626f..64d0c13 100644
--- a/north-glass-erp/northglass-erp/src/router/index.js
+++ b/north-glass-erp/northglass-erp/src/router/index.js
@@ -715,8 +715,20 @@
path: 'PaymentPurchaseOrder',
name: 'PaymentPurchaseOrder',
component: () => import('../views/mm/purchaseOrder/Payment.vue')
- }
- , {
+ },
+ /*----------- 閫�璐� ----------------*/
+ {
+ path: 'ReturnPurchaseOrder',
+ name: 'ReturnPurchaseOrder',
+ component: () => import('../views/mm/purchaseOrder/Return.vue')
+ },
+ /*----------- 鍏ュ簱 ----------------*/
+ {
+ path: 'StoragePurchaseOrder',
+ name: 'StoragePurchaseOrder',
+ component: () => import('../views/mm/purchaseOrder/Storage.vue')
+ },
+ {
path: '',
redirect: '/main/purchaseOrder/SelectPurchaseOrder'
}
diff --git a/north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOMDetails.vue b/north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOMDetails.vue
index b136563..27bb6f2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOMDetails.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/BOM/OrderBOMDetails.vue
@@ -74,9 +74,9 @@
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{title: '鎿嶄綔', width: 60, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'checkbox',fixed:"left", title: '鍩哄噯BOM', width: 110 },
- { type: 'checkbox',fixed:"left", title: '鏍囧噯BOM', width:110 },
- { type: 'checkbox',fixed:"left", title: '瀹℃牳', width: 80 },
+ { slots: { default: 'state' }, title: '鍩哄噯BOM', width: 110 },
+ { slots: { default: 'state' }, title: '鏍囧噯BOM', width: 110 },
+ { slots: { default: 'state' }, title: '瀹℃牳', width: 80 },
{field: 'customerNumber', width: 120, title: '瀹㈡埛缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
{field: 'customerName',width: 120, title: '瀹㈡埛鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'productNumber', width: 130,title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -238,6 +238,10 @@
</ul>
</template>
+ <template #state="{ row}">
+ <el-checkbox checked/>
+ </template>
+
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/BOM/SelectBOM.vue b/north-glass-erp/northglass-erp/src/views/pp/BOM/SelectBOM.vue
index b78a75d..b4f1c6c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/BOM/SelectBOM.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/BOM/SelectBOM.vue
@@ -73,9 +73,9 @@
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{title: '鎿嶄綔', width: 80, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'checkbox',fixed:"left", title: '鍩哄噯BOM', width: 110 },
- { type: 'checkbox',fixed:"left", title: '鏍囧噯BOM', width: 110 },
- { type: 'checkbox',fixed:"left", title: '瀹℃牳', width: 80 },
+ { slots: { default: 'state' }, title: '鍩哄噯BOM', width: 110 },
+ { slots: { default: 'state' }, title: '鏍囧噯BOM', width: 110 },
+ { slots: { default: 'state' }, title: '瀹℃牳', width: 80 },
{field: 'customerNumber', width: 120, title: '瀹㈡埛缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
{field: 'customerName',width: 120, title: '瀹㈡埛鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'productNumber', width: 130,title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -207,6 +207,10 @@
</ul>
</template>
+ <template #state="{ row}">
+ <el-checkbox checked/>
+ </template>
+
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue b/north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue
index fd8c448..c711d7c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/BOM/StandardBOM.vue
@@ -73,9 +73,9 @@
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{title: '鎿嶄綔', width: 80, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'checkbox',fixed:"left", title: '鍩哄噯BOM', width: 110 },
- { type: 'checkbox',fixed:"left", title: '鏍囧噯BOM', width: 110 },
- { type: 'checkbox',fixed:"left", title: '瀹℃牳', width: 80 },
+ { slots: { default: 'state' }, title: '鍩哄噯BOM', width: 110 },
+ { slots: { default: 'state' }, title: '鏍囧噯BOM', width: 110 },
+ { slots: { default: 'state' }, title: '瀹℃牳', width: 80 },
{field: 'customerNumber', width: 120, title: '瀹㈡埛缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
{field: 'customerName',width: 120, title: '瀹㈡埛鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'productNumber', width: 130,title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -207,6 +207,10 @@
</ul>
</template>
+ <template #state="{ row}">
+ <el-checkbox checked/>
+ </template>
+
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
diff --git a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
index 1d58a78..5985bbc 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
@@ -270,14 +270,17 @@
<template>
<div class="main-div-customer">
- <div id="head" style="width: 900px;">
+ <div id="head" >
+ <el-row :gutter="0">
<el-date-picker
v-model="value"
type="daterange"
start-placeholder="鎶ュ伐寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
/>
+
<el-button type="primary">鏌ヨ</el-button>
+ </el-row>
</div>
<vxe-grid
max-height="100%"
@@ -321,4 +324,7 @@
width: 99%;
height: 100%;
}
+#head{
+ width:40%;
+}
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
index 00a38fc..24ccb97 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/DamageReport.vue
@@ -208,7 +208,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue
index 1f9ce62..55ab727 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/EquipmentOutput.vue
@@ -183,7 +183,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue b/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue
index 6fa3f41..54e602c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/OrderBOMOutside.vue
@@ -204,7 +204,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
index 1612c12..0fb4d80 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/OrderPlanDecomposition.vue
@@ -209,7 +209,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
index 7afdcbe..7c73e59 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -160,7 +160,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue b/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
index 9346a09..494cf55 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/QualityReport.vue
@@ -203,7 +203,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
index ab60678..91b673e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue
@@ -198,7 +198,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
index d389b54..3c338af 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TaskCompletionStatus.vue
@@ -213,7 +213,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index d0a4305..8ba6f69 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -218,7 +218,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
index ebab984..a9f4f52 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/WorkInProgress.vue
@@ -208,7 +208,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
index 1ba0deb..f9f585c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue
@@ -184,7 +184,7 @@
<el-row :gutter="0">
<!-- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
<!-- <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
-
+
<el-date-picker
v-model="form.date1"
type="daterange"
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
index a97896d..17cff85 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
@@ -185,13 +185,16 @@
<template>
<div class="main-div-customer">
<div id="head" >
+ <el-row :gutter="0">
<el-date-picker
v-model="value"
type="daterange"
start-placeholder="寮�濮嬫椂闂�"
end-placeholder="缁撴潫鏃堕棿"
/>
+
<el-button type="primary">鏌ヨ</el-button>
+ </el-row>
</div>
<vxe-grid
max-height="100%"
@@ -257,4 +260,8 @@
width: 99%;
height: 100%;
}
+#head{
+ width:40%;
+
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0