apply-clients 3.3.2-80-test → 3.3.2-81-test

package/package.json

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

package/src/components/android/Process/AppServiceControl.vue

@@ -1794,6 +1794,9 @@ export default {
         }
       }))
     },
+    'addMaterial' (price) {
+      this.setLabelValue('约定合同金额',price)
+    },
     // 选择用户档案信息
     'selectUserinfo' (row) {
       this.setLabelValue('用户编号', row.f_userinfo_code)

package/src/components/android/Process/Processes/AppAddMaterialCharge.vue

@@ -0,0 +1,642 @@
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">材料名称</th>
+          <th class="textNoLineBreak">材料型号</th>
+          <th class="textNoLineBreak">材料单位</th>
+          <th class="textNoLineBreak">材料数量</th>
+          <th class="textNoLineBreak">材料单价</th>
+          <th class="textNoLineBreak">总金额</th>
+          <th class="textNoLineBreak">
+            <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_name}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_style}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_unit}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_number}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_price}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_price*row.f_material_number}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <button type="button" class="button_search button_spacing"
+                    @click="$parent.$parent.updateMaterial($index,row)">修改
+            </button>
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(row)">删除
+            </button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal v-if="showMaterialModal" :show.sync="showMaterialModal" v-ref:modal :large="true"
+           :backdrop="false" :title="title">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeMaterials"><span>&times;</span></button>
+        <h4 class="modal-title">{{title}}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
+          <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-sm-6 text-left">材料{{$index+1}}信息</div>
+            <div class="col-sm-6 text-right">
+              <button
+                class="button_delete button_spacing"
+                @click.prevent="deleteDevicesinfo(i)"
+                v-if="title === '新增'"
+              >删除
+              </button>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">选择材料：</label>
+            <div class="col-sm-8">
+              <app-input-select
+                class="select select_list"
+                :value.sync="item.material"
+                v-model="item.material"
+                :options="meterialOptions"
+                :disable="mark === 1"
+                @change="modifyOtherValue(i)"
+                :valueSingle="true"></app-input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_name ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料名称：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料名称"
+                     v-model="item.f_material_name"
+                     :value="item.f_material_name"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_style ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料型号：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料型号"
+                     v-model="item.f_material_style"
+                     :value="item.f_material_style"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_unit ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料单位：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料单位"
+                     v-model="item.f_material_unit"
+                     :value="item.f_material_unit"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_number ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料数量：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="number"
+                     placeholder="材料数量"
+                     v-model="item.f_material_number"
+                     :value="item.f_material_number"
+                     @change="ChangeMoney()"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">材料单价：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style=""
+                     placeholder="材料单价"
+                     v-model="item.price"
+                     :value.sync="item.price"
+                     @change="ChangeMoney()"
+              />
+            </div>
+          </div>
+          <div v-if=" (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建')">
+            <app-qrcode-reader :istype = fmaterialname  :index = i v-show="isShow[i]"></app-qrcode-reader>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <template v-if="mark !== 1">
+          <span class="modal-title me-3">累计金额:{{totalmoney}}</span>
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="pushMaterial()">添加材料</button>
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterialBefore()"
+                  :disabled="!$v.valid">确认添加
+          </button>
+          <button type="button" class="btn btn-primary" v-if="title==='修改'" @click="updateConfirm()"
+                  :disabled="!$v.valid">确认修改
+          </button>
+        </template>
+      </footer>
+    </modal>
+    <modal v-if="showCharge" :show.sync="showCharge" v-ref:modal :large="true" :backdrop="false" title="收费明细">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+        <h4 class="modal-title">材料收费</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="form-group row vertical-center">
+          <label class="col-xs-4 control-label">付款方式：</label>
+          <div class="col-xs-8">
+            <input-select class="select select_list"
+                          v-model="f_payment_method"
+                          :value.sync="f_payment_method"
+                          :options='paymentMethod'
+                          @change="paymentMethodChange"
+                          :value-single="true"
+                          close-on-select ></input-select>
+          </div>
+        </div>
+        <div class="text-center" v-if="f_payment_method=='二维码'">
+          <p><b>收费金额：{{ totalmoney }}￥</b></p>
+          <div id="qrcode" class="qrcode" v-ref:qrcode></div>
+          <p>
+            等待支付，剩余&ensp;<span style="color: #ff791a">{{timeLeft}}</span>&ensp;秒
+          </p>
+          <button type="button" @click="closeQRCode">取消支付</button>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button  v-if="f_payment_method!='二维码'"  id="savebut" type="button" class="btn btn-primary" @click.prevent="addMaterial()">确认</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+import QRCode from 'qrcodejs2'
+export default {
+  name: 'addMaterialScience',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      onetomany: {
+        rows: []
+      },
+      timeLeft: 120,
+      paymentInterval: null,
+      orderInterval: null,
+      order: null,
+      title: '新增',
+      showCharge: false,
+      showMaterialModal: false,
+      totalmoney:0,
+      f_payment_method:'',
+      materials: [
+        {
+          material: '',
+          f_material_name: '',
+          f_material_style: '',
+          f_material_unit: '',
+          f_material_number: '',
+          f_bjq_sid: '',
+          f_material_code: '',
+          price:0,
+          f_userinfo_code:''
+        }
+      ],
+      meterialOptions: [],
+      row: {},
+      bjqChecklag:[],
+      fmaterialname:{},
+      filiale:"",
+      paymentMethod:[
+        {
+          value: '现金',
+          label: '现金'
+        },
+        {
+          value: '二维码',
+          label: '二维码'
+        }
+      ],
+      isShow:[false],
+      charge: {
+        payment_terms:[]
+      },
+    }
+  },
+  ready() {
+    this.getOnetoManyData()
+    if (Vue.user.orgid == '10101') {
+      console.log('zhoukou')
+      this.filiale = 'zhoukou'
+    }else if (Vue.user.orgid == '35520') {
+      console.log('xiangcheng')
+      this.filiale = 'xiangcheng'
+    }else if (Vue.user.orgid == '35532') {
+      console.log('luyi')
+      this.filiale = 'luyi'
+    }else if (Vue.user.orgid == '35538') {
+      console.log('dancheng')
+      this.filiale = 'dancheng'
+    }else if (Vue.user.orgid == '35526') {
+      console.log('xihua')
+      this.filiale = 'xihua'
+    }else {
+      this.$showMessage('分公司异常，请联系管理员！')
+    }
+  },
+  methods: {
+    closeQRCode(){
+      this.clearQrCode()
+      this.f_payment_method=''
+      this.showCharge =false
+      clearInterval(this.paymentInterval)
+      clearInterval(this.orderInterval)
+
+    },
+    closeModal(){
+      this.showCharge= false
+      this.f_payment_method=''
+      clearInterval(this.paymentInterval)
+      clearInterval(this.orderInterval)
+    },
+    ChangeMoney() {
+      this.totalmoney = 0
+      for (let i = 0; i < this.materials.length; i++) {
+        const number = Number(this.materials[i].f_material_number) || 0
+        const price = Number(this.materials[i].price) || 0
+        this.totalmoney += this.accMul(number, price) // 复用高精度乘法
+        this.materials[i].f_userinfo_code = this.selectdata.f_userinfo_code || ''
+      }
+      // 保留2位小数，避免金额显示异常
+      this.totalmoney = Number(this.totalmoney.toFixed(2))
+    },
+    async getOnetoManyData () {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: `t_material_apply`,
+        condition: `f_process_id='${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable?aaa=123`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
+      )
+      this.onetomany.rows = res.data
+    },
+    async openMaterialModal() {
+      this.getMateralNames()
+      this.title = '新增'
+      this.materials = [
+        {
+          material: '',
+          f_material_name: '',
+          f_material_style: '',
+          f_material_unit: '',
+          f_material_number: '',
+          f_bjq_sid: '',
+          f_material_code: '',
+          price:0,
+          f_userinfo_code: ''
+        }
+      ],
+        this.showMaterialModal = true
+      this.isShow = [false]
+    },
+    deleteDevicesinfo(index) {
+      this.materials.splice(index, 1)
+      this.isShow.splice(index, 1)
+    },
+    pushMaterial() {
+      this.materials.push({
+        material: '',
+        f_material_name: '',
+        f_material_style: '',
+        f_material_unit: '',
+        f_material_number: '',
+        f_bjq_sid: '',
+        f_material_code: '',
+        price:0,
+        f_userinfo_code: ''
+      })
+      this.isShow.push(false)
+    },
+    // 获取模态框材料
+    async getMateralNames() {
+      let data = {
+        condition: `1=1`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/getStockMaterial`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
+      )
+
+      this.meterialOptions = res.data.map(item => {
+        return {
+          'label': `${item.f_material_name}--${item.f_material_style}`,
+          'value': item
+        }
+      })
+    },
+    modifyOtherValue(index) {
+      console.log("进来了", index)
+      console.log("dddd", this.materials[index].material)
+      let material = this.materials[index].material
+      this.materials[index].f_material_name = material.f_material_name
+      this.materials[index].f_material_style = material.f_material_style
+      this.materials[index].f_material_unit = material.f_material_unit
+      this.materials[index].f_material_number = material.f_material_number
+      this.materials[index].f_material_code = material.f_material_code
+      this.materials[index].f_userinfo_code = material.f_userinfo_code
+      this.materials[index].price = material.price
+      if (material.f_material_name === "报警器-汉威") {
+        this.isShow[index] = true
+      } else {
+        this.isShow[index] = false
+      }
+    },
+    accMul(arg1,arg2) {
+      let m = 0, s1 = arg1.toString(), s2 = arg2.toString();
+      try {
+        m += s1.split(".")[1].length
+      } catch (e) {
+      }
+      try {
+        m += s2.split(".")[1].length
+      } catch (e) {
+      }
+      return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
+    },
+    // 新增材料
+    async paymentMethodChange() {
+      if (this.f_payment_method == '二维码') {
+        let http = new HttpResetClass()
+        let data = {
+          money: this.accMul(this.totalmoney, 100),
+          attach: {
+            "f_type": '报建材料收费',
+            "f_user": Vue.user.id
+          },
+          str: "",
+          config: this.filiale,
+          f_revenue: "productV3"
+        }
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/ICBCGetCode`, data, {
+          resolveMsg: null,
+          rejectMsg: '订单生成失败！！！'
+        })
+        console.log('=================================')
+        console.log(JSON.stringify(res.data))
+        this.order = res.data
+        this.qrcode()
+        this.paymentInterval = setInterval(() => {
+          this.timeLeft = this.timeLeft - 1
+          if (this.timeLeft <= 0) {
+            this.$showMessage('支付超时，请重新发起支付')
+            this.closeQRCode() // 调用已有的取消支付方法
+          }
+        }, 1000)
+        this.orderInterval = setInterval(() => {
+          this.getOrderInformation()
+        },3000)
+      }
+    },
+    async addMaterialBefore() {
+      this.timeLeft= 120
+      this.showCharge= true
+    },
+    // 获取订单信息
+    async getOrderInformation () {
+      let http = new HttpResetClass()
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+        data: {
+          items: "id",
+          tablename: "t_weixinreturnxml",
+          condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_bill_state = 1 `,
+          orderitem: "id"
+        }
+      }, {
+        resolveMsg: null,
+        rejectMsg: '订单查询失败！！！'
+      })
+      if (res.data.length > 0) {
+        this.$showMessage('支付成功！！！')
+        clearTimeout(this.paymentInterval)
+        clearTimeout(this.orderInterval)
+        this.timeLeft = 10
+        // 清除二维码
+        this.clearQrCode()
+        this.addMaterial()
+        this.saveCharge()
+      }
+    },
+    qrcode () {
+      let qrcode = new QRCode('qrcode',{
+        text: this.order.url, // 设置二维码内容或跳转地址
+        width: 200, // 设置宽度，单位像素
+        height: 200, // 设置高度，单位像素
+        correctLevel: QRCode.CorrectLevel.L //容错率，L/M/Hs
+      })
+    },
+    clearQrCode () {
+      document.getElementById('qrcode').innerHTML = ''
+    },
+    async addMaterial() {
+      this.title = '新增'
+      let data = {
+        f_process_id: this.selectdata.f_process_id,
+        f_operator_id: Vue.user.id,
+        f_operator: Vue.user.name,
+        f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+        f_orgid: Vue.user.orgid,
+        f_orgname: Vue.user.orgs,
+        materials: this.materials
+      }
+
+      //报警器流程 设备编号检验
+      await this.bjqCheck()
+      if (this.bjqChecklag.length > 0) {
+        return
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
+        data
+      )
+      this.closeMaterials()
+    },
+     saveCharge(){
+       for (let i = 0; i < this.materials.length; i++) {
+         this.charge.payment_terms.push(
+           {
+             f_payment_term: this.materials[i].f_material_name,
+             f_charge_money: this.materials[i].price,
+             f_amount_words:this.smalltoBIG(this.materials[i].price),
+             f_payment_method : '手机APP'
+           })
+       }
+       let info = {
+         apply: this.selectdata,
+         charge: this.charge,
+         user: Vue.user,
+         f_out_trade_no:this.order.f_out_trade_no
+       }
+       http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/NewAddChargeRecord`,{data:info},{
+         resolveMsg: null,
+         rejectMsg: null
+       })
+    },
+    async addMaterialAfter() {
+      let data = {
+        f_out_trade_no:this.order.f_out_trade_no
+      }
+      //报警器流程 设备编号检验
+      await this.bjqCheck()
+      if (this.bjqChecklag.length > 0) {
+        return
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/SaveMaterialsAfter`,
+        data
+      )
+      this.closeMaterials()
+    },
+    async deleteMaterial(row) {
+
+      var show1 =  window.confirm('您确定要删除这条记录吗?')
+      if(show1 != true){
+        this.closeMaterials()
+      }else{
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/deleteMaterialapply`,
+          {data: row},
+          {resolveMsg: null, rejectMsg: '材料删除失败！！！'}
+        )
+        this.closeMaterials()
+      }
+    },
+    async updateMaterial(index, row) {
+      this.title = '修改'
+      this.row = row
+      this.getMateralNames()
+      this.materials = [
+        {
+          material: '',
+          f_material_name: row.f_material_name,
+          f_material_style: row.f_material_style,
+          f_material_unit: row.f_material_unit,
+          f_material_number: row.f_material_number,
+          f_material_code: row.f_material_code,
+          f_bjq_sid: row.f_bjq_sid,
+          f_userinfo_code: row.f_userinfo_code,
+          price:row.f_material_price
+        }
+      ]
+      this.showMaterialModal = true
+    },
+    async updateConfirm() {
+      let data = this.row
+      data.f_material_name = this.materials[0].f_material_name
+      data.f_material_style = this.materials[0].f_material_style
+      data.f_material_unit = this.materials[0].f_material_unit
+      data.f_material_number = this.materials[0].f_material_number
+      data.f_material_code = this.materials[0].f_material_code
+      data.f_bjq_sid = this.materials[0].f_bjq_sid
+      data.f_userinfo_code=this.materials[0].f_userinfo_code
+      data.f_material_price = this.materials[0].price
+      //报警器流程 设备编号检验
+      await this.bjqCheck()
+      if (this.bjqChecklag.length > 0){
+        return
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/entity/t_material_apply`,
+        data
+      )
+      this.closeMaterials()
+    },
+    sycronizedCode(index,val){
+      console.log("看看：",index,val)
+      this.materials[index].f_material_code = val
+    },
+    closeMaterials() {
+      this.getOnetoManyData()
+      this.showMaterialModal = false
+      this.showCharge= false
+    },
+    async bjqCheck(){
+      //报警器设备型号校验
+      this.bjqChecklag = [] //初始化
+      if (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建'){
+        let bjqinfo = {
+          f_material_name : "",
+          f_bjq_sid: ""
+        }
+        for (const bjqinfoElement of this.materials) {
+          bjqinfo.f_bjq_sid = bjqinfoElement.f_bjq_sid
+          bjqinfo.f_material_name = bjqinfoElement.f_material_name
+          if (bjqinfo.f_material_name.substr(0,3) === '报警器'){
+            let http = new HttpResetClass()
+            let res = await http.load(
+              'POST',
+              // `/rs/logic/bjqcheck`,
+              `${this.$androidUtil.getProxyUrl()}/ncc/rs/logic/bjqcheck`,
+              bjqinfo
+            )
+            if (res.data.code != 200){
+              this.bjqChecklag.push(res.data.code)
+              //this.$showMessage(res.data.msg)
+              Vue.showAlert(res.data.msg, 'danger', 6000)
+              return
+            }
+          }
+        }
+      }
+    }
+  },
+  beforeDestroy() {
+    clearInterval(this.paymentInterval)
+    clearInterval(this.orderInterval)
+    this.clearQrCode() // 清理二维码DOM
+  }
+}
+
+
+</script>
+
+<style scoped>
+
+</style>