apply-clients 3.5.4-7 → 3.5.4-72

package/src/filiale/baiyin/android.js

@@ -0,0 +1,8 @@
+import Vue from 'vue'
+
+let specialComp = {
+  'app-service-control': (resolve) => { require(['./android/AppServiceControl'], resolve) },
+  'by-add-material-science': (resolve) => { require(['./android/ByAddMaterialScience'], resolve) },
+  'by-device-management': (resolve) => { require(['./android/ByDeviceManagement'], resolve) }
+}
+exports.specialComp = specialComp

package/src/filiale/fugou/android/AppAddMaterialScience.vue

@@ -0,0 +1,442 @@
+<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">
+            <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal('室内施工')">室内施工
+            </button>
+            <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;">
+            <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 style="overflow: auto" :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">
+        <data-grid v-if=" title==='新增'&& showtype == '室内施工'&& indoormaterials.rows.length > 0 " :model="indoormaterials" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th class="textNoLineBreak" colspan="5">室内材料</th>
+            </tr>
+            <tr>
+              <th class="textNoLineBreak">材料名称</th>
+              <th class="textNoLineBreak">材料型号</th>
+              <th class="textNoLineBreak">材料单位</th>
+              <th class="textNoLineBreak">是否选择</th>
+              <th class="textNoLineBreak">材料数量</th>
+            </tr>
+          </template>
+          <template partial='body' >
+            <tr>
+              <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;">
+                <input type="checkbox" v-model="row.f_is_check" :value.sync="row.f_is_check"/>
+              </td>
+              <td style="text-align: center;">
+                <input class="form-control input_view"  type="number"
+                       placeholder="设备数量"
+                       v-model="row.f_material_number"
+                       :value.sync="row.f_material_number"
+                />
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+        <data-grid v-if=" title==='新增'&& showtype == '地埋施工'&& undergroundmaterials.rows.length > 0 " :model="undergroundmaterials" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th class="textNoLineBreak" colspan="5">地埋材料</th>
+            </tr>
+            <tr>
+              <th class="textNoLineBreak">材料名称</th>
+              <th class="textNoLineBreak">材料型号</th>
+              <th class="textNoLineBreak">材料单位</th>
+              <th class="textNoLineBreak">是否选择</th>
+              <th class="textNoLineBreak">材料数量</th>
+            </tr>
+          </template>
+          <template partial='body' >
+            <tr>
+              <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;">
+                <input type="checkbox" v-model="row.f_is_check" :value.sync="row.f_is_check"/>
+              </td>
+              <td style="text-align: center;">
+                <input class="form-control input_view"  type="number"
+                       placeholder="设备数量"
+                       v-model="row.f_material_number"
+                       :value.sync="row.f_material_number"
+                />
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+        <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" v-if="title==='新增'">
+            <label class="col-sm-4 control-label">选择材料：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.material"
+                v-model="item.material"
+                :options="meterialOptions"
+                :disable="mark === 1"
+                @change="modifyOtherValue(i)"
+                :valueSingle="true"></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"
+              />
+            </div>
+            </div>
+          </div>
+
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <template v-if="mark !== 1">
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="pushMaterial()">添加材料</button>
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterial()"
+                  :disabled="!$v.valid">确认添加
+          </button>
+          <button type="button" class="btn btn-primary" v-if="title==='修改'" @click="updateConfirm()"
+                  :disabled="!$v.valid">确认修改
+          </button>
+        </template>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  import {isEmpty} from "../../../components/Util";
+
+  export default {
+    name: 'addMaterialScience',
+    props: {
+      selectdata: {
+        type: Object
+      }
+    },
+    data() {
+      return {
+        onetomany: {
+          rows: []
+        },
+        title: '新增',
+        showMaterialModal: false,
+        materials: [
+        ],
+        meterialOptions: [],
+        row: {},
+        fmaterialname:{},
+        isShow:[false],
+        indoormaterials: {
+          rows: []
+        },
+        undergroundmaterials: {
+          rows: []
+        },
+        showtype:''
+      }
+    },
+    ready() {
+      this.getOnetoManyData()
+    },
+    methods: {
+      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/apply_singleTable?aaa=123`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
+        )
+        this.onetomany.rows = res.data
+      },
+      async getMateralOptions () {
+        this.indoormaterials.rows = []
+        this.undergroundmaterials.rows = []
+        let datarow = {
+          workname: 'materials'
+        }
+        let http = new HttpResetClass()
+        let row = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetConfigs`,
+          {data: datarow},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+        if (this.selectdata.f_apply_type == '散户报建'){
+          this.indoormaterials.rows = row.data['散户报建']['室内材料']
+          this.undergroundmaterials.rows = row.data['散户报建']['地埋材料']
+        }else if (this.selectdata.f_apply_type == '工商户报建' && this.selectdata.f_apply_nature == '商业报建' ){
+          this.indoormaterials.rows = row.data['商业报建']['室内材料']
+          this.undergroundmaterials.rows = row.data['商业报建']['地埋材料']
+        }
+      },
+      async openMaterialModal(row) {
+        this.getMateralOptions()
+        this.materials = []
+        this.getMateralNames()
+        this.title = '新增'
+        this.showtype = row
+        this.showMaterialModal = true
+        this.isShow = [false]
+      },
+      deleteDevicesinfo(index) {
+        this.materials.splice(index, 1)
+        this.isShow.splice(index, 1)
+      },
+      pushMaterial() {
+        this.materials.push({
+          f_material_price: '',
+          material: '',
+          f_material_name: '',
+          f_material_style: '',
+          f_material_unit: '',
+          f_material_number: '',
+          f_bjq_sid: '',
+          f_material_code: '',
+          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)
+        if(this.materials[index].material){
+          let material = this.materials[index].material
+          this.materials[index].f_material_price = material.f_material_price
+          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
+        }else{
+          this.materials[index].f_material_price =''
+          this.materials[index].f_material_name = ''
+          this.materials[index].f_material_style = ''
+          this.materials[index].f_material_unit =''
+          this.materials[index].f_material_number = ''
+          this.materials[index].f_material_code =''
+          this.materials[index].f_userinfo_code =''
+        }
+      },
+      // 新增材料
+      async addMaterial() {
+        this.title = '新增'
+        for (let i = 0; i < this.indoormaterials.rows.length; i++){
+          let row = this.indoormaterials.rows[i]
+          if (row.f_is_check && !isEmpty(row.f_material_number)){
+            this.materials.push(row)
+          }
+        }
+        for (let i = 0; i < this.undergroundmaterials.rows.length; i++){
+          let row = this.undergroundmaterials.rows[i]
+          if (row.f_is_check && !isEmpty(row.f_material_number)){
+            this.materials.push(row)
+          }
+        }
+        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
+        }
+
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/saveMaterials`,
+          data
+        )
+        this.closeMaterials()
+      },
+      async deleteMaterial(row) {
+        debugger
+        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/deleteMaterial`,
+            {data: row},
+            {resolveMsg: null, rejectMsg: '材料删除失败！！！'}
+          )
+          this.closeMaterials()
+        }
+      }
+      ,
+      async updateMaterial(index, row) {
+        this.title = '修改'
+        this.row = row
+        this.materials[0] = row
+        this.showMaterialModal = true
+      },
+      async updateConfirm() {
+        let data = this.row
+        data.f_material_price = this.materials[0].f_material_price
+        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
+
+        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
+      }
+    }
+  }
+
+</script>
+
+<style scoped>
+
+</style>

