|
|
@@ -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>
|
|
|
|
|
|
@@ -160,11 +160,9 @@
|
|
|
<template v-if="f.show">
|
|
|
<!-- :disabled="!(headerParam.isEdit && f.edit)" -->
|
|
|
|
|
|
- <!-- 效期管理（expiryDateManagerment）：控制一下几个是否可编辑
|
|
|
- expiryUnitId 效期单位 usefulLife 有效期 usefulLifeUnitId 有效期至单位-->
|
|
|
-
|
|
|
<!-- 多选框 -->
|
|
|
- <el-form-item v-if="f.attribute == 'checkbox'" style="text-align: left;">
|
|
|
+ <el-form-item v-if="f.attribute == 'checkbox'" style="text-align: left;"
|
|
|
+ :rules="[{ required: f.required, message: `请选择${f.name}`, trigger: 'change' }]" :prop="f.prop">
|
|
|
<el-checkbox :label="f.name" name="type" v-model="basicData.value[f.prop]" true-label="0"
|
|
|
false-label="2" :disabled="handleJudge(f)">
|
|
|
</el-checkbox>
|
|
|
@@ -172,13 +170,14 @@
|
|
|
|
|
|
<!-- 下拉框 -->
|
|
|
<el-form-item v-else-if="f.attribute == 'select'" :label="f.name"
|
|
|
- :id="(updateButtonGroup && f.apiUrl) ? 'selected' : ''">
|
|
|
+ :id="(updateButtonGroup && f.apiUrl) ? 'selected' : ''"
|
|
|
+ :prop="f.apiUrl ? `${f.prop}Name` : f.prop"
|
|
|
+ :rules="[{ required: f.required, message: `请选择${f.name}`, trigger: 'change' }]">
|
|
|
|
|
|
<el-select v-if="f.apiUrl" v-model="basicData.value[`${f.prop}Name`]" :placeholder="f.name"
|
|
|
:key="basicData.value[f.prop]" :disabled="handleJudge(f)"
|
|
|
@focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })">
|
|
|
- <!-- <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictCode" :label="d.dictLabel"
|
|
|
- :value="d.dictCode"></el-option> -->
|
|
|
+ <!-- <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictCode" :label="d.dictLabel":value="d.dictCode"></el-option> -->
|
|
|
|
|
|
<div slot="empty"></div>
|
|
|
</el-select>
|
|
|
@@ -201,7 +200,8 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
<!--attribute 文本 数字 文本域 为null -->
|
|
|
- <el-form-item v-else :label="f.name">
|
|
|
+ <el-form-item v-else :label="f.name" :prop="f.prop"
|
|
|
+ :rules="[{ required: f.required, message: `请输入${f.name}`, trigger: 'blur' }]">
|
|
|
<el-input size="small" v-model="basicData.value[f.prop]" :type="f.attribute || 'text'"
|
|
|
:readonly="handleJudge(f)" :placeholder="f.name">
|
|
|
</el-input>
|
|
|
@@ -258,7 +258,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>
|
|
|
@@ -394,7 +394,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> -->
|
|
|
|
|
|
<!-- 其他类型 -->
|
|
|
|
|
|
@@ -446,7 +446,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>
|
|
|
@@ -457,7 +457,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>
|
|
|
@@ -560,11 +560,18 @@
|
|
|
</el-tree>
|
|
|
|
|
|
<!-- 列表 -->
|
|
|
- <el-table v-else :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" />
|
|
|
- <el-table-column v-for="m in MoreDataDialog.form" v-if="m.show" :prop="m.prop" :label="m.name" />
|
|
|
- </el-table>
|
|
|
+ <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" />
|
|
|
+ <el-table-column v-for="m in MoreDataDialog.form" v-if="m.show" :prop="m.prop" :label="m.name" />
|
|
|
+ </el-table>
|
|
|
+
|
|
|
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
|
|
|
+ :current-page="queryParams.pageNum" :page-sizes="[10, 20, 50, 100]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper" :total="queryParams.total">
|
|
|
+ </el-pagination>
|
|
|
+ </div>
|
|
|
|
|
|
<!-- 按钮 -->
|
|
|
<el-row class="more-button">
|
|
|
@@ -703,9 +710,13 @@ export default {
|
|
|
name: '',
|
|
|
prop: ''
|
|
|
}
|
|
|
+ },
|
|
|
+ // 参照分页参数
|
|
|
+ queryParams: {
|
|
|
+ pageNum: 1,
|
|
|
+ total: 0,
|
|
|
+ pageSize: 10,
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -867,7 +878,7 @@ export default {
|
|
|
console.log(e, '主页签 列表数据选择');
|
|
|
this.mainMsg.checkedList = e;
|
|
|
},
|
|
|
- // 编辑状态下，弹窗显示查询数据
|
|
|
+ // 编辑状态下，参照弹窗显示查询数据
|
|
|
handleQueryMore(msg, val, target) {
|
|
|
this.MoreDataDialog.loading = true;
|
|
|
let _this = this;
|
|
|
@@ -910,11 +921,28 @@ export default {
|
|
|
|
|
|
})
|
|
|
},
|
|
|
+ // 参照改变分页大小
|
|
|
+ handleSizeChange(e) {
|
|
|
+ this.queryParams.pageSize = e;
|
|
|
+ this.handleQueryMore(this.MoreDataDialog.msg, this.MoreDataDialog.key, this.MoreDataDialog.target);
|
|
|
+ },
|
|
|
+ // 参照改变当前页
|
|
|
+ handleCurrentChange(e) {
|
|
|
+ this.queryParams.pageNum = e;
|
|
|
+ this.handleQueryMore(this.MoreDataDialog.msg, this.MoreDataDialog.key, this.MoreDataDialog.target);
|
|
|
+ },
|
|
|
// 根据apiUrl获取对应参照的值
|
|
|
getExecuteMethods(methodName, params, cb) {
|
|
|
- materialApi.executeMethods(methodName, params).then(res => {
|
|
|
+
|
|
|
+ let page = {
|
|
|
+ pageSize: this.queryParams.pageSize,
|
|
|
+ pageNum: this.queryParams.pageNum,
|
|
|
+ }
|
|
|
+
|
|
|
+ materialApi.executeMethods(methodName, params, page).then(res => {
|
|
|
this.MoreDataDialog.loading = false;
|
|
|
if (res.code == 200) {
|
|
|
+ this.queryParams.total = res.data.total;
|
|
|
cb(res.data);
|
|
|
}
|
|
|
})
|
|
|
@@ -1931,12 +1959,17 @@ export default {
|
|
|
margin-top: 10px;
|
|
|
|
|
|
.el-table__body-wrapper {
|
|
|
- height: 340px;
|
|
|
+ height: 300px;
|
|
|
overflow-y: auto;
|
|
|
overflow-x: hidden;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ .el-pagination {
|
|
|
+ text-align: right;
|
|
|
+ margin-top: 5px;
|
|
|
+ }
|
|
|
+
|
|
|
.referTree {
|
|
|
height: 390px;
|
|
|
overflow-x: hidden;
|
002390