Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

This commit is contained in:
gyq
2024-07-11 17:30:20 +08:00
3 changed files with 45 additions and 18 deletions

View File

@@ -106,22 +106,42 @@
<el-form-item label="单位" prop="conUnit" v-if="dialogtitle == '添加'">
<el-input v-model="ruleForm.conUnit" placeholder="请输入单位"></el-input>
</el-form-item>
<el-form-item label="耗材类型" prop="conNames" v-if="dialogtitle == '添加'">
<el-input v-model="ruleForm.conNames" placeholder="输耗材信息名称" disabled></el-input>
</el-form-item>
<el-form-item v-if="dialogtitle == '添加'">
<el-button type="primary" @click="typedialogshow = true">去选择</el-button>
<el-form-item label="耗材类型" prop="conTypeId" v-if="dialogtitle == '添加'">
<el-select v-model="ruleForm.conTypeId" placeholder="选择">
<el-option v-for="item in this.tableData.data" :key="item.conTypeId" :label="item.conTypeName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item
label="耗材类型"
prop="conNames"
v-if="dialogtitle == '添加'"
>
<el-input
v-model="ruleForm.conNames"
placeholder="请输耗材信息名称"
disabled
></el-input>
</el-form-item>-->
<!-- <el-form-item v-if="dialogtitle == '添加'">
<el-button type="primary" @click="typedialogshow = true"
>去选择</el-button
>
</el-form-item> -->
<el-form-item label="耗材信息名称" prop="conName">
<el-input v-model="ruleForm.conName" placeholder="请输入耗材信息名称"></el-input>
</el-form-item>
<el-form-item label="耗材信息代码" prop="conCode">
<el-input v-model="ruleForm.conCode" placeholder="请输入耗材信息代码"></el-input>
</el-form-item>
<el-form-item label="耗材价格" prop="price">
<!-- <el-form-item label="耗材信息代码" prop="conCode">
<el-input
v-model="ruleForm.conCode"
placeholder="请输入耗材信息代码"
></el-input>
</el-form-item> -->
<el-form-item label="耗材价格">
<el-input v-model="ruleForm.price" placeholder="请输入耗材价格"></el-input>
</el-form-item>
<el-form-item label="预警值" prop="conWarning">
<el-form-item label="预警值">
<el-input v-model="ruleForm.conWarning" placeholder="请输入耗材预警值"></el-input>
</el-form-item>
<!-- <el-form-item label="单位耗材值" prop="surplusStock">
@@ -129,7 +149,7 @@
</el-form-item> -->
<el-form-item style="display: flex;justify-content: flex-end;">
<el-button @click="dialogshow = false">取 消</el-button>
<el-button type="primary" :loading="ruleFormLoading" @click="submitForm('refruleForm')">
<el-button type="primary" @click="submitForm('refruleForm')">
确 定
</el-button>
</el-form-item>
@@ -296,11 +316,11 @@ export default {
conCode: "",
conName: "",
conTypeId: "",
price: "",
price: "0",
conNames: "",
// surplusStock: '',
conUnit: "",
conWarning: "",
conWarning: "999",
shopId: localStorage.getItem("shopId")
},
rules: {
@@ -310,7 +330,7 @@ export default {
conName: [
{ required: true, message: "请输入耗材信息名称", trigger: "blur" }
],
conNames: [
conTypeId: [
{ required: true, message: "请选择耗材类型", trigger: "blur" }
],
price: [{ required: true, message: "请输入耗材价格", trigger: "blur" }],
@@ -404,6 +424,7 @@ export default {
this.tableData.loading = false;
this.tableData.data = res.content;
this.tableData.total = res.totalElements;
} catch (error) {
console.log(error);
}
@@ -493,6 +514,7 @@ export default {
this.dialogshow = false;
} else {
//添加
console.log(this.ruleForm,'调试')
await posttbConsInfo({
...this.ruleForm
});