sale-client 3.6.258 → 3.6.260

package/build/dev-server.js

@@ -1,97 +1,94 @@
-var path = require('path')
-const [ serverRul, localUrl ] = ['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 = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    host: '127.0.0.1',
-    port: 8089,
-    open: false,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-      '/invoice/rs/logic/getInvoice': {
-        target: serverRul
-      },
-      '/rs/file': {
-        target: serverRul
-      },
-      '/webapps': {
-        target: serverRul
-      },
-      '/rs/sql/singleTable': {
-        target: serverRul
-      },
-      '/invoice': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/search': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getLogin': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getInitData': {
-        target: serverRul
-      },
-      '/rs/logic/getSaleInitData': {
-        target: serverRul
-      },
-      // 用户登录服务地址
-      '/rs/user': {
-        target: serverRul
-      },
-      '/rs/path': {
-        target: serverRul
-      },
-      '/rs/data': {
-        target: serverRul
-      },
-      '/rs/license': {
-        target: serverRul
-      },
-      '/rs/db': {
-        target: serverRul
-      },
-      '/excel': {
-        target: serverRul
-      },
-      '/rs/config': {
-        target: serverRul
-      },
-      '/rs/report': {
-        target: serverRul
-      },
-      '/rs/vue': {
-        target: serverRul
-      },
-      '/rs/logic/webHandReverse': {
-        target: 'http://localhost:8085'
-      },
-      '/rs/logic': {
-        target: localUrl
-      },
-      '/rs/sql': {
-        target: localUrl
-      },
-      '/webmeter': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-        // changeOrigin: true
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080/']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: false,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+      '/invoice/rs/logic/getInvoice': {
+        target: serverRul
+      },
+      '/rs/file': {
+        target: serverRul
+      },
+      '/webapps': {
+        target: serverRul
+      },
+      '/rs/sql/singleTable': {
+        target: serverRul
+      },
+      '/invoice': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/search': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getLogin': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getInitData': {
+        target: serverRul
+      },
+      '/rs/logic/getSaleInitData': {
+        target: serverRul
+      },
+      // 用户登录服务地址
+      '/rs/user': {
+        target: serverRul
+      },
+      '/rs/path': {
+        target: serverRul
+      },
+      '/rs/data': {
+        target: serverRul
+      },
+      '/rs/license': {
+        target: serverRul
+      },
+      '/rs/db': {
+        target: serverRul
+      },
+      '/excel': {
+        target: serverRul
+      },
+      '/rs/config': {
+        target: serverRul
+      },
+      '/rs/report': {
+        target: serverRul
+      },
+      '/rs/vue': {
+        target: serverRul
+      },
+      '/rs/logic/getWarningMsg': {
+        target: localUrl
+      },
+      '/rs/sql': {
+        target: serverRul
+      },
+      '/webmeter': {
+        target: serverRul
+      },
+      '/rs': {
+        target: serverRul
+        // changeOrigin: true
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/package.json

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

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

@@ -84,6 +84,9 @@
         <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>
@@ -108,6 +111,7 @@
   import WebChargeQueryUser from './ic_detail/WebChargeQueryUser'
   import WebHandQueryUser from './ic_detail/WebHandQueryUser'
   import UserDeviceQuery from './ic_detail/UserDeviceQuery'
+  import contractSigningList from './ic_detail/contractSigningList'
 
   // 导入物联网相关查询
   import QueryInstruct from './iot_detail/QueryInstruct'
@@ -115,10 +119,11 @@
   import WatchCollection from './iot_detail/WatchCollection'
   import WatchWarning from './iot_detail/WatchWarning'
   import PriceChangeQueryUser from './ic_detail/PriceChangeQueryUser'
-import ChangeRecord from './ic_detail/ChangeRecord'
+  import ChangeRecord from './ic_detail/ChangeRecord'
   import PriceAdjustmentQueryUser from './ic_detail/PriceAdjustmentQueryUser'
   import MeterParam from './ic_detail/MeterParam'
   import DeveiceRecord from './ic_detail/DeveiceRecord'
+
 export default {
     title: '用户详细信息',
     props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
@@ -147,7 +152,8 @@ export default {
       MeterParam,
       DeveiceRecord,
       MachineRecordQuery,
-      UserDeviceQuery
+      UserDeviceQuery,
+      contractSigningList
     },
     data () {
       return {

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

@@ -0,0 +1,117 @@
+<template >
+  <div class="flex" style="justify-content: space-between;">
+    <div @keyup.enter="search" style="">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker placeholder='开始时间' style="width:60%"
+                            v-model="model.startTime"
+                            :value.sync="model.startTime"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="true"
+                            condition="f_signature_date >= '{} 00:00:00'">
+                </datepicker>
+              </div>
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body">结束日期</label>
+                <datepicker placeholder='结束日期' style="width:60%"
+                            v-model="model.endTime"
+                            :value.sync="model.endTime"
+                            :format="'yyyy-MM-dd'"
+                            :show-reset-button="true"
+                            condition="f_signature_date <= '{} 23:59:59'">
+                </datepicker>
+              </div>
+
+              <div style="float: right">
+                <button @click="search()"  class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+              </div>
+            </div>
+
+
+          </div>
+
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" class="list_area table_sy" partial='list' v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th><nobr>用户编号</nobr></th>
+              <th><nobr>用户姓名</nobr></th>
+              <th><nobr>用户地址</nobr></th>
+              <th><nobr>合同名称</nobr></th>
+              <th><nobr>合同签订状态</nobr></th>
+              <th><nobr>合同签订时间</nobr></th>
+              <th><nobr>合同签订人</nobr></th>
+              <th><nobr>操&emsp;&emsp;作</nobr></th>
+            </tr>
+          </template>
+          <template partial='body' partial='list' v-ref:grid>
+            <tr >
+              <td style="text-align:center">{{ row.f_userinfo_code }}</td>
+              <td style="text-align:center">{{ row.f_user_name }}</td>
+              <td style="text-align:center">{{ row.f_address }}</td>
+              <td style="text-align:center">{{ row.f_contract_name }}</td>
+              <td style="text-align:center">{{ row.f_signature_state }}</td>
+              <td style="text-align:center">{{ row.f_signature_date }}</td>
+              <td style="text-align:center">{{ row.f_user_name_not }}</td>
+              <td style="text-align:center"><button type="button" name="button" class="btn btn-link" @click="$parent.$parent.$parent.showExplain(row)">合同预览</button></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+    <modal v-if="explainShow" :show.sync="explainShow" :title="titleL" style="height: 1000px" :width="1000" v-ref:model backdrop="false">
+      <article slot="modal-body" class="modal-body">
+        <iframe id="myIframe" :src="pdfPath" style="width: 100%;height: 500px"></iframe>
+      </article>
+      <div slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default"  @click="printPDF">打印</button>
+        <button type="button" class="btn btn-default" @click="close()">关闭</button>
+      </div>
+    </modal>
+  </div>
+
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  export default {
+    title: '合同查看',
+    data () {
+      return {
+        condition: `f_userinfo_id = '${this.row.f_userinfo_id}'`,
+        model: new PagedList('rs/sql/getContractSigin', 20, {}),
+        explainShow: false,
+        pdfPath: null,
+        prPdf: null,
+        titleL: null
+      }
+    },
+    props: ['row'],
+    ready () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      printPDF () {
+        window.open(this.prPdf, '_blank')
+      },
+      async search () {
+        this.condition = `f_userinfo_id = '${this.row.f_userinfo_id}'`
+        this.model.search(this.condition, this.model)
+      },
+      showExplain (row) {
+        this.pdfPath = row.f_visit_url + '#toolbar=0'
+        this.prPdf = row.f_visit_url
+        this.titleL = row.f_contract_name
+        this.explainShow = true
+      }
+    },
+    computed: {
+    }
+  }
+</script>
+

package/src/components/revenue/HandManager/meterbookEntry.vue

@@ -10,13 +10,12 @@
 </template>
 
 <script>
-  import MbpeopleList from './MbpeopleList'
   import AddTobook from './AddTobook'
   import {HttpResetClass} from 'vue-client'
 
   export default {
     name: 'meterbookEntry',
-    components: {AddTobook, MbpeopleList},
+    components: {AddTobook},
     title: '添加用户到抄表册',
     data () {
       return {

package/src/filiale/haile/FilesManage/MeterinfoTest.vue

@@ -11,7 +11,7 @@
             <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
                    v-validate:brand='{required: true }'>
             <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备' && row.f_meter_classify != '机表'" v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">气表型号</label>
@@ -19,7 +19,7 @@
                    v-validate:model='{required: true }'>
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
                       close-on-select
-                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
+                      v-model='row.gasmodel' :disabled="(row.gasbrand.length === 0 || curuser.f_user_state != '预备') && row.f_meter_classify != '机表'" v-ref:model></v-select>
           </div>
 
           <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">

package/src/filiale/haile/leftview/Userinfo.vue

@@ -83,6 +83,18 @@
           <label class="col-sm-5">旧客户编号</label>
           <span class="col-sm-7">{{ data ? data.f_olduserinfo_code : dafault.f_userinfo_code }}</span>
         </div>
+        <div class="row" v-if="data.f_meter_type.includes('物联网')">
+          <label class="col-sm-5">开关阀状态</label>
+          <span class="col-sm-7">{{ data ? data.f_valve_state : '' }}</span>
+        </div>
+        <div class="row" v-if="data.f_meter_type.includes('机表')">
+          <label class="col-sm-5">开关阀状态</label>
+          <span class="col-sm-7">{{ data ? data.f_bqf_state : '' }}</span>
+        </div>
+        <div class="row" v-if="!data.f_meter_type.includes('卡表')">
+          <label class="col-sm-5">开关阀原因</label>
+          <span class="col-sm-7">{{ data ? data.f_off_valve_reason : '' }}</span>
+        </div>
         <modal v-if="showselectncuserinfo" :show.sync="showselectncuserinfo" width="40%" title="修正客户电话号码"
                v-ref:modal large backdrop="false">
           <article slot="modal-body" class="modal-body">