apply-clients 3.4.28 → 3.4.30

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 +18 -0
  3. package/src/filiale/guangxi/pc/Process/Service/ServiceControl.vue +1 -0
  4. package/src/filiale/guangxi/pc/Process/Service/addMaterialScience.vue +39 -25
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.4.28",
3
+ "version": "3.4.30",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/filiale/guangxi/android/Process/Processes/AppAddMaterialScience.vue CHANGED
@@ -10,6 +10,8 @@
10
10
  <th class="textNoLineBreak">材料数量</th>
11
11
  <th class="textNoLineBreak">材料金额</th>
12
12
  <th class="textNoLineBreak">材料备注</th>
13
+ <th class="textNoLineBreak">材料总金额：{{$parent.$parent.summoney}}</th>
14
+ <th class="textNoLineBreak" v-if="$parent.$parent.selectdata.defname=='通气点火'">点火材料金额：{{$parent.$parent.twomoney}}</th>
13
15
  <th class="textNoLineBreak">
14
16
  <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加
15
17
  </button>
@@ -221,6 +223,8 @@
221
223
  f_material_remarks:''
222
224
  }
223
225
  ],
226
+ summoney:0,
227
+ twomoney:0,
224
228
  meterialOptions: [],
225
229
  row: {},
226
230
  bjqChecklag:[],
@@ -232,6 +236,19 @@
232
236
  this.getOnetoManyData()
233
237
  },
234
238
  methods: {
239
+ sumMaterialzong(materials){
240
+ debugger
241
+ this.summoney=0
242
+ for(var i=0;i<materials.length; i++){
243
+ this.summoney =parseFloat(parseFloat(materials[i].f_material_money)+ parseFloat(this.summoney)).toFixed(2)
244
+ }
245
+ this.twomoney= parseFloat(parseFloat(this.summoney)- parseFloat(this.selectdata.f_sumtwo_money)).toFixed(2)
246
+ console.log('打印材料总金额',this.summoney)
247
+ if(this.selectdata.defname=='工程施工'){
248
+ this.selectdata.f_sumtwo_money = this.summoney
249
+ console.log('打印首次材料金额',this.selectdata.f_sumtwo_money)
250
+ }
251
+ },
235
252
  sumMaterialmoney(index){
236
253
  this.materials[index].f_material_money = this.materials[index].f_material_price * this.materials[index].f_material_number
237
254
  console.log('打印',this.materials[index].f_material_money)
@@ -249,6 +266,7 @@
249
266
  {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
250
267
  )
251
268
  this.onetomany.rows = res.data
269
+ this.sumMaterialzong(this.onetomany.rows)
252
270
  },
253
271
  async openMaterialModal() {
254
272
  this.getMateralNames()
package/src/filiale/guangxi/pc/Process/Service/ServiceControl.vue CHANGED
@@ -1654,6 +1654,7 @@
1654
1654
  )
1655
1655
  this.show_data.actid=restpz.data[0].actid
1656
1656
  }
