sale-client 3.6.57 → 3.6.59

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://121.36.106.17:8400', 'http://121.36.106.17:8400']
+const [localUrl, serverRul] = ['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 = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.57",
+  "version": "3.6.59",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "yarn": "^1.22.10"
   },
   "devDependencies": {
-    "address-client": "3.2.29",
+    "address-client": "3.2.56",
     "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -76,9 +76,16 @@
           </div>
           <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error' : '']">
             <label for="f_people_num" class="font_normal_body">&ensp;人&ensp;口&ensp;数</label>
-            <input type="number" v-model="baseinfo.base.f_people_num" v-validate:f_people_num='{dctest: [0, ">=" ]}'
+            <input type="number" v-model="baseinfo.base.f_people_num" v-show="!peopleMax" v-validate:f_people_num='{dctest: [0, ">=" ]}'
                    :disabled="!jurisdiction.includes('修改人口数')" class="input_search" style="width:60%"
                    placeholder="家庭人口数">
+            <v-select id="f_people_num" :value.sync="baseinfo.base.f_people_num"
+                      v-if="peopleMax"
+                      v-model="baseinfo.base.f_people_num"
+                      :value-single="true"
+                      :options='peoplenums' placeholder='家庭人口数'
+                      style="width: 65%"
+                      close-on-select></v-select>
           </div>
         </div>
         <div class="row">
@@ -249,6 +256,7 @@
         banknames: this.$appdata.getParam('银行名称'),
         userstates: this.$appdata.getParam('用户状态'),
         mgq: this.$appdata.getParam('是否煤改气'),
+        peopleMax: this.$appdata.getSingleValue('最大人口数'),
         costtype: this.$appdata.getParam('付款类型'),
         usernature: this.$appdata.getParam('用户性质'),
         userlevel: this.$appdata.getParam('用户等级'),
@@ -322,7 +330,19 @@
       //     // }
       // }
     },
-    computed: {},
+    computed: {
+      peoplenums () {
+        let peopleMax = this.$appdata.getSingleValue('最大人口数') ? this.$appdata.getSingleValue('最大人口数') : 0
+        let nums = []
+        for (let i = 1; i <= peopleMax; i++) {
+          let temp = {}
+          temp.label = i
+          temp.value = i
+          nums.push(temp)
+        }
+        return nums
+      }
+    },
     events: {
       'confirmaddress' (res) {
         console.log('选定地址', res)

package/src/components/FilesManageNew/UserEssentialInfoTest.vue

@@ -74,9 +74,16 @@
           </div>
           <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error' : '']">
             <label for="f_people_num" class="font_normal_body">&ensp;人&ensp;口&ensp;数</label>
-            <input type="number" v-model="baseinfo.base.f_people_num" v-validate:f_people_num='{dctest: [0, ">=" ]}'
+            <input type="number" v-model="baseinfo.base.f_people_num" v-show="!peopleMax"  v-validate:f_people_num='{dctest: [0, ">=" ]}'
                    :disabled="!jurisdiction.includes('修改人口数')" class="input_search" style="width:60%"
                    placeholder="家庭人口数">
+            <v-select id="f_people_num" :value.sync="baseinfo.base.f_people_num"
+                      v-if="peopleMax"
+                      v-model="baseinfo.base.f_people_num"
+                      :value-single="true"
+                      :options='peoplenums' placeholder='家庭人口数'
+                      style="width: 65%"
+                      close-on-select></v-select>
           </div>
         </div>
         <div class="row">
@@ -240,6 +247,7 @@
           mgq: this.$appdata.getParam('是否煤改气'),
           costtype: this.$appdata.getParam('付款类型'),
           printstate: this.$appdata.getParam('建档打印类型') ? [{label: '暂不选择', value: '暂不选择'}, ...this.$appdata.getParam('建档打印类型')]:[{label: '暂不选择', value: '暂不选择'}],
+          peopleMax: this.$appdata.getSingleValue('最大人口数'),
           jurisdiction: this.$login.r,
           edituserstate: false,
             // highMeterPlugin: {},
@@ -310,7 +318,19 @@
           }
         }
       },
-      computed: {},
+      computed: {
+        peoplenums () {
+          let peopleMax = this.$appdata.getSingleValue('最大人口数') ? this.$appdata.getSingleValue('最大人口数') : 0
+          let nums = []
+          for (let i = 1; i <= peopleMax; i++) {
+            let temp = {}
+            temp.label = i
+            temp.value = i
+            nums.push(temp)
+          }
+          return nums
+        }
+      },
       events: {
         'confirmaddress' (res) {
             //  console.log('选定地址', res)

package/src/components/charge/business/refund/RefundManage.vue

@@ -1,20 +1,13 @@
 <template>
   <div class="auto">
     <iot-refund v-if="row.f_meter_type === '物联网表'" :data="row"></iot-refund>
-    <machine-Refund v-if="row.f_meter_type !== '物联网表'" :data="row"></machine-Refund>
+    <machine-refund v-if="row.f_meter_type !== '物联网表'" :data="row"></machine-refund>
   </div>
 
 </template>
 <script>
-  import IotRefund from './IOTRefund'
-  import machineRefund from './machineRefund'
-
   export default {
     title: '退费管理',
-    components: {
-      IotRefund,
-      machineRefund
-    },
     data () {
       return {
 

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

@@ -111,12 +111,23 @@
       <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" style="text-align: center;border: #E9E9E9 solid 1px;">安检结果:</td>
-        <td  colspan="1" 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;">安检结果:</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" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
-        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
+        <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;