From d3ce4133bea04fb9f8d1921500058ed6ef4f34bc Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 10:45:31 +0800
Subject: [PATCH] 产品模块 启用多单位和设置之前的交互修改+浮动和显示的关系调整
---
src/views/productManage/product/components/UnitMoreDialog.vue | 5 ++++-
src/views/productManage/product/AddProductDialog.vue | 30 +++++++++++++++---------------
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index a923d07..18ba9bc 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -148,7 +148,7 @@
placeholder="鍗曚綅"
filterable
@change="Gtechange"
- style="width: calc(85% - 110px)"
+ style="width: calc(85% - 120px)"
>
<el-option
v-for="ele in unitList"
@@ -167,9 +167,9 @@
:disabled="editConfig.infomation.unit&&showFooter?false:true"
v-model="editConfig.infomation.moreUnit"
@change="moreUnitChange"
- ></el-checkbox
+ >鍚敤澶氬崟浣�</el-checkbox
>
- <span class="margin_left_10px cursor_pointer" @click="handleUnitMore">鍚敤澶氬崟浣�</span>
+ <!-- <span class="margin_left_10px cursor_pointer" @click="handleUnitMore">鍚敤澶氬崟浣�</span> -->
</el-form-item>
<el-form-item label="浜у搧鏍囩" prop="productTagName">
@@ -820,19 +820,19 @@
},
// 鍚敤澶氬崟浣嶇殑寮�鍏�
moreUnitChange(){
- let string=false;
+ // let string=false;
if(this.editConfig.infomation.unit){
- if(this.editConfig.infomation.moreUnitList&&this.editConfig.infomation.moreUnitList.length>0){
- for(let i in this.editConfig.infomation.moreUnitList){
- if(this.editConfig.infomation.moreUnitList[i].unit&&this.editConfig.infomation.moreUnitList[i].amount){
- string=true;
- break;
- }
- }
- }
- if(!string){
- this.editConfig.infomation.moreUnit=false
- this.$message.error('璇峰厛閰嶇疆澶氬崟浣嶏紒')
+ // if(this.editConfig.infomation.moreUnitList&&this.editConfig.infomation.moreUnitList.length>0){
+ // for(let i in this.editConfig.infomation.moreUnitList){
+ // if(this.editConfig.infomation.moreUnitList[i].unit&&this.editConfig.infomation.moreUnitList[i].amount){
+ // string=true;
+ // break;
+ // }
+ // }
+ // }
+ if(this.editConfig.infomation.moreUnit){
+ // this.editConfig.infomation.moreUnit=false
+ // this.$message.error('璇峰厛閰嶇疆澶氬崟浣嶏紒')
this.$refs.unitMoreDialog.editDialogVisible = true;
}
}else{
diff --git a/src/views/productManage/product/components/UnitMoreDialog.vue b/src/views/productManage/product/components/UnitMoreDialog.vue
index 2fb9ce6..171ab69 100644
--- a/src/views/productManage/product/components/UnitMoreDialog.vue
+++ b/src/views/productManage/product/components/UnitMoreDialog.vue
@@ -51,7 +51,10 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="1" class="col-name">鈮�</el-col>
+ <el-col :span="1" class="col-name">
+ <span v-if="index==0">{{ item.floating?'鈮�':'='}} </span>
+ <span v-else> = </span>
+ </el-col>
<el-col :span="7">
<el-form-item
label=""
--
Gitblit v1.8.0