apply-clients 3.4.31 → 3.4.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/filiale/guangxi/android/Process/Processes/AppAddMaterialScience.vue +3 -3
  3. package/src/filiale/guangxi/pc/Process/Service/ServiceControl.vue +3 -0
  4. package/src/filiale/guangxi/pc/Process/Service/addMaterialScience.vue +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.4.31",
3
+ "version": "3.4.33",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/filiale/guangxi/android/Process/Processes/AppAddMaterialScience.vue CHANGED
@@ -42,9 +42,9 @@
42
42
  <nobr>{{row.f_material_remarks}}</nobr>
43
43
  </td>
44
44
  <td style="text-align: center;">
45
- <button type="button" class="button_search button_spacing"
46
- @click="$parent.$parent.updateMaterial($index,row)">修改
47
- </button>
45
+ <!-- <button type="button" class="button_search button_spacing"-->
46
+ <!-- @click="$parent.$parent.updateMaterial($index,row)">修改-->
47
+ <!-- </button>-->
48
48
  <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(row)">删除
49
49
  </button>
50
50
  </td>
package/src/filiale/guangxi/pc/Process/Service/ServiceControl.vue CHANGED
@@ -1654,6 +1654,9 @@
1654
1654
  )
1655
1655
  this.show_data.actid=restpz.data[0].actid
1656
1656
  }
1657
+ if(this.selectdata.f_sumtwo_money==''||this.selectdata.f_sumtwo_money==null){
1658
+ this.selectdata.f_sumtwo_money=0
1659
+ }
1657
1660
  this.show_data.f_sumtwo_money=this.selectdata.f_sumtwo_money
1658
1661
  let res = await this.$resetpost(
1659
1662
  `rs/logic/ApplyProductService`,
package/src/filiale/guangxi/pc/Process/Service/addMaterialScience.vue CHANGED
@@ -45,7 +45,7 @@
45
45
  <nobr>{{row.f_operator}}</nobr>
46
46
  </td>
47
47
  <td style="text-align: center;">
48
- <button type="button" class="button_search button_spacing" :disabled="row.f_operator==this.$login.f.name ? false : true" @click="$parent.$parent.updateMaterial($index,row)">修改</button>
48
+ <!-- <button type="button" class="button_search button_spacing" :disabled="row.f_operator==this.$login.f.name ? false : true" @click="$parent.$parent.updateMaterial($index,row)">修改</button>-->
49
49
  <button type="button" class="button_delete button_spacing":disabled="row.f_operator==this.$login.f.name ? false : true" @click="$parent.$parent.deleteMaterial(row)">删除</button>
50
50
  </td>
51
51
  </tr>
@@ -221,7 +221,7 @@
221
221
  for(var i=0;i<materials.length; i++){
222
222
  this.summoney =parseFloat(parseFloat(materials[i].f_material_money)+ parseFloat(this.summoney)).toFixed(2)
223
223
  }
224
- 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)
224
+ this.twomoney= parseFloat(parseFloat(this.summoney)- parseFloat(this.selectdata.f_sumtwo_money)).toFixed(2)
225
225
  console.log('打印材料总金额',this.summoney)
226
226
  if(this.selectdata.defname=='工程施工'){
227
227
  this.selectdata.f_sumtwo_money = this.summoney