|
|
@@ -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>
|
|
|
@@ -49,7 +49,7 @@
|
|
|
<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> -->
|
|
|
</el-button-group>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -58,7 +58,7 @@
|
|
|
<el-button-group>
|
|
|
<el-button size="small" @click="handleQueryForm">申请单查询</el-button>
|
|
|
</el-button-group>
|
|
|
- </el-col> -->
|
|
|
+ </el-col> -->
|
|
|
|
|
|
<!-- 导入导出 -->
|
|
|
<!-- <el-col :span="1.5">
|
|
|
@@ -66,7 +66,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>
|
|
|
|
|
|
@@ -112,7 +112,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>
|
|
|
@@ -124,7 +124,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>
|
|
|
|
|
|
@@ -162,7 +162,7 @@
|
|
|
<!-- 多选框 -->
|
|
|
<el-form-item v-if="f.attribute == 'checkbox'" style="text-align: left;">
|
|
|
<el-checkbox :label="f.name" name="type" v-model="basicData.value[f.prop]"
|
|
|
- :disabled="!updateButtonGroup">
|
|
|
+ :disabled="!(updateButtonGroup && f.edit)">
|
|
|
</el-checkbox>
|
|
|
</el-form-item>
|
|
|
|
|
|
@@ -171,7 +171,7 @@
|
|
|
:id="(updateButtonGroup && f.apiUrl) ? 'selected' : ''">
|
|
|
|
|
|
<el-select v-model="basicData.value[`${f.prop}Label`]" :placeholder="f.name"
|
|
|
- :key="basicData.value[f.prop]" :disabled="!updateButtonGroup"
|
|
|
+ :key="basicData.value[f.prop]" :disabled="!(updateButtonGroup && f.edit)"
|
|
|
@focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })">
|
|
|
<el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictValue" :label="d.dictLabel"
|
|
|
:value="d.dictValue">
|
|
|
@@ -191,7 +191,7 @@
|
|
|
<!--attribute 文本 数字 文本域 为null -->
|
|
|
<el-form-item v-else :label="f.name">
|
|
|
<el-input size="small" v-model="basicData.value[f.prop]" :type="f.attribute || 'text'"
|
|
|
- :readonly="!updateButtonGroup" :placeholder="f.name">
|
|
|
+ :readonly="!(updateButtonGroup && f.edit)" :placeholder="f.name">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
@@ -411,7 +411,7 @@
|
|
|
<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-form-item> -->
|
|
|
<el-form-item label="物料编码">
|
|
|
<el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -423,7 +423,7 @@
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="版本号">
|
|
|
<el-input v-model="basicData.value.version" placeholder="版本号"></el-input>
|
|
|
- </el-form-item> -->
|
|
|
+ </el-form-item> -->
|
|
|
|
|
|
</el-form>
|
|
|
</el-collapse-item>
|
|
|
@@ -1104,9 +1104,9 @@ export default {
|
|
|
console.log(res, '医药行业');
|
|
|
let { code, data } = res;
|
|
|
if (code == 200) {
|
|
|
- // _this.medcineData.value = data.data || {};
|
|
|
+ _this.medcineData.value = data.data || {};
|
|
|
// this.medcineData.form = data.form;
|
|
|
- // _this.handleAddReferLabel('medcineData');
|
|
|
+ _this.handleAddReferLabel('medcineData');
|
|
|
console.log(' _this.medcineData', _this.medcineData, res);
|
|
|
}
|
|
|
})
|
|
|
@@ -1122,7 +1122,7 @@ export default {
|
|
|
},
|
|
|
// 查询物料辅助属性列表+表头字段
|
|
|
getPropertyList(materialId) {
|
|
|
- materialApi.propertyList({materialId}).then(res => {
|
|
|
+ materialApi.propertyList({ materialId }).then(res => {
|
|
|
console.log(res, '料辅助属性列表');
|
|
|
if (res.code == 200) {
|
|
|
this.propertyDetail.value = res.data.data || [];
|
|
|
@@ -1198,8 +1198,6 @@ export default {
|
|
|
},
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
// 新增
|
|
|
handleInster() {
|
|
|
this.$message({
|
|
|
@@ -1581,7 +1579,6 @@ export default {
|
|
|
this.medcineData.value[item.prop] = ''
|
|
|
})
|
|
|
this.medcineData.form = form;
|
|
|
- console.log('this.medcineData this.medcineData this.medcineData', this.medcineData);
|
|
|
this.getMedcineDetails(this.materialId, 'material_medcine');
|
|
|
})
|
|
|
},
|
|
|
@@ -1611,6 +1608,8 @@ export default {
|
|
|
height: calc(100vh - 160px);
|
|
|
box-sizing: border-box;
|
|
|
padding: 12px;
|
|
|
+ overflow-y: auto;
|
|
|
+ overflow-x: auto;
|
|
|
}
|
|
|
|
|
|
.md-content {
|
|
|
@@ -1622,8 +1621,8 @@ export default {
|
|
|
overflow: auto;
|
|
|
|
|
|
.md-main {
|
|
|
- height: calc(100vh - 625px);
|
|
|
- // max-height: 290px;
|
|
|
+ // height: calc(100vh - 625px);
|
|
|
+ max-height: 160px;
|
|
|
margin-bottom: 10px;
|
|
|
overflow-y: auto;
|
|
|
overflow-x: hidden;
|
002390