Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

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

@@ -418,11 +418,13 @@
       <!-- 分年度用款计划 -->
       <fund-plan-edit :fundPlan.sync="formData.fundPlan" @save="planSave" />
 
+      <!-- 项目承担单位研究资金支出预算明细表 -->
+      <unit-payment-edit :unitPayment.sync="formData.unitPayment"/>
       <!-- <equipments-edit :equipments.sync="formData.equipments" /> -->
       <!-- 设备费-购置设备预算明细表 -->
       <device-edit :deviceList.sync="formData.deviceList" />
       <!-- 设备费-试制设备预算明细表 -->
-      <manufacture-edit :manufactureList.sync:="formData.manufactureList"></manufacture-edit>
+      <manufacture-edit :manufactureList.sync:="formData.manufactureList"/>
 
       <a-row type="flex">
         <a-col :span="24" style="text-align: center;">
@@ -583,6 +585,7 @@ import budgetEdit from '@/views/report/project/components/budgetEdit'
 import fundPlanEdit from '@/views/report/project/components/fundPlanEdit'
 import projectKpiEdit from '@/views/report/project/components/projectKpiEdit'
 import manufactureEdit from '@/views/report/project/components/manufactureEdit'
+import unitPaymentEdit from '@/views/report/project/components/unitPaymentEdit'
 import projectSubEdit from '@/views/report/project/components/projectSubEdit'
 import fileEdit from '@/views/report/project/components/fileEdit'
 import { isEmptyParams } from "@/views/utils/common"
