sale-client 3.6.343 → 3.6.345

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Jul 23 10:01:49 CST 2024
+#Fri Jul 26 10:19:09 CST 2024
 gradle.version=5.2.1

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/', 'http://192.168.50.67:31785']
+const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/', 'http://192.168.50.67:31785']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/components/common/userinfo_detail/ic_detail/HandQueryUser.vue

@@ -52,7 +52,7 @@
 
               <div style="float: right">
                 <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
-                <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :model="$parent.$parent.printModel"
+                <print-data :defaultfield="$parent.$parent.defaultfield" :field="$parent.$parent.fields" :is-selected="true" :model="$parent.$parent.printModel"
                             @print-data="$parent.$parent.print()"
                             :starthead="$parent.$parent.starthead"
                             titletable="预存气费打印明细"

package/src/components/revenue/base/leftview/otherinfo.vue

@@ -4,7 +4,8 @@
     <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
     <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
     <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
-    <safe-check :data="data"></safe-check>
+    <sale-safecheck-info :data="data"></sale-safecheck-info>
+
     <service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>
     <check-gas :data="data" v-if="checkgas==='气量核对'"></check-gas>
   </div>
@@ -16,7 +17,6 @@
 */
 
 import MixPriceInfo from './MixPriceInfo'
-import SafeCheck from './SafeCheck'
 import ServiceRepair from './ServiceRepair'
 import CheckGas from './CheckGas'
 export default {
@@ -27,7 +27,7 @@ export default {
       checkgas: ''
     }
   },
