sale-client 3.4.198 → 3.4.199

package/build/dev-server.js

@@ -100,7 +100,7 @@ var proxyTable = {
   '/rs': {
     // target: 'http://192.168.30.63:8081/'
     // target: 'http://121.36.106.17:8400/'
-    target: bendi
+    target: fuwu
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.198",
+  "version": "3.4.199",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/MeterinfoTest.vue

@@ -101,7 +101,7 @@
           </div>
           <div class="col-sm-4 form-group" v-show="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_type == '物联网表' && row.gasbrand[0].f_hascard == '是'">
             <label class="font_normal_body" title="开户方式">开户方式</label>
-            <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-if="row.f_userfiles_id && row.f_open_way"
+            <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-if="row.f_userfiles_id"
                       search v-model='row.f_open_way' :disabled="true"></v-select>
             <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-else
                       search v-model='row.f_open_way' :disabled="false"></v-select>

package/src/components/charge/business/ChangeMeterAddGas.vue

@@ -153,7 +153,7 @@
 <script>
   /**
    *综合业务
-   *卡表收费组件
+   *补气购气组件
    */
 
     // 输入金额，换算气量

package/src/components/revenue/Common/PrintBill.vue

@@ -41,7 +41,7 @@
       condition: self.data.id
     }
     if (self.data.fillgasid) {
-      temp.fillgasid = `"${self.data.fillgasid}"`
+      temp.condition = `"${self.data.fillgasid}"`
     }
     console.log('self.billData.url:', self.billData.url)
     self.bill = new DataModel(self.billData.url, temp)

package/src/components/revenue/comprehen/Maintenance/fillgas/fillgasRecordMaintain.vue

@@ -92,7 +92,7 @@
       },
       async getGroupData () {
         console.log('获取记录')
-        let condition = ' hand_id= ' + this.model.id + " and tablename='t_fillgas'"
+        let condition = ' fillgas_id= ' + this.model.id + " and tablename='t_fillgas'"
         let res = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: '*',

package/src/components/revenue/comprehen/Maintenance/fillgas/fillgasSpecific.vue

@@ -86,6 +86,10 @@
             <label class="font_normal_body">所属部门</label>
             <input type="text" v-model="model.f_depname" disabled=disabled style="width: 60%" class="input_search">
           </div>
+          <div class="col-sm-12">
+            <label  class="font_normal_body" >补气原因</label>
+            <textarea class="form-control" v-model="model.f_comments" rows="3" ></textarea>
+          </div>
         </div>
       </form>
       <div style="float: right">
@@ -145,6 +149,7 @@
           'f_operator': '操作人员',
           'f_meter_brand': '气表品牌',
           'f_write_card': '写卡状态',
+          'f_comments': '补气原因',
           'f_depname': '所属部门'
         }
       }

package/src/filiale/qianneng/OtherChargeNew.vue

@@ -275,7 +275,7 @@
     self.model.f_use_type = self.config.billType
     self.model.f_bill_type = self.model.f_print
     self.hasValidateBill = self.config.hasBillManage
-    self.setTypename(self.model.otherdetail[0].f_brand_spec)
+    self.setTypename(self.model.otherdetail[0].f_brand_spec, self.model.otherdetail[0])
   }
   export default {
     title: '其他收费',
@@ -323,7 +323,7 @@
         f_typenumber: '',
         typeNameList: [],
         typenumberList: [],
-        brandspec: this.$appdata.getParam('品名及规格') ? this.$appdata.getParam('品名及规格') : [],
+        brandspec: this.$appdata.getParam('其他收费收费类型') ? this.$appdata.getParam('其他收费收费类型') : [],
         printstyle: this.$appdata.getParam('打印格式'),
         paytype: this.$appdata.getParam('付款方式'),
         feetype: this.$appdata.getParam('其他费用'),

package/src/filiale/qianneng/revenue/ChargeManage.vue

@@ -124,7 +124,7 @@ export default {
               }
             }
           })
