Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs

kimi

2020-03-18 fadf2795757ac6df1c792546725ea177c93d9d7a

 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']}]"
                           >
@@ -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);
                     //展开所有树节点对应的from
                     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 {