sale-client 3.6.38 → 3.6.39

package/package.json

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

package/src/components/revenue/comprehen/replacement/replaceMentList.vue

@@ -20,12 +20,12 @@
 
                 <!--<div :class="$parent.$parent.styles">-->
                 <!--<label class="font_normal_body">补卡日期</label>-->
-                <!--<datepicker id="f_fillcard_date" placeholder="补卡日期" style="width:60%"-->
-                <!--v-model="model.f_fillcard_date"-->
-                <!--:value.sync="model.f_fillcard_date"-->
+                <!--<datepicker id="f_operate_date" placeholder="补卡日期" style="width:60%"-->
+                <!--v-model="model.f_operate_date"-->
+                <!--:value.sync="model.f_operate_date"-->
                 <!--:format="'yyyy-MM-dd'"-->
                 <!--:show-reset-button="true"-->
-                <!--condition="f_fillcard_date = '{}'">-->
+                <!--condition="f_operate_date = '{}'">-->
                 <!--</datepicker>-->
                 <!--</div>-->
                 <div style="float:right;margin-top: 8px" class="span">
@@ -115,20 +115,20 @@
                 </div>
                 <div :class="$parent.$parent.styles">
                   <label class="font_normal_body">补卡原因</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_reason"
-                         condition="f_reason like '{}%'" placeholder='补卡原因'>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_comments"
+                         condition="f_comments like '{}%'" placeholder='补卡原因'>
                 </div>
 <!--                <div :class="$parent.$parent.styles">-->
 <!--                  <label class="font_normal_body">补卡日期</label>-->
-<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_fillcard_date"-->
-<!--                         condition="f_fillcard_date like '%{}%'" placeholder='补卡日期'>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_operate_date"-->
+<!--                         condition="f_operate_date like '%{}%'" placeholder='补卡日期'>-->
 <!--                </div>-->
                 <div :class="$parent.$parent.styles">
                   <label class="font_normal_body">补卡日期</label>
                   <datepicker  placeholder="补卡日期" style="width: 60%"
-                               v-model="model.f_fillcard_date"
-                               condition=" f_fillcard_date >= '{}'"
-                               :value.sync="model.f_fillcard_date"
+                               v-model="model.f_operate_date"
+                               condition=" f_operate_date >= '{}'"
+                               :value.sync="model.f_operate_date"
                                :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
@@ -209,8 +209,8 @@
               <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_bill_style}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_ispick_table}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_reason}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_fillcard_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_depname}}</nobr></td>

package/src/filiale/qianneng/components/thirdSurplus.vue

