sale-client 3.6.297 → 3.6.298

package/package.json

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

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -244,9 +244,21 @@
         <h4 class="modal-title" align="center">阀控管理</h4>
       </header>
       <article slot="modal-body" class="modal-body">
+        <div class="form-group" style="padding-left: 8px">
+          <label >阀控状态</label>
+          <div class="col-sm-3" >
+            <select v-model="selectedOption" class="input_search">
+              <option value="">请选择</option>
+              <option v-for="option in networkValveOptions" :value="option">
+                {{  option }}
+              </option>
+            </select>
+          </div>
+        </div>
+
         <div class="form-group " style="padding-left: 8px">
           <label class="font_normal_body" :class="operateReason?'text-info':'text-danger'">操作原因</label>
-          <textarea class="form-control" style="width:80%" v-model="operateReason" rows="3"
+          <textarea class="form-control" style="width:80%" v-model="operateReason" rows="1"
                     placeholder="请填写操作原因"></textarea>
         </div>
       </article>
@@ -254,7 +266,6 @@
         <button type="button" class="button_search btn-ln fr" :disabled="!operateReason" @click='valveoperate(true)'>
           开阀
         </button>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <button type="button" class="btn btn-info btn-ln fr" :disabled="!operateReason" @click='valveoperate(false)'>
           关阀
         </button>
