From dd4cf3d4716cba2492ec7af0bea3fa8c6aef68ea Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 05 一月 2024 15:28:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/mainTrader/Trader.vue | 1 +
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue | 13 ++++++++++---
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue | 9 +++++----
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue | 2 +-
north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue | 10 +++++-----
5 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
index 777c902..de48f33 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/SelectIngredients.vue
@@ -52,8 +52,8 @@
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: '50'},
// { type: 'checkbox',fixed:"left", title: '閫夋嫨', width: '80' },
- { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
{title: '鎿嶄綔', width: '110', slots: { default: 'button_slot' },fixed:"left"},
+ { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
{field: 'materialCode', width:'150', title: '鐗╂枡缂栫爜', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } } },
{field: 'materialName', width: '150',title: '鐗╂枡鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'origin', width: '120',title: '浜у湴', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
index f34a0a3..68cf0be 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/CreateOutBound.vue
@@ -10,7 +10,7 @@
switch (type) {
case 'edit' :{
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- // router.push({path: '/main/trader/CreateTrader', query: { id: row.id }})
+ router.push({path: '/main/trader/CreateTrader', query: { id: row.id }})
break
}
case 'delete':{
@@ -76,9 +76,10 @@
{field: 'remark',width: '80', title: '澶囨敞', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
],//琛ㄥご鎸夐挳
toolbarConfig: {
- buttons: [{
- 'name': '鎻愪氦',status:'primary'
- }],
+ buttons: [
+ {'name': '鎻愪氦',status:'primary'},
+ {'name': '瀹℃牳',status:'primary', 'disabled': true}
+ ],
import: false,
export: true,
print: true,
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
index 5c370a7..b7e5868 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/MaterialOutbound.vue
@@ -10,7 +10,7 @@
switch (type) {
case 'edit' :{
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- // router.push({path: '/main/trader/CreateTrader', query: { id: row.id }})
+ router.push({path: '/main/ingredientsStock/CreateOutbound', query: { id: row.id }})
break
}
case 'delete':{
@@ -54,9 +54,12 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: '50'},
- { type: 'checkbox',fixed:"left", title: '閫夋嫨', width: '80' },
- { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
{title: '鎿嶄綔', width: '110', slots: { default: 'button_slot' },fixed:"left"},
+ // { type: 'checkbox',fixed:"left", title: '閫夋嫨', width: '80' },
+ { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
+
+ {title: '瀹℃牳', width: 50, slots: { default: 'state' },},
+
{field: 'InventoryOrganization', width:'150', title: '搴撳瓨缁勭粐', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } } },
{field: 'MaterialCode', width: '150',title: '鐗╂枡缂栫爜', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'MaterialName', width: '120',title: '鐗╂枡鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -231,11 +234,15 @@
</div>
</template>
+ <template #state="{ row}">
+ <el-checkbox checked/>
+ </template>
</vxe-grid>
</div>
</template>
+
<style scoped>
.main-div-customer{
width: 99%;
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue b/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue
index 02261a1..a0cae16 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainTrader/SelectTrader.vue
@@ -52,8 +52,8 @@
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: '50'},
// { type: 'checkbox',fixed:"left", title: '閫夋嫨', width: '80' },
- { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
{title: '鎿嶄綔', width: '110', slots: { default: 'button_slot' },fixed:"left"},
+ { type: 'seq',fixed:"left", title: '鑷簭', width: '80' },
{field: 'supplierCode', width:'150', title: '渚涘簲鍟嗙紪鍙�', sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } } },
{field: 'supplierName', width: '150',title: '渚涘簲鍟嗗悕绉�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'agentProduct', width: '120',title: '浠ｇ悊浜у搧', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -71,10 +71,10 @@
{field: 'remark',width: '80', title: '澶囨敞', sortable: true},
],//琛ㄥご鎸夐挳
toolbarConfig: {
- buttons: [{
- 'name': '鏂板',
- 'code':'add'
- },],
+ // buttons: [{
+ // 'name': '鏂板',
+ // 'code':'add'
+ // },],
import: false,
export: true,
print: true,
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainTrader/Trader.vue b/north-glass-erp/northglass-erp/src/views/mm/mainTrader/Trader.vue
index 5799432..ceb3526 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainTrader/Trader.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainTrader/Trader.vue
@@ -23,6 +23,7 @@
<div id="div-title">
<el-breadcrumb :separator-icon="ArrowRight">
<el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/trader/SelectTrader' }">渚涘簲鍟嗗垪琛�</el-breadcrumb-item>
+ <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/trader/CreateTrader' }">渚涘簲鍟嗘柊澧�</el-breadcrumb-item>
<el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">鎶ヨ〃</el-breadcrumb-item>
<!-- <el-breadcrumb-item :to="{ path: '/main/trader/CreateTrader' }">鍒涘缓</el-breadcrumb-item>-->
</el-breadcrumb>
--
Gitblit v1.8.0