diff --git a/src/application/mk/components/editors/MkFormCropper.vue b/src/application/mk/components/editors/MkFormCropper.vue index 3700557..9fec566 100644 --- a/src/application/mk/components/editors/MkFormCropper.vue +++ b/src/application/mk/components/editors/MkFormCropper.vue @@ -7,7 +7,7 @@ avatar -
+
上传 @@ -39,11 +39,12 @@ export default { cls:String, cropWidth: Number, cropHeight: Number, + isReadonly:Boolean }, data() { return { - loading: false, + loading: false, showUrl: "" } }, @@ -59,6 +60,9 @@ export default { }, methods: { showCropper() { + if(this.isReadonly === true){ + return; + } if(this.value){ this.$hevueImgPreview(this.value) }else{ diff --git a/src/pages/Middle/Mes/MesBG/MesBG/index.vue b/src/pages/Middle/Mes/MesBG/MesBG/index.vue new file mode 100644 index 0000000..9b2416b --- /dev/null +++ b/src/pages/Middle/Mes/MesBG/MesBG/index.vue @@ -0,0 +1,447 @@ + + + + + + diff --git a/src/pages/Middle/bathroom/BathroomFittings/BathroomFittings/Edit.vue b/src/pages/Middle/bathroom/BathroomFittings/BathroomFittings/Edit.vue index c2b1c7c..08054b0 100644 --- a/src/pages/Middle/bathroom/BathroomFittings/BathroomFittings/Edit.vue +++ b/src/pages/Middle/bathroom/BathroomFittings/BathroomFittings/Edit.vue @@ -128,6 +128,7 @@ export default { //{ field: 'edge_id', title: '封边id', span: 12, itemRender: { name: '$input' } }, { field: 'remark', title: '备注', span: 12, itemRender: { name: '$input' } }, + { field: 'IsShowExpression', title: '是否输出变量', span: 12, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } } }, // =============================== 表单项 自动生成 End =============================== ] }, diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue index 9481712..e54e2f7 100644 --- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue +++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue @@ -1261,10 +1261,12 @@ export default { this.fittings_list.forEach(o => { - - this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的长"); + if(o.IsShowExpression){ + this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的长"); this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的宽"); this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的厚"); + } + }); diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue index 8350a6d..fa26f38 100644 --- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue +++ b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/drawer.vue @@ -954,11 +954,11 @@ export default { this.fittings_list.forEach(o => { - + if(o.IsShowExpression){ this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的长"); this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的宽"); this.moreExpressionsList_fittings.push(this.formatName(o.name) + "的厚"); - + } }); });