@@ -319,6 +330,16 @@ export default {
   },
   data () {
     return {
+      selectedOption: '手动',
+      delaySeconds: '',
+      networkValveOptions: [
+        '手动',
+        '自动',
+        '1小时后自动',
+        '3小时后自动',
+        '6小时后自动',
+        '12小时后自动',
+      ],
       showModal: false,
       disableModel: {
         f_othereason: '',
@@ -503,8 +524,16 @@ export default {
       this.operateReason = ''
     },
     // 开关阀操作
-    async valveoperate (oper) {
-      let msg = oper ? '开阀' : '关阀'
+    // 开关阀操作
+    async valveoperate(oper) {
+      let msg = oper ? '开阀' : '关阀';
+      let delaySeconds = 0; // 初始化 delaySeconds 变量
+      let currentTime = new Date(); // 获取当前时间
+      let adjustedTime = new Date(currentTime); // 创建一个新的 Date 对象用于计算延迟后的时间
+
+      let beijingTime = new Date(currentTime.getTime() + 8 * 60 * 60 * 1000);
+      let formattedBeijingTime = beijingTime.toISOString().slice(0, 19).replace('T', ' ');
+
       let datas = {
         instructType: '阀门控制',
         instructTitle: `手动${msg}`,
@@ -515,24 +544,68 @@ export default {
         inputtorid: Vue.$login.f.id,
         reasonInfo: this.operateReason,
         meternumberf: this.row.f_meternumber,
-        contentData: {isOpen: oper ? 1 : 0}
+        contentData: { isOpen: oper ? 1 : 0 },
+        auto_adjust_option: this.selectedOption,
+        delaySeconds: delaySeconds,
+        executeDelayedOperation: true,
+        f_timestamp: formattedBeijingTime, // 使用北京时间
+        f_userfiles_id: this.row.f_userfiles_id,
+        f_userinfo_id: this.row.f_userinfo_id,
+      };
+
+      let _this = this;
+
+      // 计算延迟时间
+      switch (_this.selectedOption) {
+        case '1小时后自动':
+          delaySeconds = 60; // 1小时 = 3600秒
+          break;
+        case '3小时后自动':
+          delaySeconds = 10800; // 3小时 = 10800秒
+          break;
+        case '6小时后自动':
+          delaySeconds = 21600; // 6小时 = 21600秒
+          break;
+        case '12小时后自动':
+          delaySeconds = 43200; // 12小时 = 43200秒
+          break;
+        default:
+          delaySeconds = 0;
       }
-      let _this = this
-      await this.$resetpost('rs/sql/iot_searchInstruct', {data: datas},
-        {warnMsg: null, resolveMsg: null}).then(res => {
+
+      adjustedTime.setSeconds(adjustedTime.getSeconds() + delaySeconds);
+      let adjustedBeijingTime = new Date(adjustedTime.getTime() + 8 * 60 * 60 * 1000);
+      let formattedAdjustedBeijingTime = adjustedBeijingTime.toISOString().slice(0, 19).replace('T', ' ');
+
+      // 更新 datas 对象
+      datas.delaySeconds = delaySeconds;
+      datas.f_current_timestamp = formattedAdjustedBeijingTime; // 使用延迟后的北京时间
+
+      await this.$resetpost('rs/sql/iot_searchInstruct', { data: datas }, { warnMsg: null, resolveMsg: null }).then(res => {
         if (res.data.length === 0) {
-          _this.$resetpost('rs/logic/iot_saveInstruct', {data: datas},
-            {warnMsg: `确定要进行${msg}操作吗？`, resolveMsg: `${msg}成功`, rejectMsg: `${msg}失败`}).then(res => {
-            _this.valve = false
-            _this.operateReason = ''
-          })
+          _this.$resetpost('rs/logic/iot_saveInstruct', { data: datas }, {
+            warnMsg: `确定要进行${msg}操作吗？`,
+            resolveMsg: `${msg}成功`,
+            rejectMsg: `${msg}失败`
+          }).then(res => {
+            _this.valve = false;
+            _this.operateReason = '';
+            if (_this.selectedOption !== '手动') {
+              _this.$showAlert(`阀控状态将在${_this.selectedOption}后自动调整为“自动”`, 'info', 3000);
+
+              _this.$resetpost('rs/logic/iot_processDelayedOperations', { data: datas }, { warnMsg: null, resolveMsg: null }).then(res => {
+                console.log('延时操作逻辑已执行');
+              });
+            }
+          });
         } else {
-          this.$showAlert('存在开关阀待发送的指令，系统不生成同样的待发送指令', 'warning', 3000)
-          _this.valve = false
-          _this.operateReason = ''
+          this.$showAlert('存在开关阀待发送的指令，系统不生成同样的待发送指令', 'warning', 3000);
+          _this.valve = false;
+          _this.operateReason = '';
         }
-      })
+      });
     }
+
   },
   watch: {
     'row' () {

package/src/filiale/kelai/meterinfodetail.vue

@@ -75,7 +75,7 @@
         </div>
         <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
           <label class = "col-sm-5 " style="color: brown">系统余额</label>
-          <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
+          <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
         </div>
         <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
           <label class = "col-sm-5 " style="color: brown">系统余量</label>

package/src/filiale/yangchun/EticketV4/CustQueryEticket.vue

@@ -116,7 +116,7 @@
           <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
             <label class="control-label" style="width: 100px">开票名称:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_paper_name" placeholder="开票名称">
+                   v-model="row.f_paper_name" placeholder="开票名称" :disabled="true">
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_is_pax ? 'has-error' : '']">
             <nobr class="col-sm-4"><label class="control-label" style="width: 100px">是否征税:</label></nobr>
@@ -231,9 +231,10 @@
         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_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
         }
@@ -268,9 +269,10 @@
         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_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
         }

package/src/filiale/yangchun/EticketV4/EticketOpenCard.vue

@@ -0,0 +1,350 @@
+<template>
+  <div class="auto basic-main" style="height:95%">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" class="form-control" v-model="model.f_userinfo_code" style="width:60%"
+                     condition="info.f_userinfo_code = '{}' " placeholder="客户编号"
+              >
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">用户姓名</label>
+              <input type="text" class="form-control" v-model="model.f_user_name" style="width:60%"
+                     condition="info.f_user_name = '{}'" placeholder="用户姓名"
+              >
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">是否有票</label>
+              <v-select
+                v-model="model.mid"
+                placeholder='是否有票'
+                :search="false"
+                condition="mid.count {} "
+                :value.sync="model.mid"
+                :options='$parent.$parent.mid'
+                close-on-select></v-select>
+            </div>
+            <div class="row" width="100%">
+              <div class="col-sm-4 col-sm-2">
+                <label class="font_normal_body">&nbsp;开始时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="s.f_operate_date >= '{} 00:00:00'"
+                            placeholder="起始时间"
+                            style="width:60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-4 col-sm-2">
+                <label class="font_normal_body">结束时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="s.f_operate_date <= '{} 23:59:59'"
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div style="float: right">
+                <button class="button_search" @click="search()">查 询</button>
+                <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>
+              <input type="checkbox" @click="$parent.$parent.$parent.addOrRemove($parent.$parent.$parent.selectAll)"
+                     style="width: 22px;height: 22px"    :checked="$parent.$parent.$parent.selectAll">
+            </th>
+            <th>客户编号</th>
+            <th>客户姓名</th>
+            <th>客户地址</th>
+            <th>客户电话</th>
+            <th>缴费类型</th>
+            <th>实收金额</th>
+            <th>收款人</th>
+            <th>收款部门</th>
+            <th>是否开过票</th>
+            <th>缴费时间</th>
+            <th>操作</th>
+          </tr>
+        </template>
+        <template partial='body' :model="model">
+          <tr>
+            <td style="text-align:center">
+              <input type="checkbox" v-model="$parent.$parent.$parent.selecteds" :value="row"
+                     style="width: 22px;height: 22px"    @click="$parent.$parent.$parent.checkbox($index, $event)">
+            </td>
+            <th style="text-align:center">{{ row.f_userinfo_code }}</th>
+            <th style="text-align:center">{{ row.f_user_name }}</th>
+            <th style="text-align:center">{{ row.f_address }}</th>
+            <th style="text-align:center">{{ row.f_phone }}</th>
+            <th style="text-align:center">{{ row.f_type }}</th>
+            <th style="text-align:center">{{ row.f_collection }}</th>
+            <th style="text-align:center">{{ row.f_operator }}</th>
+            <th style="text-align:center">{{ row.f_depname }}</th>
+            <th style="text-align:center">{{ row.is_bill }}</th>
+            <th style="text-align:center">{{ row.f_operate_date }}</th>
+            <th>
+              <button class="btn btn-link" @click="$parent.$parent.$parent.kp(row)">开具发票</button>
+            </th>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="eticket_msg" v-ref:modal large backdrop="false" :width="900">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="eticket_msg = false"><span>&times;</span></button>
+      <h4 class="modal-title">发票信息</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="auto select-overspread form-horizontal">
+        <div class="row auto">
+          <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
+            <label class="control-label" style="width: 100px">开票名称:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_paper_name" placeholder="开票名称" :disabled="true">
+          </div>
+          <div class="col-sm-6 form-group form-input-group" :class="[!invoice_is_pax ? 'has-error' : '']">
+            <nobr class="col-sm-4">
+              <label class="control-label" style="width: 100px">是否征税:</label>
+            </nobr>
+            <v-select v-model="invoice_is_pax"
+                      placeholder='请选择'
+                      :value.sync="invoice_is_pax"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='is_pax' clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-6 form-group form-input-group"  :class="[!row.f_paper_type || !row.f_paper_type === '' ? 'has-error' : '']">
+            <label class="control-label" style="width: 100px">发票种类:</label>
+            <v-select v-model="row.f_paper_type"
+                      placeholder='请选择'
+                      :value.sync="row.f_paper_type"
+                      close-on-select
+                      :width="60"
+                      :value-single="true"
+                      :search="false"
+                      :options='invoice_types' clear-button>
+            </v-select>
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label" style="width: 100px">开户行及账号:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_paper_account" placeholder="购方开户行及账号">
+          </div>
+          <div class="col-sm-12 form-group form-input-group" >
+            <label class="control-label" style="width: 100px">纳税人识别号:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_taxpayer_id" placeholder="纳税人识别号">
+          </div>
+          <div class="col-sm-12 form-group form-input-group" :class="[!row.f_address_phone ? 'has-error' : '']">
+            <label class="control-label" style="width: 100px">开票地址电话:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_address_phone" placeholder="开票地址">
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label" style="width: 100px">邮箱推送:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_email" placeholder="邮箱推送">
+          </div>
+          <div class="col-sm-12 form-group form-input-group">
+            <label class="control-label" style="width: 100px">备注:</label>
+            <input class="form-control col-sm-2"
+                   v-model="row.f_remarks" placeholder="备注">
+          </div>
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn button_search"
+              :disabled="!(row.f_paper_name&&row.f_paper_type&&invoice_is_pax&&row.f_paper_type!== '')"
+              @click='confirm'>确认开票
+      </button>
+    </footer>
+  </modal>
+  <ticket-print :show="eticket_show" @toggle="eticket_toggle" v-ref:eticketbill></ticket-print>
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import * as Util from '../../../Util'
+let asyncReadyGen = async function (self) {
+  self.$refs.paged.$refs.cri.model.f_start_date = Util.toStandardDateString().substr(0, 5) + '01-01'
+  self.$refs.paged.$refs.cri.model.f_end_date = Util.toStandardDateString()
+  await self.search()
+}
+export default {
+  title: '发票管理',
+  data () {
+    return {
+      model: new PagedList('rs/sql/open_eTicket_cardQuery', 20,
+        {}),
+      criteriaShow: false,
+      getfield: {},
+      f_orgid: '',
+      other: [],
+      footer: [],
+      invoice_types: this.$appdata.getParam('发票种类'),
+      invoice_is_pax: '征税',
+      is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      },
+      eticket_show: false,
+      selectAll: false,
+      selecteds: [],
+      orgCondtionStr: '',
+      // 合计数据
+      sumsmodel: {},
+      msg: [],
+      orgname: [],
+      depname: [],
+      eticket_msg: false,
+      invoice_show_gas: '否',
+      show_gas: [{label: '是', value: '是'}, {label: '否', value: '否'}],
+      row: {},
+      mid: [{label: '全部', value: ''}, {label: '是', value: ' > 0 '}, {label: '否', value: ' is null'}]
+    }
+  },
+  ready () {
+    asyncReadyGen(this)
+  },
+  methods: {
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    async kp (row) {
+      let HttpReset = new HttpResetClass()
+      let _row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
+        data: {
+          orderitem: 'f_userinfo_code',
+          condition: `f_userinfo_code = '${row.f_userinfo_code}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+      this.row = _row.data[0]
+      this.row.id = row.id
+      this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
+      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
+      }
+      this.eticket_msg = true
+    },
+    async open_eTicket () {
+      if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
+        this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
+        return
+      }
+      if (this.selecteds.filter(item => item.is_bill === '是').length >= 1) {
+        // await this.$showMessage('选中的有已开过票得记录,确认开票吗?', ['confirm', 'cancel']).then(
+        //   (response) => {
+        //     if (response !== 'confirm') {
+        //
+        //     }
+        //   })
+        return this.$showAlert('已结算的记录不能再次结算开票', 'warning', 3000)
+      }
+      let HttpReset = new HttpResetClass()
+      let row = await HttpReset.load('POST', 'rs/sql/sale_getUser', {
+        data: {
+          orderitem: 'f_userinfo_code',
+          condition: `f_userinfo_code = '${[...new Set(this.selecteds.map(item => item.f_userinfo_code))][0]}'`
+        }
+      }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+      this.row = row.data[0]
+      this.invoice_show_gas = this.row.f_collection_type === '按气量' ? '是' : '否'
+      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
+      }
+      this.eticket_msg = true
+    },
+    confirm () {
+      this.eticket_msg = false
+      this.eticket_show = true
+      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '结算收费', this.row.f_paper_type, false, this.invoice_is_pax)
+    },
+    selfSearch (args) {
+      this.selecteds = []
+      // let f_orgstr = this.orgCondtionStr
+      // args.condition = `${args.condition} ` + f_orgstr
+      this.model.search(args.condition, args.model)
+    },
+    eticket_toggle () {
+      this.eticket_show = false
+      this.search()
+    },
+    addOrRemove (is) {
+      this.selecteds = []
+      if (!is) { // 添加本页所有数据到ids中
+        this.model.rows.forEach((row) => {
+          this.selecteds.push(row)
+        })
+        this.selectAll = true
+      } else { // 从ids中取消所有的数据
+        this.model.rows.forEach((row, index) => {
+          if (index <= this.maxIndex) {
+            this.selecteds.push(row)
+          }
+        })
+        this.selectAll = false
+      }
+    },
+    checkbox (val, event) {
+      // this.selecteds = []
+      if (event.target.checked === true) {
+        // for (let i = 0; i <= val; i++) {
+        this.selecteds.push(this.model.rows[val])
+        // }
+      } else if (event.target.checked === false) {
+        // for (let i = 0; i <= val - 1; i++) {
+        this.selecteds.splice(this.selecteds.findIndex(item => item.id === this.model.rows[val].id), 1)
+        // }
+      }
+      this.selectAll = (this.selecteds.length === this.model.rows.length)
+    }
+  },
+  computed: {
+    getPayee () {
+      return this.$GetSaleParam.getPayee()
+    },
+    getReviewer () {
+      return this.$GetSaleParam.getReviewer()
+    },
+    getDrawer () {
+      return this.$GetSaleParam.getDrawer()
+    }
+  },
+  events: {
+    'search' () {
+      this.search()
+    }
+  },
+  watch: {}
+}
+</script>

package/src/filiale/yangchun/EticketV4/EticketOpenJBPage.vue

@@ -112,7 +112,7 @@
           <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
             <label class="control-label" style="width: 100px">开票名称:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_paper_name" placeholder="开票名称">
+                   v-model="row.f_paper_name" placeholder="开票名称" :disabled="true">
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_is_pax ? 'has-error' : '']">>
             <nobr class="col-sm-4"><label class="control-label" style="width: 100px">是否征税:</label></nobr>
@@ -241,9 +241,10 @@ export default {
       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_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
       }
@@ -275,9 +276,10 @@ export default {
       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_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
       }

package/src/filiale/yangchun/EticketV4/EticketOpenPage.vue

@@ -113,7 +113,7 @@
           <div class="col-sm-6 form-group form-input-group" :class="[!row.f_paper_name ? 'has-error' : '']">
             <label class="control-label" style="width: 100px">开票名称:</label>
             <input class="form-control col-sm-2"
-                   v-model="row.f_paper_name" placeholder="开票名称">
+                   v-model="row.f_paper_name" placeholder="开票名称" :disabled="true">
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_is_pax ? 'has-error' : '']">
             <nobr class="col-sm-4"><label class="control-label" style="width: 100px">是否征税:</label></nobr>
@@ -240,9 +240,10 @@ export default {
       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_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
       }
@@ -268,9 +269,10 @@ export default {
       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_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
       }

package/src/filiale/yangchun/sale.js

@@ -48,8 +48,12 @@ export default function () {
 
   // 电子发票管理 对接v4 新的表结构
   Vue.component('e-ticket-manage-query-v4', (resolve) => { require(['./EticketV4/EticketManage'], resolve) })
-  // 电子发票开票
+  // 物联网表结算
   Vue.component('e-ticket-open-iot-query-v4', (resolve) => { require(['./EticketV4/EticketOpenPage'], resolve) })
-  // 抄表结算
+  // 机表结算
   Vue.component('e-ticket-open-hand-query-v4', (resolve) => { require(['./EticketV4/EticketOpenJBPage'], resolve) })
+  // 卡表结算
+  Vue.component('e-ticket-open-card-query-v4', (resolve) => { require(['./EticketV4/EticketOpenCard'], resolve) })
+  // 自定义开票
+  Vue.component('cust-query-eticket-query-v4', (resolve) => { require(['./EticketV4/CustQueryEticket'], resolve) })
 }