xujun

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

@@ -74,7 +74,8 @@
         </div>
       </a-col>
     </a-row>
-    <a-row v-for="(item, index) in equipments" :key="'equipments' + index" type="flex" class="row_center">
+    <div>
+    <a-row v-for="(item, index) in equipments" :key="'equipments'+index" type="flex" class="row_center">
       <a-col :span="1">
         <div class="special-middle"><a-button icon="close" type="primary" shape="circle" size="small" @click="deleteEquipment(item)"></a-button>&nbsp;{{ index + 1 }}</div>
       </a-col>
@@ -139,10 +140,10 @@
         </a-form-model-item>
       </a-col>
     </a-row>
-
+  </div>
     <a-row type="flex" class="row_center">
       <a-col :span="5">
-        <div class="special-middle"><div>单价5万元及以上购置设备合计</div></div>
+        <div class="special-middle"><div>单价50万元及以上购置设备合计</div></div>
       </a-col>
       <a-col :span="2">
         <div class="special-middle"><div>/</div></div>
@@ -177,7 +178,7 @@
     </a-row>
     <a-row type="flex" class="row_center">
       <a-col :span="5">
-        <div class="special-middle"><div>单价5万元以下购置设备合计</div></div>
+        <div class="special-middle"><div>单价50万元以下购置设备合计</div></div>
       </a-col>
       <a-col :span="2">
         <div class="special-middle"><div>/</div></div>
@@ -258,7 +259,7 @@
     <a-row type="flex" class="item_inner">
       <a-col :span="24">
         <span style="color: red;">注:1.本表只填写省级财政科技资金购置的设备;涉及自筹经费购买的设备，请在资金预算编制说明中说明。<br />
-        2.单价5万元以下的设备不填写明细。</span>
+        2.单价50万元以下的设备不填写明细。</span>
       </a-col>
     </a-row>
   </div>
@@ -303,6 +304,7 @@ export default {
     },
   },
   created () {
+    console.log(this.equipments)
   },
   methods: {
     calNumberAmount() {
@@ -311,7 +313,7 @@ export default {
       this.fiftyUpNumber = 0
       this.fiftyDownNumber = 0
       this.equipments.forEach(e => {
-        if (e.unitPrice >= 5) {
+        if (e.unitPrice >= 50) {
           this.fiftyUpAmount += e.unitPrice * e.quantity
           this.fiftyUpNumber += e.quantity
         } else {
@@ -331,8 +333,9 @@ export default {
       this.calNumberAmount()
     },
     addArrey() {
-      this.equipments.push(Object.assign({ ...Equipment }))
-      this.calNumberAmount()
+      this.equipments.push({ ...Equipment })
+      console.log(this.equipments)
+      //this.calNumberAmount()
     },
     deleteEquipment(item) {
       let index = this.equipments.indexOf(item)

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

@@ -790,6 +790,9 @@ export default {
       if (!!!this.formData.members || this.formData.members.length == 0)
         this.formData.members = []
 
+      if (!!!this.formData.equipments || this.formData.equipments.length == 0)
+        this.formData.equipments = []
+
       if (!!!this.formData.fileList || !this.formData.fileList.length || this.formData.fileList.length == 0) {
         this.formData.fileList = []
       }