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

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

@@ -142,7 +142,7 @@
     <a-row type="flex" class="row_center">
       <a-col :span="5">
         <div class="special-middle">
-          <div>单价50万元及以上购置设备合计</div>
+          <div>单价5万元及以上购置设备合计</div>
         </div>
       </a-col>
       <a-col :span="2">
@@ -199,7 +199,7 @@
     <a-row type="flex" class="row_center">
       <a-col :span="5">
         <div class="special-middle">
-          <div>单价50万元以下购置设备合计</div>
+          <div>单价5万元以下购置设备合计</div>
         </div>
       </a-col>
       <a-col :span="2">
@@ -362,7 +362,7 @@ export default {
     },
   },
   created () {
-    console.log(this.deviceList)
+    
   },
   methods: {
     calNumberAmount () {
@@ -371,7 +371,7 @@ export default {
       this.fiftyUpNumber = 0
       this.fiftyDownNumber = 0
       this.deviceList.forEach(e => {
-        if (e.unitPrice >= 50) {
+        if (e.unitPrice >= 5) {
           this.fiftyUpAmount += e.unitPrice * e.quantity
           this.fiftyUpNumber += e.quantity
         } else {
@@ -392,8 +392,7 @@ export default {
     },
     addArray () {
       this.deviceList.push({ ...Device })
-      console.log(this.deviceList)
-      //this.calNumberAmount()
+      this.calNumberAmount()
     },
     deleteEquipment (item) {
       let index = this.deviceList.indexOf(item)
@@ -403,5 +402,14 @@ export default {
       this.calNumberAmount()
     },
   },
+  watch: {
+    deviceList: {
+        handler(deviceList) {
+          if (!!deviceList) {
+            this.calNumberAmount()
+          }
+        },
+      },
+    },
 }
 </script>

src/views/report/project/components/equipmentsInfo.vue → src/views/report/project/components/deviceInfo.vue

@@ -74,7 +74,7 @@
         </div>
       </a-col>
     </a-row>
-    <a-row v-for="(item, index) in equipments" :key="'equipments' + index" type="flex" class="row_center">
+    <a-row v-for="(item, index) in deviceList" :key="'deviceList' + index" type="flex" class="row_center">
       <a-col :span="1">
         <div class="special-middle">{{ index + 1 }}</div>
       </a-col>
@@ -268,7 +268,7 @@ const Equipment = {
 };
 
 export default {
-  name: "EquipmentInfo",
+  name: "deviceInfo",
   data() {
     return {
       fiftyUpNumber: 0,
@@ -280,7 +280,7 @@ export default {
     };
   },
   props: {
-    equipments: {
+    deviceList: {
       type: Array,
       default: () => {
         return [];
@@ -288,6 +288,8 @@ export default {
     },
   },
   created() {
+    if (this.deviceList) 
+      this.calNumberAmount()
   },
   methods: {
     calNumberAmount() {
@@ -295,7 +297,7 @@ export default {
       this.fiftyDownAmount = 0.0;
       this.fiftyUpNumber = 0;
       this.fiftyDownNumber = 0;
-      this.equipments.forEach((e) => {
+      this.deviceList.forEach((e) => {
         if (e.unitPrice >= 5) {
           this.fiftyUpAmount += e.unitPrice * e.quantity;
           this.fiftyUpNumber += e.quantity;
@@ -308,22 +310,22 @@ export default {
       this.totalAmount = this.fiftyUpAmount + this.fiftyDownAmount;
     },
     outUnitPriceChange(index) {
-      this.equipments[index].totalBudget =
-        this.equipments[index].unitPrice * this.equipments[index].quantity;
+      this.deviceList[index].totalBudget =
+        this.deviceList[index].unitPrice * this.deviceList[index].quantity;
       this.calNumberAmount();
     },
     outNumberChange(index) {
-      this.equipments[index].totalBudget =
-        this.equipments[index].unitPrice * this.equipments[index].quantity;
+      this.deviceList[index].totalBudget =
+        this.deviceList[index].unitPrice * this.deviceList[index].quantity;
       this.calNumberAmount();
     },
   },
-  watch: {
-    equipments: {
-      handler(equipments) {
-        if (!!equipments) this.calNumberAmount();
-      },
-    },
-  },
+  // watch: {
+  //   deviceList: {
+  //     handler(deviceList) {
+  //       if (!!deviceList) this.calNumberAmount();
+  //     },
+  //   },
+  // },
 };
 </script>
\ No newline at end of file

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

@@ -679,7 +679,6 @@ import cooperativeUnitsInfo from '@/views/report/project/components/cooperativeU
 import participateUnitsInfo from '@/views/report/project/components/participateUnitsInfo'
 import budgetInfo from '@/views/report/project/components/budgetInfo'
 import fundPlanInfo from '@/views/report/project/components/fundPlanInfo'
-import equipmentsInfo from '@/views/report/project/components/equipmentsInfo.vue'
 import unitPaymentInfo from '@/views/report/project/components/unitPaymentInfo.vue'
 import projectKpiInfo from '@/views/report/project/components/projectKpiInfo.vue'
 import projectResearchInfo from '@/views/report/project/components/projectResearchInfo'
@@ -695,7 +694,7 @@ import { toTextarea } from '@/views/utils/common'
 
 export default {
   components: {
-    projectMemberInfo, cooperativeUnitsInfo, participateUnitsInfo, budgetInfo, fundPlanInfo, equipmentsInfo, unitPaymentInfo, projectKpiInfo, projectResearchInfo, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
+    projectMemberInfo, cooperativeUnitsInfo, participateUnitsInfo, budgetInfo, fundPlanInfo, unitPaymentInfo, projectKpiInfo, projectResearchInfo, projectSubInfo, managementRuleInfo, fileInfo, AuditList, documentView
   },
   name: "ProjectInfo",
   data () {

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

@@ -405,6 +405,7 @@
           </div>
         </a-col>
       </a-row>
+
       <!-- 经费预算 -->
       <budget-edit :budget.sync="formData.budget" />
       <a-row type="flex">
@@ -416,6 +417,13 @@
       </a-row>
       <!-- 分年度用款计划 -->
       <fund-plan-edit :fundPlan.sync="formData.fundPlan" @save="planSave" />
+
+      <!-- <equipments-edit :equipments.sync="formData.equipments" /> -->
+      <!-- 设备费-购置设备预算明细表 -->
+      <device-edit :deviceList.sync="formData.deviceList" />
+      <!-- 设备费-试制设备预算明细表 -->
+      <manufacture-edit :manufactureList.sync:="formData.manufactureList"></manufacture-edit>
+
       <a-row type="flex">
         <a-col :span="24" style="text-align: center;">
           <div class="special-middle">
@@ -550,12 +558,6 @@
         </a-col>
       </a-row>
 
-      <!-- <equipments-edit :equipments.sync="formData.equipments" /> -->
-      <!-- 设备费-购置设备预算明细表 -->
-      <device-edit :deviceList.sync="formData.deviceList" />
-      <!-- 设备费-试制设备预算明细表 -->
-      <manufacture-edit :manufactureList.sync:="formData.manufactureList"></manufacture-edit>
-
       <!-- 项目安排及阶段目标 -->
       <proj-stage-goals-edit :stageGoals.sync="formData.stageGoals" />
 

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

@@ -501,6 +501,10 @@
       <budget-info :budget.sync="value.budget" />
       <!-- 分年度用款计划 -->
       <fund-plan-info :fundPlan.sync="value.fundPlan" />
+      <!-- 设备费-购置设备预算明细表 -->
+      <device-info :deviceList.sync="value.deviceList" />
+      <!-- 设备费-试制设备预算明细表 -->
+      <manufacture-info :manufactureList.sync:="value.manufactureList" />
     </div>
     <div v-if="tabsData[5].isShow">
       <a-row>
@@ -518,6 +522,7 @@
         </a-col>
       </a-row>
     </div>
+
     <div v-if="tabsData[6].isShow">
       <!-- 附件 -->
       <file-info :fileList.sync="value.fileList" />
@@ -553,6 +558,8 @@ 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 deviceInfo from '@/views/report/project/components/deviceInfo'
+import manufactureInfo from '@/views/report/project/components/manufactureInfo'
 import projStageGoalsInfo from "@/views/report/project/components/projStageGoalsInfo";
 import projectSubInfo from '@/views/report/project/components/projectSubInfo'
 import fileInfo from "@/views/report/project/components/fileInfo";
@@ -563,7 +570,7 @@ import { toTextarea } from '@/views/utils/common'
 
 export default {
   components: {
-    cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, fileInfo, documentView, AuditList, projStageGoalsInfo, projectSubInfo, participateUnitsInfo
+    cooperativeUnitsInfo, projectMemberInfo, projectKpiInfo, budgetInfo, fundPlanInfo, deviceInfo, manufactureInfo, fileInfo, documentView, AuditList, projStageGoalsInfo, projectSubInfo, participateUnitsInfo
   },
   name: "ProjectInfo",
   data () {