From 54eb50ff3bf802e0d784065a710313395ed56800 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 四月 2024 09:39:46 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue | 28 +++++++++++++++++++++++++++-
north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue | 3 ++-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
index 371354b..1c783da 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredient/CreateIngredients.vue
@@ -36,6 +36,21 @@
const userinfo=[]
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+})
+
+//椤甸潰绗竴娆″姞杞�
+request.get(`/basicData/BasicDataByType/product/stuffColor`).then((res) => {
+
+ if(res.code==200){
+ titleSelectJson.value=deepClone(res.data)
+ console.log(titleSelectJson.value)
+ }else{
+ ElMessage.warning(res.msg)
+ }
+})
+
@@ -168,8 +183,19 @@
<el-row gutter="5"
v-for="item in BasicData" >
<el-col :span="4.5" >
- {{item.OperateTypeName}}锛�<el-input v-model="item.Type" placeholder="璇疯緭鍏ユ暟鎹�" style="width: 150px; height: 30px;" />
+ {{item.OperateTypeName}}锛�
+ <el-select filterable v-if="item.OperateTypeName=='鑶滅郴'" v-model="item.Type" placeholder="璇疯緭鍏ユ暟鎹�" style="width: 150px; height: 30px;" >
+ <el-option
+ v-for="item in titleSelectJson"
+ :key="item.id"
+ :label="item.basicName"
+ :value="item.basicName"
+ />
+ </el-select>
+ <el-input v-else v-model="item.Type" placeholder="璇疯緭鍏ユ暟鎹�" style="width: 150px; height: 30px;" />
+
</el-col>
+
<el-divider ></el-divider> <!-- 娣诲姞鍒嗛殧绾� -->
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
index 494fbc4..bf4281f 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue
@@ -160,7 +160,7 @@
<td>{{items.money}}</td>
<td>{{items.processingNote}}</td>
</tr>
- <tr class="day-in">
+ <tr class="day-in" >
<td style="font-size: 15px;font-weight: bold;" colspan="3">灏忚:</td>
<td>{{item.DeliveryDetail.quantity}}</td>
<td>{{item.DeliveryDetail.area}}</td>
@@ -228,6 +228,7 @@
margin-top:8mm;
}
+ /*#fen {page-break-after: always;}*/
}
#table1 tr{
height: 30px;
--
Gitblit v1.8.0