sale-client 3.5.238 → 3.5.239

package/lib/package_2022-06-30-14-06-19.json

@@ -0,0 +1,117 @@
+{
+  "name": "sale-client",
+  "version": "3.4.179-1",
+  "description": "收费模块前台组件",
+  "main": "src/index.js",
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "build": "rimraf lib && mkdirp lib && cross-env webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/product.git"
+  },
+  "dependencies": {
+    "examples": "^0.1.0",
+    "js-file-download": "0.4.12",
+    "less-loader": "^2.2.3",
+    "qrcodejs2": "0.0.2",
+    "vue": "^1.0.17",
+    "yarn": "^1.22.10"
+  },
+  "devDependencies": {
+    "address-client": "3.2.27",
+    "axios": "0.15.3",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "co": "^4.6.0",
+    "compression-webpack-plugin": "1.1.2",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^3.19.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-friendly-formatter": "^3.0.0",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "filemanager-webpack-plugin": "^2.0.5",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.7",
+    "less": "^2.7.3",
+    "manage-client": "3.1.8-88",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "moment": "2.24.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "qrcodejs2": "0.0.2",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.2.0-2",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.52",
+    "vue-clipboard2": "0.3.1",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "webpack-parallel-uglify-plugin": "^1.0.0",
+    "weixin-js-sdk": "^1.2.0"
+  },
+  "keywords": [
+    "selling-clients"
+  ],
+  "author": "张桥",
+  "license": "ISC",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  }
+}

package/package.json

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

package/src/components/revenue/third//346/227/245/347/205/247/transferAuditCenter.vue

@@ -43,7 +43,7 @@
           value: data.val
         })
         try {
-          await this.$resetget(`http://127.0.0.1:8091/rs/content/images?path=${data.val.f_userinfo_code}`, {resolveMsg: null, rejectMsg: '获取数据错误！'})
+          await this.$resetget(`http://193.168.1.50:8887/rs/content/images?path=${data.val.f_userinfo_code}`, {resolveMsg: null, rejectMsg: '获取数据错误！'})
             .then(res => {
               console.log('离谱啊', res)
               let img = res.data.replace('[', '')

package/src/components/revenue/third//346/227/245/347/205/247/transferAuditDisposeBasics.vue

@@ -86,18 +86,19 @@
                            readonly
                            placeholder="备注">
                   </div>
+                  <div v-for="image in images" class="imgBox">
+                    <span>用户{{row.value.f_newuser_name}}的过户资料</span>
+                    <img :src="'data:image/'+'jpg'+';base64,'+image" width="50%"/>
+                  </div>
               </div>
 
             </div>
           </div>
-          <div v-for="image in images" class="imgBox">
-            <span>不动产证</span>
-            <img :src="'data:image/'+'jpg'+';base64,'+image" width="50%"/>
-          </div>
+
         </div>
 
         <div style="text-align:right;height:auto;margin-top:10px;margin-right:30px;">
-          <span style="color: red" v-if="row.f_order_state !== '待处理'&&row.f_order_state!==''&&row.f_order_state!==null">该条预约已处理</span>
+          <span style="color: red" v-if="row.f_order_state !== '待处理'&&row.f_order_state!==''&&row.f_order_state!==null">该条审核已处理</span>
           <br>
           <button type="button" :disabled="row.f_order_state!=='待处理'&&row.f_order_state!==''&&row.f_order_state!==null" class="btn btn-warning" @click="confirm(row)" style="width:80px;margin-left:20px;">审核失败</button>
           <button type="button" :disabled="row.f_order_state!=='待处理'&&row.f_order_state!==''&&row.f_order_state!==null" class="btn btn-primary" @click="confirm1(row)" style="width:80px;margin-left:20px;">审核通过</button>
@@ -179,13 +180,13 @@
           rejectMsg: '审核失败!!'
         }).then((res) => {
           if (res.data.code === 200) {
+            this.$resetpost('rs/logic/transferPass', row, {resolveMsg: '推送成功', rejectMsg: '推送失败!!'})
             this.$showAlert('预约成功审核成功！！', 'success', 2000)
           } else {
             this.$showAlert('预约成功审核失败！！', 'danger', 2000)
           }
         })
         this.$dispatch('refresh')
-
       }
     }
   }

package/src/filiale/shanxian/components/FilesManage/FileUserFiles.vue

@@ -236,16 +236,16 @@
                               condition="f_usetype = '{}'" placeholder='使用类型'
                               v-model='model.f_usetype'></v-select>
                   </div>
-                  <div
-                          :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
-                          class="form-group" >
-                    <label class="font_normal_body">用户等级</label>
-                    <v-select :options='$parent.$parent.userlevel' :search='true'
-                              :value.sync="model.userlevel"
-                              close-on-select
-                              condition="f_user_level = '{}'" placeholder='用户等级'
-                              v-model='model.userlevel'></v-select>
-                  </div>
+<!--                  <div-->
+<!--                          :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"-->
+<!--                          class="form-group" >-->
+<!--                    <label class="font_normal_body">用户等级</label>-->
+<!--                    <v-select :options='$parent.$parent.userlevel' :search='true'-->
+<!--                              :value.sync="model.userlevel"-->
+<!--                              close-on-select-->
+<!--                              condition="f_user_level = '{}'" placeholder='用户等级'-->
+<!--                              v-model='model.userlevel'></v-select>-->
+<!--                  </div>-->
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group" >

package/src/filiale/shanxian/components/FilesManage/UserEssentialInfoTest.vue

@@ -133,17 +133,24 @@
 <!--          </div>-->
         </div>
         <div class="row">
-          <div style="" class="col-sm-4 form-group">
-            <label for="f_user_level" class="font_normal_body ">&ensp;用户等级</label>
-            <v-select :value.sync="baseinfo.base.f_user_level" :search="false" :value-single="true"
-                      :options='userlevel' placeholder='用户等级' close-on-select>
-            </v-select>
-          </div>
+<!--          <div style="" class="col-sm-4 form-group">-->
+<!--            <label for="f_user_level" class="font_normal_body ">&ensp;用户等级</label>-->
+<!--            <v-select :value.sync="baseinfo.base.f_user_level" :search="false" :value-single="true"-->
+<!--                      :options='userlevel' placeholder='用户等级' close-on-select>-->
+<!--            </v-select>-->
+<!--          </div>-->
           <div class="col-sm-4 form-group">
