Browse Source

标本容器选择颜色

master
mch 2 years ago
parent
commit
b83554ea2e
  1. 6
      src/views/Home.vue
  2. 22
      src/views/basic-dictionary/SampleContainer.vue
  3. 2
      src/views/fee-settings/Item.vue
  4. 2
      src/views/user-list/UserList.vue

6
src/views/Home.vue

@ -279,13 +279,13 @@
label-width="100px" label-width="100px"
> >
<el-form-item label="旧密码" prop="oldPassWord"> <el-form-item label="旧密码" prop="oldPassWord">
<el-input v-model="form.oldPassWord"></el-input>
<el-input v-model="form.oldPassWord" autocomplete='new-password' show-password></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新密码" prop="newPassWord"> <el-form-item label="新密码" prop="newPassWord">
<el-input v-model="form.newPassWord"></el-input>
<el-input v-model="form.newPassWord" autocomplete='new-password' show-password></el-input>
</el-form-item> </el-form-item>
<el-form-item label="确认密码" prop="newPassWord"> <el-form-item label="确认密码" prop="newPassWord">
<el-input v-model="confirmpassword" type="password"></el-input>
<el-input v-model="confirmpassword" type="password" autocomplete='new-password' show-password></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">

22
src/views/basic-dictionary/SampleContainer.vue

@ -93,7 +93,12 @@
prop="containerColor" prop="containerColor"
style="width: 90%; margin-top: -40px" style="width: 90%; margin-top: -40px"
> >
<el-input v-model="form.containerColor"></el-input>
<el-input
v-model="form.containerColor"
maxlength="8"
minlength="6"
@change="colorchange"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
@ -231,8 +236,17 @@ export default {
}, },
methods: { methods: {
colorchange(v) { colorchange(v) {
this.form.containerColor = parseInt(v)
var hexColor = v;
// #
hexColor = hexColor.substring(1);
//
this.form.containerColor = parseInt(hexColor, 16);
console.log(this.form.containerColor); console.log(this.form.containerColor);
// this.form.containerColor = parseInt(v)
// console.log(this.form.containerColor);
}, },
// //
cancellation() { cancellation() {
@ -360,7 +374,7 @@ export default {
newlyspecimen({ newlyspecimen({
displayName: this.form.displayName, displayName: this.form.displayName,
containerColorName: this.form.containerColorName, containerColorName: this.form.containerColorName,
containerColor: Number(this.form.containerColor),
containerColor: this.form.containerColor,
}).then((res) => { }).then((res) => {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.getlist(); this.getlist();
@ -370,7 +384,7 @@ export default {
specimenediting(this.form.id, { specimenediting(this.form.id, {
displayName: this.form.displayName, displayName: this.form.displayName,
containerColorName: this.form.containerColorName, containerColorName: this.form.containerColorName,
containerColor: Number(this.form.containerColor),
containerColor: this.form.containerColor,
}).then((res) => { }).then((res) => {
this.$message.success("修改成功"); this.$message.success("修改成功");
this.getlist(); this.getlist();

2
src/views/fee-settings/Item.vue

@ -308,7 +308,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="结果模板" prop="resultTemplateTypeFlag">
<el-form-item label="项目结果模板" prop="resultTemplateTypeFlag">
<!-- <el-input v-model="form.resultTemplateTypeFlag">resulttemp</el-input> --> <!-- <el-input v-model="form.resultTemplateTypeFlag">resulttemp</el-input> -->
<el-select <el-select
v-model="form.resultTemplateTypeFlag" v-model="form.resultTemplateTypeFlag"

2
src/views/user-list/UserList.vue

@ -264,8 +264,10 @@
v-if="title == 1 ? true : false" v-if="title == 1 ? true : false"
> >
<el-input <el-input
show-password
v-model="form.password" v-model="form.password"
type="password" type="password"
autocomplete='new-password'
></el-input> </el-form-item ></el-input> </el-form-item
></el-col> ></el-col>

Loading…
Cancel
Save