|
|
@@ -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>
|
|
|
@@ -47,7 +47,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-item :command="isInvoke(false)">停用</el-dropdown-item></el-dropdown-menu></el-dropdown> -->
|
|
|
</el-button-group>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -56,7 +56,7 @@
|
|
|
<el-button-group>
|
|
|
<el-button size="small" @click="handleQueryForm">申请单查询</el-button>
|
|
|
</el-button-group>
|
|
|
- </el-col> -->
|
|
|
+ </el-col> -->
|
|
|
|
|
|
<!-- 导入导出 -->
|
|
|
<!-- <el-col :span="1.5">
|
|
|
@@ -64,7 +64,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>
|
|
|
|
|
|
@@ -109,7 +109,7 @@
|
|
|
<el-col :span="6" style="text-align: right;">
|
|
|
<!-- 附件管理 -->
|
|
|
<!-- <el-button-group>
|
|
|
- <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button></el-button-group> -->
|
|
|
+ <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button></el-button-group> -->
|
|
|
|
|
|
<!-- 切换 -->
|
|
|
<!-- <el-button-group>
|
|
|
@@ -120,7 +120,7 @@
|
|
|
<el-button size="small" icon="el-icon-arrow-right" :disabled="!handleBasicEdit"
|
|
|
@click="handleChangePage('next')" />
|
|
|
<el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
|
|
|
- @click="handleChangePage('end')" /></el-button-group> -->
|
|
|
+ @click="handleChangePage('end')" /></el-button-group> -->
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -128,7 +128,7 @@
|
|
|
<el-form :inline="true" label-position="right" :model="basicData.value">
|
|
|
<!-- <el-form-item label="所属组织"></el-form-item> -->
|
|
|
<el-form-item label="物料编码">
|
|
|
- <el-input v-model="basicData.value.code" readonly size="small" ></el-input>
|
|
|
+ <el-input v-model="basicData.value.code" readonly size="small"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="物料名称">
|
|
|
<el-input v-model="basicData.value.name" readonly size="small"></el-input>
|
|
|
@@ -188,7 +188,7 @@
|
|
|
</el-select>
|
|
|
|
|
|
<!-- 字典 -->
|
|
|
- <el-select v-if="f.dictId" v-model="basicData.value[f.prop]" placeholder="请选择"
|
|
|
+ <el-select v-if="f.dictId" v-model="basicData.value[f.prop]" placeholder="请选择"
|
|
|
:key="basicData.value[f.prop]" :disabled="handleJudge(f)">
|
|
|
<el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictValue" :label="d.dictLabel"
|
|
|
:value="d.dictValue">
|
|
|
@@ -219,7 +219,7 @@
|
|
|
</template>
|
|
|
|
|
|
<el-input size="small" v-model="basicData.value[f.prop]" :type="f.attribute || 'text'"
|
|
|
- :readonly="handleJudge(f)" >
|
|
|
+ :readonly="handleJudge(f)">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
@@ -276,8 +276,8 @@
|
|
|
<el-form-item v-else-if="m.attribute == 'select'" :label="m.name">
|
|
|
|
|
|
<!-- 参照弹窗 -->
|
|
|
- <el-select v-if="m.apiUrl" v-model="medcineData.value[`${m.prop}Name`]" placeholder="请选择"
|
|
|
- :key="medcineData.value[m.prop]"
|
|
|
+ <el-select v-if="m.apiUrl" v-model="medcineData.value[`${m.prop}Name`]" placeholder="请选择"
|
|
|
+ :key="medcineData.value[m.prop]"
|
|
|
:disabled="!(updateButtonGroup && m.edit && basicData.value.isMedicine == '0')"
|
|
|
@focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
|
|
|
|
|
|
@@ -287,7 +287,7 @@
|
|
|
</el-select>
|
|
|
|
|
|
<!-- 下拉选择 -->
|
|
|
- <el-select v-else v-model="medcineData.value[m.prop]" placeholder="请选择"
|
|
|
+ <el-select v-else v-model="medcineData.value[m.prop]" placeholder="请选择"
|
|
|
:key="medcineData.value[m.prop]"
|
|
|
:disabled="!(updateButtonGroup && m.edit && basicData.value.isMedicine == '0')"
|
|
|
@focus="m.apiUrl && handleQueryMore(m, '', { name: 'medcineData', prop: m.prop })">
|
|
|
@@ -308,7 +308,6 @@
|
|
|
<!-- 文本、数字、textarae -->
|
|
|
<el-form-item v-else :label="m.name">
|
|
|
<el-input size="small" v-model="medcineData.value[m.prop]" :type="m.attribute || 'text'"
|
|
|
-
|
|
|
:readonly="!(updateButtonGroup && m.edit && basicData.value.isMedicine == '0')">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
@@ -369,10 +368,10 @@
|
|
|
<el-input v-model="basicData.value.createTime" size="small" readonly></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="最后修改人">
|
|
|
- <el-input v-model="basicData.value.updateByName" size="small" readonly ></el-input>
|
|
|
+ <el-input v-model="basicData.value.updateByName" size="small" readonly></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="最后修改时间">
|
|
|
- <el-input v-model="basicData.value.updateTime" size="small" readonly ></el-input>
|
|
|
+ <el-input v-model="basicData.value.updateTime" size="small" readonly></el-input>
|
|
|
</el-form-item>
|
|
|
|
|
|
</el-form>
|
|
|
@@ -421,9 +420,8 @@
|
|
|
true-label="0" false-label="2" v-model="scope.row[mt.prop]" />
|
|
|
|
|
|
<!-- 下拉框 / 参照弹窗---- 药品类别编码 scope.row[`${mt.prop}Name`] -->
|
|
|
- <el-select size="small" v-else-if="mt.attribute == 'select' && mt.apiUrl" placeholder="请选择"
|
|
|
+ <el-select size="small" v-else-if="mt.attribute == 'select' && mt.apiUrl" placeholder="请选择"
|
|
|
:disabled="!(materialType.isEdit && mt.edit)" v-model="scope.row[mt.prop]" :key="scope.row[mt.prop]"
|
|
|
-
|
|
|
@focus="mt.apiUrl && handleQueryMore(mt, '', { name: 'materialType', prop: scope.row })">
|
|
|
<div slot="empty"></div>
|
|
|
</el-select>
|
|
|
@@ -432,11 +430,10 @@
|
|
|
: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> -->
|
|
|
+ </el-option></el-select> -->
|
|
|
|
|
|
<!-- 其他类型 -->
|
|
|
- <el-input v-else size="small" v-model="scope.row[mt.prop]" :readonly="!(materialType.isEdit && mt.edit)"
|
|
|
- />
|
|
|
+ <el-input v-else size="small" v-model="scope.row[mt.prop]" :readonly="!(materialType.isEdit && mt.edit)" />
|
|
|
</template>
|
|
|
|
|
|
</el-table-column>
|
|
|
@@ -540,7 +537,7 @@
|
|
|
<!--attribute 文本 数字 文本域 为null -->
|
|
|
<el-form-item v-else :label="f.name">
|
|
|
<el-input size="small" v-model="otherDeatils.value[f.prop]" :type="f.attribute || 'text'"
|
|
|
- :readonly="!(otherDeatils.isEdit && f.edit)">
|
|
|
+ :readonly="!(otherDeatils.isEdit && f.edit)">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
@@ -1710,7 +1707,7 @@ export default {
|
|
|
console.log('确认弹窗操作');
|
|
|
|
|
|
this.optionDialog.show = false;
|
|
|
-
|
|
|
+
|
|
|
if (this.updateButtonGroup) {
|
|
|
this.updateButtonGroup = false;
|
|
|
this.handleRest();
|
|
|
@@ -1898,7 +1895,8 @@ export default {
|
|
|
materialMedcine: this.medcineData.value,
|
|
|
materialMedcineItem: {}
|
|
|
};
|
|
|
- // basicData this.medcineData.value materialMedcine
|
|
|
+ // diCode
|
|
|
+ param.diCode = param.diCode.replace(/ /g, '');
|
|
|
console.log(param, '保存物料以及相关页签param');
|
|
|
materialApi.insertMaterialInfo(param).then(res => {
|
|
|
console.log(res, '保存物料以及相关页签');
|
002390