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/mainIngredientStock/MaterialOutbound.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
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%;
--
Gitblit v1.8.0