|
|
@@ -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>
|
|
|
|
|
|
@@ -282,7 +282,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>
|
|
|
@@ -771,18 +771,29 @@ export default {
|
|
|
methods: {
|
|
|
// 判断效期管理
|
|
|
handleJudge(attribute) {
|
|
|
- // 效期管理（expiryDateManagerment）：控制一下几个是否可编辑
|
|
|
- // expiryUnitId 效期单位 usefulLife 有效期 usefulLifeUnitId 有效期至单位
|
|
|
- // !(updateButtonGroup && f.edit)
|
|
|
- if (attribute.prop == 'expiryUnitId'
|
|
|
+
|
|
|
+ // 批号及库存状态管理(isInventoryStatus) 控制 效期管理是否展示(expiryDateManagerment)
|
|
|
+ if (attribute.prop == 'expiryDateManagerment') {
|
|
|
+
|
|
|
+ if (this.basicData.value['isInventoryStatus'] == '2') this.basicData.value['expiryDateManagerment'] = '2';
|
|
|
+
|
|
|
+ return !(this.updateButtonGroup && attribute.edit && this.basicData.value['isInventoryStatus'] == '0');
|
|
|
+ }
|
|
|
+ else if (attribute.prop == 'expiryUnitId'
|
|
|
|| attribute.prop == 'usefulLife'
|
|
|
|| attribute.prop == 'usefulLifeUnitId'
|
|
|
+ || attribute.prop == 'recentWarningPeriod'
|
|
|
) {
|
|
|
- return !(this.updateButtonGroup && attribute.edit && this.basicData.value['expiryDateManagerment'] == '0')
|
|
|
+ // 效期管理（expiryDateManagerment）：控制一下几个是否可编辑
|
|
|
+ // expiryUnitId 效期单位 usefulLife 有效期 usefulLifeUnitId 有效期至单位 近效期预警天数 "recentWarningPeriod"
|
|
|
+ // !(updateButtonGroup && f.edit)
|
|
|
+ return !(this.updateButtonGroup && attribute.edit && this.basicData.value['expiryDateManagerment'] == '0');
|
|
|
} else {
|
|
|
// 其他属性是否可编辑
|
|
|
- return !(this.updateButtonGroup && attribute.edit)
|
|
|
+ return !(this.updateButtonGroup && attribute.edit);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
},
|
|
|
// 返回
|
|
|
handleBack() {
|
002390