1657
+ this.show_data.f_sumtwo_money=this.selectdata.f_sumtwo_money
1657
1658
  let res = await this.$resetpost(
1658
1659
  `rs/logic/ApplyProductService`,
1659
1660
  {data: this.show_data},
package/src/filiale/guangxi/pc/Process/Service/addMaterialScience.vue CHANGED
@@ -10,6 +10,8 @@
10
10
  <th class="textNoLineBreak">材料数量</th>
11
11
  <th class="textNoLineBreak">材料金额</th>
12
12
  <th class="textNoLineBreak">材料备注</th>
13
+ <th class="textNoLineBreak">材料总金额：{{$parent.$parent.summoney}}</th>
14
+ <th class="textNoLineBreak" v-if="$parent.$parent.selectdata.defname=='通气点火'">点火材料金额：{{$parent.$parent.twomoney}}</th>
13
15
  <th class="textNoLineBreak">
14
16
  <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加</button>
15
17
  <button type="button" class="btn btn-info head-but" v-if="$parent.$parent.mark === 0"
@@ -40,11 +42,11 @@
40
42
  <nobr>{{row.f_material_money}}</nobr>
41
43
  </td>
42
44
  <td style="text-align: center;">
43
- <nobr>{{row.f_material_remarks}}</nobr>
45
+ <nobr>{{row.f_operator}}</nobr>
44
46
  </td>
45
47
  <td style="text-align: center;">
46
- <button type="button" class="button_search button_spacing" @click="$parent.$parent.updateMaterial($index,row)">修改</button>
47
- <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(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
+ <button type="button" class="button_delete button_spacing":disabled="row.f_operator==this.$login.f.name ? false : true" @click="$parent.$parent.deleteMaterial(row)">删除</button>
48
50
  </td>
49
51
  </tr>
50
52
  </template>
@@ -188,8 +190,10 @@
188
190
  rows: []
189
191
  },
190
192
  title:'新增',
193
+ summoney:0,
191
194
  showMaterialModal:false,
192
195
  eticket_show:false,
196
+ twomoney:0,
193
197
  materials:[
194
198
  {
195
199
  material:'',
@@ -208,8 +212,22 @@
208
212
  },
209
213
  ready(){
210
214
  this.getOnetoManyData()
215
+ console.log('打印登陆人',this.$login.f.name)
211
216
  },
212
217
  methods: {
218
+ sumMaterialzong(materials){
219
+ debugger
220
+ this.summoney=0
221
+ for(var i=0;i<materials.length; i++){
222
+ this.summoney =parseFloat(parseFloat(materials[i].f_material_money)+ parseFloat(this.summoney)).toFixed(2)
223
+ }
224
+ this.twomoney= parseFloat(parseFloat(this.summoney)- parseFloat(this.selectdata.f_sumtwo_money)).toFixed(2)
225
+ console.log('打印材料总金额',this.summoney)
226
+ if(this.selectdata.defname=='工程施工'){
227
+ this.selectdata.f_sumtwo_money = this.summoney
228
+ console.log('打印首次材料金额',this.selectdata.f_sumtwo_money)
229
+ }
230
+ },
213
231
  sumMaterialmoney(index){
214
232
  debugger
215
233
  this.materials[index].f_material_money = this.materials[index].f_material_price * this.materials[index].f_material_number
@@ -226,6 +244,7 @@
226
244
  {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
227
245
  )
228
246
  this.onetomany.rows = res.data
247
+ this.sumMaterialzong(this.onetomany.rows)
229
248
  },
230
249
  async openMaterialModal () {
231
250
  this.getMateralNames()
@@ -321,28 +340,23 @@
321
340
  )
322
341
  debugger
323
342
  // if(res.data == 200){
324
- // let money = 0;
325
- // for(var i=0;i<this.materials.length; i++){
326
- // money +=this.materials[i].f_material_money
327
- // }
328
- // this.selectdata.f_contract_money += money
329
- // console.log('打印this.materials.f_contract_money',money)
330
- // let contractbu={
331
- // f_contract_money:money,
332
- // f_contract_type:'材料合同'
333
- // }
334
- // let data ={
335
- // contract:contractbu,
336
- // selectdata: this.selectdata,
337
- // user: this.$login.f,
338
- // }
339
- // let http1 = new HttpResetClass()
340
- // let res = await http1.load(
341
- // 'POST',
342
- // `rs/logic/saveReplenishContract`,
343
- // {data: data},
344
- // {resolveMsg: null, rejectMsg: '补充协议成功！！！'}
345
- // )
343
+ //
344
+ // // let contractbu={
345
+ // // f_contract_money:money,
346
+ // // f_contract_type:'材料合同'
347
+ // // }
348
+ // // let data ={
349
+ // // contract:contractbu,
350
+ // // selectdata: this.selectdata,
351
+ // // user: this.$login.f,
352
+ // // }
353
+ // // let http1 = new HttpResetClass()
354
+ // // let res = await http1.load(
355
+ // // 'POST',
356
+ // // `rs/logic/saveReplenishContract`,
357
+ // // {data: data},
358
+ // // {resolveMsg: null, rejectMsg: '补充协议成功！！！'}
359
+ // // )
346
360
  // }
347
361
  this.closeMaterials()
348
362
  },