sale-client 3.6.272 → 3.6.273

package/package.json

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

package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenCard.vue

@@ -50,7 +50,7 @@
               </div>
               <div style="float: right">
                 <button class="button_search" @click="search()">查 询</button>
-                <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
+                <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
               </div>
             </div>
           </div>

package/src/components/revenue/comprehen/Bill/EticketV4/EticketOpenPage.vue

@@ -50,7 +50,7 @@
               </div>
               <div style="float: right">
                 <button class="button_search" @click="search()">查 询</button>
-                <!--<button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>-->
+                <button class="button_search" @click="$parent.$parent.open_eTicket()">开票</button>
               </div>
             </div>
           </div>
@@ -59,10 +59,10 @@
       <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>
+              <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>
@@ -78,10 +78,10 @@
         </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>-->
+            <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>

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

@@ -302,7 +302,7 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '结算收费', this.invoice_is_pax, this.invoice_type)
+      this.$refs.eticketbill.openETicket(this.selecteds.map(item => item.id), this.row, '结算收费', false, this.invoice_is_pax, this.invoice_type)
     },
     selfSearch (args) {
       if (!this.orgCondtionStr) {

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

@@ -321,7 +321,7 @@ export default {
     confirm () {
       this.eticket_msg = false
       this.eticket_show = true
-      this.$refs.eticketbill.openETicket(this.row.id, this.row, '物联网收费', this.invoice_is_pax, this.invoice_type)
+      this.$refs.eticketbill.openETicket(this.row.id, this.row, '物联网收费', false, this.invoice_is_pax, this.invoice_type)
     },
     selfSearch (args) {
       if (!this.orgCondtionStr) {

package/src/filiale/macheng/FilesManageNew/UserEssentialInfoTest.vue

@@ -154,9 +154,9 @@
             </v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$v.f_packaging.required ? 'has-error' : '']">
-            <label for="f_contract" class="font_normal_body">*报装费&emsp;</label>
+            <label for="f_contract" class="font_normal_body">*工程安装费&emsp;</label>
             <input type="text"  v-model="baseinfo.base.f_packaging" @blur="isnumber()" v-validate:f_packaging='{required: true }'
-                   class="input_search" style="width:60%" placeholder="报装费">
+                   class="input_search" style="width:60%" placeholder="工程安装费">
           </div>
         </div>
         <div class="row">

package/src/filiale/macheng/UserEssentialInfoTest.vue

@@ -156,9 +156,9 @@
             </v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$v.f_packaging.required ? 'has-error' : '']">
-            <label for="f_contract" class="font_normal_body">*报装费&emsp;</label>
+            <label for="f_contract" class="font_normal_body">*工程安装费&emsp;</label>
             <input type="text"  v-model="baseinfo.base.f_packaging" @blur="isnumber()" v-validate:f_packaging='{required: true }'
-                   class="input_search" style="width:60%" placeholder="报装费">
+                   class="input_search" style="width:60%" placeholder="工程安装费">
           </div>
 
         <div class="row">

package/src/filiale/shexian/ChargeList.vue

@@ -332,6 +332,66 @@
       <button type="button" class="btn btn-default" @click='hasGasClose'>取消</button>
     </footer>
   </modal>
+  <modal :show.sync="showCardTotalError" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <h4 class="modal-title">卡上信息</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <form class="form-horizontal">
+        <div class="form-group">
+          <label class="col-sm-2 control-label">卡&emsp;&emsp;号</label>
+          <div class="col-sm-2">
+            <p class="form-control-static">{{cardInfo.CardID}}</p>
+          </div>
+
+          <div v-if="meterType == '气量卡表'">
+            <label class="col-sm-2 control-label">卡上累购气量</label>
+            <div class="col-sm-2">
+              <p class="form-control-static">{{cardInfo.NewParam.ljgql}}</p>
+            </div>
+            <label class="col-sm-2 control-label">系统累购气量</label>
+            <div class="col-sm-2">
+              <p class="form-control-static">{{systemTotalGas}}</p>
+            </div>
+          </div>
+
+          <div v-if="meterType == '金额卡表'">
+            <label class="col-sm-2 control-label">卡上累购金额</label>
+            <div class="col-sm-2">
+              <p class="form-control-static">{{cardInfo.TotalMoney}}</p>
+            </div>
+            <label class="col-sm-2 control-label">系统累购金额</label>
+            <div class="col-sm-2">
+              <p class="form-control-static">{{systemTotalFee}}</p>
+            </div>
+          </div>
+
+          <label class="col-sm-2 control-label">用户编号</label>
+          <div class="col-sm-2">
+            <p class="form-control-static">{{userCode}}</p>
+          </div>
+          <label class="col-sm-2 control-label">用户姓名</label>
+          <div class="col-sm-2">
+            <p class="form-control-static">{{userName}}</p>
+          </div>
+          <label class="col-sm-2 control-label">用户地址</label>
+          <div class="col-sm-2">
+            <p class="form-control-static">{{userAddress}}</p>
+          </div>
+        </div>
+        <div class="form-group" style="margin-left:10%;" v-if="meterType == '气量卡表'">
+          <p class="text-left" style="font-size:20px;line-height:60px;font-height:800;">当前卡累购气量与系统累购气量不符,请检查是否正确的卡</p>
+        </div>
+        <div class="form-group" style="margin-left:10%;" v-if="meterType == '金额卡表'">
+          <p class="text-left" style="font-size:20px;line-height:60px;font-height:800;">当前卡累购金额与系统累购金额不符,请检查是否正确的卡</p>
+        </div>
+      </form>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" v-if="showCardError2" class="button_search" @click='hasGasContinue'>继续</button>
+      <button type="button" class="btn btn-default" @click='hasGasClose'>取消</button>
+    </footer>
+  </modal>
 
 </template>
 
@@ -562,7 +622,49 @@ let cardBtnGen = async function (self, val) {
           }
         }
       }
-
+      // 读卡时判断表累购和卡上累购是否相同
+      if (getUser.data.length > 0) {
+        // 查询未写卡记录
+        let getUnWriteSell = await self.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${getUser.data[0].f_userfiles_id}'`)
+        console.log('获取未写卡记录', getUnWriteSell)
+        self.systemTotalFee = getUser.data[0].f_total_fee
+        self.systemTotalGas = getUser.data[0].f_total_gas
+        self.meterType = getUser.data[0].f_meter_type
+        self.userCode = getUser.data[0].f_userinfo_code
+        self.userName = getUser.data[0].f_user_name
+        self.userAddress = getUser.data[0].f_address
+        if (getUser.data[0].f_meter_type === '气量卡表') {
+          console.log('=============', self.cardInfo.NewParam.ljgql - getUser.data[0].f_total_gas)
+          if (self.cardInfo.NewParam.ljgql - getUser.data[0].f_total_gas > 0) {
+            self.showCardError2 = false
+            self.showCardTotalError = true
+            return
+          } else if (self.cardInfo.NewParam.ljgql - getUser.data[0].f_total_gas < 0 && getUnWriteSell.data.length < 1) {
+            self.showCardError2 = false
+            self.showCardTotalError = true
+            return
+          } else if (self.cardInfo.NewParam.ljgql - getUser.data[0].f_total_gas < 0 && getUnWriteSell.data.length > 0) {
+            self.showCardError2 = true
+            self.showCardTotalError = true
+            return
+          }
+        } else {
+          console.log('------------', self.cardInfo.TotalMoney - getUser.data[0].f_total_fee)
+          if (self.cardInfo.TotalMoney - getUser.data[0].f_total_fee > 0) {
+            self.showCardError2 = false
+            self.showCardTotalError = true
+            return
+          } else if (self.cardInfo.TotalMoney - getUser.data[0].f_total_fee < 0 && getUnWriteSell.data.length < 1) {
+            self.showCardError2 = false
+            self.showCardTotalError = true
+            return
+          } else if (self.cardInfo.TotalMoney - getUser.data[0].f_total_fee < 0 && getUnWriteSell.data.length > 0) {
+            self.showCardError2 = true
+            self.showCardTotalError = true
+            return
+          }
+        }
+      }
       if (getUser.data.length === 0) {
         self.model.state = '错误'
         self.model.rows = null
@@ -681,6 +783,10 @@ let cardBtnGen = async function (self, val) {
         userName: '',
         userAddress: '',
 
+        systemTotalGas: '',
+        systemTotalFee: '',
+        meterType: '',
+        showCardTotalError: false,
         // 当列表是一户的时候直接读卡，跳过判卡
         isSingleUser: null,
 
@@ -826,6 +932,7 @@ let cardBtnGen = async function (self, val) {
   },
   async hasGasContinue () {
     this.showCardError = false
+    this.showCardTotalError = false
     this.showCardInfo = false
     getMeterInfoGen2(this)
   },
@@ -833,6 +940,7 @@ let cardBtnGen = async function (self, val) {
     this.showCardInfo = false
     this.showCardError = false
     this.showCardError2 = false
+    this.showCardTotalError = false
   },
   async testCard () {
     try {