apply-clients 3.5.5-98 → 3.5.6-1

package/src/filiale/yangchunboneng/android/AppContractCharge.vue

@@ -1,210 +1,222 @@
-<template>
-  <div class="col-sm-12" style="margin: 20px 0px;">
-    <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
-      <template partial='head'>
-        <tr>
-          <th>合同金额</th>
-          <th>付款节点</th>
-          <th>付款比例</th>
-          <th>应收金额</th>
-          <th>
-            <button v-if="Vue.user.f_role_name.includes('付款预设-新增')" type="button" class="btn btn-primary" @click="$parent.$parent.showAdd()">新增</button>
-          </th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <tr>
-          <td style="text-align: center;">
-            <nobr><font>{{ row.f_amount }}</font></nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr><font>{{ row.defname }}</font></nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr><font>{{ row.f_payment_ratio }}%</font></nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr><font>{{ $parent.$parent.toFixed(row.f_due_money) }}</font></nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr><font>
-              <button v-if="Vue.user.f_role_name.includes('付款预设-修改')" type="button" class="btn btn-primary" @click="$parent.$parent.updateData(row)">修改</button>
-              <button  v-if="Vue.user.f_role_name.includes('付款预设-删除')" type="button" class="btn btn-primary" @click="$parent.$parent.delData(row)">删除</button>
-            </font></nobr>
-          </td>
-        </tr>
-      </template>
-    </data-grid>
-    <modal
-      :show.sync="addModal"
-      backdrop="false"
-      :title="titleText"
-    >
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
-        <h4 class="modal-title">{{ titleText }}</h4>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <div class="form-group col-sm-12">
-          <label class="col-sm-3 control-label">合同金额(元)：：</label>
-          <div class="col-sm-9">
-            <input type="text"
-                   class="form-control input_view"
-                   style="width: 60%"
-                   readonly
-                   v-model="addData.f_amount"/>
-          </div>
-        </div>
-        <div class="form-group col-sm-12">
-          <label class="col-sm-3 control-label">付款节点：</label>
-          <div class="col-sm-9">
-            <v-select
-              v-model="addData.applyType"
-              placeholder='请选择需要发起的工程类型'
-              :value.sync="addData.applyType"
-              :options='payProjects'
-              :value-single="true"
-              class="select select_list"
-              :search="false"
-              close-on-select></v-select>
-          </div>
-        </div>
-        <div class="form-group col-sm-12">
-          <label class="col-sm-3 control-label">付款比例(%)：</label>
-          <div class="col-sm-9">
-            <input type="text"
-                   class="form-control input_view" style="width: 60%"
-                   v-model="addData.f_payment_ratio" @change="inputChange(1)"/>
-          </div>
-        </div>
-        <div class="form-group col-sm-12">
-          <label class="col-sm-3 control-label">预付款金额(元)：</label>
-          <div class="col-sm-9">
-            <input type="text"
-                   style="width: 60%"
-                   class="form-control input_view"
-                   v-model="addData.f_due_money"
-                   @change="inputChange(2)"/>
-          </div>
-        </div>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary"  @click="saveOrUpdate()">确认</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '付款预设',
-  props: {
-    selectdata: {
-      type: Object
-    },
-    mark: {
-      type: Number,
-      default: 1
-    }
-  },
-  data () {
-    return {
-      model: {rows: [{f_process_id: 100, f_payment_ratio: '', defname: '', f_due_money: ''}]},
-      payProjects: [{label: '合同签订', value: '合同签订'}, {label: '验收通气', value: '验收通气'}, {label: '完工', value: '完工'}],
-      addModal: false,
-      addData: {f_amount: 0, f_process_id: '', f_payment_ratio: '', defname: '', f_due_money: ''},
-      titleText: ''
-    }
-  },
-  methods: {
-    toFixed (num) {
-      return parseFloat(num).toFixed(2)
-    },
-    showAdd () {
-      this.addData = {
-        f_amount: this.selectdata.f_contract_money,
-        f_process_id: this.selectdata.f_process_id,
-        f_payment_ratio: '',
-        defname: '',
-        f_due_money: ''
-      }
-      this.titleText = '新增付款预设'
-      this.addModal = true
-    },
-    inputChange (type) {
-      if (this.addData.f_amount) {
-        if (type === 1) {
-          this.addData.f_due_money = (this.addData.f_amount * (this.addData.f_payment_ratio / 100)).toFixed(2)
-          // this.addData.f_due_money转为数字类型
-          this.addData.f_due_money = parseFloat(this.addData.f_due_money)
-          this.selectdata.f_contract_money = parseFloat(this.selectdata.f_contract_money)
-          if (this.addData.f_due_money > this.selectdata.f_contract_money) {
-            this.addData.f_payment_ratio = 0
-            this.addData.f_due_money = 0
-            this.$showMessage('预付款金额不能大于合同金额')
-          }
-        } else {
-          this.addData.f_payment_ratio = Math.round(this.addData.f_due_money / this.addData.f_amount * 100)
-          this.addData.f_payment_ratio = parseFloat(this.addData.f_payment_ratio)
-          if (this.addData.f_payment_ratio > 100) {
-            this.addData.f_payment_ratio = 0
-            this.addData.f_due_money = 0
-            this.$showMessage('付款比率不能大于100%')
-          }
-        }
-      }
-    },
-    updateData (row) {
-      this.addData = row
-      this.addData.f_amount = this.selectdata.f_contract_money
-      this.titleText = '修改付款预设'
-      this.addModal = true
-    },
-    delData (row) {
-      console.log('delData=========')
-      this.$resetdelete(this.$androidUtil.getProxyUrl() + '/apply/rs/entity/t_contract_charge', {id: row.id}, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then(() => {
-        this.search()
-      })
-      this.addModal = false
-    },
-    saveOrUpdate () {
-      // this.addData
-      console.log('saveOrUpdate=========')
-      this.addData.defname = this.addData.applyType
-      new HttpResetClass().load('POST', this.$androidUtil.getProxyUrl() + '/apply/rs/entity/t_contract_charge', this.addData, {
-        resolveMsg: null,
-        rejectMsg: null
-      }).then(() => {
-        this.search()
-      })
-      // 关闭弹窗
-      this.addModal = false
-    },
-    closeModal () {
-      this.addModal = false
-    },
-    search () {
-      let data = {
-        condition: `f_process_id = '${this.selectdata.f_process_id}'`
-      }
-      new HttpResetClass().load('POST', this.$androidUtil.getProxyUrl() + '/rs/sql/getContractCharge', {data: data}
-        , {resolveMsg: null, rejectMsg: null})
-        .then((res) => {
-          this.model.rows = res.data
-        })
-    }
-  },
-  ready () {
-    this.payProjects = this.$appdata.getParam(this.selectdata.f_apply_type + '付款预设')
-    this.search()
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+      <template partial='head'>
+        <tr>
+          <th>合同金额</th>
+          <th>付款节点</th>
+          <th>付款比例</th>
+          <th>应收金额</th>
+          <th>
+            <button v-if="$parent.$parent.showaddc" type="button" class="btn btn-primary" @click="$parent.$parent.showAdd()">新增</button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_amount }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.defname }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ row.f_payment_ratio }}%</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>{{ $parent.$parent.toFixed(row.f_due_money) }}</font></nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr><font>
+              <button v-if="$parent.$parent.showedit" type="button" class="btn btn-primary" @click="$parent.$parent.updateData(row)">修改</button>
+              <button  v-if="$parent.$parent.showdel" type="button" class="btn btn-primary" @click="$parent.$parent.delData(row)">删除</button>
+            </font></nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal
+      :show.sync="addModal"
+      backdrop="false"
+      :title="titleText"
+    >
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+        <h4 class="modal-title">{{ titleText }}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="form-group col-sm-12">
+          <label class="col-sm-3 control-label">合同金额(元)：：</label>
+          <div class="col-sm-9">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 60%"
+                   readonly
+                   v-model="addData.f_amount"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-3 control-label">付款节点：</label>
+          <div class="col-sm-9">
+            <v-select
+              v-model="addData.applyType"
+              placeholder='请选择需要发起的工程类型'
+              :value.sync="addData.applyType"
+              :options='payProjects'
+              :value-single="true"
+              class="select select_list"
+              :search="false"
+              close-on-select></v-select>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-3 control-label">付款比例(%)：</label>
+          <div class="col-sm-9">
+            <input type="text"
+                   class="form-control input_view" style="width: 60%"
+                   v-model="addData.f_payment_ratio" @change="inputChange(1)"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-3 control-label">预付款金额(元)：</label>
+          <div class="col-sm-9">
+            <input type="text"
+                   style="width: 60%"
+                   class="form-control input_view"
+                   v-model="addData.f_due_money"
+                   @change="inputChange(2)"/>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary"  @click="saveOrUpdate()">确认</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '付款预设',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 1
+    }
+  },
+  data () {
+    return {
+      model: {rows: [{f_process_id: 100, f_payment_ratio: '', defname: '', f_due_money: ''}]},
+      payProjects: [{label: '合同签订', value: '合同签订'}, {label: '验收通气', value: '验收通气'}, {label: '完工', value: '完工'}],
+      addModal: false,
+      addData: {f_amount: 0, f_process_id: '', f_payment_ratio: '', defname: '', f_due_money: ''},
+      titleText: ''
+    }
+  },
+  methods: {
+    toFixed (num) {
+      return parseFloat(num).toFixed(2)
+    },
+    showAdd () {
+      this.addData = {
+        f_amount: this.selectdata.f_contract_money,
+        f_process_id: this.selectdata.f_process_id,
+        f_payment_ratio: '',
+        defname: '',
+        f_due_money: ''
+      }
+      this.titleText = '新增付款预设'
+      this.addModal = true
+    },
+    inputChange (type) {
+      if (this.addData.f_amount) {
+        if (type === 1) {
+          this.addData.f_due_money = (this.addData.f_amount * (this.addData.f_payment_ratio / 100)).toFixed(2)
+          // this.addData.f_due_money转为数字类型
+          this.addData.f_due_money = parseFloat(this.addData.f_due_money)
+          this.selectdata.f_contract_money = parseFloat(this.selectdata.f_contract_money)
+          if (this.addData.f_due_money > this.selectdata.f_contract_money) {
+            this.addData.f_payment_ratio = 0
+            this.addData.f_due_money = 0
+            this.$showMessage('预付款金额不能大于合同金额')
+          }
+        } else {
+          this.addData.f_payment_ratio = Math.round(this.addData.f_due_money / this.addData.f_amount * 100)
+          this.addData.f_payment_ratio = parseFloat(this.addData.f_payment_ratio)
+          if (this.addData.f_payment_ratio > 100) {
+            this.addData.f_payment_ratio = 0
+            this.addData.f_due_money = 0
+            this.$showMessage('付款比率不能大于100%')
+          }
+        }
+      }
+    },
+    updateData (row) {
+      this.addData = row
+      this.addData.f_amount = this.selectdata.f_contract_money
+      this.titleText = '修改付款预设'
+      this.addModal = true
+    },
+    delData (row) {
+      console.log('delData=========')
+      this.$resetdelete(this.$androidUtil.getProxyUrl() + '/apply/rs/entity/t_contract_charge', {id: row.id}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then(() => {
+        this.search()
+      })
+      this.addModal = false
+    },
+    saveOrUpdate () {
+      // this.addData
+      console.log('saveOrUpdate=========')
+      this.addData.defname = this.addData.applyType
+      new HttpResetClass().load('POST', this.$androidUtil.getProxyUrl() + '/apply/rs/entity/t_contract_charge', this.addData, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then(() => {
+        this.search()
+      })
+      // 关闭弹窗
+      this.addModal = false
+    },
+    closeModal () {
+      this.addModal = false
+    },
+    search () {
+      let data = {
+        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+      }
+      new HttpResetClass().load('POST', this.$androidUtil.getProxyUrl() + '/rs/sql/getContractCharge', {data: data}
+        , {resolveMsg: null, rejectMsg: null})
+        .then((res) => {
+          this.model.rows = res.data
+        })
+    }
+  },
+  ready () {
+    this.payProjects = this.$appdata.getParam(this.selectdata.f_apply_type + '付款预设')
+    this.search()
+  },
+  computed: {
+    showaddc () {
+      return Vue.user.f_role_name.includes('付款预设-新增')
+    },
+    showedit () {
+      return Vue.user.f_role_name.includes('付款预设-修改')
+    },
+    showdel () {
+      return Vue.user.f_role_name.includes('付款预设-删除')
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/yangchunboneng/android/AppInstallationMaterial.vue

@@ -651,23 +651,53 @@ export default {
       console.log('this.material', this.material)
       let otherdetail = []
       if (this.payNumber == 0) {
-        otherdetail.push({
-          f_brand_spec: ['报建通气物料 '],
-          f_typename: ['材料费'],
-          f_typenumber: [],
-          f_unitprice: 0,
-          f_number: this.material.length
-        })
+        if(this.material.length>0){
+          var  str="报建通气物料"
+          this.material.forEach((row) => {
+            str="报建通气物料"
+              if(row.f_material_name=="自闭阀"){
+                str=this.$appdata.getSingleValue(`报建自闭阀收费类型`)
+              }
+              if(row.f_material_name=="燃具管(连接管)"){
+                str=this.$appdata.getSingleValue(`报建燃具管收费类型`)
+              }
+              if(row.f_material_name=="家用报警器"){
+                str=this.$appdata.getSingleValue(`报建家用报警器收费类型`)
+              }
+              otherdetail.push({
+                f_brand_spec: [`${str}`],
+                f_typename: [`${row.f_material_name}`],
+                f_typenumber: [`${row.f_typenumber}`],
+                f_unitprice: row.f_material_price,
+                f_number: row.f_material_number,
+                f_overlength_unitprice:row.f_overlength_unitprice,
+                f_overlength_number:row.f_overlength_number,
+                f_discounts_money_detail:row.f_discounts_money_detail,
+                f_actual_materials_detail:row.f_actual_materials_detail
+              })
+          })
+        }else {
+          otherdetail.push({
+            f_brand_spec: ['报建通气物料 '],
+            f_typename: ['材料费'],
+            f_typenumber: [],
+            f_unitprice: 0,
+            f_number: this.material.length
+          })
+        }
       } else {
         var  str="报建通气物料"
         this.material.forEach((row) => {
-          if (row.f_material_price != 0) {
+          str="报建通气物料"
             if(row.f_material_name=="自闭阀"){
               str=this.$appdata.getSingleValue(`报建自闭阀收费类型`)
             }
             if(row.f_material_name=="燃具管(连接管)"){
               str=this.$appdata.getSingleValue(`报建燃具管收费类型`)
             }
+            if(row.f_material_name=="家用报警器"){
+              str=this.$appdata.getSingleValue(`报建家用报警器收费类型`)
+            }
             otherdetail.push({
               f_brand_spec: [`${str}`],
               f_typename: [`${row.f_material_name}`],
@@ -679,10 +709,8 @@ export default {
               f_discounts_money_detail:row.f_discounts_money_detail,
               f_actual_materials_detail:row.f_actual_materials_detail
             })
-          }
         })
       }
-
       let param = {
         model: this.material,
         operator_type: type,