apply-clients 3.5.4-8 → 3.5.4-81

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

@@ -0,0 +1,341 @@
+<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" >
+            <button  v-if="$parent.$parent.mark === 0"    type="button" class="btn btn-primary" @click="$parent.$parent.openMaterialModal()">添加
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operation_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_content}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>
+              {{$parent.$parent.toArry(row.f_content_value)}}
+            </nobr>
+          </td>
+          <td style="text-align: center;">
+            <button v-if="$parent.$parent.mark === 0" type="button" class="button_delete button_spacing" @click="$parent.$parent.deletelogs(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 class="form-group col-sm-6">
+          <label class="col-sm-4 control-label">设备：</label>
+          <div class="col-sm-8">
+            <input-select
+              class="select select_list"
+              :value.sync="device"
+              v-model="device"
+              :options="logOptions"
+              :disable="mark === 1"
+              :valueSingle="true"></input-select>
+          </div>
+        </div>
+        <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
+          <div class="panel-body">
+            <div class="row">
+              <div class="form-group col-sm-6">
+                <label class="col-sm-4 control-label">内容：</label>
+                <div class="col-sm-8">
+                  <input-select
+                    class="select select_list"
+                    :value.sync="item.f_content"
+                    v-model="item.f_content"
+                    :options="Options"
+                    :disable="mark === 1"
+                    :valueSingle="true"></input-select>
+                </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"
+                    v-model="item.f_content_value"
+                    :value.sync="item.f_content_value"
+                    rows="3"
+                    :readonly="mark === 1"
+                  ></input>
+                </div>
+              </div>
+              <div v-if="mark !== 1 && materials.length > 1" class="form-group col-sm-12 text-center">
+                <button type="button" class="btn btn-danger" @click="removeMaterial(i)">
+                  <i class="fa fa-minus"></i> 移除
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-if="mark !== 1" class="form-group col-sm-12 text-center">
+          <button type="button" class="btn btn-success" @click="addMaterial()">
+            <i class="fa fa-plus"></i> 添加
+          </button>
+        </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="addlogs()"
+                  :disabled="!$v.valid">确认
+          </button>
+        </template>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
+export default {
+  name: 'replacement',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {
+      onetomany: {
+        rows: []
+      },
+      logOptions: this.$appdata.getParam('置换设备'),
+      Options: this.$appdata.getParam('置换内容'),
+      device:'',
+      title: '新增',
+      deviceArry:[],
+      showMaterialModal: false,
+      materials: [
+        {
+
+        }
+      ],
+      meterialOptions: [],
+      row: {},
+      bjqChecklag:[],
+      fmaterialname:{}
+    }
+  },
+  ready() {
+    this.getOnetoManyData()
+  },
+  methods: {
+    toArry(row){
+      //将row放进数组中
+      if (!row) return "无";
+      try {
+        // 添加方括号使其成为有效的JSON数组
+        const jsonStr = '[' + row + ']';
+        // 尝试解析字符串为JSON数组
+        const jsonArray = JSON.parse(jsonStr);
+        // 将解析后的数据保存到deviceArry中
+        this.deviceArry = jsonArray;
+
+        // 格式化显示数据
+        let result = '';
+        for (let i = 0; i < this.deviceArry.length; i++) {
+          const item = this.deviceArry[i];
+          result += `${item.f_content}：${item.f_content_value}`;
+          if (i < this.deviceArry.length - 1) {
+            result += '，';
+          }
+        }
+        return result;
+      } catch (err) {
+        console.error('解析JSON数据失败:', err);
+        return "无";
+      }
+    },
+    look(row){
+      this.title = '查看'
+      this.materials = [
+        {
+          id: row.id,
+          f_log_type:row.f_log_type,
+          f_log_content:row.f_log_content
+        }
+      ],
+        this.showMaterialModal = true
+    },
+
+    changelogs(){
+      let http = new HttpResetClass()
+      let data = {
+        data: {
+          id: this.materials[0].id,
+          f_process_id:this.selectdata.f_process_id,
+          f_log_type:this.materials[0].f_log_type,
+          f_log_content:this.materials[0].f_log_content,
+          user:this.$login.f
+        }
+      }
+      http.load(
+        'POST',
+        `/rs/logic/addLogs`,
+        data,
+        {resolveMsg: '修改成功', rejectMsg: '添加失败'}
+      ).then(res => {
+        this.closeMaterials()
+      })
+    },
+    addlogs(){
+      let  value=[]
+      let http = new HttpResetClass()
+      this.materials.forEach(material => {
+        let  obj={}
+        obj.f_content=material.f_content
+        obj.f_content_value=material.f_content_value
+        //obj转为字符串
+        obj = JSON.stringify(obj)
+        value.push(obj)
+      });
+      let s = {
+        f_process_id: this.selectdata.f_process_id,
+        f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+        f_content_value:`${value}` ,
+        f_content: this.device,
+        f_operator: Vue.user.name,
+        f_operator_id: Vue.user.id
+      }
+      let data = {
+        tableName: 't_replacement',
+        model: s
+      }
+      http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/entitySingleTable`,
+        data,
+        {resolveMsg: null, rejectMsg: '添加失败'}
+      ).then(res => {
+        this.getOnetoManyData()
+        this.showMaterialModal=false
+      })
+    },
+    deletelogs(row){
+      let http = new HttpResetClass()
+      this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          let data = {
+            tableName:'t_replacement',
+            id:row.id
+          }
+          http.load(
+            'POST',
+            `${this.$androidUtil.getProxyUrl()}/rs/logic/delentitySingleTable`,
+            data,
+            {resolveMsg: '删除成功', rejectMsg: '删除失败'}
+          ).then(res => {
+            this.getOnetoManyData()
+          })
+        }
+      })
+    },
+    async getOnetoManyData () {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: `t_replacement`,
+        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 openMaterialModal() {
+      this.title = '新增'
+      this.materials = [
+        {
+          f_devices: '',
+          f_content: '',
+          f_content_value: ''
+        }
+      ];
+      this.showMaterialModal = true
+    },
+
+    closeMaterials() {
+      this.getOnetoManyData()
+      this.showMaterialModal = false
+    },
+    removeMaterial(index) {
+      if (this.materials.length > 1) {
+        this.materials.splice(index, 1);
+      } else {
+        this.$showMessage('至少需要保留一组数据');
+      }
+    },
+    addMaterial() {
+      // 获取最后一个材料的设备值，如果存在的话
+      const lastDevice = this.materials.length > 0 ? this.materials[this.materials.length - 1].f_devices : '';
+
+      this.materials.push({
+        f_devices: lastDevice, // 复制上一个设备的值
+        f_content: '',
+        f_content_value: ''
+      });
+    },
+  }
+}
+
+</script>
+
+<style scoped>
+.panel-info {
+  border: 1px solid #bce8f1;
+  margin-bottom: 15px;
+}
+
+.panel-heading {
+  background-color: #d9edf7;
+  border-bottom: 1px solid #bce8f1;
+  color: #31708f;
+  padding: 10px 15px;
+}
+
+.panel-body {
+  padding: 15px;
+}
+
+.form-group {
+  margin-bottom: 15px;
+}
+
+.btn-success {
+  margin-top: 10px;
+}
+
+.modal-body {
+  max-height: 500px;
+  overflow-y: auto;
+}
+</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()
     }