xujun

src/views/report/talent/Index.vue

@@ -30,7 +30,7 @@
       <template slot="option" slot-scope="record">
         <a-button type="link" size="small" @click="recordClick(record,'view')">查看</a-button>
         <a-button type="link" size="small" @click="recordClick(record,'edit')">修改</a-button>
-        <a-button type="link" size="small" @click="recordClick(record,'reset')">重置密码</a-button>
+        <a-button type="link" size="small" @click="recordClick(record,'report')">上报</a-button>
       </template>
     </a-table>
     <a-pagination v-if="pagination.total > 0" :total="pagination.total" show-size-changer show-quick-jumper v-model="pagination.pageIndex" :page-size="pagination.pageSize" :page-size-options="pagination.pageSizeOptions" @showSizeChange="showSizeChange" @change="change" :showTotal="() => `共 ${pagination.total} 条`" />

src/views/report/talent/components/scientificGainInfo.vue

@@ -13,7 +13,7 @@ export default {
     return {};
   },
   created() {
-
+    
   },
   methods: {
     

src/views/report/talent/components/talentEdit.vue

@@ -18,7 +18,7 @@
           <a-col :span="5">
             <div class="special-middle">
               <div>
-                <a-form-model-item prop="address">
+                <a-form-model-item prop="certId">
                   <a-input v-model="formData.certId" @change="onCertIdChange" :maxLength="18"  style="width: 200px;" />
                 </a-form-model-item>
               </div>
@@ -419,6 +419,54 @@
         <members-edit :membersList.sync="formData.membersList" />
       </div>
       <div v-if="stepsArray[4].showStatus">
+        <a-row>
+          <a-col :span="24" style="border-top: 0px; text-align: center">
+            <div class="main-title">
+              <span>经费预算及培养计划和目标</span>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row type="flex" class="row_center">
+          <a-col :span="7" class="bg-gray">
+            <div class="special-middle">
+              <div class="required">申请资助金额</div>
+            </div>
+          </a-col>
+          <a-col :span="17" class="bg-gray">
+            <div class="special-middle">
+              <a-form-model-item prop="applyFund">
+                <a-input-number v-model="formData.applyFund" @change="FundChange" :min="0" :step="0.01" style="width:120px" />(万元)
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row type="flex" class="row_center">
+          <a-col :span="7" class="bg-gray">
+            <div class="special-middle">
+              <div class="required">其他经费来源</div>
+            </div>
+          </a-col>
+          <a-col :span="17" class="bg-gray">
+            <div class="special-middle">
+              <a-form-model-item prop="otherFund">
+                <a-input-number v-model="formData.otherFund" @change="FundChange" :min="0" :step="0.01" style="width:120px" />(万元)
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+        <a-row type="flex" class="row_center">
+          <a-col :span="7" class="bg-gray">
+            <div class="special-middle">
+              <div class="required">合计</div>
+            </div>
+          </a-col>
+          <a-col :span="17" class="bg-gray">
+            <div class="special-middle">
+              {{ parseFloat(formData.totalFund).toFixed(2) }}(万元)
+            </div>
+          </a-col>
+        </a-row>
+        <budget-edit :budgetList.sync="formData.budgetList" />
       </div>
       <div v-if="stepsArray[5].showStatus">
       </div>
@@ -435,11 +483,12 @@ import cascaderSelect from '@/views/components/common/cascaderSelect'
 import resumeEdit from '@/views/report/talent/components/resumeEdit'
 import scientificGainEdit from '@/views/report/talent/components/scientificGainEdit'
 import membersEdit from '@/views/report/talent/components/membersEdit'
+import budgetEdit from '@/views/report/talent/components/budgetEdit'
 
 export default {
   name: "talentEdit",
   components: {
-    paraRadio, paraCheck, cascaderSelect, resumeEdit, scientificGainEdit, membersEdit
+    paraRadio, paraCheck, cascaderSelect, resumeEdit, scientificGainEdit, membersEdit, budgetEdit
   },
   props: {
     value: {
@@ -493,6 +542,9 @@ export default {
         researchCondition: null,
         researchProgress: null,
         email: null,
+        applyFund: null,
+        otherFund: null,
+        totalFund: null,
         resumeList: [],
         membersList: [],
         budgetList: [],
@@ -522,6 +574,8 @@ export default {
         mobile: [{ required: true, message: '*', trigger: 'blur' }],
         fax: [{ required: true, message: '*', trigger: 'blur' }],
         email: [{ required: true, message: '*', trigger: 'blur' }],
+        applyFund: [{ required: true, message: '*', trigger: 'change' }],
+        otherFund: [{ required: true, message: '*', trigger: 'change' }],
       },
     };
   },
@@ -559,7 +613,6 @@ export default {
           if (typeof data.graduateTeacher === 'string' && data.graduateTeacher) {
             data.graduateTeacher = data.graduateTeacher.split(',')
           }
-          
           this.formData = data
           this.$emit('onStepChange', { step: 0, state: data.completeStatus })
           this.loadList()
@@ -637,7 +690,6 @@ export default {
       }
     },
     submit (step, next) {
-      console.log(step)
       if (this.checkInfo(step)) {
         this.$refs.form.validate(valid => {
           if (valid) {
@@ -788,9 +840,9 @@ export default {
           break;
       }
     },
-    loadList () {
-
-    },
+    FundChange() {
+      this.formData.totalFund = this.formData.applyFund + this.formData.otherFund
+    }
   }
 };
 </script>

src/views/report/talent/components/talentInfo.vue

 <template>
-  <div></div>
+  <div>
+    
+  </div>
 </template>
 
 <script>