Skip to content

R
rongtong-app
Commit 64c6207a authored by kaitly205422@163.com's avatar kaitly205422@163.com
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop

parents f4898e4e 80906998
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 6 deletions
public/index.html
View file @ 64c6207a
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>融通物管安全管理平台</title> <title>融通危险源辨识系统</title>
<link rel="stylesheet" href="//at.alicdn.com/t/font_1623819_3g3arzgtlmk.css"> <link rel="stylesheet" href="//at.alicdn.com/t/font_1623819_3g3arzgtlmk.css">
</head> </head>
<body> <body>
......
src/views/riskProject/add/addProject.vue
View file @ 64c6207a
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<van-radio <van-radio
v-for="option in item.options" v-for="option in item.options"
:key="option.name" :key="option.name"
:name="option.name" :name="option.hasOwnProperty('value')?option.value:option.name"
>{{ option.name }}</van-radio >{{ option.name }}</van-radio
> >
</van-radio-group> </van-radio-group>
......
src/views/riskProject/add/index.vue
View file @ 64c6207a
...@@ -97,21 +97,24 @@ ...@@ -97,21 +97,24 @@
name="propertyManagement" name="propertyManagement"
label="是否为物业" label="是否为物业"
placeholder="请选择" placeholder="请选择"
:rules="[{ required: true, message: '是否为物业不能为空' }]" :rules="[{
validator:(val)=>val=='',
message:'是否为物业不能为空'
}]"
> >
<template #input> <template #input>
<van-radio-group <van-radio-group
v-model="form.propertyManagement" v-model="form.propertyManagement"
direction="horizontal" direction="horizontal"
> >
<van-radio name="是">是</van-radio> <van-radio :name="true">是</van-radio>
<van-radio name="否">否</van-radio> <van-radio :name="false">否</van-radio>
</van-radio-group> </van-radio-group>
</template> </template>
</van-field> </van-field>
<!-- <van-popup v-model="showSource" position="bottom"> <!-- <van-popup v-model="showSource" position="bottom">
<van-picker <van-picker
show-toolbar s how-toolbar
value-key="name" value-key="name"
:columns="columnsSource" :columns="columnsSource"
@confirm="onConSource" @confirm="onConSource"
...@@ -413,6 +416,8 @@ export default { ...@@ -413,6 +416,8 @@ export default {
form: { form: {
name: "", name: "",
projectBusiness: "", projectBusiness: "",
businessStatus:'',
propertyManagement:''
}, },
projectId: "", // 所属工程 projectId: "", // 所属工程
projectName: "", // 所属工程 projectName: "", // 所属工程
...@@ -483,6 +488,10 @@ export default { ...@@ -483,6 +488,10 @@ export default {
}); });
}, },
methods: { methods: {
valFn(val){
console.log(val);
return val==''
},
// 业态 // 业态
businessConfirm(value) { businessConfirm(value) {
this.business.show = false; this.business.show = false;
...@@ -699,6 +708,7 @@ export default { ...@@ -699,6 +708,7 @@ export default {
} }
}, },
onSubmit(values) { onSubmit(values) {
debugger
// this.$toast.loading({ // this.$toast.loading({
// message: "加载中...", // message: "加载中...",
// forbidClick: true, // forbidClick: true,
...@@ -855,6 +865,8 @@ export default { ...@@ -855,6 +865,8 @@ export default {
this.form.projectId = value.id; this.form.projectId = value.id;
this.form.projectName = value.name; this.form.projectName = value.name;
this.form.projectBusiness = value.business; this.form.projectBusiness = value.business;
this.form.businessStatus = value.businessStatus;
this.form.propertyManagement = value.propertyManagement;
this.showSource = false; this.showSource = false;
}, },
// 项目负责人 // 项目负责人
...@@ -937,6 +949,8 @@ export default { ...@@ -937,6 +949,8 @@ export default {
this.form.projectId = e.id; this.form.projectId = e.id;
this.form.projectName = e.name; this.form.projectName = e.name;
this.form.projectBusiness = e.business; this.form.projectBusiness = e.business;
this.form.businessStatus = e.businessStatus;
this.form.propertyManagement = e.propertyManagement;
this.show = false; this.show = false;
}, },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment