From fadf2795757ac6df1c792546725ea177c93d9d7a Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 18 三月 2020 14:03:10 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/components/popup/portion/substepReadOnly.vue | 148 +++++++++++++++++++++++++++++++++---------------
1 files changed, 101 insertions(+), 47 deletions(-)
diff --git a/src/components/popup/portion/substepReadOnly.vue b/src/components/popup/portion/substepReadOnly.vue
index 1c65e80..6b60675 100644
--- a/src/components/popup/portion/substepReadOnly.vue
+++ b/src/components/popup/portion/substepReadOnly.vue
@@ -1,6 +1,9 @@
<template>
- <div class="class_substep">
- <div style="width: 79%; height: 100%; overflow: auto; padding-top: 0px; box-sizing: border-box;">
+ <div class="class_substep" >
+ <div style="width: 79%;text-align: center; margin: 0 10px;">
+ <h2 style="margin: 10px;">椤圭洰鎬婚噾棰�:<span style="font-weight: bold;">{{money}}</span></h2>
+ </div>
+ <div style="width: 79%; height: 88%; overflow: auto; padding-top: 0px; box-sizing: border-box;">
<transition name="el-zoom-in-top">
<div v-show="showData['title']" class="transition-box" style="text-align: center; margin: 0 10px;">
<h3 style="margin: 10px;">绔嬮鏈嶅姟</h3>
@@ -25,7 +28,7 @@
</el-col>
</el-row>
<el-row v-if="form_['title'].titleType">
- <el-col :span="22" class="z_grid-content2">
+ <el-col :span="22" class="z_grid-content1">
<el-form-item label="鎻忚堪" prop="titleType"
:rules="[{required: true, message: '璇疯緭鍏�', trigger: ['blur', 'change']}]"
>
@@ -43,14 +46,14 @@
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
style="width: 100%;"
size="mini"
- v-model="form_['title'].userId"
+ v-model="form_['title'].userIds"
:options="options_users"
:props="{ expandTrigger: 'hover' }"
placeholder="璇烽�夋嫨璐熻矗浜�"
@@ -101,13 +104,13 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
size="mini"
style="width: 100%;"
- v-model="form_['scheme'].userId"
+ v-model="form_['scheme'].userIds"
:options="options_users"
:props="{ expandTrigger: 'hover' }"
placeholder="璇烽�夋嫨璐熻矗浜�"
@@ -158,7 +161,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -166,7 +169,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['search'].userId"
+ v-model="form_['search'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -215,7 +218,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -223,7 +226,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['select'].userId"
+ v-model="form_['select'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -272,7 +275,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -280,7 +283,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['get'].userId"
+ v-model="form_['get'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -329,7 +332,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -337,7 +340,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['find'].userId"
+ v-model="form_['find'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -386,7 +389,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -394,7 +397,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['properties'].userId"
+ v-model="form_['properties'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -443,7 +446,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -451,7 +454,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['risk'].userId"
+ v-model="form_['risk'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -500,7 +503,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -508,7 +511,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['target'].userId"
+ v-model="form_['target'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -557,7 +560,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -565,7 +568,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['propertiesArrangement'].userId"
+ v-model="form_['propertiesArrangement'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -614,7 +617,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -622,7 +625,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['riskChart'].userId"
+ v-model="form_['riskChart'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -671,7 +674,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -679,7 +682,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['meta'].userId"
+ v-model="form_['meta'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -728,7 +731,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -736,7 +739,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['grade'].userId"
+ v-model="form_['grade'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -785,7 +788,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -793,7 +796,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['tsa'].userId"
+ v-model="form_['tsa'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -842,7 +845,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -850,7 +853,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['compose'].userId"
+ v-model="form_['compose'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -899,7 +902,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -907,7 +910,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['translate'].userId"
+ v-model="form_['translate'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -956,7 +959,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -964,7 +967,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['evaluation'].userId"
+ v-model="form_['evaluation'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -1013,7 +1016,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -1021,7 +1024,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['recommend'].userId"
+ v-model="form_['recommend'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -1070,7 +1073,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -1078,7 +1081,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['format'].userId"
+ v-model="form_['format'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -1127,7 +1130,7 @@
</el-form-item>
</el-col>
<el-col :span="11" class="z_grid-content3">
- <el-form-item label="璐熻矗浜�" prop="userId"
+ <el-form-item label="璐熻矗浜�" prop="userIds"
:rules="{required: true, message: '璇烽�夋嫨璐熻矗浜�', trigger: ['change', 'blur']}"
>
<el-cascader
@@ -1135,7 +1138,7 @@
:options="options_users"
:props="{ expandTrigger: 'hover' }"
size="mini"
- v-model="form_['Contribute'].userId"
+ v-model="form_['Contribute'].userIds"
placeholder="璇烽�夋嫨璐熻矗浜�"
>
</el-cascader>
@@ -1178,19 +1181,30 @@
<script>
export default {
props:{
- showData_: {
+ /* showData_: {
type: Object,
required: true
},
form_objs: {
type: Object,
required: true
+ }, */
+
+ xmId: {
+ type: String,
+ required: true
},
+ /* totalItems: {
+ type: Array,
+ required: true
+ } */
},
data() {
return {
showData: {},
+ money:0,
hideData: {
+
'title': false,
'scheme': false,
'search': false,
@@ -1441,7 +1455,6 @@
let url = "/api/sysRoleMapping/detail";
this.$axios.get(url)
.then(data_ => {
- console.log(data_);
let list = data_.data.data;
let parId = "";
let obj = {};
@@ -1472,14 +1485,54 @@
me.options_users = result;
}).catch(error =>{
- console.log(error);
})
},
getDetailed() {
+ let me = this;
+ let url = "/api/detail/parent/" + this.xmId;
+ this.$axios.get(url).then(data_ => {
+ me.defaultCheckedKeys = [];
+ me.showData = {};
+ let details_ = data_.data.data;
+ me.money = 0;
+ if(details_.length > 0) {//濡傛灉瀛樺湪鏄庣粏
+ for(let i=0; i<details_.length; i++) {
+ let detail_ = details_[i];
+ //璁剧疆鏍戠殑閫変腑
+ me.defaultCheckedKeys.push(detail_.type);
+ //灞曞紑鎵�鏈夋爲鑺傜偣瀵瑰簲鐨刦rom
+ me.showData[detail_.type] = true;
+
+ //缁欐墍鏈夌殑from鐨勬暟鎹祴鍊�
+
+ me.form_[detail_.type] = detail_;
+ me.form_[detail_.type].userIds = [];
+ me.form_[detail_.type].userIds.push(detail_.roleName);
+ me.form_[detail_.type].userIds.push(detail_.userId);
+
+ me.money += parseFloat(detail_.budget);
+ }
+
+
+
+ }
+ }).catch(error =>{
+ })
+
+ },
+
+ /* getDetailed() {
this.showData = this.showData_;
this.form_= this.form_objs;
- },
+ this.money = 0;
+ for (let itm_k in this.showData_) {
+
+ let form_obj = {};
+ form_obj = this.form_objs[itm_k];
+ this.money += parseFloat(form_obj.budget);
+ }
+ }, */
//鍗曚竴浜嬩欢
title_titleType(val) {
@@ -1500,6 +1553,7 @@
<style>
.class_substep {
height: 100%;
+ overflow: hidden;
}
.class_substep .el-divider--horizontal {
--
Gitblit v1.8.0