@@ -0,0 +1,364 @@
+<template style="position: absolute;">
+  <div :class="{'basic-main':!showItem,'binary-left':showItem}" style="height:98%;">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row" width="100%">
+            <div class="row">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">组织机构</label>
+                <res-select
+                  :initresid='$parent.$parent.curorgid'
+                  @res-select="$parent.$parent.getorgCur"
+                  is-mul="false"
+                  v-model="$parent.$parent.curorgid"
+                  :value.sync="$parent.$parent.curorgid"
+                  restype='organization'
+                >
+                </res-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" for="usercode">用户编号</label>
+                <input id="usercode" class="input_search" condition="f_userinfo_code = '{}'"
+                       placeholder="请输入要查询的用户编号" style="width:60%" type="text"
+                       v-el:qjmc v-model="model.f_userinfo_code" v-next-el="cx"
+                >
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body" for="username">用户姓名</label>
+                <input id="username" class="input_search" condition="f_user_name = '{}'"
+                       placeholder="请输入要查询的用户姓名" style="width:60%" type="text"
+                       v-el:qjmc v-model="model.f_user_name" v-next-el="cx"
+                >
+              </div>
+
+              <div class="span" style="float:right;">
+                <button class="button_search" @click="search()" v-el:cba>查询</button>
+                <button class="button_export" @click="$parent.$parent.importFile">导入</button>
+                <button class="button_search" @click="$parent.$parent.clear">清空</button>
+                <button @click="$parent.$parent.delete()" v-show="$parent.$parent.deleteShow" class="button_delete">
+                  批量删除
+                </button>
+                <div class="button_spacing" style="float:right;"
+                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                     @click="$parent.$parent.hidden()"></div>
+              </div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">开始时间</label>
+              <datepicker :format="'yyyy-MM-dd'"
+                          :value.sync="model.f_start_date"
+                          condition="f_start_date >= '{} 00:00:00'"
+                          v-model="model.f_start_date" style="width: 55%">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">结束时间</label>
+              <datepicker :format="'yyyy-MM-dd'"
+                          :value.sync="model.f_end_date"
+                          condition="f_end_date <= '{} 23:59:59'"
+                          v-model="model.f_end_date" style="width: 55%">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" title="参数名称:补差状态">补差状态</label>
+              <v-select id="f_adjust_state"
+                        v-model="model.f_state"
+                        placeholder='状态'
+                        condition="f_state ='{}'"
+                        :value.sync="model.f_state"
+                        :options='$parent.$parent.states'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" title="参数名称:是否缴费">是否缴费</label>
+              <v-select id="f_whether_pay"
+                        v-model="model.f_whether_pay"
+                        placeholder='是否缴费'
+                        condition="f_whether_pay ='{}'"
+                        :value.sync="model.f_whether_pay"
+                        :options='$parent.$parent.whetherPay'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" for="operator">操作人</label>
+              <input id="operator" class="input_search" condition="f_operator like '%{}%'"
+                     placeholder="请输入要查询的操作人" style="width:60%" type="text"
+                     v-el:qjmc v-model="model.f_operator" v-next-el="cx"
+              >
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid id="webmeterinfo" :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>
+              <input type="checkbox" v-show="$parent.$parent.$parent.deleteShow"
+                     @click="$parent.$parent.$parent.isAll(model.pageIndex)">
+            </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>补差气量</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>是否缴费</nobr>
+            </th>
+            <th>
+              <nobr>操作人</nobr>
+            </th>
+            <th>
+              <nobr>状态</nobr>
+            </th>
+
+
+          </tr>
+        </template>
+        <template partial='body'>
+
+          <td style="text-align:center">
+            <input type="checkbox" v-show="$parent.$parent.$parent.deleteShow" v-model="$parent.$parent.$parent.ids"
+                   :value="row.id">
+          </td>
+          <td style="text-align: center;">{{ $index + 1 }}</td>
+          <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_change_price }}</td>
+          <td style="text-align: center">{{ row.f_old_price }}</td>
+          <td style="text-align: center">{{ row.f_new_price }}</td>
+          <!--            <td style="text-align: center" >{{row.f_device_id}}</td>-->
+          <td style="text-align: center">{{ row.f_real_amount }}</td>
+          <td style="text-align: center">{{ row.f_surplus_fee }}</td>
+          <td style="text-align: center">{{ row.f_start_date }}</td>
+          <td style="text-align: center">{{ row.f_end_date }}</td>
+          <td style="text-align: center">{{ row.f_type }}</td>
+          <!--            <td style="text-align: center" >{{row.f_vender}}</td>-->
+          <td style="text-align: center">{{ row.f_whether_pay }}</td>
+          <td style="text-align: center">{{ row.f_operator }}</td>
+          <td style="text-align: center">{{ row.f_state }}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="show" width="500px" title="文件导入" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body">
+      <file-upload class="my-file-uploader " name="UploadFile" class="btn btn-success" style="border-radius: 2px;"
+                   action="rs/file/uploadFile" tagname="调价导入" v-ref:file :headers="headers" multiple></file-upload>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '调价导入',
+  data() {
+    return {
+      model: new PagedList('rs/sql/getsurplus', 20, {items: '"*"', tablename: '"t_meterinfo"', orderitem: '"id"'}),
+      criteriaShow: false,
+      curorgid: [this.$login.f.orgid],
+      headers: {'username': Vue.$login.f.name},
+      ids: [],
+      f_state: '',
+      f_whether_pay: '',
+      deleteShow: false,
+      f_filialeid: this.$login.f.orgid,
+      pages: [],
+      whetherPay: this.$appdata.getParam('是否缴费') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('是否缴费')] : [],
+      states: this.$appdata.getParam('补差状态') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('补差状态')] : [],
+      show: false
+    }
+  },
+  ready() {
+    this.search()
+  },
+
+  methods: {
+    clear() {
+      Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+        this.$refs.paged.$refs.criteria.model[key] = []
+      })
+      this.deleteShow = false
+    },
+    delete() {
+      if (this.ids.length !== 0) {
+        this.$refs.paged.$refs.criteria.condition = this.$refs.paged.$refs.criteria.condition + 'and id in (' + this.ids + ')'
+      }
+      this.$showMessage('删除后不可恢复，确认删除？', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          this.deleteAdjustImport(this.$refs.paged.$refs.criteria.condition).then((res) => {
+            this.$dispatch('success')
+            this.search()
+            this.ids = []
+          }).catch((error) => {
+            this.$dispatch('error', error)
+          })
+        }
+      })
+    },
+    deleteAdjustImport(condition) {
+      console.log(condition)
+      return this.$resetpost('rs/logic/deleteAdjustImport', {condition: condition}, {
+        resolveMsg: '删除成功',
+        rejectMsg: '删除失败'
+      })
+    },
+    isAll(page) {
+      // console.log(this.model.ids)
+      if (this.pages.includes(page)) { // 已添加,取消动作
+        // 从ids中删除本页所有数据的ids
+        this.addOrRemove(false)
+        this.pages = this.pages.filter((item) => {
+          return item !== page
+        })
+      } else { // 未添加
+        this.pages.push(page) // 添加id，添加动作
+        this.addOrRemove(true)
+      }
+    },
+    addOrRemove(is) {
+      let that = this
+      if (is) { // 添加本页所有数据到ids中
+        this.ids = []
+        this.model.rows.forEach((row) => {
+          if (!that.ids.includes(row.id)) {
+            that.ids.push(row.id)
+          }
+        })
+      } else { // 从ids中取消所有的数据
+        this.ids = []
+        this.model.rows.forEach((row) => {
+          that.ids = that.ids.filter((item) => {
+            return item !== row.id
+          })
+        })
+      }
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch(args) {
+      if (!this.f_orgid) {
+        this.getorgCur([this.$login.f.orgid])
+      }
+      if (this.f_orgid) {
+        args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
+        this.model.search(args.condition, args.model)
+      }
+      if (args.condition.includes('f_state =\'有效\' and f_whether_pay =\'否\'')) {
+        this.deleteShow = true
+      } else {
+        this.deleteShow = false
+      }
+    },
+
+    getorgCur(val) {
+      console.log('组织事件返回。。', val[0])
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+      this.$parent.f_filialeid = val[0]
+      this.search()
+    },
+    importFile() {
+      this.show = true
+    }
+
+  },
+  events: {
+    onFileUpload: function (file, res) {
+      console.log(this.$login.f, '======')
+      console.log(res)
+      let batchParam = {
+        filepath: res.f_downloadpath,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps
+      }
+      let jobParam = {
+        f_operatorid: this.$login.f.id,
+        total: 0,
+        operator: this.$login.f.name,
+        jobType: '调价补差'
+      }
+      let param = {
+        jobParam: jobParam,
+        batchParam: batchParam
+      }
+      console.log(param, '++++++++++++++++++++++++++')
+      this.$resetpost('rs/business/batchRunExcelDefault/thirdSurplusSave/thirdSurplus', {data: param}, {
+        resolveMsg: '上传成功',
+        rejectMsg: '上传失败'
+      }).then((res) => {
+        // window.location.href = '/excel/表具导入异常信息.txt';
+        this.show = false
+        this.search()
+      })
+    }
+  }
+}
+</script>
+<style>
+.form-input-group label {
+  text-align: right;
+  width: auto;
+}
+
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+  padding: 10px 30px 10px 30px;
+  border-radius: 15px;
+}
+</style>
+