-            <label for="f_user_nature" class="font_normal_body" title="用户性质">&ensp;用气类型</label>
+            <label for="f_user_nature" class="font_normal_body" title="用户性质">&ensp;用户类型</label>
             <input type="text" v-show="false" v-model="baseinfo.base.f_user_nature">
             <v-select :value.sync="baseinfo.base.f_user_nature" :search="false" :value-single="true"
-                      :options='usernature' placeholder='用气类型' close-on-select>
+                      :options='usernature' placeholder='用户类型'
+                      close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label for="f_industry_type" class="font_normal_body ">&ensp;行业类型</label>
+            <v-select :value.sync="baseinfo.base.f_industry_type" :search="false" :value-single="true"
+                      :options='getIndustryType' placeholder='行业类型' close-on-select>
             </v-select>
           </div>
           <div class="col-sm-4 form-group">
@@ -247,7 +254,9 @@
         userstates: this.$appdata.getParam('用户状态'),
         mgq: this.$appdata.getParam('是否煤改气'),
         costtype: this.$appdata.getParam('付款类型'),
+        // 用户类型
         usernature: this.$appdata.getParam('用户性质'),
+        // industryType: this.$appdata.getParam('行业类型'),
         userlevel: this.$appdata.getParam('用户等级'),
         housetype: [{label: '楼房', value: '楼房'}, {label: '自建房', value: '自建房'}],
         jurisdiction: this.$login.r,
@@ -319,7 +328,14 @@
       //     // }
       // }
     },
