sale-client 3.6.200 → 3.6.201

package/.eslintrc.js

@@ -16,6 +16,7 @@ module.exports = {
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
     // 必须使用全等
     'eqeqeq': 0,
-    "import/no-unresolved": ["error", { "caseSensitive": true }]
+    "import/no-unresolved": ["error", { "caseSensitive": true }],
+    "camelcase": "off"
   }
 }

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -17,6 +17,10 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
+      '/invoice/rs/logic/getInvoice': {
+        pathRewrite: {'/invoice/rs/logic/getInvoice': '/m2/925029-0-default/90887834'},
+        target: 'http://127.0.0.1:4523'
+      },
       '/rs/file': {
         target: serverRul
       },

package/package.json

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

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

@@ -274,7 +274,7 @@ let otherChargeGen = async function (self, parameter) {
       } else if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
         self.eticket_show = true
         self.row.f_print = self.model.f_print[0]
-        await self.$refs.eticketbill.openETicket(resid.data, self.row, '其他收费')
+        await self.$refs.eticketbill.openETicket(resid.data, self.row, '其他收费', '其他收费', '其他收费', self.model.f_print[0])
         // self.$CommonService.openEticket(resid.data, '其他收费')
         // self.$dispatch('success')
       }

package/src/components/revenue/cardHandManage/cardHandManager.vue

@@ -1,14 +1,14 @@
 <template>
   <tab-button v-ref:list>
-<!--    <tabs header="计划下发">-->
-<!--      <card-down></card-down>-->
-<!--    </tabs>-->
+    <tabs header="计划下发">
+      <card-down></card-down>
+    </tabs>
     <tabs header="卡表抄表">
       <cards-hand></cards-hand>
     </tabs>
-<!--    <tabs header="抄表审核">-->
-<!--      <card-hand-audit></card-hand-audit>-->
-<!--    </tabs>-->
+    <tabs header="抄表审核">
+      <card-hand-audit></card-hand-audit>
+    </tabs>
   </tab-button>
 </template>
 
@@ -16,7 +16,8 @@
 <script>
   import TabButton from './../comprehen/common/TabButton'
   import Tabs from './../comprehen/common/Tabs'
