|
@@ -388,7 +388,7 @@
|
|
|
</el-row>
|
|
|
<!-- 表格数据 -->
|
|
|
<el-table :data="materialType.value" stripe style="width: 100%" max-height="350" v-loading="materialType.loading"
|
|
|
- :key="count" @selection-change="handleSelectionType">
|
|
|
+ :key="refer" @selection-change="handleSelectionType">
|
|
|
<el-table-column type="selection" width="30" />
|
|
|
<el-table-column type="index" width="50" label="序号" />
|
|
|
<el-table-column v-for="mt in materialType.form" v-if="mt.show" :label="mt.name" width="180">
|
|
@@ -409,8 +409,7 @@
|
|
|
<!-- <el-select size="small" v-else-if="mt.attribute == 'select' && mt.dictId" placeholder="请选择"
|
|
|
:disabled="!(materialType.isEdit && mt.edit)" v-model="scope.row[mt.prop]" :key="scope.row[mt.prop]">
|
|
|
<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> -->
|
|
|
+ :value="d.dictValue"></el-option></el-select> -->
|
|
|
|
|
|
<!-- 其他类型 -->
|
|
|
<el-input v-else size="small" v-model="scope.row[mt.prop]" :readonly="!(materialType.isEdit && mt.edit)" />
|
|
@@ -476,7 +475,7 @@
|
|
|
<div class="od-msg">
|
|
|
|
|
|
<!-- 展示表单 -->
|
|
|
- <el-form :inline="true" label-position="right" :hide-required-asterisk="true" :model="otherDeatils.value">
|
|
|
+ <el-form :inline="true" label-position="right" :key="refer" :hide-required-asterisk="true" :model="otherDeatils.value">
|
|
|
|
|
|
<el-row :gutter="10">
|
|
|
<el-col :span="8" v-for="f in otherDeatils.form" style="text-align: right;">
|
|
@@ -556,7 +555,7 @@
|
|
|
|
|
|
<!-- 参照弹窗 -->
|
|
|
<el-dialog :title="MoreDataDialog.msg.name" :visible.sync="MoreDataDialog.show" width="70%" class="MoreDataDialog"
|
|
|
- :key="count" :close-on-press-escape="false" :close-on-click-modal="false" :before-close="handleCloseRefer">
|
|
|
+ :close-on-press-escape="false" :close-on-click-modal="false" :before-close="handleCloseRefer">
|
|
|
<div>
|
|
|
<el-row>
|
|
|
<el-col :span="1.5">
|
|
@@ -565,12 +564,12 @@
|
|
|
</el-row>
|
|
|
<!-- 树形 -->
|
|
|
<el-tree class="referTree" v-loading="MoreDataDialog.loading" v-if="MoreDataDialog.type == 'tree'"
|
|
|
- :data="MoreDataDialog.list" @node-click="handleNodeClick"
|
|
|
+ :data="MoreDataDialog.list" @node-click="handleNodeClick" :key="refer"
|
|
|
:props="MoreDataDialog.msg.apiUrl == 'queryMedcineItemDrug' ? drugProps : defaultProps" node-key="id">
|
|
|
</el-tree>
|
|
|
<!-- queryMedcineItemDrug -->
|
|
|
<!-- 列表 -->
|
|
|
- <div v-else>
|
|
|
+ <div v-else >
|
|
|
<el-table :data="MoreDataDialog.list" v-loading="MoreDataDialog.loading" style="width: 100%"
|
|
|
@row-click="handleCurentRow" highlight-current-row>
|
|
|
<el-table-column type="index" label="序号" width="55" align="center" />
|
|
@@ -610,6 +609,7 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
count: 1,
|
|
|
+ refer: 1,
|
|
|
loading: false,
|
|
|
// 维护新版本
|
|
|
maintainNewVersion: false,
|
|
@@ -781,7 +781,6 @@ export default {
|
|
|
}
|
|
|
// 默认采购组织:purchasingOrganization 业务部门:businessDepartment
|
|
|
else if (attribute.prop == 'businessDepartment') {
|
|
|
- console.log(!this.basicData.value['purchasingOrganization'], '////////////');
|
|
|
return !(this.updateButtonGroup && attribute.edit && this.basicData.value['purchasingOrganization']);
|
|
|
}
|
|
|
else {
|
|
@@ -923,7 +922,8 @@ export default {
|
|
|
_this.MoreDataDialog.list = data.tableBody;
|
|
|
_this.MoreDataDialog.form = data.tableHeader;
|
|
|
}
|
|
|
- this.count++;
|
|
|
+ this.refer++;
|
|
|
+ // this.count++;s
|
|
|
console.log(_this.MoreDataDialog.list, 'this.MoreDataDialog.list');
|
|
|
console.log(_this.MoreDataDialog.form, 'this.MoreDataDialog.form');
|
|
|
|
|
@@ -1863,7 +1863,8 @@ export default {
|
|
|
}
|
|
|
|
|
|
if (confirm) {
|
|
|
- this.count++;
|
|
|
+ // this.count++;
|
|
|
+ this.refer++;
|
|
|
this.MoreDataDialog.show = false;
|
|
|
this.MoreDataDialog.key = '';
|
|
|
this.MoreDataDialog.value = {};
|