package/src/filiale/qianneng/sale.js

@@ -87,4 +87,6 @@ export default function () {
   Vue.component('file-user-meter-info-new', (resolve) => { require(['./UserMeterInfoTest'], resolve) })
   // 表具设备信息
   Vue.component('file-user-device-info', (resolve) => { require(['./UserDeviceInfoTest'], resolve) })
+  // 调价补差导入
+  Vue.component('third-surplus', (resolve) => { require(['./components/thirdSurplus'], resolve) })
 }

package/src/filiale/rizhao/HighMeterCard.vue

@@ -13,8 +13,8 @@
           <button class="btn btn-info photo" @click="bb()">拍照</button>
           <button class="btn btn-info" @click="cam_switch(1)">打开视频1</button>
           <button class="btn btn-info" @click="cam_switch(2)">打开视频2</button>
-          <button class="btn btn-info" @click="CloseVideo()">关闭视频</button>
-          <button class="btn btn-info" @click="openApp()">开启程序</button>
+          <button class="btn btn-info" @click="reloadVideo()">重载视频</button>
+<!--          <button class="btn btn-info" @click="CloseVideo()">关闭</button>-->
           <div style="display: inline-block;margin-left: 570px">
             <strong class="operation">读取身份证:</strong>
             <button class="btn btn-info readIDCard" @click=Begin()>读身份证</button>
