apply-clients 3.4.29 → 3.4.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.4.29",
+  "version": "3.4.31",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/filiale/guangxi/android/Process/Processes/AppAddMaterialScience.vue

@@ -10,6 +10,8 @@
           <th class="textNoLineBreak">材料数量</th>
           <th class="textNoLineBreak">材料金额</th>
           <th class="textNoLineBreak">材料备注</th>
+          <th class="textNoLineBreak">材料总金额：{{$parent.$parent.summoney}}</th>
+          <th class="textNoLineBreak" v-if="$parent.$parent.selectdata.defname=='通气点火'">点火材料金额：{{$parent.$parent.twomoney}}</th>
           <th class="textNoLineBreak">
             <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加
             </button>
@@ -221,6 +223,8 @@
             f_material_remarks:''
           }
         ],
+        summoney:0,
+        twomoney:0,
         meterialOptions: [],
         row: {},
         bjqChecklag:[],
@@ -232,6 +236,19 @@
       this.getOnetoManyData()
     },
     methods: {
+      sumMaterialzong(materials){
+        debugger
+        this.summoney=0
+        for(var i=0;i<materials.length; i++){
+          this.summoney =parseFloat(parseFloat(materials[i].f_material_money)+ parseFloat(this.summoney)).toFixed(2)
+        }
+        this.twomoney= parseFloat(parseFloat(this.summoney)- parseFloat(this.selectdata.f_sumtwo_money)).toFixed(2)
+        console.log('打印材料总金额',this.summoney)
+        if(this.selectdata.defname=='工程施工'){
+          this.selectdata.f_sumtwo_money = this.summoney
+          console.log('打印首次材料金额',this.selectdata.f_sumtwo_money)
+        }
+      },
       sumMaterialmoney(index){
         this.materials[index].f_material_money = this.materials[index].f_material_price * this.materials[index].f_material_number
         console.log('打印',this.materials[index].f_material_money)
@@ -249,6 +266,7 @@
           {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
         )
         this.onetomany.rows = res.data
+        this.sumMaterialzong(this.onetomany.rows)
       },
       async openMaterialModal() {
         this.getMateralNames()

package/src/filiale/guangxi/pc/Process/Service/addMaterialScience.vue

@@ -221,7 +221,7 @@
         for(var i=0;i<materials.length; i++){
          this.summoney =parseFloat(parseFloat(materials[i].f_material_money)+ parseFloat(this.summoney)).toFixed(2)
         }
-        this.twomoney= parseFloat(parseFloat(this.summoney)- parseFloat(this.selectdata.f_sumtwo_money)).toFixed(2)
+        this.twomoney= parseFloat(parseFloat(this.summoney)- parseFloat(this.selectdata.f_sumtwo_money== 0 || this.selectdata.f_sumtwo_money == null || this.selectdata.f_sumtwo_money =='' ? 0: this.selectdata.f_sumtwo_money)).toFixed(2)
         console.log('打印材料总金额',this.summoney)
         if(this.selectdata.defname=='工程施工'){
           this.selectdata.f_sumtwo_money = this.summoney