-        }, this.searchTime * 200000)
+        }, this.searchTime * 1000)
       } catch (error) {
         console.log('捕获到异常', error)
         // this.$showAlert(error.data, 'danger', 2000)

package/src/filiale/rizhao/MeterinfoTest.vue

@@ -101,10 +101,9 @@
           </div>
           <div class="col-sm-4 form-group" v-show="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_type == '物联网表' && row.gasbrand[0].f_hascard == '是'">
             <label class="font_normal_body" title="开户方式">开户方式</label>
-            <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-if="row.f_userfiles_id"
-                      search v-model='row.f_open_way' :disabled="true"></v-select>
-            <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-else
-                      search v-model='row.f_open_way' :disabled="false"></v-select>
+            <v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select search v-model='row.f_open_way' :disabled="!jurisdiction.includes('档案信息查询修改')"></v-select>
+            <!--<v-select :value.sync="row.f_open_way" :options='openWay' value-single placeholder='开户方式' close-on-select v-else-->
+                      <!--search v-model='row.f_open_way' :disabled="false"></v-select>-->
           </div>
         </div>
         <div>
@@ -489,6 +488,7 @@
         }
       }, {resolveMsg: null, rejectMsg: '在档案中更改气表品牌时，获取之前卡表收费信息出错！！'})
     }
+    console.log('111', self.row)
     if (beforeRecord.data.length > 0 && self.row.gasbrand[0].f_meter_brand != self.oldrow.gasbrand[0].f_meter_brand) {
       self.$showAlert('该气表已投入使用，如需更改请执行换表操作', 'warning', 3000)
       // self.row.gasbrand = self.meter.gasbrand
@@ -498,7 +498,7 @@
     } else {
       self.row.f_whether_hairpin = self.row.gasbrand[0].f_meter_type === '机表' ? '无卡' : '未发'
     }