-  export default {
+  import CardHandAudit from './cardHandAudit.vue'
+export default {
     name: 'cardHandManager',
     title: '卡表抄表管理',
     data () {
@@ -34,7 +35,7 @@
         show: [true]
       }
     },
-    components: {Tabs, TabButton},
+    components: {CardHandAudit, Tabs, TabButton},
     ready () {
       console.log(this.$refs.list)
     },

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

@@ -90,41 +90,38 @@
             <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_is_mgq"  v-model="baseinfo.base.f_is_mgq"
                       :options='mgq' placeholder='是否煤改气'   style="width: 65%"       close-on-select></v-select>
           </div>
-          <div class="col-sm-4 form-group">
-            <label for="f_contract" class="font_normal_body">&ensp;燃气本号</label>
-            <input type="text"  v-model="baseinfo.base.f_book_no" class="input_search" style="width:60%" placeholder="用户证号">
-          </div>
-        </div>
-        <div class="row">
           <div style="" class="col-sm-4 form-group">
             <label for="f_rent_name" class="font_normal_body">&ensp;租户姓名</label>
             <input type="text" v-model="baseinfo.base.f_rent_name" class="input_search" style="width:60%"
                    placeholder="租户姓名">
           </div>
+        </div>
+        <div class="row">
           <div style="" class="col-sm-4 form-group">
             <label for="f_zuhu_phone" class="font_normal_body">&ensp;租户电话</label>
             <input type="text" v-model="baseinfo.base.f_zuhu_phone" class="input_search" style="width:60%"
                    placeholder="租户电话">
           </div>
-        </div>
-        <div class="row">
           <div style="" class="col-sm-8 form-group">
             <label for="f_zuhu_idnumber" class="font_normal_body">租户身份证</label>
             <input type="text" v-model="baseinfo.base.f_zuhu_idnumber" class="input_search" style="width:80%"
                    placeholder="租户身份证">
           </div>
+        </div>
+        <div class="row">
           <div style="" class="col-sm-4 form-group">
             <label for="f_is_mgq" class="font_normal_body ">&ensp;付款类型</label>
             <v-select id="f_is_mgq" :value.sync="baseinfo.base.f_cost_type"  v-model="baseinfo.base.f_cost_type"
                       :options='costtype' placeholder='付款类型'   style="width: 65%" close-on-select></v-select>
           </div>
-        </div>
-        <div class="row">
           <div class="col-sm-8 form-group">
             <label for="f_contract" class="font_normal_body">&ensp;合同编号</label>
             <input type="text" v-model="baseinfo.base.f_contract_id" class="input_search" style="width:80%"
                    placeholder="合同编号">
           </div>
+        </div>
+        <div class="row">
+
 <!--          <div class="col-sm-4 form-group">-->
 <!--            <label for="f_user_state" class="font_normal_body">&ensp;房屋类型</label>-->
 <!--            <input type="text" v-show="false" v-model="baseinfo.base.f_house_type">-->

package/src/filiale/tongchuan/CardMeterCenter.vue

@@ -375,11 +375,11 @@ let sellgasGen = async function (self) {
           self.print = true
         }
       } else {
-        if (self.model.f_print[0] === '电子发票') {
+        if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
           self.row.id = res
           self.eticket_show = true
           // 应铜川需要卡表显示
-          await self.$refs.eticketbill.openETicket([res], self.row, '是', self.invoice_is_pax, '卡表收费')
+          await self.$refs.eticketbill.openETicket([res], self.row, '是', self.invoice_is_pax, '卡表收费', self.model.f_print[0])
           // await self.$CommonService.openEticket(res, '售气收费')
           // self.print = true
         }
@@ -515,6 +515,7 @@ export default {
       eticket_msg: false,
       eticket_show: false,
       invoice_is_pax: '不征税',
+      printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
       is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
       model: {
         f_purchase: 0,
@@ -663,7 +664,7 @@ export default {
       // 收款回车时, 如果确认按钮是灰色不进行任何操作
       if (flag) return
       console.log(this.model.f_print[0])
-      if (this.model.f_print[0] === '电子发票') {
+      if (this.printInvoiceType.indexOf(this.model.f_print[0]) !== -1) {
         if (!this.row.f_taxpayer_id) {
           this.row.f_taxpayer_id = this.row.f_idnumber
         }

package/src/filiale/tongchuan/ChargeManage.vue

@@ -93,18 +93,18 @@ export default {
         console.log('查看传进来的参数:', obj)
         this.warningInfo = await this.$resetpost('rs/logic/getWarningMsg',
           {data: {
-              f_userfiles_id: obj.f_userfiles_id,
-              f_userinfo_code: obj.f_userinfo_code,
-              f_userinfo_id: obj.f_userinfo_id,
-              f_meternumber: obj.f_meternumber,
-              f_meter_type: obj.f_meter_type,
-              f_hascard: obj.f_hascard
-            }
+            f_userfiles_id: obj.f_userfiles_id,
+            f_userinfo_code: obj.f_userinfo_code,
+            f_userinfo_id: obj.f_userinfo_id,
+            f_meternumber: obj.f_meternumber,
+            f_meter_type: obj.f_meter_type,
+            f_hascard: obj.f_hascard
+          }
           }
           , {resolveMsg: '', rejectMsg: '获取提示失败'})
-        console.log("获取到提示了！！！！",this.warningInfo)
-        if ((!this.warningInfo.data.state.info || !this.warningInfo.data.state.dibao || !this.warningInfo.data.state.taxpayerId ||
-          !this.warningInfo.data.state.ins|| !this.warningInfo.data.state.blacklist ||
+        if (this.warningInfo.data.warningNum > 0 && (!this.warningInfo.data.state.info ||
+          !this.warningInfo.data.state.dibao || !this.warningInfo.data.state.taxpayerId ||
+          !this.warningInfo.data.state.ins || !this.warningInfo.data.state.blacklist ||
           !this.warningInfo.data.state.invoice || !this.warningInfo.data.state.isExtendMeterInfo || !this.warningInfo.data.state.ruhu) && obj.f_user_state !== '预备') {
           this.modalrow = obj
           this.showModal = true

package/src/filiale/tongchuan/IOTMeterCenter.vue

@@ -8,7 +8,7 @@
               <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='请选择1'
+                        placeholder='请选择'
                         :value.sync="model.f_payment"
                         :options='paytype' clear-button v-ref:payment></v-select>
             </div>
@@ -386,9 +386,9 @@
           }
         } else if (self.config.printType === '国税发票') {
           // TODO
-        } else if (self.model.f_print[0] === '电子发票') {
+        } else if (self.printInvoiceType.indexOf(self.model.f_print[0]) !== -1) {
           self.eticket_show = true
-          await self.$refs.eticketbill.openETicket([res.data.id], self.row, self.invoice_show_gas, self.invoice_is_pax, '物联网收费')
+          await self.$refs.eticketbill.openETicket([res.data.id], self.row, self.invoice_show_gas, self.invoice_is_pax, '物联网收费', self.model.f_print[0])
           // self.$CommonService.openEticket(res.data.id, '其他收费')
           // self.$dispatch('success')
         }
@@ -487,6 +487,7 @@
         eticket_msg: false,
         eticket_show: false,
         invoice_is_pax: '不征税',
+        printInvoiceType: this.$appdata.getSingleValue('电子票打印类型') ? this.$appdata.getSingleValue('电子票打印类型') : '电子发票',
         is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
         model: {
           f_purchase: 0,
@@ -626,7 +627,7 @@
           this.model.f_sys_balance = curSysBalance
         }
 
-        if (this.model.f_print[0] === '电子发票') {
+        if (this.printInvoiceType.indexOf(this.model.f_print[0]) !== -1) {
           if (!this.row.f_taxpayer_id) {
             this.row.f_taxpayer_id = this.row.f_idnumber
           }

package/src/filiale/tongchuan/bill/EticketPrint.vue

@@ -54,14 +54,17 @@ export default {
       }
       await this.$resetpost('rs/entity/t_eticket', model, {resolveMsg: null, rejectMsg: '保存发票记录失败'})
     },
-    async openETicket (sellId, row, show_gas, is_pax, type) {
+    async openETicket (sellId, row, show_gas, is_pax, type, invoice_kind = '电子发票') {
       try {
         let model = {
-          id: sellId,
-          f_charge_type: type,
+          id: sellId[0],
+          charge_item: type,
+          invoice_type: 0,
+          invoice_kind,
           f_dept_id: this.$login.f.depids,
           f_operator: this.$login.f.name,
           f_orgid: this.$login.f.orgid,
+          org_id: this.$login.f.orgid,
           f_orgname: this.$login.f.orgs,
           f_depname: this.$login.f.deps,
           f_operatorid: this.$login.f.id,
@@ -72,12 +75,50 @@ export default {
           f_mail_push: row.f_email,
           f_buy_openbank: row.f_paper_account,
           invoice_show_gas: show_gas === '是',
-          is_pax: is_pax === '征税'
+          is_pax: is_pax === '征税',
+          isTax: is_pax === '征税' ? 1 : 0
         }
-        console.log('组织开票数据并保存', model)
         // TODO 组织开票数据并保存
-        let ticket_id = await this.$resetpost('rs/logic/TCcombineData', model, {resolveMsg: null, rejectMsg: '保存开票信息失败'})
-        return this.openEticketGen(ticket_id.data)
+        const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {resolveMsg: null, rejectMsg: '开票请求失败'})
+        if (res.data.code == '0000') {
+          this.return_msg = '发票开具成功，请稍后到发票管理页面查看或打印'
+        } else {
+          this.return_msg = '发票开具失败，请稍后到发票管理页面补打或重开'
+        }
+      } catch (error) {
+        this.$showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
+      }
+    },
+    async rushRedInvoice (sellId, eticket_id, row, type, invoice_kind = '电子发票') {
+      try {
+        let model = {
+          id: sellId[0],
+          eticket_id,
+          charge_item: type,
+          invoice_type: 1,
+          invoice_kind,
+          f_dept_id: this.$login.f.depids,
+          f_operator: this.$login.f.name,
+          f_orgid: this.$login.f.orgid,
+          org_id: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depname: this.$login.f.deps,
+          f_operatorid: this.$login.f.id,
+          f_filialeids: this.$login.f.f_orgids,
+          f_buy_name: row.f_paper_name,
+          f_pay_id: row.f_taxpayer_id,
+          f_buy_address: row.f_address_phone,
+          f_mail_push: row.f_email,
+          f_buy_openbank: row.f_paper_account,
+          isTax: 1
+        }
+        // TODO 组织开票数据并保存
+        const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {resolveMsg: null, rejectMsg: '开票请求失败'})
+        if (res.data.code == '0000') {
+          this.return_msg = '发票开具成功，请稍后到发票管理页面查看或打印'
+        } else {
+          this.return_msg = '发票开具失败，请稍后到发票管理页面补打或重开'
+        }
       } catch (error) {
         this.$showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
       }
@@ -177,7 +218,7 @@ export default {
     },
     /** 冲红
      * */
-    async rushRedInvoice (ticket_id) {
+    async rushRedInvoice_1 (ticket_id) {
       try {
           // 否则正常打票
         let time = 0

package/src/filiale/tongchuan/bill/EticketRecordList.vue

@@ -144,9 +144,9 @@
                 <button class="btn btn-link" v-if="row.f_bill_state==='开票失败'"
                         @click="$parent.$parent.$parent.kp(row)">重新开票
                 </button>
-                <button class="btn btn-link" v-if="['查询失败','等待查询'].includes(row.f_bill_state)"
-                        @click="$parent.$parent.$parent.fp_search(row)">电票查询
-                </button>
+<!--                <button class="btn btn-link" v-if="['查询失败','等待查询'].includes(row.f_bill_state)"-->
+<!--                        @click="$parent.$parent.$parent.fp_search(row)">电票查询-->
+<!--                </button>-->
               </template>
             </th>
           </tr>
@@ -215,13 +215,9 @@ export default {
       this.model.search(args.condition, args.model)
     },
     async confirm () {
-      // 修改发票状态
-      let res = await this.$resetpost('rs/logic/correctEticket', {id: this.row.id, bz: this.bz}, {
-        resolveMsg: null,
-        rejectMsg: '保存开票信息失败'
-      })
+      // row
       this.eticket_show = true
-      await this.$refs.eticketbill.rushRedInvoice(res.data)
+      await this.$refs.eticketbill.rushRedInvoice(this.row.sell_id, this.row.id, this.row, this.row.f_charge_type, this.row.f_invoice_type)
     },
     async fp_search (row) {
       this.eticket_show = true
@@ -242,7 +238,7 @@ export default {
     },
     kp (row) {
       this.eticket_show = true
-      this.$refs.eticketbill.openEticketGen(row.id)
+      this.$refs.eticketbill.openETicket(row.sell_id, row, '否', '征税', row.f_charge_type, row.f_invoice_type)
     },
     eticket_toggle () {
       this.eticket_show = false

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/wenxi/sale'
+import FilialeSale from './filiale/tongchuan/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'