package/src/filiale/fugou/android/AppChargeManagement.vue

@@ -345,16 +345,31 @@
       </footer>
     </modal>
 
-    <modal v-if="showPrint" :show.sync="showPrint" v-ref:modal :large="true" :backdrop="false" title="打印预览">
+
+    <modal v-if="showQrCode" :show.sync="showQrCode" 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>
+        <button type="button" class="close" @click="closeQrCode"><span>&times;</span></button>
       </header>
       <article slot="modal-body" class="modal-body clearfix">
-        <apply-print-chargepc :selectdata="selectdata" :charge="charge" v-ref:print></apply-print-chargepc>
+        <div partial>
+          <div class="" align="center">
+            <div style="margin-bottom:10px "><img src="../../../assets/scanCode.png">请扫描下方二维码进行付款</div>
+            <div class="row app-row">
+              <div class="col-xs-12">
+                <label class="font text-left">订单编号:{{ order.body.tradeNo }}</label>
+              </div>
+            </div>
+          </div>
+          <div class="" align="center">
+            <div class="QR-code" >
+              <img src="../../../assets/qrcode_no.png" style="width: 266px;height: 266px"/>
+              <div id="qrcode" style="margin-top: 25px;width: 266px;height: 266px"></div>
+            </div>
+          </div>
+        </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="print()">打印</button>
+        <button type="button" class="btn btn-primary" @click="closeQrCode()">关闭</button>
       </footer>
     </modal>
   </div>
@@ -364,6 +379,7 @@ import {getNowDate,isEmpty} from '../../../components/Util'
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
 import Vue from 'vue'
