2222

src/views/components/common/baseSelect.vue

@@ -210,6 +210,11 @@ export default {
     },
     selectChange (value) {
       this.$emit("input", value);
+      var newArr = this.selectArray.filter(x => x.key == value);
+      if (value && !!newArr && newArr.length > 0) {
+        var text = !!value ? newArr[0].title : ''
+        this.$emit('changeTitle', text)
+      }
       this.$emit("change");
     },
     loadValue () {

src/views/components/common/paraMultiSelect.vue

@@ -117,6 +117,11 @@ export default {
     },
     childChange (value) {
       this.$emit("input", value);
+      var newArr = this.childArray.filter(x => x.key == value);
+      if (!!newArr && newArr.length > 0) {
+        var text = !!value ? newArr[0].title : ''
+        this.$emit('changeTitle', text)
+      }
       this.$emit("change");
     }
   },

src/views/components/common/paraSelect.vue

@@ -53,7 +53,7 @@ export default {
   },
   methods: {
     loadSelected () {
-      let pars = { typeId: this.typeId}
+      let pars = { typeId: this.typeId }
       this.$api.parameter.getParameterList(pars).then(({ data = { data } }) => {
         if (data) {
           this.selectArray = data.data
@@ -69,6 +69,11 @@ export default {
     },
     paraChange (value) {
       this.$emit("input", value);
+      var newArr = this.selectArray.filter(x => x.key == value);
+      if (!!newArr && newArr.length > 0) {
+        var text = !!value ? newArr[0].title : ''
+        this.$emit('changeTitle', text)
+      }
       this.$emit("change");
     }
   },

src/views/report/project/Index.vue

@@ -87,6 +87,7 @@
         </div>
         <div style="display: inline-block;;width:50%;text-align: right;">
           <a-button type="primary" @click="projectKPI" icon="download">绩效指标表</a-button>
+          <!-- <a-button type="primary" @click="createMember">新建项目组成员</a-button> -->
           <a-button type="primary" style="margin-right:8px;" v-if="(display && isButten)" @click="createProject">新建项目</a-button>
           <a-button type="primary" @click="exportData" icon="download">Excel</a-button>
         </div>
@@ -321,7 +322,7 @@ export default {
       });
     },
     createProject () {
-      this.visibleEdit = true
+      this.id = null
       this.visibleEdit = true
       //this.$store.commit('app/addCard', { title: '项目创建', key: '1299', code: 'projectCreate', keepAlive: 1, router: '/project/create', closable: true })
     },

src/views/report/project/components/memberEdit.vue

@@ -24,7 +24,7 @@
             </a-col>
             <a-col :span="8">
               <a-form-model-item prop="certificateType">
-                <para-select v-model="formData.certificateType" :typeId="49" :width="120" />
+                <para-select v-model="formData.certificateType" :typeId="49" :width="120" @changeTitle="(e)=>{ formData.certificateTypeName = e}" />
               </a-form-model-item>
             </a-col>
             <a-col :span="4" class="bg-gray">
@@ -69,7 +69,7 @@
             </a-col>
             <a-col :span="8">
               <a-form-model-item prop="nation">
-                <para-select v-model="formData.nation" :typeId="11" :width="120" />
+                <para-select v-model="formData.nation" :typeId="11" :width="120" @changeTitle="(e)=>{ formData.nationName = e}" />
               </a-form-model-item>
             </a-col>
             <a-col :span="4" class="bg-gray">
@@ -101,7 +101,7 @@
             </a-col>
             <a-col :span="8">
               <a-form-model-item prop="degree">
-                <para-select v-model="formData.degree" :typeId="9" :width="120" />
+                <para-select v-model="formData.degree" :typeId="9" :width="120" @changeTitle="(e)=>{ formData.degreeName = e}" />
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -111,9 +111,9 @@
                 <div class="required">从事专业</div>
               </div>
             </a-col>
-            <a-col :span="8">
+            <a-col :span="20">
               <a-form-model-item prop="spec">
-                <para-multi-select v-model="formData.spec" :typeId="42" :width="120" />
+                <para-multi-select v-model="formData.spec" :typeId="42" :width="120" @changeTitle="(e)=>{ formData.specName = e}" />
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -123,9 +123,9 @@
                 <div class="required">职称</div>
               </div>
             </a-col>
-            <a-col :span="8">
+            <a-col :span="20">
               <a-form-model-item prop="title">
-                <para-multi-select v-model="formData.title" :typeId="7" :width="120" />
+                <para-multi-select v-model="formData.title" :typeId="7" :width="120" @changeTitle="(e)=>{ formData.titleName = e}" />
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -220,25 +220,6 @@ export default {
   },
   data () {
     return {
-      formData1: {
-        name: null,
-        sex: null,
-        birthday: null,
-        certificateType: null,
-        certId: null,
-        nation: null,
-        country: null,
-        workUnit: null,
-        title: null,
-        degree: null,
-        email: null,
-        mobile: null,
-        telephone: null,
-        fax: null,
-        projWork: null,
-        forMonths: null,
-        spec: null
-      },
       rules: {
         name: [{ required: true, message: '*', trigger: 'blur' },],
         sex: [{ required: true, message: '*', trigger: 'change' },],
@@ -280,14 +261,18 @@ export default {
   },
   methods: {
     submit () {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.$emit('close', 'value')
-        } else {
-          this.$message.error('项目信息未填写完全！')
-          return false
-        }
-      })
+      this.formData._key = Math.random().toString(16).substring(2, 8)
+      this.$emit('close', this.formData)
+      // this.$refs.form.validate(valid => {
+      //   if (valid) {
+      //     this.members.push(this.formData)
+      //     this.$emit('close', 'value')
+      //     console.log(this.members)
+      //   } else {
+      //     this.$message.error('项目信息未填写完全！')
+      //     return false
+      //   }
+      // })
     },
   },
 }

src/views/report/project/components/projectEdit.vue

@@ -476,7 +476,7 @@
       <cooperative-units :cooperativeUnits.sync="formData.cooperativeUnits" />
 
       <!-- 项目组成员 -->
-      <project-member-edit :members.sync="formData.members" />
+      <project-member-edit :dataList.sync="formData.members" />
 
       <a-row>
         <a-col :span="24" style="border-top: 0px">
@@ -800,6 +800,7 @@ export default {
       }
     },
     save () {
+      console.log(this.formData)
       if (this.checkProjName()) {
         this.$emit('load', true)
         let pars = isEmptyParams(this.formData)