|
|
@@ -29,7 +29,7 @@
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
|
|
|
- <el-button size="small" @click="handleQuery">查询</el-button> -->
|
|
|
+ <el-button size="small" @click="handleQuery">查询</el-button> -->
|
|
|
<el-button size="small" @click="handleRefresh">刷新</el-button>
|
|
|
|
|
|
</el-button-group>
|
|
|
@@ -48,7 +48,7 @@
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<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-menu></el-dropdown> -->
|
|
|
</el-button-group>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -57,7 +57,7 @@
|
|
|
<el-button-group>
|
|
|
<el-button size="small" @click="handleQueryForm">申请单查询</el-button>
|
|
|
</el-button-group>
|
|
|
- </el-col> -->
|
|
|
+ </el-col> -->
|
|
|
|
|
|
<!-- 导入导出 -->
|
|
|
<!-- <el-col :span="1.5">
|
|
|
@@ -65,7 +65,7 @@
|
|
|
<el-button size="small" @click="handleImport">批量导入</el-button>
|
|
|
<el-button size="small" @click="handleExport">批量导出</el-button>
|
|
|
</el-button-group>
|
|
|
- </el-col> -->
|
|
|
+ </el-col> -->
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
@@ -111,7 +111,7 @@
|
|
|
<!-- 附件管理 -->
|
|
|
<!-- <el-button-group>
|
|
|
<el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button>
|
|
|
- </el-button-group> -->
|
|
|
+ </el-button-group> -->
|
|
|
|
|
|
<!-- 切换 -->
|
|
|
<!-- <el-button-group>
|
|
|
@@ -123,7 +123,7 @@
|
|
|
@click="handleChangePage('next')" />
|
|
|
<el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
|
|
|
@click="handleChangePage('end')" />
|
|
|
- </el-button-group> -->
|
|
|
+ </el-button-group> -->
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -283,7 +283,7 @@
|
|
|
@focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
|
|
|
|
|
|
<!-- <el-option v-if="m.dictId" v-for="d in m.dictValue" :key="d.dictValue"
|
|
|
- :label="d.dictLabel" :value="d.dictValue"></el-option> -->
|
|
|
+ :label="d.dictLabel" :value="d.dictValue"></el-option> -->
|
|
|
|
|
|
<div slot="empty"></div>
|
|
|
</el-select>
|
|
|
@@ -435,7 +435,7 @@
|
|
|
<el-option v-if="mt.dictId" v-for="d in mt.dictId" :key="d.dictValue" :label="d.dictLabel"
|
|
|
:value="d.dictValue">
|
|
|
</el-option>
|
|
|
- </el-select> -->
|
|
|
+ </el-select> -->
|
|
|
|
|
|
<!-- 其他类型 -->
|
|
|
|
|
|
@@ -487,7 +487,7 @@
|
|
|
<el-collapse-item title="物料基本信息" name="basic">
|
|
|
<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-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input></el-form-item> -->
|
|
|
<el-form-item label="物料编码">
|
|
|
<el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -498,7 +498,7 @@
|
|
|
<el-input v-model="basicData.value.enName" size="small" readonly placeholder="英文名称"></el-input>
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="版本号">
|
|
|
- <el-input v-model="basicData.value.version" placeholder="版本号"></el-input></el-form-item> -->
|
|
|
+ <el-input v-model="basicData.value.version" placeholder="版本号"></el-input></el-form-item> -->
|
|
|
|
|
|
</el-form>
|
|
|
</el-collapse-item>
|
|
|
@@ -587,19 +587,19 @@
|
|
|
|
|
|
<!-- 参照弹窗 -->
|
|
|
<el-dialog :title="MoreDataDialog.msg.name" :visible.sync="MoreDataDialog.show" width="70%" class="MoreDataDialog"
|
|
|
- :close-on-press-escape="false" :close-on-click-modal="false" :before-close="handleCloseRefer">
|
|
|
+ :key="count" :close-on-press-escape="false" :close-on-click-modal="false" :before-close="handleCloseRefer">
|
|
|
<div>
|
|
|
<el-row>
|
|
|
<el-col :span="1.5">
|
|
|
<el-input v-model="MoreDataDialog.key" placeholder="过滤" size="small" @change="handleFilterRefer" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
<!-- 树形 -->
|
|
|
<el-tree class="referTree" v-loading="MoreDataDialog.loading" v-if="MoreDataDialog.type == 'tree'"
|
|
|
- :data="MoreDataDialog.list" @node-click="handleNodeClick" :props="defaultProps" node-key="id">
|
|
|
+ :data="MoreDataDialog.list" @node-click="handleNodeClick"
|
|
|
+ :props="MoreDataDialog.msg.apiUrl == 'queryMedcineItemDrug' ? drugProps : defaultProps" node-key="id">
|
|
|
</el-tree>
|
|
|
-
|
|
|
+ <!-- queryMedcineItemDrug -->
|
|
|
<!-- 列表 -->
|
|
|
<div v-else>
|
|
|
<el-table :data="MoreDataDialog.list" v-loading="MoreDataDialog.loading" style="width: 100%"
|
|
|
@@ -648,6 +648,13 @@ export default {
|
|
|
children: 'childrens',
|
|
|
label: 'name'
|
|
|
},
|
|
|
+ drugProps: {
|
|
|
+ children: 'childrens',
|
|
|
+ label: function (data, node) {
|
|
|
+ return data.code + ' ' + data.name
|
|
|
+ }
|
|
|
+ // 'name'
|
|
|
+ },
|
|
|
// 标签页当前激活状态
|
|
|
activeMainTab: 'material',
|
|
|
activeViceTab: 'material_medcine',
|
|
|
@@ -955,7 +962,7 @@ export default {
|
|
|
_this.MoreDataDialog.list = data.tableBody;
|
|
|
_this.MoreDataDialog.form = data.tableHeader;
|
|
|
}
|
|
|
-
|
|
|
+ this.count++;
|
|
|
console.log(_this.MoreDataDialog.list, 'this.MoreDataDialog.list');
|
|
|
console.log(_this.MoreDataDialog.form, 'this.MoreDataDialog.form');
|
|
|
|
|
|
@@ -1762,7 +1769,9 @@ export default {
|
|
|
console.log('确认时选择的数据', this.MoreDataDialog.value);
|
|
|
|
|
|
this.materialType.value = this.materialType.value.map(m => {
|
|
|
- if (m.id == this.MoreDataDialog.target.prop['id'] || m.insertId == this.MoreDataDialog.target.prop['insertId']) {
|
|
|
+ if ((m.id != '' && m.id == this.MoreDataDialog.target.prop['id']) ||
|
|
|
+ (m.insertId && m.insertId == this.MoreDataDialog.target.prop['insertId'])
|
|
|
+ ) {
|
|
|
m.drugId = this.MoreDataDialog.value['id'];
|
|
|
m.drugCode = this.MoreDataDialog.value['code'];
|
|
|
m.drugName = this.MoreDataDialog.value['name'];
|
002390