+import QRCode from "qrcodejs2";
 
 export default {
   title: '收费管理',
@@ -380,20 +396,120 @@ export default {
     return {
       showCharge: false,  // 收费明细
       showInvalid: false, // 作废
-      showPrint: false,   // 打印
       model: {
         data: null
       },       // 记录
       useraddresList: [],  // 地址列表
       charge: {
 
-      }
+      },
+      order:'',
+      isTimeout:false,
+      showQrCode:false
     }
   },
   ready () {
     this.search()
   },
   methods: {
+    closeQrCode(){
+      document.getElementById('qrcode').innerHTML = ''
+    },
+    async openQrCode() {
+      const merchantMsg =this.$appdata.getSingleValue('商户号')
+      if (!merchantMsg){
+        this.$showMessage('未配备商户号,请联系管理员！')
+        return
+      }
+      const outTradeNo = this.generateRandomString(30)
+      // 下订单
+      let http = new HttpResetClass()
+      const val = {
+        "body": this.charge.f_payment_term,
+        "detail": this.charge.f_payment_term,
+        "totalAmount": (this.charge.f_charge_money).toString(),
+        "merchantMsg": merchantMsg,//商户id
+        "outTradeNo": outTradeNo,//随机数30位
+        "service": "nativePay",//死值
+        "tradeType": "wechat_jsapi"//死值
+      }
+      try {
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/bank/rs/logic/BC_10001`, {data: val}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        if (res.data.status === 200) {
+          console.log("调用结果", res.data, res.data.body.url)
+          try {
+              this.order = res.data
+              this.isTimeout = false
+              this.showQrCode = true
+              console.log(this.order)
+              this.$nextTick(() => {
+                this.qrcode(res.data.body.url)
+              })
+              if (this.order.body.tradeNo) {
+                this.timer1 = window.setInterval(this.getOrderInformation, 3000)
+            }
+          } catch (e) {
+            this.$showMessage('创建订单失败！')
+          }
+        } else {
+          this.$showMessage('获取二维码失败！')
+        }
+      } catch (e) {
+        this.$showMessage('获取二维码失败，请检查网络！')
+      }
+    },
+    // 获取订单信息
+    async getOrderInformation() {
+      const merchantMsg =this.$appdata.getSingleValue('商户号')
+      // 查询订单信息
+      console.log('查询订单信息！！！', this.order)
+      try {
+        let http = new HttpResetClass()
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/bank/rs/logic/BC_10003`, {
+          data: {
+            "service": "queryOrder",
+            "outTradeNo": this.order.body.outTradeNo,
+            "merchantMsg": merchantMsg,
+            "tradeNo": ""
+          }
+        }, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        // 支付成功
+        this.orderstatus = res.data
+        console.log('查询结果=======', res.data)
+        if (res.data.status == '200') {
+          window.clearInterval(this.timer1)
+          console.log('支付成功', this.orderstatus)
+          this.order = {}
+        }
+      } catch (e) {
+        window.clearInterval(this.timer1)
+        this.$showMessage('创建订单失败！')
+        this.order = {}
+      }
+    },
+    qrcode(url) {
+      new QRCode('qrcode', {
+        text: url, // 设置二维码内容或跳转地址
+        width: 266, // 设置宽度，单位像素
+        height: 266, // 设置高度，单位像素
+        correctLevel: QRCode.CorrectLevel.L //容错率，L/M/Hs
+      })
+    },
+    generateRandomString(length) {
+      let result = new Date().getTime().toString()
+      const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+      const charactersLength = characters.length;
+      for (let i = 0; i < length; i++) {
+        result += characters.charAt(Math.floor(Math.random() * charactersLength));
+      }
+      return result.substring(0, 30);
+    },
     async payerNumberChange () {
       if (isEmpty(this.charge.f_payer_number)) {
         return
@@ -415,10 +531,6 @@ export default {
     print () {
       this.$refs.print.$refs.print.PrintTable()
     },
-    showPrintModal(row) {
-      this.charge = row
-      this.showPrint = true
-    },
     selectAddres () {
       if (this.charge.useraddres) {
         this.charge.f_cumulative_payment_money = this.charge.useraddres.f_cumulative_payment_money
@@ -452,6 +564,9 @@ export default {
     },
     // 新增收费
     async saveCharge() {
+      if(this.charge.f_payment_method=='二维码收费'){
+        this.openQrCode()
+      }
       let http = new HttpResetClass()
       let data = {
         apply: this.selectdata,
@@ -591,7 +706,6 @@ export default {
     closeModal() {
       this.showCharge = false
       this.showInvalid = false
-      this.showPrint = false
       this.charge = {}
       this.search()
     }