diff --git a/jnpf-app/components/jnpf/jnpf-checkbox/index.vue b/jnpf-app/components/jnpf/jnpf-checkbox/index.vue index 8347c82a..306b3d10 100644 --- a/jnpf-app/components/jnpf/jnpf-checkbox/index.vue +++ b/jnpf-app/components/jnpf/jnpf-checkbox/index.vue @@ -2,20 +2,36 @@ - - {{ item[props.label] }} - + + - - {{ item[props.label] }} - + + @@ -52,6 +68,10 @@ disabled: { type: Boolean, default: false + }, + showOnly: { + type: Boolean, + default: false } }, data() { diff --git a/jnpf-app/components/jnpf/jnpf-radio/index.vue b/jnpf-app/components/jnpf/jnpf-radio/index.vue index 0e50ab7f..abf82e12 100644 --- a/jnpf-app/components/jnpf/jnpf-radio/index.vue +++ b/jnpf-app/components/jnpf/jnpf-radio/index.vue @@ -2,17 +2,34 @@ - - {{ item[props.label] }} - + + - + + + @@ -47,6 +64,10 @@ disabled: { type: Boolean, default: false + }, + showOnly: { + type: Boolean, + default: false } }, data() { diff --git a/jnpf-app/pages/scm/form/productWarehouse/index.vue b/jnpf-app/pages/scm/form/productWarehouse/index.vue index 2c474d94..01dc4bd3 100644 --- a/jnpf-app/pages/scm/form/productWarehouse/index.vue +++ b/jnpf-app/pages/scm/form/productWarehouse/index.vue @@ -4,10 +4,7 @@ label-align="right" :label-width="labelwidth" class="jnpf-form"> - - + 商品类型 @@ -15,16 +12,13 @@ prop="productTypeId"> + :props="productTypeIdProps" :options="productTypeIdOptions" :showOnly="true"> - - + 基本信息 @@ -104,10 +98,7 @@ - - + 商品特性 @@ -148,11 +139,14 @@ + 供应链/财务信息 + + - - + 单位/价格信息 @@ -303,10 +294,7 @@ - - + 销售信息 @@ -333,10 +321,7 @@ - - + 库存信息 @@ -397,10 +382,7 @@ - - + 适配业务范围 @@ -411,7 +393,7 @@ :disabled="judgeWrite('jnpf_jg_product_business_jnpf_businessLineId')" @change="changeData('jnpf_jg_product_business_jnpf_businessLineId',-1)" optionType="default" direction="horizontal" :props="jnpf_jg_product_business_jnpf_businessLineIdProps" - :options="jnpf_jg_product_business_jnpf_businessLineIdOptions"> + :options="jnpf_jg_product_business_jnpf_businessLineIdOptions" :showOnly="true"> @@ -745,7 +727,7 @@ "multiple": false, "children": "" }, - labelwidth: 120 * 1.5, + labelwidth: 130 * 1.5, menuId: '', jurisdictionType: '', ruleList: {