sale-client 3.6.173 → 3.6.175

package/build/dev-server.js

@@ -18,13 +18,7 @@ var devConfig = {
     },
     proxy: {
       '/rs/file': {
-        target: localUrl
-      },
-      '/rs/logic/filemanage_fileSave': {
-        target: "http://127.0.0.1:4523/m1/719967-0-default"
-      },
-      '/rs/downloadfile': {
-        target: localUrl
+        target: serverRul
       },
       '/webapps': {
         target: serverRul
@@ -79,10 +73,13 @@ var devConfig = {
         target: serverRul
       },
       '/rs/logic': {
-        target: localUrl
+        target: serverRul
       },
       '/rs/sql': {
-        target: localUrl
+        target: serverRul
+      },
+      '/rs/entity': {
+        target: serverRul
       },
       '/webmeter': {
         target: serverRul

package/package.json

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

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

@@ -622,7 +622,8 @@
         }
       },
       'model.f_payment' (val) {
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
           if (this.row.f_collection_type == '按气量') {

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

@@ -111,7 +111,7 @@
               <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
                      @blur="config.calculatePreByCollection && calculatePreByCollection()"
                      @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
-                     v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection && !config.quickSale">
+                     v-el:sk v-scale="[model.f_collection, row.f_fee_decimal||4]" :disabled="!config.calculatePreByCollection ">
             </div>
             <div class="col-sm-1 form-group">
               <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
@@ -587,7 +587,8 @@
         this.getPrivilegeList()
       },
       'model.f_payment' (val) {
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
           if (this.row.f_collection_type == '按气量') {
@@ -743,10 +744,12 @@
       preamount () {
         if (this.model.f_preamount && this.model.f_preamount > 0) {
           try {
-            preamountGen(this)
-            if (this.config.quickSale) {
-              this.$els.sk.focus()
-            }
+            preamountGen(this).then((res) => {
+              if (this.config.quickSale) {
+                this.checkInvoiceMsg((!this.$v.valid || this.validateOk || !this.islegal || this.clickConfirm))
+                // this.$els.sk.focus()
+              }
+            })
           } catch (error) {
             this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
             this.$dispatch('error', '发卡售气', this.model, error)

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

@@ -139,6 +139,16 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+            <div class="col-sm-4" v-if="!mjshow" >
+              <label for="f_serial_number" class=" font_normal_body">业务单号</label>
+              <input class="input_search" style="width:60%"  type="text"
+                     v-model="model.f_serial_number" placeholder="业务单号">
+            </div>
+            <div class="col-sm-4" v-if="mjshow" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+              <label for="f_serial_number" class=" font_normal_body">业务单号</label>
+              <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
+                     v-model="model.f_serial_number" placeholder="业务单号">
+            </div>
             <div class="col-sm-8">
               <label for="f_comments" class=" font_normal_body">&nbsp;备&emsp;&emsp;注</label>
               <input type="text" class="input_search" style="width:80%" v-model="model.f_comments" rows="1"
@@ -326,6 +336,7 @@ export default {
         otherdetail: [{f_brand_spec: [''], typeNameList: [], f_typenumber: '', typenumberList: [], f_unitprice: '', f_number: ''}]
       },
       eticket_msg: false,
+      mjshow: false,
       eticket_show: false,
       invoice_is_pax: '征税',
       is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
@@ -362,6 +373,10 @@ export default {
       if (val[0]) {
         this.userfees(this.row.f_userinfo_id, val[0])
       }
+    },
+    'model.f_payment' (val) {
+      let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+      this.mjshow = (val === '免交' || _payment.includes(val))
     }
   },
   events: {

package/src/components/charge/business/machine/MachineMeterCenter.vue

@@ -652,7 +652,8 @@ let asyncMachineMeterCenter = async function (self) {
       'data.f_payment' (val) {
         this.getPrivilegeList()
         // 根据付款方式增加业务单号
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else {
           this.mjshow = false

package/src/components/revenue/changeInsurance/InsuranceChargesDetails.vue

@@ -14,7 +14,7 @@
                 <div class="col-sm-2  form-group">
                   <label class="font_normal_body" for="f_user_name">客户姓名</label>
                   <input id="f_user_name" type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
-                         condition="f_user_name like '{}'" placeholder='请输入要查询的客户姓名'>
+                         condition="f_user_name like '%{}%'" placeholder='请输入要查询的客户姓名'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" for="f_insurance_type">险&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种</label>
@@ -61,6 +61,61 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" for="f_state">收款方式</label>
+                  <v-select id="f_state"
+                            v-model="model.f_payment"
+                            placeholder='请选择'
+                            condition="f_payment ='{}'"
+                            :value.sync="model.f_payment"
+                            :options='$parent.$parent.payment'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+                <div class="col-sm-2  form-group">
+                  <label class="font_normal_body" for="f_user_name">客户地址</label>
+                  <input id="f_address" type="text" class="input_search" style="width: 60%" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder='请输入要查询的客户地址'>
+                </div>
+                <div class="col-sm-2  form-group">
+                  <label class="font_normal_body" for="f_user_name">客户电话</label>
+                  <input id="f_user_phone" type="text" class="input_search" style="width: 60%" v-model="model.f_user_phone"
+                         condition="f_user_phone like '%{}%'" placeholder='请输入要查询的客户电话'>
+                </div>
+                <div class="col-sm-2  form-group">
+                  <label class="font_normal_body" for="f_user_name">身份证号</label>
+                  <input id="f_idnumber" type="text" class="input_search" style="width: 60%" v-model="model.f_idnumber"
+                         condition="f_idnumber like '%{}%'" placeholder='请输入要查询的身份证号'>
+                </div>
+                <div class="col-sm-2  form-group">
+                  <label class="font_normal_body" for="f_user_name">保险单号</label>
+                  <input id="f_ins_number" type="text" class="input_search" style="width: 60%" v-model="model.f_ins_number"
+                         condition="f_ins_number like '%{}%'" placeholder='请输入要查询的保险单号'>
+                </div>
+                <div class="col-sm-2  form-group">
+                  <label class="font_normal_body" for="f_user_name">备注信息</label>
+                  <input id="f_comments" type="text" class="input_search" style="width: 60%" v-model="model.f_comments"
+                         condition="f_comments like '%{}%'" placeholder='请输入要查询的备注信息'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">开始时间</label>
+                  <datepicker :format="'yyyy-MM-dd'"
+                              :value.sync="model.f_ins_start_date"
+                              placeholder="缴费开始时间"
+                              condition="f_operate_date >= '{}'"
+                              v-model="model.f_ins_start_date" style="width: 55%">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">结束时间</label>
+                  <datepicker :format="'yyyy-MM-dd'"
+                              :value.sync="model.f_expiration_date"
+                              placeholder="缴费结束时间"
+                              condition="f_operate_date <= '{}'"
+                              v-model="model.f_expiration_date" style="width: 55%">
+                  </datepicker>
+                </div>
+
               </div>
             </div>
 
@@ -251,6 +306,7 @@
         },
         f_state: '',
         state: this.$appdata.getParam('保险状态') ? this.$appdata.getParam('保险状态') : [],
+        payment: this.$appdata.getParam('收费方式') ? this.$appdata.getParam('收费方式') : [],
         f_insurance_type: '',
         insuranceType: this.$appdata.getParam('险种') ? this.$appdata.getParam('险种') : [],
         orgCondtionStr: '',

package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue

@@ -119,7 +119,7 @@
           </button>
         </div>
         <!--<upload :blodid="blodid" isremark="true" fusetype="过户"></upload>-->
-        <upload :blodid="blodid" v-if="config.showupload" :businessid="randomBusinessId" isremark="true" fusetype="过户管理"></upload>
+        <upload :blodid="blodid" v-if="config.showupload" v-on:confirminfo="confirmIdCard" :businessid="randomBusinessId" isremark="true" fusetype="过户管理"></upload>
       </validator>
     </div>
     <modal v-if="loaduserflag" :show.sync="loaduserflag" width="80%" title="过户资产信息" v-ref:modal large backdrop="false">
@@ -219,6 +219,8 @@
           f_transfer_fees: this.$appdata.getSingleValue('过户费') ? this.$appdata.getSingleValue('过户费') : '',
           // f_transfer_fees: '',
           f_newbank_accopen: '',
+          f_newuser_name: '',
+          f_newidnumber: '',
           f_newbank_name: ''
         },
         transferdata: {
@@ -262,6 +264,11 @@
     },
 
     methods: {
+      confirmIdCard (msg) {
+        console.log(msg)
+        this.model.f_newuser_name = msg.strName
+        this.model.f_newidnumber = msg.strID
+      },
       getRandomId () {
         this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
           let res = Math.random() * 16 | 0

package/src/filiale/haile/unHandplanQuery.vue

@@ -129,6 +129,17 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber = '{}' " placeholder="表号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">机表未抄期数</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_hand_month"
+                         condition="f_hand_month  >= '{}' " placeholder="机表未抄期数">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">物联未报天数</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_webhand_day"
+                         condition="f_webhand_day >= '{}' " placeholder="物联未报天数">
+                </div>
+
 
                 <!--表册片区-->
                 <!--<div class="col-sm-2 form-group">-->

package/src/filiale/shanxian/components/revenue/InsuranceChargesDetails.vue

@@ -57,6 +57,24 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">开始时间</label>
+                  <datepicker :format="'yyyy-MM-dd'"
+                              :value.sync="model.f_ins_start_date"
+                              placeholder="缴费开始时间"
+                              condition="f_operate_date >= '{}'"
+                              v-model="model.f_ins_start_date" style="width: 55%">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">结束时间</label>
+                  <datepicker :format="'yyyy-MM-dd'"
+                              :value.sync="model.f_expiration_date"
+                              placeholder="缴费结束时间"
+                              condition="f_operate_date <= '{}'"
+                              v-model="model.f_expiration_date" style="width: 55%">
+                  </datepicker>
+                </div>
               </div>
             </div>
 

package/src/filiale/shexian/HighMeterCard.vue

@@ -72,6 +72,10 @@ export default {
   data () {
     return {
       cameraurl: '',
+      IdCardInfo: {
+        name: '',
+        cardId: ''
+      },
       jd: 'transform:rotate(0deg)',
       degs: 0
     }
@@ -930,8 +934,10 @@ export default {
     },
     confirmIdCard () {
       let param = this.IdCardInfo
-      param.strName=this.IdCardInfo.name
-      param.strID=this.IdCardInfo.cardID
+      param.strName = this.IdCardInfo.name
+      param.strID = this.IdCardInfo.cardID
+      // param.strName = '测试'
+      // param.strID = '123'
       this.$emit('confirminfo', param)
       this.IdCardInfo = {}
     }

package/src/filiale/shexian/Upload.vue

@@ -0,0 +1,599 @@
+<template>
+  <div style="background-color: #FFFFFF;">
+    <div class=" col-sm-12"
+         style="background-color: #FFFFFF;height: auto;border-radius: 8px">
+      <div style="position: relative;height: 34px;width:75%;margin: 30px auto 10px auto;">
+        <div class="inpGroup" v-if="isremark" style="position:absolute;left: 0px;">
+          <input v-model="headers.fremarks" style="width:70%" class="input_search" placeholder="文件说明"/>
+        </div>
+        <div style="position:absolute;right:10%;">
+          <button class="button_search btn-gn"  @click="upload()" v-show="!takeimg" >拍照</button>
+          <button class="button_search btn-gn"   @click="fileUpload()" v-show="!isupload" >审核资料上传</button>
+        </div>
+        <high-meter :show.sync="showhighmeter" @photo-finish="newPhoto" v-if="showhighmeter" v-on:confirminfo="confirmIdCard"></high-meter>
+        <div v-if="isusetype">
+          <v-select class="inp_button2" type="button" placeholder="使用类型" :options="foptions"
+                    :value.sync="useType" v-model="useType"></v-select>
+        </div>
+      </div>
+      <hr style="width: 90%;margin: 0px auto;border: #999999 1px solid;margin-top: 20px"/>
+      <div class="showList col-sm-12" style="padding: 10px;margin-top: 20px">
+        <div :class="cols ? cols : 'col-sm-6'" style="padding:10px 10px 0px 10px;height: auto;box-sizing: border-box"
+             v-for="row in fileInfoData">
+          <div class="showData">
+            <div class="left">
+              <a href="#" class="thumbnail"  style="width:100%;height:100%" >
+                <img v-if="(row.f_filetype.toLowerCase()==='jpg'||row.f_filetype.toLowerCase()==='png'||row.f_filetype.toLowerCase()==='gif'||row.f_filetype.toLowerCase()==='bmp')&&!rotating" :src="row.f_downloadURL" alt="..."/>
+                <img-self v-if="(row.f_filetype.toLowerCase()==='jpg'||row.f_filetype.toLowerCase()==='png'||row.f_filetype.toLowerCase()==='gif'||row.f_filetype.toLowerCase()==='bmp')&&rotating" :width="width?width:60"  :height="height?height:60" :src="row.f_downloadURL" alt="..."></img-self>
+                <img v-if="row.f_filetype.toLowerCase()==='pdf'" src="../../../static/mainicon/pdf.jpg" alt="" style="width:66%"/>
+                <img-self v-if="row.f_filetype.toLowerCase()==='pdf'&&rotating" :width="width?width:60"  :height="height?height:60" src="../../../static/mainicon/pdf.jpg" alt="..."></img-self>
+                <img v-if="row.f_filetype.toLowerCase()==='xls'||row.f_filetype.toLowerCase()==='xlsx'" src="../../../static/mainicon/excel.jpg" alt=""  style="width:66%"/>
+                <img-self v-if="row.f_filetype.toLowerCase()==='xls'||row.f_filetype.toLowerCase()==='xlsx'&&rotating" :width="width?width:60"  :height="height?height:60" src="../../../static/mainicon/excel.jpg" alt="..."></img-self>
+                <img v-if="row.f_filetype.toLowerCase()==='doc'||row.f_filetype.toLowerCase()==='docx'" src="../../../static/mainicon/doc.jpg" alt=""  style="width:66%"/>
+                <img-self v-if="row.f_filetype.toLowerCase()==='doc'||row.f_filetype.toLowerCase()==='docx'&&rotating" :width="width?width:60"  :height="height?height:60" src="../../../static/mainicon/doc.jpg" alt="..."></img-self>
+              </a>
+            </div>
+            <div class="right">
+              <p :title="row.f_uploaddate" class="top clears"><strong>上传时间</strong>:&nbsp;<span>{{row.f_uploaddate}}</span></p>
+              <p :title="row.f_username" class="top clears"><strong>操作员</strong>:&nbsp;<span>{{row.f_username}}</span></p>
+              <p :title="row.f_filename" class="top clears"><strong>文件名</strong>:&nbsp;{{row.f_filename}}</p>
+              <p :title="row.fremarks" class="top clears"><strong>文件说明</strong>:&nbsp;{{row.fremarks}}</p>
+              <p>
+                <a v-if="row.f_filetype.toLowerCase()==='jpg'||row.f_filetype.toLowerCase()==='png'||row.f_filetype.toLowerCase()==='gif'||row.f_filetype.toLowerCase()==='bmp'" :href="row.f_downloadURL" style="background:#6aa6e2" class="btn btn-primary" target="_blank" role="button">预览</a>
+                <button class="button_search btn-gn" v-if="row.f_filetype.toLowerCase()==='pdf'||row.f_filetype.toLowerCase()==='xls'||row.f_filetype.toLowerCase()==='xlsx'||row.f_filetype.toLowerCase()==='doc'||row.f_filetype.toLowerCase()==='docx'"  @click="downloadfile(row.f_downloadURL)" >下载</button>
+                <a v-if="isDelete == '1'" @click="delet($index,row)" href="#" class="btn btn-default" role="button">删除</a>
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <modal :show.sync="showUpload" styles="border-radius:20px;margin-top:300px" v-ref:modal backdrop="false" :width="700" >
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close"><span class="glyphicon glyphicon-remove"></span></button>
+        <h4 class="modal-title" style="text-align: center">文件上传</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <file-upload  style="margin-left:100px;padding-top:20px" class="my-file-uploader" :name="'myFile' + blodid"
+                        action="rs/file/uploadFile" tagname="文件上传" :headers="headers" multiple v-ref:file></file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+import { HttpResetClass } from 'vue-client'
+//import HttpResetClass from '../plugins/HttpResetClass'
+  import Vue from "vue";
+
+  export default {
+    title: "附件",
+    props: ['blodid','businessid','isremark', 'isusetype','takeimg','defname','isupload','fusetype','cols','width','height'],
+    data() {
+      return {
+        isDelete: '0', // 删除按钮，可以进行控制（权限等）
+        fileInfoData: [], // 数据库存储的文件记录对象数组
+        headers: {'username': this.$login.f.name, 'blodid': '','businessid':'', 'fremarks': '','defname':'','fusetype':this.fusetype?this.fusetype:''}, // 调用rs/file/uploadFile 的参数
+        showUpload: false, // 上传模态框控制
+        showhighmeter: false, // 高拍仪组件控制
+        useType: '', // 使用类型
+        fileRemark: '', // 文件说明
+        rotating: this.$appdata.getSingleValue('图片附加功能') // 文件是否旋转
+      }
+    },
+    methods: {
+      confirmIdCard (IdCardInfo) {
+        this.showhighmeter = !this.showhighmeter
+        console.log(IdCardInfo)
+        if(IdCardInfo && IdCardInfo.strID){
+          this.$emit('confirminfo', IdCardInfo)
+        }
+      },
+      // 查询按钮事件
+      delet(index, row) {
+        this.$resetdelete('rs/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+          this.$dispatch("delResid",row.id)
+          this.fileInfoData.splice(index, 1)
+        })
+      },
+      downloadfile(filepath){
+
+        var link = document.createElement('a');
+        // let pathName = "http://" + location.host + filepath;
+        link.href = filepath;
+        link.target='_blank'
+        link.dispatchEvent(new MouseEvent('click'));
+      },
+      GetRequest() {
+        var url = location.search;
+        var theRequest = new Object();
+        if (url.indexOf("?") != -1) {
+          var str = url.substr(1);
+          let strs = str.split("&");
+          for (var i = 0; i < strs.length; i++) {
+            theRequest[strs[i].split("=")[0]] = decodeURIComponent(strs[i].split("=")[1]);
+          }
+        }
+        return theRequest;
+      },
+      upload() {
+
+        if(this.showhighmeter){
+          console.log(this,'测试')
+          this.$refs.ltgao.closeVideo()
+        }
+        console.log('测试1')
+        this.showhighmeter = !this.showhighmeter
+      },
+      async load(self) {
+        let condition=''
+        if(this.businessid){
+          condition = `f_businessid= '${self.headers.businessid}' `
+        }else{
+          condition = `f_blobid= '${self.headers.blodid}' `
+        }
+        if(this.fusetype){
+          condition += ` and fusetype like '%${this.fusetype}%'`
+        }
+        var http = new HttpResetClass()
+        let data = {
+         condition: condition
+       }
+        let getFile = []
+        try {
+          getFile = await http.load('POST', 'rs/sql/getFiles', {data: data}, {
+            warnMsg: null,
+            resolveMsg: null
+          })
+        } catch (e) {
+          console.log(e)
+        }
+        for (var i = 0; i < getFile.data.length; i++) {
+          // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+          if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
+            getFile.data.splice(i,1)
+            i--
+            continue
+          }
+          let temp = getFile.data[i].f_downloadpath
+          let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+          var xy=this.$appdata.getSingleValue('协议')?this.$appdata.getSingleValue('协议'):"http://"
+          getFile.data[i].f_downloadURL = xy+ location.host + "/" + URL
+        }
+        self.fileInfoData = []
+        self.fileInfoData = getFile.data
+      },
+      // 数据库时间格式化
+      formatdate(val) {
+        //20180914151603   :    2018-09-14 15:16:03
+        if (val.length != 14)
+          return
+        let year = val.substr(0, 4)
+        let month = val.substr(4, 2)
+        let day = val.substr(6, 2)
+        let hour = val.substr(8, 2)
+        let min = val.substr(10, 2)
+        let second = val.substr(12, 2)
+        return year + '-' + month + '-' + day + ' ' + hour + ':' + min + ':' + second
+      },
+      // 打开文件上传对话框
+      fileUpload() {
+        this.showUpload = true
+      },
+      // 关闭文件上传对话框
+      close() {
+        this.showUpload = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+        this.load(this)
+      },
+      convertBase64ToBlob(base64String) {
+        // 将base64解码
+        var bytes = atob(base64String);
+        //var bytes = base64;
+        var bytesCode = new ArrayBuffer(bytes.length);
+        // 转换为类型化数组
+        var byteArray = new Uint8Array(bytesCode);
+
+        // 将base64转换为ascii码
+        for (var i = 0; i < bytes.length; i++) {
+          byteArray[i] = bytes.charCodeAt(i);
+        }
+        // 生成Blob对象（文件对象）
+        return new Blob([bytesCode], {type: 'image/jpeg'});
+      },
+      newPhoto(Imgbase64) {
+        let form = new FormData()
+        let xhr = new XMLHttpRequest()
+        let formDataBoundary = "----WebkitFormBoundary" + "GaoPaiYi";
+        form.append('Content-Type', 'multipart/form-data;boundary=' + formDataBoundary)
+        form.append('file', this.convertBase64ToBlob(Imgbase64), "GaoPaiYi.jpg")
+        xhr.open("POST", "rs/file/uploadFile")
+
+        if (this.headers) {
+          for (var header in this.headers) {
+            xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
+          }
+        }
+        if (Vue.$login && Vue.$login.jwt) {
+          xhr.setRequestHeader('Authorization', 'Bearer ' + Vue.$login.jwtNew)
+          xhr.setRequestHeader('Token', Vue.$login.jwt)
+        }
+        xhr.send(form)
+        setTimeout(() => {
+          this.load(this)
+        }, 5000)
+      }
+    },
+    ready() {
+      if (this.$login.r.find(value => value == '上传附件删除')) {
+        // 有删除权限
+        this.isDelete = '1'
+      }
+      this.headers.blodid = this.blodid
+      this.headers.businessid = this.businessid
+      console.log('123222', this.businessid)
+      if (this.blodid||this.businessid) {
+        this.load(this)
+      }
+    },
+    watch: {
+      'blodid'(val) {
+        if (val) {
+          console.log('观察blodid', val)
+          this.headers.blodid = this.blodid
+          this.load(this)
+        }
+      },
+      'businessid'(val) {
+        console.log('观察businessid')
+        if (val) {
+          console.log('观察businessid', val)
+          this.headers.businessid = this.businessid
+          this.load(this)
+        }
+      },
+      'useType'() {
+        this.headers.fusetype = this.useType[0] ? this.useType[0] : ''
+      },
+      'defname'() {
+        this.headers.defname=this.defname
+      }
+    },
+    computed: {
+      foptions() {
+        return this.$appdata.getParam('使用类型')
+      },
+    },
+    events: {
+      onFileUpload: function (file, res) {
+        console.log("上传完毕",res)
+        this.$dispatch("resid",res.id)
+        this.headers.fremarks=''
+        this.close()
+      }
+    }
+  }
+</script>
+<style scoped>
+
+  * {
+    padding: 0px;
+    margin: 0px;
+  }
+
+  .inpGroup {
+    position: absolute;
+    left: 0px;
+    right: 220px;
+    font-family: "微软雅黑";
+  }
+
+  .navWin {
+    position: relative;
+  }
+
+  .navWin .navShow {
+    margin-top: 5px;
+    height: 34px;
+    font-size: 20px;
+    line-height: 34px;
+    color: rgb(180, 180, 180);
+  }
+
+  .navWin .navShow span {
+    display: inline-block;
+    height: 34px;
+  }
+
+  .navWin .navShow .icon {
+    height: 34px;
+    margin-right: 10px;
+    color: rgb(200, 200, 200);
+  }
+
+  .navWin .navList {
+    position: absolute;
+    width: 100%;
+    z-index: 99;
+    list-style: none;
+    background-color: rgba(241, 241, 241, 0.9);
+    line-height: 34px;
+    color: #8d8d8d;
+    visibility: hidden;
+  }
+
+  .navWin:hover .navList {
+    visibility: visible;
+  }
+
+  .navWin .navList li {
+    font-size: 18px;
+    padding-left: 30px;
+  }
+
+  .navWin .navList li:hover {
+    background-color: rgba(220, 220, 220, 0.9);
+  }
+
+  .inp {
+    box-sizing: border-box;
+    width: 79%;
+    padding: 0px 10px;
+    height: 34px;
+    font-size: 14px;
+    line-height: 36px;
+    color: #999999;
+    border: solid 1px #c1c1c1;
+    border-radius: 2px;
+    background: none;
+    outline: none;
+  }
+
+  .inp::-webkit-input-placeholder {
+    color: #999999;
+  }
+
+  .inp_button {
+    float: right;
+    margin-left: 10px;
+    /*    position: absolute;
+        right: 35px;
+        height: 40px;*/
+    width: 100px;
+    font-size: 14px;
+    line-height: 34px;
+    color: #ffffff;
+    text-align: center;
+    background-color: rgb(90, 180, 90);
+    border-radius: 4px;
+    cursor: pointer;
+  }
+
+  .btn-group {
+    height: 34px;
+  }
+
+  .inp_button2 {
+    float: right;
+    margin-left: 10px;
+    /*    position: absolute;
+        right: 35px;
+        height: 40px;*/
+    width: auto;
+    font-size: 16px;
+    line-height: 34px;
+    color: #ffffff;
+    text-align: center;
+    border-radius: 4px;
+    cursor: pointer;
+  }
+
+  .inp_button:hover {
+    /*background-color: rgb(80, 150, 80);*/
+  }
+
+  .inp_button:active {
+    font-size: 20px;
+    /*background-color: rgb(150, 200, 150);*/
+  }
+
+  .showData {
+    height: auto;
+    position: relative;
+    padding-bottom: 7px;
+    border-bottom: solid 1px #c1c1c1;
+    font-family: "微软雅黑";
+  }
+
+  .showData .left {
+    height: 180px;
+    width: 210px;
+    background-color: rgb(240, 240, 240);
+    overflow: hidden;
+    line-height: 180px;
+  }
+
+  .showData .left img {
+    width: 100%;
+    height: auto;
+  }
+
+  .showData .right {
+    position: absolute;
+    top: 0px;
+    left: 220px;
+    right: 0px;
+    height: 180px;
+  }
+
+  .showData .right .top {
+    height: 30px;
+    line-height: 30px;
+    color: rgb(98, 98, 98);
+  }
+
+  .showData .right .top .topleft {
+    float: left;
+    font-size: 16px;
+    margin-right: 20px;
+  }
+
+  .showData .right .top .topright {
+    float: right;
+    margin-left: 20px;
+  }
+
+  .showData .right .text {
+    word-wrap: break-word;
+    overflow: hidden;
+    /*height: 100px;*/
+    color: #999999;
+    /*padding: 8px 0px;*/
+  }
+
+  .showData .right ul {
+    height: 20px;
+    padding: 0px;
+    margin: 0px;
+    font-size: 0px;
+  }
+
+  .showData .right ul li {
+    display: inline-block;
+    height: 20px;
+    list-style: none;
+    font-size: 16px;
+    line-height: 20px;
+    padding: 0px 7px;
+    margin-right: 10px;
+    cursor: pointer;
+    background-color: none;
+    font-weight: bold;
+    color: #006fa3;
+  }
+
+  .showData .right ul li:hover {
+    color: #006fb3;
+  }
+
+  .showData .right ul li:active {
+    color: #006fb3;
+  }
+
+  .showData .right ul li a {
+    width: 100%;
+    height: 100%;
+    text-decoration: none;
+    color: #FFFFFF;
+  }
+
+  body {
+    color: black;
+  }
+
+  .search {
+    width: 75%;
+    margin: 10px auto 30px auto;
+  }
+
+  .search .searchAll {
+    height: 34px;
+    font-size: 18px;
+    color: #999999;
+    line-height: 34px;
+  }
+
+  .search .searchAll span {
+    display: inline-block;
+    width: 15px;
+    height: 15px;
+    border: #999999 1px solid;
+    position: relative;
+    top: 2px;
+  }
+
+  .search .searchAll .spanAll {
+    background-color: rgb(90, 180, 90);
+  }
+
+  .search .itemList {
+    font-size: 16px;
+    color: #999999;
+    line-height: 34px;
+  }
+
+  .search .itemList .item {
+    height: 34px;
+    position: relative;
+  }
+
+  .search .itemList .item .descript {
+    display: inline-block;
+    width: 80px;
+  }
+
+  .search .itemList .item .inputBox {
+    height: 30px;
+    position: absolute;
+    top: 0px;
+    left: 80px;
+    right: 20px;
+  }
+
+  .search .itemList .item .inputBox input {
+    width: 100%;
+    height: 100%;
+    outline: none;
+    padding: 0px 5px;
+  }
+
+  .search .itemList .item .inputBox input::-webkit-input-placeholder {
+    color: #999999;
+  }
+
+  .searchItem {
+    height: 30px;
+    position: absolute;
+    top: 0px;
+    left: 80px;
+    right: 20px;
+  }
+
+  .searchItem .show {
+    padding-left: 10px;
+  }
+
+  .searchItem ul {
+    position: relative;
+    list-style: none;
+    background-color: none;
+    font-weight: bold;
+    color: #006fa3;
+
+    z-index: 99;
+    visibility: hidden;
+  }
+
+  .searchItem ul li {
+    padding-left: 10px;
+  }
+
+  .searchItem:hover ul {
+    visibility: visible;
+  }
+
+  .searchItem ul li:hover {
+    color: #006fb1;
+  }
+  .clears{
+    overflow:hidden;
+
+    　　　text-overflow:ellipsis;
+
+    　　　white-space:nowrap;
+  }
+</style>

package/src/filiale/shexian/sale.js

@@ -18,6 +18,7 @@ export default function () {
   // 机表抄表
   Vue.component('high-meter', (resolve) => { require(['./HighMeterCard'], resolve) })
   Vue.component('upload-idcard', (resolve) => { require(['./UploadIdCard'], resolve) })
+  Vue.component('upload', (resolve) => { require(['./Upload'], resolve) })
   // 换表
   Vue.component('change-meter', (resolve) => { require(['./revenue/newchangemeter/ChangeMeter'], resolve) })
   // 清零

package/src/filiale/tongchuan/CardMeterCenter.vue

@@ -612,7 +612,8 @@ export default {
       }
     },
     'model.f_payment' (val) {
-      if (val == '免交') {
+      let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+      if (val == '免交' || _payment.includes(val)) {
         this.mjshow = true
       } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
         if (this.row.f_collection_type == '按气量') {

package/src/filiale/tongchuan/IOTMeterCenter.vue

@@ -581,7 +581,8 @@
         this.getPrivilegeList()
       },
       'model.f_payment' (val) {
-        if (val == '免交') {
+        let _payment = this.$appdata.getSingleValue('需要输入业务单号的付款方式') || ''
+        if (val == '免交' || _payment.includes(val)) {
           this.mjshow = true
         } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
           if (this.row.f_collection_type == '按气量') {

package/src/filiale/wenxi/cardsHand.vue

@@ -581,7 +581,7 @@ export default {
   },
   methods: {
     downloadFiles () {
-      let downurl = 'rs/downloadfile/file?filename=卡表批量抄表导入模板'
+      let downurl = 'rs/downloadfile/file?filename=闻喜卡表批量抄表导入模板'
       this.$downFile(downurl,'卡表批量抄表导入模板.xlsx')
     },
     hidden () {

package/src/main.js

@@ -4,7 +4,7 @@ import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
 // import wenxi from './filiale/rizhao/sale'
-import FilialeSale from './filiale/yuansheng/sale'
+import FilialeSale from './filiale/zhongsheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'