|
|
@@ -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>
|
|
|
|
|
|
@@ -284,7 +284,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>
|
|
|
@@ -437,7 +437,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> -->
|
|
|
|
|
|
<!-- 其他类型 -->
|
|
|
|
|
|
@@ -489,7 +489,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>
|
|
|
@@ -500,7 +500,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>
|
|
|
@@ -1730,8 +1730,12 @@ export default {
|
|
|
},
|
|
|
// 参照弹窗确认
|
|
|
handleConfirmRefer() {
|
|
|
+
|
|
|
+ let _this = this;
|
|
|
console.log('确认参照弹窗', `{this.${this.MoreDataDialog.target.name}:${this.MoreDataDialog.value.id}}`);
|
|
|
|
|
|
+ let confirm = true;
|
|
|
+
|
|
|
if (this.MoreDataDialog.target.name == 'basicData') {
|
|
|
// 基本信息
|
|
|
this.basicData.value[this.MoreDataDialog.target.prop] = this.MoreDataDialog.value.id;
|
|
|
@@ -1779,22 +1783,35 @@ export default {
|
|
|
console.log('确认时选择的数据', this.MoreDataDialog.value);
|
|
|
|
|
|
this.materialType.value = this.materialType.value.map(m => {
|
|
|
- if ((m.id && m.id != '' && m.id == this.MoreDataDialog.target.prop['id']) ||
|
|
|
- (m.insertId && m.insertId == this.MoreDataDialog.target.prop['insertId'])
|
|
|
+ if ((m.id && 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'];
|
|
|
+ let drug = _this.materialType.value.filter(d => d.drugId == _this.MoreDataDialog.value['id'])
|
|
|
+ console.log(drug, 'drug------------------------------------');
|
|
|
+ if (drug.length) {
|
|
|
+ _this.$message({
|
|
|
+ message: '不能维护相同的物料类别！',
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ confirm = false;
|
|
|
+ } else {
|
|
|
+ m.drugId = _this.MoreDataDialog.value['id'];
|
|
|
+ m.drugCode = _this.MoreDataDialog.value['code'];
|
|
|
+ m.drugName = _this.MoreDataDialog.value['name'];
|
|
|
+ }
|
|
|
}
|
|
|
- console.log(m, '物料维护列表中每一项的值');
|
|
|
return m;
|
|
|
})
|
|
|
|
|
|
console.log(this.materialType.value, '修改之后-----this.materialType.value');
|
|
|
}
|
|
|
- this.count++;
|
|
|
- this.MoreDataDialog.show = false;
|
|
|
- this.MoreDataDialog.key = '';
|
|
|
+
|
|
|
+ if (confirm) {
|
|
|
+
|
|
|
+ this.count++;
|
|
|
+ this.MoreDataDialog.show = false;
|
|
|
+ this.MoreDataDialog.key = '';
|
|
|
+ }
|
|
|
},
|
|
|
// 取消-关闭参照弹窗
|
|
|
handleConcalRefer() {
|
002390