sale-client 3.6.150 → 3.6.152

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['https://qnjtkf.cn:7400/', 'https://qnjtkf.cn:7400/']
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://localhost:8080/']
 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.150",
+  "version": "3.6.152",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

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

@@ -80,13 +80,13 @@
           resolveMsg: null
         })
         this.model.rows = record.data
-        this.hasCardCental = this.$appdata.getSingleValue('多收提示') ? this.$appdata.getSingleValue('多收提示') : true
-        if(this.hasCardCental && this.model.rows.length>0 && ( this.model.rows[0].type== '发卡售气' ||  this.model.rows[0].type== '卡表收费' ) ){
-          let checkdata = this.model.rows[0].operate_date.substr(0,10)
-          let nowdate = new Date();
-          let pdate = nowdate.getFullYear()+'-'+(nowdate.getMonth()<10? '0'+nowdate.getMonth()+1 : nowdate.getMonth()+1) +'-'+(nowdate.getDate()<10? '0'+nowdate.getDate() : nowdate.getDate());
-          if(new Date(checkdata).getTime() == new Date(pdate).getTime()){
-            this.cardCental = true;
+        this.hasCardCental = this.$appdata.getSingleValue('多收提示') ? this.$appdata.getSingleValue('多收提示') : false
+        if (this.hasCardCental && this.model.rows.length > 0 && (this.model.rows[0].type == '发卡售气' || this.model.rows[0].type == '卡表收费')) {
+          let checkdata = this.model.rows[0].operate_date.substr(0, 10)
+          let nowdate = new Date()
+          let pdate = nowdate.getFullYear() + '-' + (nowdate.getMonth() < 10 ? '0' + nowdate.getMonth() + 1 : nowdate.getMonth() + 1) + '-' + (nowdate.getDate() < 10 ? '0' + nowdate.getDate() : nowdate.getDate())
+          if (new Date(checkdata).getTime() == new Date(pdate).getTime()) {
+            this.cardCental = true
           }
         }
       }

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

@@ -41,7 +41,7 @@
         <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.datasource =='newos'">
+    <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>
@@ -61,14 +61,14 @@
         <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==='拒绝入户') ? 'brown' : ''}"    style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
-        <td :style="{color: (model.f_entry_status==='到访不遇'||model.f_entry_status==='拒绝入户') ? 'brown' : ''}" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ model.f_entry_status }}</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: 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.datasource =='newos'">
+    <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>
+      <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">

package/src/components/revenue/comprehen/StairPrice/GasPriceList.vue

@@ -97,6 +97,9 @@
             <th>
               <nobr>气价编号</nobr>
             </th>
+            <th>
+              <nobr>气价ID</nobr>
+            </th>
             <th v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">
               <nobr>气价名称</nobr>
             </th>
@@ -136,6 +139,7 @@
           <tr>
             <td style="text-align:center">{{$index + 1}}</td>
             <td style="text-align:center">{{row.f_price_id}}</td>
+            <td style="text-align:center">{{row.id}}</td>
             <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)"><nobr>{{row.f_price_name}}</nobr></td>
             <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_user_type}}</td>
             <td style="text-align:center" v-show="!$parent.$parent.$parent.$parent.usershow && !($parent.$parent.$parent.$parent.isdetail && !$parent.$parent.$parent.$parent.usershow)">{{row.f_gasproperties}}</td>