|
|
@@ -49,7 +49,7 @@
|
|
|
<el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
|
|
|
<el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
- </el-dropdown> -->
|
|
|
+ </el-dropdown> -->
|
|
|
</el-button-group>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -411,7 +411,7 @@
|
|
|
<el-form :inline="true" label-position="right" :model="basicData.value">
|
|
|
<!-- <el-form-item label="所属组织">
|
|
|
<el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input>
|
|
|
- </el-form-item> -->
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item label="物料编码">
|
|
|
<el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -423,7 +423,7 @@
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="版本号">
|
|
|
<el-input v-model="basicData.value.version" placeholder="版本号"></el-input>
|
|
|
- </el-form-item> -->
|
|
|
+ </el-form-item> -->
|
|
|
|
|
|
</el-form>
|
|
|
</el-collapse-item>
|
|
|
@@ -923,7 +923,7 @@ export default {
|
|
|
_this[dataName].value[`${item.prop}Label`] = (Blabel && Blabel.name) || Blabel || '';
|
|
|
}
|
|
|
|
|
|
- this.count++;
|
|
|
+ // this.count++;
|
|
|
this.loading = false;
|
|
|
console.log(_this[dataName].value, `${dataName}//////////////////////`);
|
|
|
})
|
|
|
@@ -1104,9 +1104,10 @@ export default {
|
|
|
console.log(res, '医药行业');
|
|
|
let { code, data } = res;
|
|
|
if (code == 200) {
|
|
|
- _this.medcineData.value = data.data || {};
|
|
|
+ // _this.medcineData.value = data.data || {};
|
|
|
// this.medcineData.form = data.form;
|
|
|
- _this.handleAddReferLabel('medcineData');
|
|
|
+ // _this.handleAddReferLabel('medcineData');
|
|
|
+ console.log(' _this.medcineData', _this.medcineData, res);
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -1511,7 +1512,12 @@ export default {
|
|
|
console.log(this.basicData.value[`${this.MoreDataDialog.target.prop}Label`], '//////////基本信息///////////');
|
|
|
|
|
|
} else if (this.MoreDataDialog.target.name == 'medcineData') {
|
|
|
-
|
|
|
+ console.log('this.MoreDataDialog.value', this.MoreDataDialog.value, this.MoreDataDialog.target.prop, this.medcineData);
|
|
|
+ if (this.MoreDataDialog.target.prop === 'dosageFrom')
|
|
|
+ this.medcineData.form = this.medcineData.form.map((item) => {
|
|
|
+ if (item.prop === "dosageFrom") item.dictValue = [{ dictLabel: this.MoreDataDialog.value.name, dictValue: this.MoreDataDialog.value.id }]
|
|
|
+ return item
|
|
|
+ })
|
|
|
// 医药信息
|
|
|
this.medcineData.value[this.MoreDataDialog.target.prop] = this.MoreDataDialog.value.id;
|
|
|
|
|
|
@@ -1571,7 +1577,11 @@ export default {
|
|
|
})
|
|
|
// 医疗行业
|
|
|
await this.getTagList('material_medcine', (form) => {
|
|
|
+ form.forEach((item) => {
|
|
|
+ this.medcineData.value[item.prop] = ''
|
|
|
+ })
|
|
|
this.medcineData.form = form;
|
|
|
+ console.log('this.medcineData this.medcineData this.medcineData', this.medcineData);
|
|
|
this.getMedcineDetails(this.materialId, 'material_medcine');
|
|
|
})
|
|
|
},
|
|
|
@@ -1588,7 +1598,6 @@ export default {
|
|
|
}
|
|
|
|
|
|
},
|
|
|
-
|
|
|
}
|
|
|
</script>
|
|
|
|
002390