From 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期二, 06 八月 2024 11:16:58 +0800
Subject: [PATCH] gitlab上面的wms转移到公司git
---
src/views/productManage/product/components/UnitMoreDialog.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/views/productManage/product/components/UnitMoreDialog.vue b/src/views/productManage/product/components/UnitMoreDialog.vue
index fd1d60b..3399579 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>{{ item.floating?'鈮�':'='}} </span>
+ <!--<span v-else> = </span>-->
+ </el-col>
<el-col :span="7">
<el-form-item
label=""
@@ -72,8 +75,8 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="2" class="col-name">鍖�</el-col>
- <el-col :span="5" v-if="index==0">
+ <el-col :span="2" class="col-name">{{unitRight||'--'}}</el-col>
+ <el-col :span="5">
<el-form-item
label=""
:prop="`formList.${index}.floating`"
@@ -85,7 +88,7 @@
>
</el-form-item>
</el-col>
- <el-col :span="5" class="col-name" v-else>
+ <!-- <el-col :span="5" class="col-name" v-else>
<el-button
@click="delItem(index)"
type="text"
@@ -93,7 +96,7 @@
style="text-align:center;"
>娓呯┖</el-button
>
- </el-col>
+ </el-col>-->
</el-row>
</div>
</el-form>
@@ -121,6 +124,9 @@
},
workList: {
type: [Array],
+ },
+ unitRight:{
+ type: String,
},
},
data() {
@@ -210,13 +216,28 @@
handleConfirmSave() {
this.$refs.form.validate((valid) => {
if (valid) {
- this.shutdown()
+ let iscontinue=false;
+ for(let i in this.form.formList){
+ if(this.form.formList[i].unit){
+ iscontinue=true;
+ break;
+ }
+ }
+ if(!iscontinue){
+ this.$message.error('璇疯嚦灏戝～鍐欎竴椤癸紒')
+ return true
+ }
this.$emit('saveUnitMore',this.form.formList)
+ this.editDialogVisible = false;
}
})
},
shutdown() {
+ if(this.editDialogVisible){
+ this.$emit('cancelUnitMore')
+ }
this.editDialogVisible = false;
+
},
},
};
--
Gitblit v1.8.0