xujun

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

@@ -142,7 +142,7 @@
 
     <a-row type="flex" class="row_center">
       <a-col :span="5">
-        <div class="special-middle"><div>单价50万元及以上购置设备合计</div></div>
+        <div class="special-middle"><div>单价5万元及以上购置设备合计</div></div>
       </a-col>
       <a-col :span="2">
         <div class="special-middle"><div>/</div></div>
@@ -177,7 +177,7 @@
     </a-row>
     <a-row type="flex" class="row_center">
       <a-col :span="5">
-        <div class="special-middle"><div>单价50万元以下购置设备合计</div></div>
+        <div class="special-middle"><div>单价5万元以下购置设备合计</div></div>
       </a-col>
       <a-col :span="2">
         <div class="special-middle"><div>/</div></div>
@@ -258,7 +258,7 @@
     <a-row type="flex" class="item_inner">
       <a-col :span="24">
         <span style="color: red;">注:1.本表只填写省级财政科技资金购置的设备;涉及自筹经费购买的设备，请在资金预算编制说明中说明。<br />
-        2.单价50万元以下的设备不填写明细。</span>
+        2.单价5万元以下的设备不填写明细。</span>
       </a-col>
     </a-row>
   </div>
@@ -311,7 +311,7 @@ export default {
       this.fiftyUpNumber = 0
       this.fiftyDownNumber = 0
       this.equipments.forEach(e => {
-        if (e.unitPrice >= 50) {
+        if (e.unitPrice >= 5) {
           this.fiftyUpAmount += e.unitPrice * e.quantity
           this.fiftyUpNumber += e.quantity
         } else {

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

@@ -123,7 +123,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">
@@ -163,7 +163,7 @@
     </a-row>
     <a-row type="flex" class="row_center">
       <a-col :span="5">
-        <div class="special-middle"><div>单价50万元以下购置设备合计</div></div>
+        <div class="special-middle"><div>单价5万元以下购置设备合计</div></div>
       </a-col>
       <a-col :span="2">
         <div class="special-middle"><div>/</div></div>
@@ -243,7 +243,7 @@
       <a-col :span="24">
         <span style="color: red">
           注:1.本表只填写省级财政科技资金购置的设备;涉及自筹经费购买的设备，请在资金预算编制说明中说明。<br />
-          2.单价50万元以下的设备不填写明细。</span>
+          2.单价5万元以下的设备不填写明细。</span>
       </a-col>
     </a-row>
   </div>
@@ -296,7 +296,7 @@ export default {
       this.fiftyUpNumber = 0;
       this.fiftyDownNumber = 0;
       this.equipments.forEach((e) => {
-        if (e.unitPrice >= 50) {
+        if (e.unitPrice >= 5) {
           this.fiftyUpAmount += e.unitPrice * e.quantity;
           this.fiftyUpNumber += e.quantity;
         } else {

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

@@ -583,6 +583,9 @@
         </a-col>
       </a-row>
 
+      <!-- 购置设备预算明细表 -->
+      <equipments-edit :equipments.sync="formData.equipments"></equipments-edit>
+
       <!-- 附件 -->
       <file-edit :fileList.sync="formData.fileList" />
     </a-form-model>
@@ -597,7 +600,8 @@ import projectMemberEdit from '@/views/report/project/components/projectMemberEd
 import cooperativeUnitsEdit from '@/views/report/project/components/cooperativeUnitsEdit'
 import budgetEdit from '@/views/report/project/components/budgetEdit'
 import fundPlanEdit from '@/views/report/project/components/fundPlanEdit'
-import projectKpiEdit from '@/views/report/project/components/projectKpiEdit.vue'
+import projectKpiEdit from '@/views/report/project/components/projectKpiEdit'
+import equipmentsEdit from '@/views/report/project/components/equipmentsEdit'
 import fileEdit from '@/views/report/project/components/fileEdit'
 import { isEmptyParams } from "@/views/utils/common"
 import moment from 'moment'
@@ -608,6 +612,7 @@ const ManagementRule = { policyName: null, releaseDate: null, documentNumber: nu
 const ProjectSub = { projName: null, undertakingUnit: null, address: null, director: null, totalBudget: null, govBudget: null, selfBudget: null, cooperativeUnits: null, fileId: null, downloadId: null, fileName: null, downloadUrl: null }
 const Cooperative = { id: null, unitName: null }
 const File = { fileName: '', downloadUrl: '', fileExplain: '', downloadId: '' }
+const Equipment = { id: "", objectId: "", name: "", functionTarget: "", specificationType: "", quantity: 1, totalBudget: 0.0, useFrom: "", buyUnit: "", storageLocation: "", equipmentType: "", manufacturer: "", sharedScope: "", unitPrice: 0.0, };
 
 const projectKPI = {
   reportYear: "",
@@ -648,7 +653,7 @@ import cascaderSelect from '@/views/components/common/cascaderSelect'
 export default {
   name: 'projectEdit',
   components: {
-    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView, cascaderSelect
+    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView, cascaderSelect, equipmentsEdit
   },
   props: {
     value: {
@@ -709,6 +714,7 @@ export default {
         members: [],
         budget: [],
         fundPlan: [],
+        equipments: [],
         fileList: [],
         auditList: [],
         managerDept: "",