-    computed: {},
+    computed: {
+      getIndustryType (){
+        let usernature = this.baseinfo.base.f_user_nature;
+        let industryType = this.$appdata.getParam(usernature+'行业类型')
+        industryType==null?industryType=[]:industryType
+        return industryType
+      }
+    },
     events: {
       'confirmaddress' (res) {
         console.log('选定地址', res)

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

@@ -0,0 +1,944 @@
+<template>
+  <div class="flex-row">
+    <div class="span" style="overflow-y: hidden">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <div class="row">
+            <div class="col-sm-4" :class="[$v.payment.required ? 'has-error' : '']">
+              <label class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
+              <input type="text" v-show="false" v-model="$refs.payment.selectedItems"
+                     v-validate:payment='{required: true }'>
+              <v-select v-model="f_payment"
+                        placeholder='请选择'
+                        :value.sync="model.f_payment"
+                        :options='paytype' clear-button v-ref:payment></v-select>
+            </div>
+
+            <div class="col-sm-4" v-if="row.f_collection_type == '按气量'">
+              <label for="f_pregas" class=" font_normal_body">*预购气量</label>
+              <input class="input_search" style="width:60%" type="number" :disabled="config.calculatePreByCollection"
+                     @blur="pregas()" v-model="model.f_pregas" v-el:fpregas
+                     placeholder="预购气量"
+                     v-next-el='fcollection'>
+            </div>
+            <div class="col-sm-4" v-if="row.f_collection_type == '按金额'">
+              <label for="f_pregas" class=" font_normal_body">*预购气量</label>
+              <input class="input_search" style="width:60%" type="number" v-el:fpregas
+                     @blur="pregas()" v-model="model.f_pregas" placeholder="预购气量"
+                     v-next-el='fcollection' :disabled="config.calculatePreByCollection"/>
+            </div>
+            <div class="col-sm-4"
+                 :class="[$v.f_preamount.required || $v.f_preamount.dctest || model.f_preamount === 0 ? 'has-error' : 'has-success']">
+              <label for="f_pregas" class=" font_normal_body">*预购金额</label>
+              <input class="input_search" style="width:60%" type="number"
+                     @blur="preamount()" v-model="model.f_preamount"
+                     :disabled="config.calculatePreByCollection"
+                     v-validate:f_preamount='{required: true, dctest: [maxmoney, "<=" ]}' placeholder="预购金额">
+            </div><!--
+            <div class="col-sm-4" v-if="row.f_collection_type == '按气量'">
+              <label for="f_preamount" class=" font_normal_body">&nbsp;预购金额</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+                     v-scale="[model.f_preamount, 4]" placeholder="预购金额" disabled>
+            </div>-->
+
+          </div>
+          <div class="row" style="margin-top:6px;">
+            <div class="col-sm-4" :class="[$v.printstyle.required ? 'has-error' : '']">
+              <label for="f_print" class="font_normal_body">打印格式</label>
+              <input type="text" v-show="false" v-model="$refs.printstyle.selectedItems"
+                     v-validate:printstyle='{required: true }'>
+              <v-select id="print"
+                        v-model="f_print"
+                        placeholder='请选择'
+                        :multiple="mulPrint"
+                        :value.sync="model.f_print"
+                        :options='printstyle'
+                        close-on-select clear-button v-ref:printstyle>
+              </v-select>
+            </div>
+            <div class="col-sm-4 " v-if="hasLimit&&limitgas">
+              <label class="font_normal_body">&ensp;购气上限</label>
+              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxgas"
+                     v-scale="[maxgas, 4]" placeholder='限购余气' disabled>
+            </div>
+            <div class="col-sm-4 form-group" v-if="hasLimit&&limitmoney">
+              <label class="font_normal_body">金额上限</label>
+              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxmoney"
+                     v-scale="[maxmoney, 2]" placeholder='限购金额' disabled>
+            </div>
+            <div class="col-sm-4" v-if="!hasLimit">
+            </div>
+
+            <div class="col-sm-4"
+                 :class="[$v.f_totalcost.required || $v.f_totalcost.dctest ? 'has-error' : 'has-success']">
+              <label for="f_temp_amount"
+                     class=" font_normal_body">&nbsp;应收金额</label>
+              <input class="input_search" style="width:60%" type="number"
+                     @blur="preamount()" v-model="model.f_totalcost"
+                     v-validate:f_totalcost='{required: true, dctest: [0, ">=" ] }' placeholder="应收金额"
+                     v-next-el='fcollection' v-scale="[model.f_totalcost, 4]" disabled>
+            </div>
+          </div>
+          <div class="row">
+
+            <div class="col-sm-4">
+              <label for="f_balance" class="font_normal_body">上期结余</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_balance"
+                     v-scale="[model.f_balance, 4]" placeholder="上期结余" disabled>
+            </div>
+
+            <div class="col-sm-4">
+              <label for="f_curbalance" class="font_normal_body">&nbsp;本期结余</label>
+              <input class="input_search" style="width:60%" type="number" v-model="curbalance"
+                     v-scale="[curbalance, 4]" placeholder="本期结余" disabled>
+            </div>
+
+            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && !config.calculatePreByCollection"
+                 :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
+              <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
+              <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     v-validate:f_collection='{required: true, dctest: [(model.f_totalcost - 0), ">=" ] }'
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
+                     v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''"/>
+            </div>
+            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment!='赠气' && row.f_meter_type.includes('卡表') && config.calculatePreByCollection"
+                 :class="[$v.f_collection.required ? 'has-error' : 'has-success']">
+              <label for="f_collection" class=" font_normal_body">*收&emsp;&emsp;款</label>
+              <input id="f_collection" class="input_search" style="width:60%" type="number" v-model="model.f_collection"
+                     v-validate:f_collection='{required: true }'
+                     @blur="calculatePreByCollection()"
+                     v-el:fcollection
+                     @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"/>
+            </div>
+            <div class="col-sm-3" v-if="row.f_collection_type === '按气量' && model.f_payment=='赠气' && row.f_meter_type.includes('卡表')"
+                 :class="[$v.f_collection.required  || $v.f_collection.dctest ? 'has-error' : 'has-success']">
+              <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
+              <input id="f_collection" class="input_search" style="width:60%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_totalcost, 4]" :disabled="$refs.givechange.promptText != ''">
+            </div>
+            <div class="col-sm-3" v-if="row.f_collection_type === '按金额' && row.f_meter_type.includes('卡表')">
+              <label for="f_collection" class=" font_normal_body"><font size="4px" style="font-weight:bold">*收&emsp;款</font></label>
+              <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;" type="number" v-model="model.f_collection"
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
+                     v-el:fcollection @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))" v-scale="[model.f_collection, 4]" :disabled="$refs.givechange.promptText != ''">
+            </div>
+            <div class="col-sm-4" v-if="!row.f_meter_type.includes('卡表')">
+              <label for="f_collection" class=" font_normal_body"><font size="4px"
+                                                                        style="font-weight:bold">*收&emsp;款</font></label>
+              <input id="f_collection" class="input_search" style="width:50%;font-size: 18px;font-weight:bold;"
+                     type="number" v-model="model.f_collection"
+                     v-el:fcollection
+                     @blur="config.calculatePreByCollection && calculatePreByCollection()"
+                     @keyup.enter="checkInvoiceMsg((!$v.valid || validateOk || !islegal || clickConfirm))"
+                     v-scale="[model.f_collection, 4]" disabled>
+            </div>
+            <div class="col-sm-1 form-group" v-show=" row.f_meter_type.includes('卡表')">
+              <give-change :curbalance="curbalance" :collection.sync="model.f_collection" v-ref:givechange></give-change>
+            </div>
+          </div>
+          <div class="row" style="margin-top:5px;" v-if="!config.calculatePreByCollection">
+            <div class="col-sm-9">
+            </div>
+            <div class="col-sm-3">
+              <span v-if="$v.f_collection.dctest" style="color:red ">收款不能小于应收金额</span>
+            </div>
+          </div>
+
+          <div class="row" style="margin-top:5px;" v-show="authArr.includes('优惠权限')">
+            <div class="col-sm-4">
+              <label class="font_normal_body">优惠方式</label>
+              <v-select v-model="model.f_privilege_id" @blur.native.capture="privilegeCalculate"
+                        placeholder='请选择'
+                        :value.sync="model.f_privilege_id"
+                        :options='privilegeList' clear-button value-single>
+              </v-select>
+            </div>
+            <div class="col-sm-4">
+              <label for="f_preamount" class=" font_normal_body">&nbsp;优惠金额</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_privilege_money"
+                     v-scale="[model.f_privilege_money, 2]" placeholder="优惠金额" disabled>
+            </div>
+            <div class="col-sm-4">
+              <label for="f_preamount" class=" font_normal_body">&nbsp;实际收款</label>
+              <input class="input_search" style="width:60%" type="number" v-model="model.f_after_discount"
+                     v-scale="[model.f_after_discount, 2]" placeholder="优惠后收款" disabled>
+            </div>
+          </div>
+
+          <div class="row" v-if="model.f_payment[0].includes('POS')">
+            <div class="col-sm-4">
+              <label for="f_voucher_number" class="font_normal_body">凭证号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_voucher_number"
+                     placeholder="凭证号">
+            </div>
+          </div>
+          <div class="row" style="padding-top: 0.5em;">
+            <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 class="input_search" style="width:77%" v-model="model.f_comments" rows="1" placeholder="备注">
+            </div>
+          </div>
+
+          <div v-if="paymentModel.length >1">
+            <div class="row" style="margin-top:10px;">
+              <p class="col-sm-2 text-left" style="padding: 10px;"><img src="../../../../../static/juxing.png"/><strong
+                style="margin-left: 4%">付款明细</strong></p>
+            </div>
+            <div class="row" style="margin-top:10px;">
+              <div class="col-sm-4 " v-for="pay in paymentModel">
+                <label class="font_normal_body">{{pay.f_payment}}:</label>
+                <input id="f_money" type="text" class="input_search" style="width:60%" v-model="pay.f_money">
+              </div>
+              <div class="col-sm-4 ">
+                <strong v-if="!islegal" style="color: red">所输入的金额必须等于收款金额</strong>
+              </div>
+            </div>
+          </div>
+        </form>
+        <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
+        <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close"
+                    @printok="printok" v-ref:printbill></print-bill>
+        <div style="text-align:right; height: 25%">
+          <strong style="color:red;margin-right: 5px">{{ $refs.givechange.promptText }}</strong>
+          <strong style="font-size: large" v-if="!config.notShowFormula">计算公式:{{calculatedetail ? calculatedetail : ' 暂无'}}</strong><br/>
+          <payment-code-button :clickable="!$v.valid || validateOk || !islegal || clickConfirm|| model.f_preamount === 0"
+                               :payment.sync="model.f_payment" :payment-data="paytype"
+                               @confirm-payment="confirm()">
+          </payment-code-button>
+          <button class="button_search btn-gn" type="submit" @click="checkInvoiceMsg()"
+                  :disabled='!$v.valid || validateOk || !islegal || clickConfirm || model.f_preamount === 0'>确认
+          </button>
+          <button class="button_clear btn-gn" @click="clean()">取消</button>
+        </div>
+      </validator>
+      <eticket-modal :show="eticket_msg" @close-modal-show="eticket_msg = false" :row="row" @confirm="confirm"></eticket-modal>
+      <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
+      <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_after_discount"></payment-code>
+    </div>
+  </div>
+  <upload :blodid="row.f_userinfo_id" v-if="config.showupload" isremark="true" fusetype="卡表收费"></upload>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  /**
+   *综合业务
+   *卡表收费组件
+   */
+
+    // 输入金额，换算气量
+  let preamountGen = async function (self) {
+      let calFee = ((self.model.f_preamount - 0)).toFixed(4)
+      if (self.model.f_payment == '赠气') {
+        calFee = (self.model.f_preamount - 0).toFixed(4)
+      }
+      // 通过金额进行划价
+      let getGas = await self.$CommonService.feeCalculate(self.model, calFee)
+      if (getGas.data.gas) {
+        if (self.row.f_isdecimal === '是') {
+          if (self.row.f_alias === 'QiaoSong') {
+            self.model.f_pregas = (getGas.data.gas - 0).toFixed(1)
+          } else {
+            if (self.row.f_collection_type === '按气量') {
+              self.model.f_pregas = (getGas.data.gas - 0).toFixed(2)
+            } else {
+              self.model.f_pregas = (getGas.data.gas - 0).toFixed(4)
+            }
+          }
+          if (self.row.f_collection_type === '按金额') {
+            self.dymoney = 0
+          } else {
+            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas).toFixed(4))
+            self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
+          }
+        } else {
+          // 如果不支持小数,将划价出的多余非整数气量进行划价为金额
+          let tempnum = Math.floor(getGas.data.gas - 0)
+          let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(4))
+          self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(2)
+          self.model.f_pregas = Math.floor(getGas.data.gas - 0)
+        }
+      }
+      self.model.f_totalcost = ((self.row.f_balance - 0) >= (self.model.f_preamount - 0) ? 0 : (self.model.f_preamount - 0 - self.row.f_balance))
+
+      self.model.chargeprice = getGas.data.chargeprice
+      Object.assign(self.model, self.model, getGas.data)
+      if (self.model.f_payment == '赠气') {
+        self.model.f_totalcost = self.model.f_preamount
+        self.model.f_collection = 0
+      } else {
+        self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
+        self.model.f_totalcost = ((self.model.f_totalcost - 0) - (self.dymoney - 0)).toFixed(4)
+      }
+      self.model.f_collection = calFee
+      self.model.f_preamount = (calFee - (self.dymoney - 0)).toFixed(4)
+      self.calText(getGas.data.chargeprice)
+    }
+
+  // 输入气量，换算金额
+  let pregasGen = async function (self) {
+    if (self.row.f_isdecimal === '是') {
+      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(4)
+    } else {
+      self.model.f_pregas = (self.model.f_pregas - 0).toFixed(0)
+    }
+    if ((self.model.f_pregas - 0) - (self.maxgas - 0) <= 0) {
+      self.model.f_meter_type = self.row.f_meter_type
+      let getAmount = await self.$CommonService.gasCalculate(self.model, self.model.f_pregas)
+      self.model.f_preamount = getAmount.data.chargenum
+      self.model.f_totalcost = ((self.row.f_balance - 0) > (getAmount.data.chargenum - 0) ? 0 : ((getAmount.data.chargenum - 0) - (self.row.f_balance - 0)).toFixed(4))
+      Object.assign(self.model, self.model, getAmount.data)
+      self.model.chargeprice = getAmount.data.chargeprice
+      if (self.model.f_payment == '赠气') {
+        self.model.f_totalcost = getAmount.data.chargenum
+        self.model.f_collection = 0
+      } else {
+        self.model.f_collection = self.config.autoCollection ? self.model.f_totalcost : 0
+        if (self.config.floor) {
+          self.model.f_collection = Math.ceil(self.model.f_collection)
+        }
+      }
+      self.calText(getAmount.data.chargeprice)
+    }
+  }
+  // 执行保存逻辑
+  let sellgasGen = async function (self) {
+    try {
+      self.row.cardInfo = self.cardData
+
+      if (self.paymentModel.length === 0) {
+        self.paymentModel = [{
+          f_payment: self.model.f_payment[0],
+          f_money: self.model.f_preamount
+        }]
+      }
+      self.model.xiekamoney = self.model.f_preamount
+      if (self.row.f_price_type == '阶梯气价' && self.row.f_is_step == '否' && self.row.f_collection_type == '按金额') {
+        self.model.xiekamoney = (self.model.f_pregas * self.model.chargeprice[0].f_price)
+        self.model.xiekamoney = self.model.xiekamoney.toFixed(4)
+      }
+
+      self.model.payments = self.paymentModel
+      // 加入扫码盒付款码支付流水号
+      self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
+      let res = await self.$CardService.sellgas(self.model, self.row)
+      let localeSustainMoney = window.localStorage.getItem('sustainMoney')
+      if (localeSustainMoney != null) {
+        localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)
+        window.localStorage.setItem('sustainMoney', localeSustainMoney)
+      }
+      let param = []
+      for (let row of self.resid) {
+        param.push({id: row.id})
+      }
+      let writeid
+      if (res.data && res.data.id) {
+        writeid = res.data.id
+      } else {
+        writeid = res
+      }
+      let data = {
+        param: param,
+        f_blobid: writeid
+      }
+
+      await self.$resetpost('rs/logic/updatefiles', data)
+      console.log(self.config, self.config.hasPrint && !self.$login.r.includes('不打印发票'))
+      // 开始打票
+      if (self.config.hasPrint && !self.$login.r.includes('不打印发票')) {
+        if (self.model.f_print.indexOf('电子发票') == -1) {
+          if (self.$login.r.includes('非民用纸质票据拆分')) {
+            if (self.row.f_user_type === '非民用') {
+              self.billData.url = 'rs/report/fmy_card_bill'
+            }
+          }
+          if (self.row.f_meter_type === '金额卡表' && self.$appdata.getSingleValue('金额气量区分卡表票据')) {
+            self.billData.url = 'rs/report/fee_card_bill'
+          }
+          if (self.config.hasBillManage) {
+            // 启用发票管理，获取票据管理中的票号并存储记录
+            self.row.id = res
+            self.row.f_bill_type = '卡表收费'
+            self.row.f_bill_style = self.model.f_print[0]
+            self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+            self.print = true
+          } else {
+            self.row.id = res
+            self.row.f_url = 'http://192.168.50.77:31039/report/jmreport/shareView/787097260170534912'
+            self.print = true
+          }
+        } else {
+          if (self.model.f_print[0] === '电子发票') {
+            self.row.id = res
+            self.eticket_show = true
+            // 应铜川需要卡表显示
+            await self.$refs.eticketbill.openETicket([res], self.row, '是', self.invoice_is_pax, '卡表收费')
+            // await self.$CommonService.openEticket(res, '售气收费')
+            // self.print = true
+          }
+        }
+      } else {
+        self.$dispatch('success', '卡表收费')
+      }
+      self.clickConfirm = false
+    } catch (error) {
+      console.log('捕获到异常', error)
+      if (error instanceof Object) {
+        self.$showAlert(error.data, 'danger', 0)
+      } else {
+        self.$showAlert(error, 'danger', 0)
+      }
+      self.$dispatch('refresh')
+      self.clickConfirm = false
+    }
+  }
+
+  let asyncCardMeterCenter = async function (self) {
+    await self.$getConfig(self, 'CardMeterCenter')
+    console.log('卡表收费config', self.config)
+    // 添加 “系统余额透支” 付款方式
+    let i = -1
+    for (const index in self.paytype) {
+      if (self.paytype[index].value == '系统余额透支') {
+        i = index
+        break
+      }
+    }
+    if (self.canOverdraftBalance()) {
+      if (i == -1) {
+        self.paytype.push({
+          label: '系统余额透支',
+          value: '系统余额透支'
+        })
+      }
+    } else {
+      if (i != -1) {
+        self.paytype.splice(i, 1)
+      }
+    }
+
+    // 默认打印格式
+    self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
+    self.model.f_payment = [self.config.payment]
+    self.mulPrint = self.config.printType instanceof Array
+
+    // 获取当前票号用
+    self.model.f_use_type = self.config.billType
+    self.model.f_bill_type = self.model.f_print
+    self.hasValidateBill = self.config.hasBillManage
+
+    // 判断限购
+    let limit_param = {
+      f_userinfo_id: self.row.f_userinfo_id,
+      f_user_id: self.row.f_user_id,
+      f_stairprice_id: self.row.f_stairprice_id
+    }
+    let getLimit = await self.$resetpost('rs/logic/sale_getLimitGas', {data: limit_param}, {
+      resolveMsg: null,
+      rejectMsg: '获取限购值失败！！'
+    })
+    console.log('获取限购值', getLimit)
+    self.hasLimit = getLimit.data.hasLimit
+    if (self.hasLimit) {
+      if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
+        if (getLimit.data.f_limit_value < 0 && getLimit.data.f_limit_amount < 0) {
+          self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
+          self.$dispatch('refresh')
+        } else {
+          if (getLimit.data.f_limit_value) {
+            self.maxgas = (getLimit.data.f_limit_value - 0)
+            self.limitgas = true
+          }
+          if (getLimit.data.f_limit_amount) {
+            self.maxmoney = (getLimit.data.f_limit_amount - 0)
+            self.limitmoney = true
+          }
+        }
+      }
+    }
+    let nowrite_param = {
+      f_userfiles_id: self.row.f_userfiles_id
+    }
+    let getNoWriteCard = await self.$resetpost('rs/sql/getnowritecard', {data: nowrite_param}, {
+      resolveMsg: null,
+      rejectMsg: '获取最近卡表收费记录失败！！'
+    })
+    if (getNoWriteCard.data.length > 0) {
+      self.$showMessage(`三小时内存在写卡失败的记录，是否重新写卡？`, ['confirm', 'cancel']).then(async (res) => {
+        if (res === 'confirm') {
+          let url = 'http://127.0.0.1:8003/' + getNoWriteCard.data[0].f_cardpost
+          let param = JSON.parse(getNoWriteCard.data[0].f_cardparam)
+          let cardRes = await self.$resetpost(url, param, {resolveMsg: null, rejectMsg: '重新写卡失败'})
+          if (cardRes.data.Err || cardRes.data.Exception) {
+            self.$showAlert(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`, 'danger', 3000)
+            self.$dispatch('refresh', self.row)
+          } else {
+            self.$resetpost('rs/logic/writeCardAgin', getNoWriteCard.data[0], {resolveMsg: '重新写卡成功', rejectMsg: '重新写卡失败'})
+            self.$dispatch('success', '卡表收费')
+          }
+        } else {
+          self.$dispatch('refresh', self.row)
+        }
+      })
+    }
+  }
+  export default {
+    title: '卡表收费',
+    data () {
+      return {
+        mjshow: false,
+        serialShow: false,
+        resid: [],  // 存放新增的f_files表中id
+        config: {
+          calculatePreByCollection: false, // 可以更具收款来反向计算预购
+          notShowFormula: false, // 不显示计算公式,默认显示
+          autoCollection: true, // 自动填写收款
+          showupload: true, // 显示上传
+          hasPrint: true,  // 默认打票
+          hasBillManage: false,  // 默认不启用发票管理
+          billType: '燃气费',   // 票据类型（燃气费，其他费用，调用的发票代码不同）
+          printType: '普通收据', // 收据/电子票/专用发票/国税发票
+          payment: '现金缴费',
+          floor: false,
+          overdraftBalance: false // 是否支持系统余额透支
+        },
+        eticket_msg: false,
+        eticket_show: false,
+        invoice_is_pax: '不征税',
+        is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
+        model: {
+          f_purchase: 0,
+          f_payment: [],
+          f_pregas: '',
+          f_preamount: 0,
+          f_totalcost: 0,
+          f_curbalance: 0,
+          f_collection: '',
+          f_balance: 0,
+          f_print: [],
+          f_meter_type: '',
+          f_voucher_number: '',
+          f_banktransfer_person: '',
+          f_banktransfer_date: '',
+          f_privilege_id: 0,
+          f_privilege_money: 0,
+          f_after_discount: 0
+        },
+        calculatedetail: '',
+
+        // 启用发票管理需要对票号进行验证
+        hasValidateBill: false,
+        validateOk: false,
+
+        print: false,
+        billData: {
+          url: 'rs/report/card_bill',
+          billnumber: ''
+        },
+        hasLimit: false,
+        maxgas: 99999999, // 限购
+        maxmoney: 99999999,
+        limitmoney: false,
+        limitgas: false,
+
+        paymentModel: [], // 多笔付款方式
+
+        mulPrint: false,
+        clickConfirm: false, // 控制确认按钮只能点击一次
+        // 下拉框值
+        paytype: [],
+        printstyle: this.$appdata.getParam('打印格式'),
+        privilegeList: [{label: '无优惠', value: '0'}],
+        BankTransfer: false,
+        // 小数是否支持,导致划价产生的多余气量,金额
+        dymoney: 0
+      }
+    },
+    props: ['row', 'cardData'],
+    async ready () {
+      if (this.authArr.includes('余额写卡限定')) {
+        this.paytype = [{label: '余额写卡', value: '余额写卡'}]
+      } else {
+        this.paytype = await this.$appdata.getParam('付款方式') ? await this.$appdata.getParam('付款方式') : []
+        if (!this.$login.r.includes('免交充值付款')) {
+          this.paytype = this.paytype.filter((item) => {
+            return item.label != '免交'
+          })
+        }
+      }
+      // this.getPurchase()
+      this.model.f_price_id = this.row.f_price_id
+      this.model.f_user_id = this.row.f_user_id
+      this.model.f_userfiles_id = this.row.f_userfiles_id
+      this.model.f_userinfo_id = this.row.f_userinfo_id
+      this.model.f_balance = this.row.f_alias === 'QiaoSong' ? Math.trunc(this.row.f_balance) : this.row.f_balance
+      if (this.row.f_collection_type == '按金额') {
+        this.model.f_preamount = ''
+        this.model.f_pregas = 0
+      }
+      this.$els.fpregas.focus()
+      asyncCardMeterCenter(this)
+    },
+    watch: {
+      'model.f_payment.length' (val) {
+        console.log('付款方式多选。。', val)
+        if (val > 1 && !this.model.f_preamount) {
+          this.model.f_payment = ['现金缴费']
+          this.$showAlert('请先计算付款金额', 'warning', 2000)
+        } else {
+          this.paymentModel = []
+
+          this.model.f_payment.forEach((res) => {
+            let temp = {
+              f_payment: res,
+              f_money: 0
+            }
+            this.paymentModel.push(temp)
+          })
+          this.$resetValidation()
+
+          // 获取计算优惠
+          this.getPrivilegeList()
+        }
+      },
+      'model.f_payment' (val) {
+        if (val == '免交') {
+          this.mjshow = true
+        } else if (val == '赠气' && (this.model.f_preamount || this.model.f_preamount != '')) {
+          if (this.row.f_collection_type == '按气量') {
+            this.pregas()
+          } else {
+            this.preamount()
+          }
+        } else {
+          this.mjshow = false
+        }
+        // if(this.row.f_collection_type == '按气量'){
+        //   this.pregas();
+        // }else{
+        //   this.preamount();
+        // }
+      },
+      'model.f_collection' (val) {
+        // 获取计算优惠
+        this.getPrivilegeList()
+      }
+    },
+    events: {
+      // 删除Resid数组元素
+      'delResid' (val) {
+        this.resid.$remove({id: val, f_biobid: ''})
+        // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+      },
+      // 增加Resid数组元素
+      'resid' (val) {
+        this.resid.push({id: val, f_biobid: ''})
+      }
+    },
+    methods: {
+      // 根据收款金额计算划价信息
+      // 需要配置 calculatePreByCollection = true
+      async calculatePreByCollection() {
+        try {
+          this.model.f_collection = (this.model.f_collection - 0)
+          let calFee = ((this.model.f_collection - 0) + (this.row.f_balance)).toFixed(4)
+          // 通过收款进行划价
+          let getGas = await this.$CommonService.feeCalculate(this.model, calFee)
+          this.model.f_pregas = parseInt(getGas.data.gas)
+          let dymoney2 = await this.$CommonService.gasCalculate(this.model, this.model.f_pregas)
+          this.model.chargeprice = dymoney2.data.chargeprice
+          Object.assign(this.model, this.model, dymoney2.data)
+          this.model.f_totalcost = dymoney2.data.chargenum
+          this.model.f_preamount = dymoney2.data.chargenum
+          this.calText(dymoney2.data.chargeprice)
+        } catch (error) {
+          this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+          this.$dispatch('error', '发卡售气', this.model, error)
+        }
+      },
+      // 校验发票信息
+      checkInvoiceMsg (flag) {
+        // 校验是否超出最大透支余额
+        if (this.model.f_payment == '系统余额透支') {
+          const maxOverdraftBalance = -(this.$appdata.getSingleValue('最大透支余额') - 0)
+          const curSysBalance = (this.row.f_sys_balance - 0) - (this.model.f_totalcost - 0)
+          if (curSysBalance < maxOverdraftBalance) {
+            this.$showAlert('您的系统余额将超出最大透支余额，请使用别的付款方式！', 'danger', 5000)
+            return
+          }
+          this.model.f_sys_balance = curSysBalance
+        }
+
+        // 收款回车时, 如果确认按钮是灰色不进行任何操作
+        if (flag) return
+        console.log(this.model.f_print[0])
+        if (this.model.f_print[0] === '电子发票') {
+          if (!this.row.f_taxpayer_id) {
+            this.row.f_taxpayer_id = this.row.f_idnumber
+          }
+          if (!this.row.f_paper_name) {
+            this.row.f_paper_name = this.row.f_user_name
+          }
+          if (!this.row.f_address_phone) {
+            this.row.f_address_phone = this.row.f_address + ' ' + this.row.f_user_phone
+          }
+          if (!this.row.f_email) {
+            this.row.f_email = this.row.f_email
+          }
+          this.eticket_msg = true
+        } else {
+          this.confirm()
+        }
+      },
+      confirm () {
+        this.eticket_msg = false
+        if (this.model.f_payment.length > 0 && this.model.f_payment.includes('余额写卡')) {
+          if (this.model.f_collection > this.row.f_balance) {
+            this.$showAlert('请注意！您的账户余额小于当前写卡金额,无法进行余额写卡,请修改后重试', 'warning', 2000)
+            return
+          }
+
+          if (this.model.f_collection > 0) {
+            this.$showAlert('请注意！进行余额写卡,收款不能大于0', 'warning', 1000)
+            return
+          }
+        }
+        this.$showMessage(`确定对用户${this.row.f_user_name}进行卡表收费吗？`, ['confirm', 'cancel']).then(async (res) => {
+          if (res === 'confirm') {
+            // 先调用付款码支付组件流程
+            let ss = await this.$refs.paymentcode.flowPath()
+            this.$refs.paymentcode.paymentCodeShow = false
+            console.log('付款码操作返回', ss)
+            if (!ss.result) return
+
+            this.clickConfirm = true
+            this.model.f_curbalance = this.curbalance
+            this.$dispatch('no-button')
+            sellgasGen(this)
+          }
+        })
+      },
+      eticket_toggle () {
+        this.eticket_show = false
+        this.$dispatch('success', '卡表收费')
+      },
+      clean () {
+        this.$info('取消操作')
+        this.$dispatch('refresh', this.row)
+      },
+      validateBill (val) {
+        this.validateOk = !val.isOk
+        this.billData.bill = val.bill
+      },
+      printok () {
+        // 收据打完，判断是否还有其他票据进行请求
+        for (let i = 0; i < this.model.f_print.length; i++) {
+          if (this.model.f_print[i] === '电子发票') {
+            this.$CommonService.openEticket(this.row.id, '售气收费')
+          }
+        }
+        this.$dispatch('success', '卡表收费')
+      },
+      pregas () {
+        this.dymoney = 0
+        if (this.model.f_pregas && this.model.f_pregas > 0) {
+          try {
+            // 对气量进行验证
+            if ((this.row.f_topup_ceil - 0) > 0 && (this.model.f_pregas - 0) > (this.row.f_topup_ceil - 0)) {
+              this.$showAlert(`您输入的气量不能大于该表的充值上限: ${this.row.f_topup_ceil}`, 'warning', 5000)
+              this.model.f_pregas = null
+            } else {
+              pregasGen(this)
+            }
+          } catch (error) {
+            this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+            this.$dispatch('error', '发卡售气', this.model, error)
+          }
+        } else {
+          this.model.f_pregas = null
+        }
+      },
+      preamount () {
+        this.dymoney = 0
+        this.model.f_price_id = this.row.f_price_id
+        this.model.f_user_id = this.row.f_user_id
+        this.model.f_userfiles_id = this.row.f_userfiles_id
+        this.model.f_userinfo_id = this.row.f_userinfo_id
+        try {
+          preamountGen(this)
+        } catch (error) {
+          this.$showAlert(`发卡售气划价错误，错误类型：${error}`, 'danger', 0)
+          this.$dispatch('error', '发卡售气', this.model, error)
+        }
+      },
+      calText (val) {
+        let str = ''
+        let num = 0
+        val.forEach((item) => {
+          if (item.f_gas > 0) {
+            num = num + 1
+          }
+          if (this.row.f_isdecimal === '是') {
+            str = str + item.f_price + ' x ' + item.f_gas + '+'
+          } else {
+            str = str + item.f_price + ' x ' + Math.floor(item.f_gas) + '+'
+          }
+        })
+        str = str.slice(0, str.length - 1)
+        this.calculatedetail = str
+        if (num > 1) {
+          if (this.$login.r.find(item => item == '阶梯提示无按钮')) {
+            this.$showAlert('友好提示：本次购气已跨阶梯', 'warning', 3000)
+          } else {
+            this.$showMessage('友好提示：本次购气已跨阶梯', ['confirm', 'cancel'])
+          }
+        }
+      },
+      close () {
+        this.print = false
+        this.clean()
+      },
+      paymentchange () {
+        if (JSON.stringify(this.model.f_payment).indexOf('转账') !== -1) {
+          // 进入转账筛选条件
+          this.model.f_banktransfer_person = ''
+          this.model.f_banktransfer_date = ''
+          this.BankTransfer = true
+        } else {
+          this.model.f_banktransfer_person = ''
+          this.model.f_banktransfer_date = ''
+          this.BankTransfer = false
+        }
+      },
+      // 根据选择的付款方式 获取优惠列表
+      async getPrivilegeList () {
+        // 初始化下拉选择列表
+        this.privilegeList = [{label: '无优惠', value: '0'}]
+        // 初始为无优惠
+        this.model.f_privilege_id = '0'
+        if (this.model.f_payment && this.model.f_payment.length) {
+          // 查询条件
+          let payments = JSON.stringify(this.model.f_payment)
+          payments = payments.replace('[', '(').replace(']', ')').replace(/"/g, '\'')
+          let HttpReset = new HttpResetClass()
+          let privilege = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
+            data: {
+              items: 'id,f_privilege_name,f_privilege_type',
+              tablename: 't_privilege',
+              condition: `f_payment in ${payments} and f_gasproperties = '${this.row.f_gasproperties}' and f_user_type = '${this.row.f_user_type}' and f_perform_date <= GETDATE() and f_end_date >= GETDATE() and f_state = '有效'`,
+              orderitem: 'id'
+            }
+          }, {resolveMsg: null, rejectMsg: '查询优惠信息失败'})
+          // 查询结果放到下拉列表
+          for (let p of privilege.data) {
+            this.privilegeList.push({label: p.f_privilege_name, value: p.id, type: p.f_privilege_type})
+          }
+          this.privilegeCalculate()
+        }
+      },
+      // 优惠计算
+      async privilegeCalculate () {
+        // 初始化减免金额
+        this.model.f_privilege_money = 0
+        this.model.f_after_discount = this.model.f_collection
+        // 判断是否是自定义优惠
+        if (this.model.f_privilege_id != null && parseInt(this.model.f_privilege_id)) {
+          for (let p of this.privilegeList) {
+            if (p.value == this.model.f_privilege_id && p.type == '自定义') {
+              this.model.f_privilege_money = window.prompt('请输入你想优惠的金额')
+              if (!(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money) || !(/^[1-9]\d*(\.\d+)?$/).test(this.model.f_privilege_money)) {
+                this.$showMessage('金额输入格式不正确!')
+                this.model.f_privilege_money = 0
+                return
+              }
+              if ((this.model.f_privilege_money - 0) >= this.model.f_collection) {
+                this.$showMessage('减免金额不能大于等于收款金额')
+                this.model.f_privilege_money = 0
+                return
+              }
+            }
+          }
+        }
+        // 优惠方式, 收款 缺一不计算
+        if (this.model.f_payment && this.model.f_payment.length && parseInt(this.model.f_privilege_id) && this.model.f_collection) {
+          let c = {
+            f_privilege_id: this.model.f_privilege_id,
+            f_collection: this.model.f_collection,
+            f_privilege_money: this.data.f_privilege_money
+          }
+          let privilegeData = await this.$resetpost('rs/logic/calculatePrivilege', c, {
+            resolveMsg: null,
+            rejectMsg: '计算优惠金额出错'
+          })
+          // 减免金额
+          this.model.f_privilege_money = privilegeData.data.f_privilege_money
+          // 减免后收款金额
+          this.model.f_after_discount = privilegeData.data.f_collection
+        }
+      },
+      // 判断当前用户是否可以使用系统余额透支
+      canOverdraftBalance () {
+        return this.config.overdraftBalance && this.row.f_user_type != '民用'
+      }
+    },
+    computed: {
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
+      'curbalance' () {
+        if (this.model.f_payment == '赠气') {
+          return this.model.f_balance
+        }
+        if (this.model.f_preamount) {
+          if (this.config.calculatePreByCollection) {
+            return ((this.model.f_collection - 0) + (this.row.f_balance - 0) - this.model.f_preamount).toFixed(4)
+          }
+          // if (this.row.f_collection_type === '按金额') {
+          //   return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+          // } else {
+          if ((this.row.f_balance - 0) > (this.model.f_preamount - 0)) {
+            return ((this.row.f_balance - 0) - (this.model.f_preamount - 0) + (this.model.f_collection - 0)).toFixed(4)
+          } else {
+            return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+          }
+          // return ((this.model.f_collection - 0) - (this.model.f_totalcost - 0)).toFixed(4)
+          // }
+        } else {
+          return this.row.f_balance
+        }
+      },
+      'invoice_show_gas' () {
+        return this.row.f_collection_type === '按气量' ? '是' : '否'
+      },
+      'islegal' () {
+        console.log('支付分离。。。', this.paymentModel.length, this.model.f_collection)
+        if (this.paymentModel.length > 1 && this.model.f_collection) {
+          let sum = 0
+          this.paymentModel.forEach((res) => {
+            sum += (res.f_money - 0)
+          })
+          return (this.model.f_collection - 0) === (sum - 0)
+        } else {
+          return true
+        }
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

package/src/filiale/shanxian/sale.js

@@ -29,4 +29,6 @@ export default function () {
   Vue.component('high-meter-idcard', (resolve) => { require(['./HighMeterCard'], resolve) })
 // 文件上传
   Vue.component('upload-idcard', (resolve) => {require(['./UploadIdCard'], resolve)})
+  // 卡表收费
+  Vue.component('card-meter-center', (resolve) => { require(['./components/revenue/CardMeterCenter'], resolve) })
 }

package/src/filiale/wenxi/UserDeviceInfoTest.vue

@@ -133,17 +133,17 @@
               <a style="font-size: 16px;font-weight: 500;">连接管信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
             </div>
               <div class="row auto" style="margin-left: 10px;">
-                <div class="col-sm-6 form-group" style="padding-right: 5px;">
-                  <label class="font_normal_body">管道类型</label>
-                  <v-select :value.sync="row.f_pipe_type" v-model="row.f_pipe_type"
-                            :options='pipetypes' placeholder='管道类型' :value-single="true"
+                <div class="col-sm-8 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">有无不锈钢波纹管</label>
+                  <v-select  :value.sync="row.f_pipe_type" v-model="row.f_pipe_type"
+                            :options='pipetypes' placeholder='有无不锈钢波纹管' :value-single="true"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-6 form-group" style="padding-right: 5px;" :class="[!row.f_pipe_num ? 'has-error' : '']">
-                  <label class="font_normal_body">*管道数量</label>
-                  <input type="number" class="input_search" style="width: 60%" v-model="row.f_pipe_num"
+                <div class="col-sm-4 form-group" style="padding-right: 5px;" :class="[!row.f_pipe_num ? 'has-error' : '']">
+                  <label class="font_normal_body">*波纹管数量</label>
+                  <input type="number" class="input_search" style="width: 40%" v-model="row.f_pipe_num"
                        required="true"
-                       placeholder='管道数量'>
+                       placeholder='数量'>
                 </div>
                 <div class="col-sm-6 form-group" style="padding-right: 5px;">
                   <label class="font_normal_body" title="连接管安装日期">安装日期</label>
@@ -153,8 +153,8 @@
                               :format="'yyyy-MM-dd'">
                   </datepicker>
                 </div>
-                <div class="col-sm-6 form-group" style="padding-right: 5px;">
-                  <label class="font_normal_body" title="连接管到期日期">到期日期</label>
+                <div  class="col-sm-6 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body" title="连接管到期日期" style="margin-left: 20px">到期日期</label>
                   <datepicker placeholder="连接管到期日期" style="width: 60%"
                               v-model="row.f_pipeexpire_date"
                               :value.sync="row.f_pipeexpire_date"
@@ -261,6 +261,7 @@ export default {
       imgadd: '/images/mainicon/adddevice.png',
       devicetypes: this.$appdata.getParam('设备类型'),
       pipetypes: this.$appdata.getParam('管道类型'),
+      // pipetypes: ['有不锈钢波纹管','无不锈钢波纹管'],
       WatchPurchases: this.$appdata.getParam('购买方式'),
       installperson: this.$appdata.getParam('安装人'),
       installtype: this.$appdata.getParam('安装方式'),

package/src/sale.js

@@ -1136,9 +1136,16 @@ export default function () {
   // json模板
   Vue.component('json-parse', (resolve) => { require(['./components/revenue/comprehen/common/JSONParse'], resolve) })
   // 六安第三方过户预约审核页面
-  Vue.component('transfer-audit-center', (resolve) => { require(['./components/revenue/third/transferAuditCenter'], resolve) })
+  // Vue.component('transfer-audit-center', (resolve) => { require(['./components/revenue/third/transferAuditCenter'], resolve) })
   // 六安第三方过户预约审核列表页面
-  Vue.component('transfer-audit', (resolve) => { require(['./components/revenue/third/transferAudit'], resolve) })
+  // Vue.component('transfer-audit', (resolve) => { require(['./components/revenue/third/transferAudit'], resolve) })
   // 六安第三方过户预约审核数据展示页面
-  Vue.component('transfer-audit-dispose-basics', (resolve) => { require(['./components/revenue/third/transferAuditDisposeBasics'], resolve) })
+  // Vue.component('transfer-audit-dispose-basics', (resolve) => { require(['./components/revenue/third/transferAuditDisposeBasics'], resolve) })
+  // 日照第三方过户预约审核页面
+  Vue.component('transfer-audit-center', (resolve) => { require(['./components/revenue/third/日照/transferAuditCenter'], resolve) })
+  // 日照第三方过户预约审核列表页面
+  Vue.component('transfer-audit', (resolve) => { require(['./components/revenue/third/日照/transferAudit'], resolve) })
+  // 日照第三方过户预约审核数据展示页面
+  Vue.component('transfer-audit-dispose-basics', (resolve) => { require(['./components/revenue/third/日照/transferAuditDisposeBasics'], resolve) })
+
 }