apply-clients 3.5.4-2 → 3.5.4-21

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/AppChargeManagement.vue

@@ -357,6 +357,32 @@
         <button type="button" class="btn btn-primary" @click="print()">打印</button>
       </footer>
     </modal>
+    <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="closeQrCode"><span>&times;</span></button>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <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="closeQrCode()">关闭</button>
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -364,6 +390,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: '收费管理',
@@ -387,13 +414,114 @@ export default {
       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
@@ -452,6 +580,9 @@ export default {
     },
     // 新增收费
     async saveCharge() {
+      if(this.charge.f_payment_method=='二维码收费'){
+        this.openQrCode()
+      }
       let http = new HttpResetClass()
       let data = {
         apply: this.selectdata,

package/src/filiale/fugou/pc/ServiceControl.vue

@@ -43,6 +43,9 @@
       this.refurbish()
     },
     methods: {
+      getServicPeo(){
+        this.setLabelValue("服务人",this.$login.f.name)
+      },
       async servicer(){
         let data = {
           tablename: 't_user',
@@ -166,8 +169,13 @@
 
             }
           }
-
-
+          if(item.rolename){
+            //判断当前用户是否有这个角色
+            if(!this.$login.f.rolestr.includes(item.rolename)){
+              item.readonly=true
+              item.disabled=true
+            }
+          }
           if (item.type === 'checkbox') {
             if (this.selectdata[item.field]) {
               item.value = JSON.parse(this.selectdata[item.field])
@@ -309,6 +317,7 @@
         this.$nextTick(() => {
           this.showview = true
         })
+        this.getServicPeo()
       },
       // 金额转大写
       smalltoBIG(n) {
@@ -1405,7 +1414,7 @@
         let f_address_type = this.show_data.fields[index].value
         for (const item of this.show_data.fields) {
           if (f_address_type === '民用市区') {
-            if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号'|| item.label === '小区') {
+            if ( item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号'|| item.label === '小区') {
               item.hidden = false
               item.required = true
               item.value = null
@@ -1421,7 +1430,7 @@
             }
           }
           if (f_address_type === '民用乡镇') {
-            if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号'|| item.label === '小区') {
+            if ( item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号'|| item.label === '小区') {
               item.hidden = false
               item.required = true
               item.value = null
@@ -1442,7 +1451,7 @@
             }
           }
           if (f_address_type === '特殊地址') {
-            if (item.label === '区/县' || item.label === '街道/乡镇') {
+            if ( item.label === '街道/乡镇') {
               item.hidden = false
               item.required = true
               item.value = null
@@ -1844,7 +1853,19 @@
         }
       },
       selectSearch (val, index) {},
-      'onblur' (index) {},
+      'onblur' (index) {
+        if(this.show_data.fields[index].label==="优惠金额"){
+          let contract=this.getLableValue('合同金额')
+          let add=this.getLableValue('追加款')
+          let money = this.getLableValue('优惠金额')
+          //转为数字，然后contract减去money，保留两位小数
+          let money_num = parseFloat(money)
+          let add_num = parseFloat(add)
+          let contract_num = parseFloat(contract)
+          let new_contract = contract_num+add_num - money_num
+          this.setLabelValue('应交金额', new_contract.toFixed(2))
+        }
+      },
       'oninput' (index) {},
       'initializtionView' () {},
       async 'onchangeModal' (index, fieldIndex) {

package/src/filiale/qianneng/android/AppExplorationUser.vue

@@ -9,12 +9,24 @@
               <input class="" v-model=model.f_user_name condition="u.f_user_name like '%{}%'" />
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">客户编号：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_userinfo_code condition="u.f_userinfo_code like '%{}%'" />
+            </div>
+          </div>
           <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">联系电话：</label>
             <div class="col-xs-8" >
               <input class="" v-model=model.f_phone condition="u.f_phone like '%{}%'" />
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">入户证号：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_entry_number condition="u.f_entry_number like '%{}%'" />
+            </div>
+          </div>
           <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">工程编号：</label>
             <div class="col-xs-8" >
@@ -90,6 +102,32 @@
               <input class="" v-model=model.f_igniter_people condition="f_igniter_people like '%{}%'" />
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">验收预约时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 100%!important;"
+                          v-model="model.startDate1"
+                          :value.sync="model.startDate1"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="u.f_start_build >= '{}'">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">验收预约时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 100%!important;"
+                          v-model="model.endDate1"
+                          :value.sync="model.endDate1"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="f_start_build <= '{}'">
+              </datepicker>
+            </div>
+          </div>
           <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">开始时间：</label>
             <div class="col-xs-8" >

package/src/filiale/qianneng/android/AppInstallationDetails.vue

@@ -201,28 +201,37 @@
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label">安装日期：</label>
             <div class="col-xs-8">
-              <input class="form-control input_view" style=""
+<!--              <input class="form-control input_view" style=""
                      v-model="item.f_install_date"
                      :value.sync="installdate(item.f_install_date)"
                      placeholder="安装日期"
-                     />
-<!--              <datepicker-->
-<!--                placeholder="安装日期"-->
-<!--                :value.sync="item.f_install_date"-->
-<!--                v-model="item.f_install_date"-->
-<!--                format="yyyy-MM-dd HH:mm:ss"-->
-<!--                :show-reset-button="reset">-->
-<!--              </datepicker>-->
+                     />-->
+              <datepicker
+                placeholder="安装日期"
+                :value.sync="item.f_install_date"
+                v-model="item.f_install_date"
+                format="yyyy-MM-dd"
+                :default="true"
+                :show-reset-button="reset">
+              </datepicker>
             </div>
           </div>
           <div class="form-group row vertical-center">
             <label class="col-xs-4 control-label">生产日期：</label>
             <div class="col-xs-8">
-              <input class="form-control input_view" style=""
+<!--              <input class="form-control input_view" style=""
                      v-model="item.f_factory_date"
                      :value.sync="installdate(item.f_factory_date)"
                      placeholder="生产日期"
-              />
+              />-->
+              <datepicker
+                placeholder="安装日期"
+                :value.sync="item.f_factory_date"
+                v-model="item.f_factory_date"
+                format="yyyy-MM-dd"
+                :default="true"
+                :show-reset-button="reset">
+              </datepicker>
             </div>
           </div>
         </div>