@@ -637,7 +640,7 @@ import cascaderSelect from '@/views/components/common/cascaderSelect'
 export default {
   name: 'projectEdit',
   components: {
-    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView, cascaderSelect, deviceEdit, projStageGoalsEdit, manufactureEdit, projectSubEdit, participateUnitsEdit
+    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView, cascaderSelect, deviceEdit, projStageGoalsEdit, manufactureEdit, unitPaymentEdit, projectSubEdit, participateUnitsEdit
   },
   props: {
     value: {
@@ -701,6 +704,7 @@ export default {
         fundPlan: [],
         deviceList: [],
         manufactureList: [],
+        unitPayment: [],
         stageGoals: [],
         projectSubList: [],
         fileList: [],
@@ -787,6 +791,9 @@ export default {
       if (!!!this.formData.manufactureList || this.formData.manufactureList.length == 0)
         this.formData.manufactureList = []
 
+      if (!!!this.formData.unitPayment || this.formData.unitPayment.length == 0)
+        this.formData.unitPayment = []
+
       if (!!!this.formData.stageGoals || this.formData.stageGoals.length == 0)
         this.formData.stageGoals = [{ ...StageGoals }, { ...StageGoals }, { ...StageGoals }]
 

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

@@ -501,6 +501,8 @@
       <budget-info :budget.sync="value.budget" />
       <!-- 分年度用款计划 -->
       <fund-plan-info :fundPlan.sync="value.fundPlan" />
+      <!-- 项目承担单位研究资金支出预算明细表 -->
+      <unit-payment-info :unitPayment.sync="value.unitPayment"/>
       <!-- 设备费-购置设备预算明细表 -->
       <device-info :deviceList.sync="value.deviceList" />
       <!-- 设备费-试制设备预算明细表 -->
@@ -558,6 +560,7 @@ import projectMemberInfo from '@/views/report/project/components/projectMemberIn
 import projectKpiInfo from '@/views/report/project/components/projectKpiInfo.vue'
 import budgetInfo from '@/views/report/project/components/budgetInfo'
 import fundPlanInfo from '@/views/report/project/components/fundPlanInfo'
+import unitPaymentInfo from '@/views/report/project/components/unitPaymentInfo'
 import deviceInfo from '@/views/report/project/components/deviceInfo'
 import manufactureInfo from '@/views/report/project/components/manufactureInfo'
 import projStageGoalsInfo from "@/views/report/project/components/projStageGoalsInfo";
@@ -570,7 +573,7 @@ import { toTextarea } from '@/views/utils/common'
 
 export default {
   components: {
-    cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, deviceInfo, manufactureInfo, fileInfo, documentView, AuditList, projStageGoalsInfo, projectSubInfo, participateUnitsInfo
+    cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, unitPaymentInfo, deviceInfo, manufactureInfo, fileInfo, documentView, AuditList, projStageGoalsInfo, projectSubInfo, participateUnitsInfo
   },
   name: "ProjectInfo",
   data () {

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

@@ -13,17 +13,17 @@
           <div>序号</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <a-col :span="4" class="bg-gray">
         <div class="special-middle">
           <div>单位名称</div>
         </div>
       </a-col>
-      <a-col :span="2" class="bg-gray">
+      <!-- <a-col :span="2" class="bg-gray">
         <div class="special-middle">
           <div>单位国别</div>
         </div>
-      </a-col>
-      <a-col :span="2" class="bg-gray">
+      </a-col> -->
+      <a-col :span="3" class="bg-gray">
         <div class="special-middle">
           <div>统一社会信用代码</div>
         </div>
@@ -72,17 +72,17 @@
       <a-col :span="2">
         <div class="special-middle"><a-button icon="close" type="primary" shape="circle" size="small" @click="deleteUnitPayment(item)"></a-button>&nbsp;{{ index + 1 }}</div>
       </a-col>
-      <a-col :span="3">
+      <a-col :span="4">
         <a-form-model-item :prop="'unitPayment.' + index + '.unitName'" :rules="{required: true, message: '*', trigger: 'blur',}">
           <a-input v-model="item.unitName" :maxLength="100" style="width: 90%;" />
         </a-form-model-item>
       </a-col>
-      <a-col :span="2">
+      <!-- <a-col :span="2">
         <a-form-model-item :prop="'unitPayment.' + index + '.countryName'" :rules="{required: true, message: '*', trigger: 'blur',}">
           <a-input v-model="item.countryName" :maxLength="100" style="width: 90%;" />
         </a-form-model-item>
-      </a-col>
-      <a-col :span="2">
+      </a-col> -->
+      <a-col :span="3">
         <a-form-model-item :prop="'unitPayment.' + index + '.socialCode'" :rules="{required: true, message: '*', trigger: 'blur',}">
           <a-input v-model="item.socialCode" :maxLength="50" style="width: 90%;" />
         </a-form-model-item>

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

@@ -14,17 +14,17 @@
           <div>序号</div>
         </div>
       </a-col>
-      <a-col :span="3" class="bg-gray">
+      <a-col :span="4" class="bg-gray">
         <div class="special-middle">
           <div>单位名称</div>
         </div>
       </a-col>
-      <a-col :span="2" class="bg-gray">
+      <!-- <a-col :span="2" class="bg-gray">
         <div class="special-middle">
           <div>单位国别</div>
         </div>
-      </a-col>
-      <a-col :span="2" class="bg-gray">
+      </a-col> -->
+      <a-col :span="3" class="bg-gray">
         <div class="special-middle">
           <div>统一社会信用代码</div>
         </div>
@@ -73,13 +73,13 @@
       <a-col :span="2">
         <div class="special-middle">{{ index + 1 }}</div>
       </a-col>
-      <a-col :span="3">
+      <a-col :span="4">
         <div class="special-middle">{{ item.unitName }}</div>
       </a-col>
-      <a-col :span="2">
+      <!-- <a-col :span="2">
         <div class="special-middle">{{ item.countryName }}</div>
-      </a-col>
-      <a-col :span="2">
+      </a-col> -->
+      <a-col :span="3">
         <div class="special-middle">{{ item.socialCode }}</div>
       </a-col>
       <a-col :span="2">
@@ -167,6 +167,8 @@ export default {
     };
   },
   created() {
+    if (this.unitPayment)
+      this.calTotalAmount()
   },
   methods: {
     outAmountChange(index) {
@@ -195,13 +197,13 @@ export default {
       })
     }
   },
-  watch: {
-    unitPayment: {
-      handler (unitPayment) {
-        if (!!unitPayment)
-          this.calTotalAmount()
-      },
-    },
-  }
+  // watch: {
+  //   unitPayment: {
+  //     handler (unitPayment) {
+  //       if (!!unitPayment)
+  //         this.calTotalAmount()
+  //     },
+  //   },
+  // }
 };
 </script>
\ No newline at end of file