-  components: {MixPriceInfo, SafeCheck, ServiceRepair, CheckGas},
+  components: {MixPriceInfo, ServiceRepair, CheckGas},
   props: {
     data: {
       type: Object

package/src/filiale/qingjian/SafeCheck.vue

@@ -0,0 +1,339 @@
+<template>
+  <div class="panel panel-info auto">
+    <div class="panel-heading auto" style="height: 35px">
+      <h4 style="display:inline-block;margin-top: auto">安检信息</h4>
+    </div>
+    <div class="auto info-content" v-if="hasCheck == 1 && model.datasource=='oldos'">
+      <div class="row">
+        <label class="col-sm-6 ">客户名称:</label>
+        <span class="col-sm-6">{{model.name}}</span>
+      </div>
+      <div class="row">
+        <label class="col-sm-6 ">客户地址:</label>
+        <span class="col-sm-6">{{model.address}}</span>
+      </div>
+      <div class="row">
+        <label class="col-sm-6 ">安检状态:</label>
+        <span class="col-sm-6">{{model.taskStatusText}}</span>
+      </div>
+      <tr  v-show="nextCheckDateShow">
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">下次安检时间:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.nextcheckdate }}</td>
+      </tr>
+      <div class="row">
+        <label class="col-sm-6 ">上次安检时间:</label>
+        <span class="col-sm-6">{{model.lastCheckDate}}</span>
+      </div>
+      <div class="row">
+        <label class="col-sm-6 ">安检员:</label>
+        <span class="col-sm-6">{{model.f_checker_name}}</span>
+      </div>
+      <div class="row">
+        <label class="col-sm-6 ">壁挂炉:</label>
+        <span class="col-sm-6">{{model.hasFireplace == 0 ? '无': '有'}}</span>
+      </div>
+      <div class="row">
+        <label class="col-sm-6 ">热水器:</label>
+        <span class="col-sm-6">{{model.hasWaterHeater == 0 ? '无': '有'}}</span>
+      </div>
+      <div class="row">
+        <label class="col-sm-6 ">天然气专用灶:</label>
+        <span class="col-sm-6">{{model.hasCookTool == 0 ? '无': '有'}}</span>
+      </div>
+    </div>
+    <table class="table table-striped table-bordered" v-if="(model.f_entry_status=='到访不遇' || model.f_entry_status=='拒检') && model.datasource =='newos'">
+      <thead>
+      <tr>  <th colspan="4" style="text-align: center;background-color: #8cbce2;">用户安检概况</th></tr>
+      </thead>
+      <tbody>
+      <tr v-show="nextCheckDateShow">
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">下次安检时间:</td>
+        <td  colspan="3" :style=style>{{ model.f_next_check_date }}</td>
+      </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次安检时间:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_last_check_date }}</td>
+      </tr>
+      <tr>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_onsite_time }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
+        <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_offsite_time }}</td>
+      </tr>
+      <tr>
+        <td :style="{color: (model.f_entry_status==='到访不遇'||model.f_entry_status==='拒绝入户'||model.f_entry_status==='拒检') ? 'brown' : ''}"    style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
+        <td :style="{color: (model.f_entry_status==='到访不遇'||model.f_entry_status==='拒绝入户'||model.f_entry_status==='拒检') ? 'brown' : ''}" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_entry_status }}</td>
+      </tr>
+      </tbody>
+    </table>
+    <table  class="table table-striped table-bordered" v-if="(model.f_entry_status=='到访不遇' || model.f_entry_status=='拒检') && model.datasource =='newos'">
+      <thead>
+      <tr>  <th  colspan="4" style="text-align: center;background-color: #8cbce2;">{{ model.f_entry_status }}图片</th></tr>
+      </thead>
+      <tbody> <tr>
+        <td style="margin: auto;text-align: center">
+          <div class="container" style="background: #FFFFFF;margin:0;width:100%;">
+            <div class="img" v-for="img in model.f_overall_imgs">
+              <img-self v-if="img.f_overall_path!='' && img.f_overall_path!=null" :src="'rs/image/file/'+img.f_overall_path" style="float: left"  width="100" height="150"></img-self>
+            </div>
+
+          </div>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+
+    <table class="table table-striped table-bordered" v-if="model.f_entry_status=='入户' && model.datasource =='newos'">
+      <thead>
+      <tr>  <th colspan="4" style="text-align: center;background-color: #8cbce2;">用户安检概况</th></tr>
+      </thead>
+      <tbody>
+      <tr v-show="nextCheckDateShow">
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">下次安检时间:</td>
+        <td  colspan="3" :style=style>{{ model.f_next_check_date }}</td>
+      </tr>
+      <tr>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">上次安检时间:</td>
+        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_last_check_date }}</td>
+      </tr>
+      <tr>
+        <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检员:</td>
+        <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;">{{model.f_checker_name}}</td>
+      </tr>
+      <tr>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">到达时间:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_onsite_time }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">离开时间:</td>
+        <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_offsite_time }}</td>
+      </tr>
+      <tr>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_entry_status }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 17%" >燃气使用:</td>
+        <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_usegas }}</td>
+      </tr>
+      <tr>
+        <td colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;width: 17%" >机械读数:</td>
+        <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_base_num_machinery }}</td>
+      </tr>
+      <tr >
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">用户满意度:</td>
+        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_client_evaluation }}</td>
+        <td  colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))" style="text-align: center;border: #E9E9E9 solid 1px;">安检结果:</td>
+        <td  colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >= 0))"  style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.ajresult }}</td>
+        <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)"  style="text-align: center;border: #E9E9E9 solid 1px;color:red;">安检结果:</td>
+        <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)"  style="text-align: center;border: #E9E9E9 solid 1px;color:red;">{{ model.ajresult }}</td>
+      </tr>
+      <tr>
+        <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;color:red;">隐患详情:</td>
+        <td  colspan="3" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%;color:red;">
+             <span  v-for="deviceCollect in model.deviceCollects">
+                      <span class="li-font">
+                        {{deviceCollect.name}}:{{deviceCollect.value}}&nbsp;&nbsp;&nbsp;
+                      </span>
+                <br>
+           </span>
+        </td>
+        <td  colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
+        <td  colspan="3" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))"  style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
+             <span  v-for="deviceCollect in model.deviceCollects">
+                      <span class="li-font">
+                        {{deviceCollect.name}}:{{deviceCollect.value}}&nbsp;&nbsp;&nbsp;
+                      </span>
+                <br>
+           </span>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+    <table class="table table-striped table-bordered" v-if="model.safecheckitem.length>0 && model.datasource =='newos'">
+      <thead>
+      <tr>  <th colspan="4" style="text-align: center;background-color: #8cbce2;">隐患详情</th></tr>
+      </thead>
+      <tr v-for="checkitem in model.safecheckitem">
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ checkitem.f_item_name }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ checkitem.f_repaire_state }}</td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%" v-if="checkitem.f_path!='' && checkitem.f_path!=null">
+          <img-self :src="'rs/image/file/'+checkitem.f_path" style="float: left"  width="100" height="150"></img-self>
+        </td>
+        <td  style="text-align: center;border: #E9E9E9 solid 1px;width: 33%" v-if="checkitem.f_path=='' && checkitem.f_path==null">
+          暂无图片
+        </td>
+      </tr>
+    </table>
+
+
+    <table  class="table table-striped table-bordered" v-if="model.f_entry_status=='入户'  && model.datasource =='newos'">
+      <thead>
+      <tr>  <th  colspan="4" style="text-align: center;background-color: #8cbce2;">总体安检照片</th></tr>
+      </thead>
+      <tbody> <tr>
+        <td style="margin: auto;text-align: center">
+          <div class="container" style="background: #FFFFFF;margin:0;width:100%;">
+            <div class="img" v-for="img in model.f_overall_imgs">
+              <img-self  :src="img.f_overall_path" style="float: left"  width="100" height="150"></img-self>
+            </div>
+          </div>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+    <div class="auto info-content" v-if="hasCheck === 0">
+      <div class="row">
+        <strong>暂无安检信息</strong>
+      </div>
+    </div>
+    <div class="auto info-content" v-if="hasCheck === -1">
+      <div class="row">
+        <p>正在获取安检信息...</p>
+      </div>
+    </div>
+  </div>
+  <modal :show.sync="imgshow2" v-ref:modal backdrop="true">
+    <header slot="modal-header" class="modal-header">
+      {{model.f_entry_status}}照片
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <div class="row">
+          <div class="col-md-6">
+            <img-self v-if="this.model.f_entry_status=='到访不遇'" :src="showimg3"   width="300" height="400"></img-self>
+          </div><div class="col-md-6">
+          <img-self v-if="this.model.f_entry_status=='拒检'" :src="showimg4"   width="300" height="400"></img-self>
+        </div>
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" v-show="false">
+      <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
+    </footer>
+  </modal>
+</template>
+<script>
+  /**
+   *用户信息
+   *安检信息
+   */
+
+  import {HttpResetClass} from 'vue-client'
+
+  let getSafeCheckGen = async function (self) {
+    // 获取安检信息
+    try {
+      let http = new HttpResetClass()
+      let param = {
+        f_userfiles_id: self.data.f_userfiles_id,
+        f_userinfo_id: self.data.f_userinfo_id
+      }
+      if (self.data.f_olduserinfo_code) {
+        param.f_olduserinfo_code = self.data.f_olduserinfo_code
+      }
+      let getSafeCheck = await http.load('POST', 'rs/logic/getSafecheck', param, {resolveMsg: null, rejectMsg: null})
+      if (!(JSON.stringify(getSafeCheck.data) == '{}')) {
+        self.model = {}
+        self.model = Object.assign({}, self.model, getSafeCheck.data)
+        self.hasCheck = 1
+      } else {
+        self.hasCheck = 0
+      }
+    } catch (error) {
+      self.hasCheck = 0
+    }
+
+    if (new Date(self.model.f_next_check_date) < new Date(self.nowdate)) {
+      self.style = 'text-align: center;border: #E9E9E9 solid 1px;color:red'
+    } else {
+      self.style = 'text-align: center;border: #E9E9E9 solid 1px;'
+    }
+  }
+
+  export default {
+    title: '安检信息',
+    data () {
+      return {
+        model: {},
+        style: 'text-align: center;border: #E9E9E9 solid 1px;',
+        nowdate: this.$login.toStandardTimeString(),
+        hasCheck: -1,
+        imgshow: false,
+        imgshow2: false,
+        showimg1: '',
+        showimg2: '',
+        showimg3: '',
+        nextCheckDateShow: true,
+        showimg4: ''
+      }
+    },
+    props: ['data'],
+    ready () {
+      getSafeCheckGen(this)
+      if (this.$appdata.getSingleValue('是否显示下次安检时间') == '否') {
+        this.nextCheckDateShow = false
+      }
+    },
+    methods: {
+      showpicture2 () {
+        this.imgshow2 = true
+      }
+    },
+    watch: {
+      'data' () {
+        if (this.data == null) {
+          this.hasCheck = 0
+          this.model = {}
+        } else {
+          getSafeCheckGen(this)
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  .img {
+    border: 1px solid #9773ed;
+    width: auto;
+    height: auto;
+    float: left;
+    text-align: center;
+    margin: 6px;
+  }
+
+  img {
+    margin: 6px;
+  }
+
+
+  .container{
+    margin: 10px auto;
+    width: 80%;
+    height: auto;
+  }
+  div::-webkit-scrollbar {
+    width: 0 !important;
+    height: 0 !important;
+  }
+
+  div{
+    -ms-overflow-style: none;
+    overflow: -moz-scrollbars-none;
+  }
+  .divmask {
+    pointer-events: none;
+  }
+  .app-header {
+    border-radius: 50%;
+    background: rgba(73, 158, 223, 0.4);
+    color: #FFF;
+    padding: 20px;
+    text-align: center;
+    font-size: 1.2em;
+    z-index: 10;
+    opacity:0.5;
+    bottom: 50px;
+    margin-top: -20px;
+    position: absolute;
+    top: 10%;
+    right: 2%;
+    height: 8%;
+  }
+</style>

package/src/filiale/qingjian/sale.js

@@ -6,6 +6,8 @@ export default function () {
   Vue.component('card-meter-center', (resolve) => { require(['./CardMeterCenter'], resolve) })
   // 发卡售气
   Vue.component('show-card-sell-gas', (resolve) => { require(['./ShowCardSellGas'], resolve) })
+  // 安检信息
+  Vue.component('sale-safecheck-info', (resolve) => { require(['./SafeCheck'], resolve) })
   // 档案信息
   Vue.component('file-user-files', (resolve) => { require(['./FileUserFiles'], resolve) })
   // 单个表具信息

package/src/filiale/rizhao/UserInfoDetailManageNew.vue

@@ -0,0 +1,218 @@
+<template>
+  <div class="binary flex" >
+    <div class="row binary-left flex" style="width:99%;height:98%;margin-bottom:0px">
+      <div class="auto">
+        <user-base-info-new :row="row" :buttonshow="buttonshow"
+                            @cancel-main="cancel"
+                            @cancel-re="cancelRe"
+        @search-main="search"></user-base-info-new></div>
+      <saletabbut  v-if="row" v-ref:list style="height:72%;margin-top: 1%;overflow-y: scroll">
+        <saletab header="流水查询" v-if="permission('流水查询')">
+          <record-query-user :row="row"></record-query-user>
+        </saletab>
+        <saletab header="机表流水查询" v-if="permission('机表流水查询')&&row.f_meter_type.includes('机表')">
+          <machine-record-query :row="row" v-if="show == '机表流水查询'" @deal-msg="dealMsg"></machine-record-query>
+        </saletab>
+        <saletab header="收费查询" v-if="!newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="收费查询" v-if="newWebHand && permission('收费查询')">
+          <charge-query-user  :row="row" v-if="show == '收费查询'" @deal-msg="dealMsg"></charge-query-user>
+        </saletab>
+        <saletab header="累购查询" v-if="permission('累购查询')">
+          <Repurchase  :row="row" v-if="show == '累购查询'" @deal-msg="dealMsg"></Repurchase>
+        </saletab>
+        <saletab header="下账查询" v-if="!newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <automatic-purse  :row="row"   @deal-msg="dealMsg"></automatic-purse>
+        </saletab>
+        <saletab header="下账查询" v-if="newWebHand && row.f_meter_type.includes('物联网表')&&permission('自动下账查询')">
+          <web-automatic-purse  :row="row"   @deal-msg="dealMsg"></web-automatic-purse>
+        </saletab>
+        <saletab header="抄表记录" v-if="row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <card-hand-record :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></card-hand-record>
+        </saletab>
+        <saletab header="抄表记录" v-if="!newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></hand-query-user>
+        </saletab>
+        <saletab header="抄表记录" v-if="newWebHand && !row.f_meter_type.includes('卡表')&&permission('抄表记录')">
+          <web-hand-query-user  :row="row" v-if="show == '抄表记录'" @deal-msg="dealMsg"></web-hand-query-user>
+        </saletab>
+        <saletab header="补卡查询" v-if="row.f_meter_type.includes('卡表')&&permission('补卡查询')">
+          <fill-card-query-user :row="row" v-if="show == '补卡查询'" @deal-msg="dealMsg"></fill-card-query-user>
+        </saletab>
+        <saletab header="补气查询" v-if="permission('补气查询')">
+          <fill-gas-query-user  :row="row" v-if="show == '补气查询'" @deal-msg="dealMsg"></fill-gas-query-user>
+        </saletab>
+        <saletab header="换表查询" v-if="permission('换表查询')">
+          <change-meter-query-user  :row="row" v-if="show == '换表查询'" @deal-msg="dealMsg"></change-meter-query-user>
+        </saletab>
+<!--        <saletab header="其他收费" v-if="permission('其他收费')">-->
+<!--          <other-charge-query-user  :row="row" v-if="show == '其他收费'" @deal-msg="dealMsg"></other-charge-query-user>-->
+<!--        </saletab>-->
+        <saletab header="过户查询" v-if="permission('过户查询')">
+          <transfer-query-user  :row="row" v-if="show == '过户查询'" @deal-msg="dealMsg"></transfer-query-user>
+        </saletab>
+        <saletab header="价格调整" v-if="permission('价格调整')">
+          <price-change-query-user  :row="row" v-if="show == '价格调整'" @deal-msg="dealMsg"></price-change-query-user>
+        </saletab>
+        <saletab header="附件查看" v-if="permission('附件查看')">
+          <upload-file-history :row="row" v-if="show == '附件查看'" @deal-msg="dealMsg"></upload-file-history>
+        </saletab>
+        <saletab header="变更记录" v-if="permission('变更记录')">
+          <change-record  :row="row" v-if="show == '变更记录'" @deal-msg="dealMsg"></change-record>
+        </saletab>
+        <saletab header="指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('指令查看')">
+          <query-instruct  :row="row" v-if="show == '指令查看'" @deal-msg="dealMsg"></query-instruct>
+        </saletab>
+        <saletab header="历史指令查看" v-if="row.f_meter_type.includes('物联网表')&&permission('历史指令查看')">
+          <query-history-instruct  :row="row" v-if="show == '历史指令查看'" @deal-msg="dealMsg"></query-history-instruct>
+        </saletab>
+        <saletab header="异常报警" v-if="row.f_meter_type.includes('物联网表')&&permission('异常报警')">
+          <watch-warning  :row="row" v-if="show == '异常报警'" @deal-msg="dealMsg"></watch-warning>
+        </saletab>
+        <saletab header="表具采集" v-if="row.f_meter_type.includes('物联网表')&&permission('表具采集')">
+          <watch-collection  :row="row" v-if="show == '表具采集'" @deal-msg="dealMsg"></watch-collection>
+        </saletab>
+        <saletab header="调价补差" v-if="permission('调价补差')">
+          <price-adjustment-query-user  :row="row" v-if="show == '调价补差'" @deal-msg="dealMsg"></price-adjustment-query-user>
+        </saletab>
+        <saletab header="设备查询" v-if="permission('设备查询')">
+          <deveice-record  :row="row" v-if="show == '设备查询'" @deal-msg="dealMsg"></deveice-record>
+        </saletab>
+        <saletab header="流量计参数查看" v-if="permission('流量计参数查看')">
+          <meter-param  :row="row" v-if="show == '流量计参数查看'" @deal-msg="dealMsg"></meter-param>
+        </saletab>
+        <saletab header="表使用量图表" v-if="permission('流量计参数查看')">
+          <table-usage-chart :row="row" v-if="show == '表使用量图表'" @deal-msg="dealMsg"></table-usage-chart>
+        </saletab>
+        <saletab header="用户设备查询"  v-if="permission('用户设备查看')">
+          <user-device-query :row="row" v-if="show == '用户设备查询'" @deal-msg="dealMsg"></user-device-query>
+        </saletab>
+        <saletab header="合同查看"  v-if="permission('合同查看')">
+          <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
+        </saletab>
+      </saletabbut>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  // 导入IC卡相关查询界面
+  import ChangeMeterQueryUser from '../../components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser'
+  import ChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeQueryUser'
+  import ChargeRecordQueryUser from '../../components/common/userinfo_detail/ic_detail/ChargeRecordQuery'
+  import FillCardQueryUser from '../../components/common/userinfo_detail/ic_detail/FillCardQueryUser'
+  import HandQueryUser from '../../components/common/userinfo_detail/ic_detail/HandQueryUser'
+  import OtherChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/OtherChargeQueryUser'
+  import RecordQueryUser from '../../components/common/userinfo_detail/ic_detail/RecordQueryUser'
+  import TransferQueryUser from '../../components/common/userinfo_detail/ic_detail/TransferQueryUser'
+  import CardHandRecord from '../../components/common/userinfo_detail/ic_detail/CardHandRecord'
+  import AutomaticPurse from '../../components/common/userinfo_detail/ic_detail/AutomaticPurse'
+  import Repurchase from '../../components/common/userinfo_detail/ic_detail/Repurchase'
+  import MachineRecordQuery from '../../components/common/userinfo_detail/ic_detail/MachineRecordQuery'
+  import WebAutomaticPurse from '../../components/common/userinfo_detail/ic_detail/WebAutomaticPurse'
+  import WebChargeQueryUser from '../../components/common/userinfo_detail/ic_detail/WebChargeQueryUser'
+  import WebHandQueryUser from '../../components/common/userinfo_detail/ic_detail/WebHandQueryUser'
+  import UserDeviceQuery from '../../components/common/userinfo_detail/ic_detail/UserDeviceQuery'
+  import contractSigningList from '../../components/common/userinfo_detail/ic_detail/contractSigningList'
+
+  // 导入物联网相关查询
+  import QueryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryInstruct'
+  import QueryHistoryInstruct from '../../components/common/userinfo_detail/iot_detail/QueryHistoryInstruct'
+  import WatchCollection from '../../components/common/userinfo_detail/iot_detail/WatchCollection'
+  import WatchWarning from '../../components/common/userinfo_detail/iot_detail/WatchWarning'
+  import PriceChangeQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceChangeQueryUser'
+  import ChangeRecord from '../../components/common/userinfo_detail/ic_detail/ChangeRecord'
+  import PriceAdjustmentQueryUser from '../../components/common/userinfo_detail/ic_detail/PriceAdjustmentQueryUser'
+  import MeterParam from '../../components/common/userinfo_detail/ic_detail/MeterParam'
+  import DeveiceRecord from '../../components/common/userinfo_detail/ic_detail/DeveiceRecord'
+
+export default {
+    title: '用户详细信息',
+    props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
+    components: {
+      PriceAdjustmentQueryUser,
+      PriceChangeQueryUser,
+      AutomaticPurse,
+      WebAutomaticPurse,
+      WebChargeQueryUser,
+      WebHandQueryUser,
+      Repurchase,
+      ChangeMeterQueryUser,
+      ChargeQueryUser,
+      ChargeRecordQueryUser,
+      FillCardQueryUser,
+      HandQueryUser,
+      OtherChargeQueryUser,
+      RecordQueryUser,
+      TransferQueryUser,
+      WatchWarning,
+      WatchCollection,
+      QueryInstruct,
+      QueryHistoryInstruct,
+      ChangeRecord,
+      CardHandRecord,
+      MeterParam,
+      DeveiceRecord,
+      MachineRecordQuery,
+      UserDeviceQuery,
+      contractSigningList
+    },
+    data () {
+      return {
+        row: null,
+        name: '自动下账查询',
+        newWebHand: this.$appdata.getSingleValue('新抄表'),
+        show: ''
+      }
+    },
+    ready () {
+      this.search()
+      console.log(this.$login)
+    },
+    methods: {
+      permission (name) {
+        if (this.$login.r.find(value => value == '收费综合查询')) {
+          if (!this.$login.r.find(value => value == name)) {
+            return false
+          }
+        }
+        return true
+      },
+      async search () {
+        let http = new HttpResetClass()
+        let condition = ' 1 = 1'
+        if (this.f_userfiles_id) {
+          condition = `f_userfiles_id = '${this.f_userfiles_id}'`
+        } else if (this.f_userinfo_id) {
+          condition = `f_userinfo_id = '${this.f_userinfo_id}'`
+        } else if (this.f_userinfo_code) {
+          condition = `f_userinfo_code = '${this.f_userinfo_code}'`
+        }
+
+        let getBaseInfo = await http.load('POST', 'rs/sql/iot_getUserBaseData',
+          {data: {condition: condition}}, {resolveMsg: null, rejectMsg: '获取基本信息出错'})
+        this.row = getBaseInfo.data[0]
+        this.row.parentname = this.parentname || ''
+      },
+
+      cancel (val) {
+        this.$emit('cancel-main', val)
+      },
+
+      cancelRe (val) {
+        this.$emit('cancel-re', val)
+      },
+
+      butOper (val) {
+        this.name = val
+      }
+    },
+    watch: {
+      'f_userinfo_id' () {
+        this.search()
+      }
+    }
+  }
+</script>

package/src/filiale/rizhao/sale.js

@@ -48,5 +48,6 @@ export default function () {
   Vue.component('show-card-sell-gas', (resolve) => { require(['./ShowCardSellGas'], resolve) })
   // 地址管理
   Vue.component('file-user-address', (resolve) => { require(['./FileUserAddress'], resolve) })
-
+  // 清零
+  Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
 }

package/src/filiale/yangchun/ChangeMeter.vue

@@ -43,7 +43,7 @@
         <meter-message v-if="!model.f_type.includes('清零') && !model.f_type.includes('换卡控流量计')"
                        :f_userfiles_id="row.f_userfiles_id" :metermessage.sync="model.metermessage"
                        @valid="meterinfo = true"
-                       @invalid="meterinfo = false" @gasmodel="gasModelChange" v-ref:metermsg></meter-message>
+                       @invalid="meterinfo = false" @gasmodel="gasModelChange" @gasbrand="gasBrandChange" v-ref:metermsg></meter-message>
 
         <div v-if="row.f_meter_type != '机表'">
           <div class="row auto" style="margin-top: 10px"
@@ -359,6 +359,22 @@ let getPrice = async function (self) {
   if (res.data.length > 0) {
     self.model.f_remanent_price = res.data[0].f_price
   }
+  let http2 = new HttpResetClass()
+  let chargeData = {
+    tablename: 't_chargeprice',
+    items: 'f_gas,f_money,f_price',
+    condition: `f_userfiles_id = '${self.row.f_userfiles_id}'`,
+    orderitem: 'id desc'
+  }
+  let chargePrice = await http2.load('POST', 'rs/sql/singleTable_OrderBy', {
+    data: chargeData
+  }, {
+    resolveMsg: null,
+    rejectMsg: '获取划价记录失败!!'
+  })
+  if (chargePrice.data.length > 0) {
+    self.chargePrices = chargePrice.data
+  }
   let temp = {
     tablename: 't_meter_book',
     condition: `f_book_state='有效' and f_filiale_id='${self.$login.f.orgid}'`
@@ -439,6 +455,7 @@ export default {
         f_using_fee_old: 0,
         randomBusinessId: ''
       },
+      chargePrices: [],
       meterinfo: false,
 
       meterbookoptions: [],
@@ -969,9 +986,7 @@ export default {
         this.$showAlert('该表可能存在超用，请核实输入后进行换表操作！！', 'warning', 5000)
         this.$dispatch('refresh')
       }
-      if (this.model.f_remanent_price > 0) {
-        this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(4)
-      }
+      this.model.f_remanent_gas = (param - (this.model.f_using_base_old - 0)).toFixed(4)
     },
 
     calMoneyCardRemanent () {
@@ -1109,14 +1124,75 @@ export default {
           this.$dispatch('button-specifies', {name: '机表收费', value: 'machine-charge'}, this.row)
         }
       }
+    },
+    getComments (array) {
+      let str = '剩余补气量中，'
+      array.forEach((item) => {
+        str = str + '单价：' + item.price + '补气量为：' + item.gas + 'm³,'
+      })
+      str += '折算后补气量为' + this.model.f_remanent_gas + 'm³,补气金额为' + this.model.f_remanent_money + '元,平均单价为' + this.model.f_remanent_price + '元'
+      this.model.f_comments = str
+    },
+    allocateGas (totalGas, rates, price) {
+      let remainingGas = totalGas
+      const allocations = []
+      let totalAmount = 0
+
+      for (const rate of rates) {
+        if (remainingGas <= 0) break // 如果剩余气量为0或负数，跳出循环
+        if (remainingGas >= rate.f_gas) {
+          // 如果剩余气量大于等于当前条目的气量
+          allocations.push({
+            gas: rate.f_gas,
+            price: rate.f_price,
+            amount: rate.f_money
+          })
+          totalAmount += parseFloat(rate.f_money)
+          remainingGas -= rate.f_gas
+        } else {
+          // 如果剩余气量小于当前条目的气量
+          allocations.push({
+            gas: remainingGas,
+            price: rate.f_price,
+            amount: parseFloat((remainingGas * rate.f_price).toFixed(4))
+          })
+          totalAmount += parseFloat((remainingGas * rate.f_price).toFixed(4))
+          remainingGas = 0 // 剩余气量设置为0
+          break // 跳出循环
+        }
+      }
+      // 如果遍历完所有条目后仍有剩余气量
+      if (remainingGas > 0) {
+        allocations.push({
+          gas: remainingGas,
+          price: price,
+          amount: parseFloat((remainingGas * price).toFixed(4))
+        })
+        totalAmount += parseFloat((remainingGas * price).toFixed(4))
+      }
+      this.model.f_remanent_price = (totalAmount / this.model.f_remanent_gas).toFixed(4)
+      this.model.f_remanent_money = totalAmount
+      // 计算公式
+      this.getComments(allocations)
     }
   },
-
   watch: {
     'row' () {
       console.log('-------------------------------')
       console.log(this.row)
     },
+    'model.metermessage.f_meter_type' (val) {
+      console.log(val)
+      if (val.length > 0) {
+        if (val[0] != '气量卡表' && this.row.f_meter_type == '气量卡表') {
+          this.allocateGas(this.model.f_remanent_gas, this.chargePrices, this.model.f_remanent_price)
+        } else {
+          if (this.model.f_comments) {
+            this.model.f_comments = ''
+          }
+        }
+      }
+    },
     'model.f_remanent_money' (val) {
       console.log('观察补气金额', val)
       if (!this.isGas) {
@@ -1126,9 +1202,20 @@ export default {
         this.commitflag = true
       }
     },
-    'model.f_remanent_gas' (val) {
+    'model.f_remanent_gas' (val, val2) {
+      console.log('观察补气量', val)
       if (this.isGas) {
-        this.model.f_remanent_money = (val * this.model.f_remanent_price).toFixed(4)
+        if (this.row.f_meter_type == '气量卡表' && this.model.metermessage.f_meter_type[0] && this.model.metermessage.f_meter_type[0] != '气量卡表') {
+          if (this.chargePrices.length < 1) {
+            this.model.f_remanent_money = (val / this.model.f_remanent_price).toFixed(4)
+          } else {
+            this.allocateGas(this.model.f_remanent_gas, this.chargePrices, this.model.f_remanent_price)
+          }
+        } else {
+          if (this.model.f_remanent_price > 0) {
+            this.model.f_remanent_money = (val * this.model.f_remanent_price).toFixed(4)
+          }
+        }
       }
       if (this.model.f_using_base_old) {
         this.commitflag = true

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/shimen/sale'
+import FilialeSale from './filiale/qingjian/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'

package/src/sale.js

@@ -126,6 +126,8 @@ export default function () {
   Vue.component('user-meterinfodetail', (resolve) => { require(['./components/revenue/base/leftview/meterinfodetail'], resolve) })
   // 当前选择用户的其他信息
   Vue.component('otherinfo', (resolve) => { require(['./components/revenue/base/leftview/otherinfo'], resolve) })
+  // 安检信息
+  Vue.component('sale-safecheck-info', (resolve) => { require(['./components/revenue/base/leftview/SafeCheck'], resolve) })
   // 当前选择用户的发票信息
   Vue.component('bill-message', (resolve) => { require(['./components/revenue/base/leftview/billMessage'], resolve) })
   // 当前选择用户的阶梯使用信息