@@ -25,7 +25,7 @@
           <IMG ID="Base64IMG" src="" class="img"></IMG>
           <!--          <button style="position: absolute;buttom:-10px;left:0px;" @click="splitsimg">旋转</button>-->
           <textarea id="Console" disabled="disabled"></textarea>
-          <IMG id="cam"  :src="cameraurl" width="640" height="640">
+          <IMG id="cam" :src="cameraurl" width="640" height="640">
           </IMG>
         </div>
         <div class="IdCard">
@@ -67,11 +67,15 @@
 <script>
 let ws
 let server_addr = 'ws://127.0.0.1:38088'// 本机端口地址
+import * as Util from '../../Util'
 export default {
   title: '高拍仪',
   data () {
     return {
       cameraurl: '',
+      capID:1,
+      connected:false,
+      ws:null,
       jd: 'transform:rotate(0deg)',
       degs: 0
     }
@@ -85,13 +89,17 @@ export default {
     // 页面load消息
     onLoad () {
       return new Promise((resolve, reject) => {
-        if (ws) {
-          resolve()
-        }
-        // output("正在连接：" + server_addr);
+        console.log(ws)
+        // if (ws) {
+        //   console.log('222')
+        //   resolve()
+        // }
+        this.output("正在连接：" + server_addr);
         ws = new WebSocket(server_addr)
+
         ws.onopen = (evt) => {
           if (this.connected) {
+            console.log('333')
             resolve()
           }
           this.connected = true
@@ -103,7 +111,12 @@ export default {
           // 打开自动裁边
           resolve()
         }
+        ws.onerror = function(e){
+          console.log('链接失败'+ e)
+          //如果出现连接、处理、接收、发送数据失败的时候触发onerror事件
+        }
         ws.onclose = (evt) => {
+          console.log('关闭'+ evt)
           if (!this.connected) {
             window.location.href = 'FLShell://'
             setTimeout('this.onLoad()', 3)
@@ -115,6 +128,7 @@ export default {
           reject(new Error('连接失败'))
         }
         ws.onmessage = (evt) => {
+          console.log(evt.data)
           if (evt.data.length === 0) {
             return
           }
@@ -148,12 +162,12 @@ export default {
           }
         }
         let canvas = document.getElementById('cam')
+         console.log(4444)
         canvas.onmousedown = (e) => {
           canvas.style.cursor = 'crosshair'
-
           this.clicked = true
-
           this.sendMsg(this.CLT_MSG.PRESET_MOUSEDOWN, {origX: e.layerX, origY: e.layerY}, function (msg) {
+            console.log(msg)
             if (msg.err !== 0) { }
           })
         }
@@ -185,20 +199,34 @@ export default {
     },
     // 打开视频
     cam_switch (capID) {
+      this.capID = capID
       if (capID == 1) {
 
-        this.cameraurl = 'http://127.0.0.1:38088/video=stream&camidx=0'
+        this.cameraurl = `http://127.0.0.1:38088/video=stream&camidx=0&uuid=${Util.guid()}`
       }
       if (capID == 2) {
-        this.cameraurl = 'http://127.0.0.1:38088/video=stream&camidx=1'
+        this.cameraurl =`http://127.0.0.1:38088/video=stream&camidx=1&uuid=${Util.guid()}`
       }
     },
-    // 关闭视频
-    CloseVideo () {
+    // 重新初始化视频
+    reloadVideo () {
       this.cameraurl = ''
+
+      let url = `http://127.0.0.1:38088/video=close&camidx=${this.capID}`
+       this.$resetpost(url,{},{rejectMsg:null,resolveMsg:null}).then((res)=>{
+         setTimeout(this.onLoad,2000)
+       })
+    },
+    CloseVideo(){
+      window.location.href = 'cameraServicetis:0'
+      let url = `http://127.0.0.1:38088/video=close&camidx=${this.capID}`
+      this.$resetpost(url).then((res)=>{
+        setTimeout(this.onLoad,2000)
+      })
     },
     openApp () {
       window.location.href = 'cameraServicetis:0' // 启动 CameraService 服务程序
+
     },
     // //获取初始化结果
     // GetInitRet(){
@@ -924,9 +952,12 @@ export default {
     },
     close () {
       this.show = !this.show
-      if (this.isopen) {
-        this.CloseVideo()
-      }
+      this.CloseVideo()
+    },
+    getSatate(){
+      this.$resetpost('http://127.0.0.1:38088/video=status').then((res)=>{
+        console.log(res.data)
+      })
     },
     confirmIdCard () {
       let param = this.IdCardInfo
@@ -938,9 +969,10 @@ export default {
   },
   ready () {
     this.onLoad().then(() => {
-      this.$emit('ready')
+      console.log(12345)
+      // setInterval(this.getSatate,1000)
     }).catch((error) => {
-      this.$emit('error', error)
+
     })
   }
 }

package/src/filiale/rizhao/replaceMentList.vue

@@ -126,9 +126,9 @@
                 <div :class="$parent.$parent.styles">
                   <label class="font_normal_body">补卡日期</label>
                   <datepicker  placeholder="补卡日期" style="width: 60%"
-                               v-model="model.f_fillcard_date"
-                               condition=" f_fillcard_date >= '{}'"
-                               :value.sync="model.f_fillcard_date"
+                               v-model="model.f_operate_date"
+                               condition=" f_operate_date >= '{}'"
+                               :value.sync="model.f_operate_date"
                                :format="'yyyy-MM-dd HH:mm:ss'">
                   </datepicker>
                 </div>
@@ -210,7 +210,7 @@
               <td style="text-align: center;"><nobr>{{row.f_bill_style}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_ispick_table}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_comments}}</nobr></td>
-              <td style="text-align: center;"><nobr>{{row.f_fillcard_date}}</nobr></td>
+              <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
               <td style="text-align: center;"><nobr>{{row.f_depname}}</nobr></td>