|
@@ -62,7 +62,7 @@
|
|
|
<SelectPop v-model="formData.unitId" :multiple="false" :options="unitList"
|
|
<SelectPop v-model="formData.unitId" :multiple="false" :options="unitList"
|
|
|
@on-select-label="unitClear"
|
|
@on-select-label="unitClear"
|
|
|
labelKey="unitName"
|
|
labelKey="unitName"
|
|
|
- valueKey="unitId">
|
|
|
|
|
|
|
+ valueKey="unitId">formData.flgSubUnit
|
|
|
</SelectPop>
|
|
</SelectPop>
|
|
|
</DkFormItem>
|
|
</DkFormItem>
|
|
|
<!--是否开启辅助单位-->
|
|
<!--是否开启辅助单位-->
|
|
@@ -489,6 +489,11 @@ export default {
|
|
|
setValuesByEdit(data) {
|
|
setValuesByEdit(data) {
|
|
|
if (data) {
|
|
if (data) {
|
|
|
this.formData = data;
|
|
this.formData = data;
|
|
|
|
|
+ if (this.formData.subUnitId) {
|
|
|
|
|
+ this.showSubUnit = true
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.showSubUnit = false
|
|
|
|
|
+ }
|
|
|
if (this.formData.subUnitId && this.formData.conversionFactor && this.formData.unitId){
|
|
if (this.formData.subUnitId && this.formData.conversionFactor && this.formData.unitId){
|
|
|
//计算公式
|
|
//计算公式
|
|
|
this.formData.calculationFormula = this.formData.conversionFactor + data.unitName + "=1" + data.subUnitName
|
|
this.formData.calculationFormula = this.formData.conversionFactor + data.unitName + "=1" + data.subUnitName
|