-    console.log('111', self.row)
+    console.log('222', self.row)
   }
   export default {
     title: '表具信息',

package/src/filiale/rizhao/UserEssentialInfoTest.vue

@@ -0,0 +1,321 @@
+<template>
+  <div>
+    <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
+      <form class="form-horizontal select-overspread ">
+        <div class="row">
+          <div class="col-sm-4 form-group " :class="[$v.f_user_name.required ? 'has-error' : '']">
+            <label for="f_user_name" class="font_normal_body">*客户姓名</label>
+            <input type="text" v-model="baseinfo.base.f_user_name" v-validate:f_user_name='{required: true }'
+                   class="input_search" style="width:60%" placeholder="客户名称" v-next-el="phone">
+          </div>
+          <div style="" class="col-sm-4 form-group"
+               :class="[$v.f_user_phone.minlength || $v.f_user_phone.maxlength ? 'has-error' : '']">
+            <label for="f_user_phone" class="font_normal_body">*客户电话</label>
+            <input type="text" maxlength="11" v-model="baseinfo.base.f_user_phone"
+                   v-validate:f_user_phone="{minlength: 11, maxlength: 11  }" class="input_search" style="width:60%"
+                   placeholder="客户电话" v-el:phone v-next-el="area">
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_user_state" class="font_normal_body">&ensp;客户状态</label>
+            <v-select :value.sync="baseinfo.base.f_user_state"
+                      :disabled="false"
+                      :value-single="true"
+                      :options='userstates' placeholder='客户状态'
+                      close-on-select></v-select>
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_credentials" class="font_normal_body">&ensp;证件类型</label>
+            <v-select id="idCardType" :value.sync="baseinfo.base.f_credentials"
+                      v-model="baseinfo.base.f_credentials"
+                      :value-single="true"
+                      :options='credentials' placeholder='证件类型'
+                      style="width: 65%"
+                      close-on-select></v-select>
+          </div>
+          <div style="" class="col-sm-8 form-group"
+               :class="[$v.f_idnumber2.identityCardValid ? 'has-error' : '']"
+               v-if="baseinfo.base.f_credentials === '身份证'||baseinfo.base.f_credentials[0] === '身份证'">
+            <label for="f_idnumber" class="font_normal_body color-red">*证件号码</label>
+            <input type="text" maxlength="18" v-model="baseinfo.base.f_idnumber"
+                   v-validate:f_idnumber2='{identityCardValid: true}' class="input_search" style="width:80%"
+                   placeholder="证件号码">
+          </div>
+          <div style="" class="col-sm-8 form-group"
+               v-if="baseinfo.base.f_credentials !== '身份证'&&baseinfo.base.f_credentials[0] !== '身份证'">
+            <label class="font_normal_body">&ensp;证件号码</label>
+            <input type="text" v-model="baseinfo.base.f_idnumber" class="input_search" style="width:80%"
+                   placeholder="证件号码">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-12 form-group" :class="[$v.f_address.required ? 'has-error' : '']">
+            <label for="f_address" class="font_normal_body">*地址信息</label>
+            <input type="text" v-model="addressinfo.f_address" :value.sync="addressinfo.f_address" v-validate:f_address='{required: true }'
+                   class="input_search" disabled="disabled" style="width:75%;" placeholder="用户地址" >
+            <span>
+              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="!isedit" @click="selectaddress()">选择地址</button>
+<!--              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="isedit" @click="modifyaddress()">修改地址</button>-->
+              <button class="button_search button_spacing" type="button" style="width: max-content" v-if="isedit" @click="selectaddress()">修改地址</button>
+            </span>
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_used_name" class="font_normal_body">&ensp;曾&ensp;用&ensp;名</label>
+            <input type="text" v-model="baseinfo.base.f_used_name" class="input_search" style="width:60%"
+                   placeholder="曾用名">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_rent_phone" class="font_normal_body">&ensp;备用电话</label>
+            <input type="text" v-model="baseinfo.base.f_rent_phone" class="input_search" style="width:60%"
+                   placeholder="备用电话">
+          </div>
+          <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error' : '']">
+            <label for="f_people_num" class="font_normal_body">&ensp;人&ensp;口&ensp;数</label>
+            <input type="number" v-model="baseinfo.base.f_people_num" v-validate:f_people_num='{dctest: [0, ">=" ]}'
+                   :disabled="!jurisdiction.includes('修改人口数')" class="input_search" style="width:60%"
+                   placeholder="家庭人口数">
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_balance" class="font_normal_body">&ensp;用户余额</label>
+            <input type="text" v-model="baseinfo.base.f_balance" class="input_search" style="width:60%"
+                   placeholder="用户余额" :disabled="!jurisdiction.includes('档案信息查询修改')">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_is_mgq" class="font_normal_body ">煤&ensp;改&ensp;气&ensp;</label>
+            <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_is_mgq"  v-model="baseinfo.base.f_is_mgq"
+                      :options='mgq' placeholder='是否煤改气'   style="width: 65%"       close-on-select></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_contract" class="font_normal_body">&ensp;燃气本号</label>
+            <input type="text"  v-model="baseinfo.base.f_book_no" class="input_search" style="width:60%" placeholder="用户证号">
+          </div>
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_rent_name" class="font_normal_body">&ensp;租户姓名</label>
+            <input type="text" v-model="baseinfo.base.f_rent_name" class="input_search" style="width:60%"
+                   placeholder="租户姓名">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_zuhu_phone" class="font_normal_body">&ensp;租户电话</label>
+            <input type="text" v-model="baseinfo.base.f_zuhu_phone" class="input_search" style="width:60%"
+                   placeholder="租户电话">
+          </div>
+          <div style="" class="col-sm-4 form-group">
+            <label for="f_cost_type" class="font_normal_body ">&ensp;付款类型</label>
+            <v-select id="f_cost_type" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"
+                      :options='costtype' placeholder='付款类型'   style="width: 65%"       close-on-select></v-select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-8 form-group">
+            <label for="f_contract" class="font_normal_body">&ensp;合同编号</label>
+            <input type="text" v-model="baseinfo.base.f_contract_id" class="input_search" style="width:80%"
+                   placeholder="合同编号">
+          </div>
+          <!--<div style="" class="col-sm-4 form-group">-->
+            <!--<label for="f_print_lc" class="font_normal_body ">&ensp;打印状态</label>-->
+            <!--<v-select id="f_print_lc" :value.sync="baseinfo.base.f_print_lc"  v-model="baseinfo.base.f_print_lc"-->
+                      <!--:value-single="true" :disabled="!jurisdiction.includes('档案信息查询修改')"-->
+                      <!--:options='mgq' placeholder='是否打印'   style="width: 65%"       close-on-select></v-select>-->
+          <!--</div>-->
+          <div class="col-sm-4 form-group" >
+            <label for="f_print_dh" class="font_normal_body ">&ensp;打印类别</label>
+            <v-select id="f_print_dh" :value.sync="baseinfo.base.f_print_dh"  v-model="baseinfo.base.f_print_dh"
+                      :options='printstate' placeholder='流程单 | 点火单' style="width: 65%" close-on-select></v-select>
+          </div>
+
+
+        </div>
+        <div class="row">
+          <div style="" class="col-sm-8 form-group">
+            <label for="f_comments" class="font_normal_body ">&ensp;备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:80%" v-model="baseinfo.base.f_comments"/>
+          </div>
+          <div class="col-sm-4 form-group" >
+            <label for="f_house_type" class="font_normal_body">&ensp;房屋类型</label>
+            <v-select :value.sync="baseinfo.base.f_house_type" v-model="baseinfo.base.f_house_type"
+                      :options='housetype' placeholder='房屋类型' style="width: 65%" close-on-select>
+            </v-select>
+          </div>
+        </div>
+        <div class="row">
+        <a style="text-decoration: none;font-weight: 300;float: left;color: #333;margin-top: 15px;font-weight: 500"
+           v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">银行信息</a>
+        </div>
+        <div v-if="baseinfo.base.f_cost_type[0] === '银行代扣'">
+          <div class="row">
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_bank_accopen.required ? 'has-error' : '']">
+              <label for="f_username" class="font_normal_body">银行户名</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_accopen"
+                     class="input_search" style="width:60%" id="f_username" placeholder="客户名称"
+                     v-validate:f_bank_accopen='{required: true}'
+                     v-next-el="bankaccount">
+            </div>
+            <div class="col-sm-4 form-group" id=userfiles-useEssInf-银行名称>
+              <label for="f_username" class="font_normal_body ">银行名称</label>
+              <v-select :value.sync="baseinfo.bank.f_bank_name"
+                        :options='banknames' placeholder='银行名称'
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-4 form-group">
+              <label for="f_bank_idnumber" class="font_normal_body">缴费编号</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_pay_number"
+                     class="input_search" style="width:60%"
+                     aria-describedby="helpBlock" placeholder="缴费编号" v-el:bankpaynumber>
+            </div>
+            <div class="col-sm-12 form-group">
+              <label for="f_bank_idnumber" class="font_normal_body">身份证号</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_idnumber"
+                     class="input_search" style="width:54%"
+                     aria-describedby="helpBlock" placeholder="身份证号" v-el:bankidnumber>
+            </div>
+            <div class="col-sm-12 form-group"
+                 :class="[$v.f_bank_account.required ? 'has-error' : '']">
+              <label for="f_userid" class="font_normal_body">银行账号</label>
+              <input type="text" v-model="baseinfo.bank.f_bank_account" class="input_search" style="width:54%"
+                     v-validate:f_bank_account='{required: true}' placeholder="银行账号" v-el:bankaccount
+                     v-next-el="bankidnumber">
+            </div>
+          </div>
+        </div>
+      </form>
+    </validator>
+    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="80%" title="地址信息" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
+        <file-address-manage-new :is-select="isSelect" :fileinfo="addressinfo"
+                             @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage-new>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+    import {HttpResetClass} from 'vue-client'
+    // import HighMeter from '../../plugins/HighMeterPlugin'
+
+    let getEditUserState = async function (self) {
+      try {
+        let http = new HttpResetClass()
+        let result = await http.load('GET', `rs/vue/EditUserState.json`, {}, {resolveMsg: null, rejectMsg: null})
+        console.log('看看结果', result.data.EditUserState)
+        self.config.f_print_dh = result.data.f_print_dh
+        self.baseinfo.base.f_print_dh = (self.baseinfo.base.f_print_dh && self.baseinfo.base.f_print_dh != '' && self.baseinfo.base.f_print_dh != '否') ? self.baseinfo.base.f_print_dh : result.data.f_print_dh
+        self.edituserstate = result.data.EditUserState
+      } catch (e) {
+        console.log(e)
+      }
+    }
+
+    export default {
+      title: '基本信息',
+      props: ['baseinfo', 'addressinfo', 'isedit'],
+      data () {
+        return {
+          showselectaddress: false,
+          site: '',
+          areas: [],
+          streets: [],
+          residentials: [],
+          config: {},
+          inputtores: this.$appdata.getParam('抄表员'),
+          credentials: this.$appdata.getParam('证件类型'),
+          costtypes: this.$appdata.getParam('缴费类型'),
+          banknames: this.$appdata.getParam('银行名称'),
+          userstates: [{label: '预备', value: '预备'}],
+          housetype: [{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
+          mgq: this.$appdata.getParam('是否煤改气'),
+          costtype: this.$appdata.getParam('付款类型'),
+          printstate: this.$appdata.getParam('建档打印类型') ? [{label: '暂不选择', value: '暂不选择'}, ...this.$appdata.getParam('建档打印类型')]:[{label: '暂不选择', value: '暂不选择'}],
+          jurisdiction: this.$login.r,
+          edituserstate: false,
+            // highMeterPlugin: {},
+          readCardFlag: true,
+
+          isSelect: false
+        }
+      },
+      ready () {
+        getEditUserState(this)
+        this.$resetValidation()
+            // this.highMeterPlugin = new HighMeter(this,this.readIDCardCallback)
+      },
+      beforeDestroy () {
+        console.log('销毁')
+          // this.highMeterPlugin.Stop()
+      },
+      methods: {
+        selectaddress () {
+          this.showselectaddress = true
+          this.isSelect = true
+        },
+        modifyaddress () {
+          this.showselectaddress = true
+          this.isSelect = false
+        },
+        onValid (res) {
+          this.$dispatch('valid')
+        },
+        onInvalid (res) {
+          this.$dispatch('invalid')
+        },
+        doNothing () {
+           // console.log('啥也不做')
+        },
+        readIDCardCallback (compoent, msg) {
+           // console.log('进入高拍仪',msg)
+          if (msg.err !== 0) {
+            return
+          }
+            // document.getElementById("idCardType").getElementsByClassName("btn-content")[0].innerHTML="身份证"
+          compoent.baseinfo.base.f_idnumber = msg.strID
+          compoent.baseinfo.base.f_user_name = msg.strName.trim()
+          compoent.baseinfo.base.f_credentials = ['身份证']
+        }
+      },
+      watch: {
+            // 重置验证结果，当证件类型切换时，验证结果不能立即刷新，需要重置
+        'baseinfo.base.f_credentials[0]' () {
+               // console.log('验证器重置')
+          this.$resetValidation()
+          this.baseinfo.base.f_print_dh = (this.baseinfo.base.f_print_dh && this.baseinfo.base.f_print_dh != '' && this.baseinfo.base.f_print_dh != '否') ? this.baseinfo.base.f_print_dh : this.config.f_print_dh
+        },
+        'baseinfo.base.f_cost_type[0]' () {
+              //  console.log('验证器重置')
+          this.$resetValidation()
+          this.baseinfo.base.f_print_dh = (this.baseinfo.base.f_print_dh && this.baseinfo.base.f_print_dh != '' && this.baseinfo.base.f_print_dh != '否') ? this.baseinfo.base.f_print_dh : this.config.f_print_dh
+        },
+            // 当选择销户，需要给其提醒是否进行销户
+        'baseinfo.base.f_user_state' (val) {
+          if (val[0] === '销户') {
+            this.$showMessage('是否要对该客户进行销户操作？', ['confirm', 'cancel']).then((res) => {
+              if (res !== 'confirm') {
+                this.baseinfo.base.f_user_state = ['正常']
+              }
+            })
+          }
+        }
+      },
+      computed: {},
+      events: {
+        'confirmaddress' (res) {
+            //  console.log('选定地址', res)
+          this.showselectaddress = false
+          this.addressinfo.f_address = res.f_address
+          this.addressinfo.id = res.id
+          if (res.f_house_type != null) {
+            this.baseinfo.base.f_house_type = res.f_house_type
+          }
+          this.$dispatch('defaultOtheret', res)
+        }
+      }
+    }
+</script>

package/src/filiale/rizhao/sale.js

@@ -20,6 +20,8 @@ let specialComp = {
   // 列表
   'charge-list': (resolve) => { require(['./ChargeList'], resolve) },
   // 收费页面的流水查询
-  'meter-charge-record-query': (resolve) => { require(['./ChargeRecordQuery'], resolve) }
+  'meter-charge-record-query': (resolve) => { require(['./ChargeRecordQuery'], resolve) },
+  // 用户基本信息test(预备户)
+  'file-user-essential-info-new': (resolve) => { require(['./UserEssentialInfoTest'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/shanggao/HighMeterIdCard.vue

@@ -3,7 +3,7 @@
     <header slot="modal-header">
       <div class="header">
         <span class="glyphicon glyphicon-remove-circle close" style="margin-top: 35px;margin-right: 30px" @click="close"></span>
-        <h4 class="title">高拍仪</h4>
+        <h4 class="title">高拍仪（哲林）</h4>
       </div>
     </header>
     <article slot="modal-body" class="form-control" style="padding: 0px">
@@ -23,7 +23,7 @@
         </div>
         <div class="showInfo">
           <IMG ID="Base64IMG" src="" class="img"></IMG>
-          <button style="position: absolute;buttom:-10px;left:0px;" @click="splitsimg">旋转</button>
+<!--          <button style="position: absolute;buttom:-10px;left:0px;" @click="splitsimg">旋转</button>-->
           <textarea id="Console" disabled="disabled"></textarea>
           <IMG id="cam"  :src="cameraurl" width="640" height="640">
           </IMG>
@@ -95,8 +95,10 @@ export default {
               resolve()
             }
             this.connected = true
+            console.log('已连接服务器')
             this.output('已经连接到服务器')
             // 打开视频
+            console.log('打开摄像头1')
             this.cam_switch(1)
             // 打开自动裁边
             resolve()
@@ -184,6 +186,7 @@ export default {
       // 打开视频
       cam_switch (capID) {
         if (capID == 1) {
+
           this.cameraurl = 'http://127.0.0.1:38088/video=stream&camidx=0'
         }
         if (capID == 2) {

package/src/filiale/shanggao/ReturnMoneyExamine.vue

@@ -191,7 +191,7 @@ export default {
       if (res === 'confirm') {
         let examineState = ''
         // 退款逻辑开始
-        if (row.f_payment === '微信支付') {
+        if (row.f_payment === '微信支付' || row.f_payment === '&扫码') {
           let res = await this.$resetpost('shunmin/rs/pay/refundShanggao',
             {id: row.wxid}, {
               resolveMsg: null,
@@ -227,7 +227,7 @@ export default {
           sql: sql
         }
         await this.$resetpost('rs/logic/runSQL', data, {resolveMsg: null, rejectMsg: null})
-        // this.search()
+        await this.search()
       }
     },
     // 全部通过并退款

package/src/main.js

@@ -7,7 +7,7 @@ import VueClipboard from 'vue-clipboard2'
 Vue.use(VueClipboard)
 Vue.config.silent = true
 // 新打包写法
-Vue.use(sale, {filiale: 'tongchuan'})
+Vue.use(sale, {filiale: null})
 address()
 ldap()
 require('system-clients/src/styles/less/bootstrap.less')

package/src/sale.js

@@ -221,7 +221,7 @@ export default {
     // Vue.component('change-meter-add-gas', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/ChangeMeterAddGas/OldChangeMeterAddGas'], resolve) })
     // 换表补卡
     Vue.component('change_fill_sendcard', (resolve) => { require(['./components/charge/business/ChangeSendCard'], resolve) })
-    // 换表补气
+    // 补气购气
     Vue.component('change-meter-add-gas', (resolve) => { require(['./components/charge/business/ChangeMeterAddGas'], resolve) })
     // 退费管理
     Vue.component('refund-manage', (resolve) => { require(['./components/charge/business/refund/RefundManage'], resolve) })