sale-client 4.1.230 → 4.2.1-ronghao

package/src/filiale/ronghao/uploadFilesHistory.vue

@@ -0,0 +1,214 @@
+<template>
+  <div class="row" style="height:8%">
+    <div class="col-sm-2 form-group" >
+      <label for="f_hand_date" class="font_normal_body">上传日期</label>
+      <datepicker style="width:60%" id="f_hand_date" placeholder="上传日期"
+                  :value.sync="upload_date"
+                  :format="'yyyy-MM-dd'"
+                  class="datepicker"
+                  :show-reset-button="true">
+      </datepicker>
+    </div>
+    <div class="col-sm-2 form-group" >
+      <label  class="font_normal_body">分类</label>
+      <v-select :value.sync="fusetype" :options='fusetypes'  placeholder='分类' close-on-select></v-select>
+    </div>
+    <div style="float: right">
+      <button class="button_search"  @click="selfSearch()" style="float:right;margin-right: 5px" v-el:cba>查询</button>
+    </div>
+  </div>
+  <div class="panel panel-info auto" style="overflow-y: auto;height:100%" id="apps">
+    <!--        <div class="panel-heading auto">-->
+    <!--          上传附件记录-->
+    <!--        </div>-->
+
+    <div class="tab-content span" style="min-height:300px" id="app">
+      <div style="padding:0px 0px 10px 0px;margin-left: 20px;overflow: auto;">
+
+        <!-- 时间轴显示 -->
+        <!-- 工单的基本信息 -->
+
+
+        <!--            <div class="flex-row" v-for="item in files" ><span >-&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;</span></div>-->
+        <timeline >
+          <timeline-item v-for="item in files"
+                         :color="$index === files.length - 1 ? 'blue' : 'default'">
+            <div class="row" >
+
+
+              <p> {{item.days}}</p>
+
+              <!-- 派单 -->
+              <div v-for="file in item.arrays" class="col-sm-6">
+
+                <div style="height:180px;">
+                  <img style="height:100%" :src="file.f_downloadURL"/>
+                </div>
+
+                <div style="height:190px;">
+                  <div class="showtext">上传时间:&nbsp;<span>{{file.f_uploaddate}}</span></div>
+                  <div class="showtext">操作员:&nbsp;<span>{{file.f_operator}}</span></div>
+                  <div class="showtext">分类:&nbsp;<span>{{file.fusetype}}</span></div>
+                  <div class="showtext">文件说明:&nbsp;{{file.fremarks}}</div>
+                  <div class="flex-row showtext">
+                    <button  class="btn btn-link" @click.stop="imgShow(file.f_downloadURL)">预览</button>
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <a   v-show="isDelete == '1'" @click="delet($index,file)">删除</a>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+          </timeline-item>
+        </timeline>
+      </div>
+    </div>
+  </div>
+  <modal :show.sync="imgshow" v-ref:modal backdrop="true" coverstyle="modalContentRight">
+    <header slot="modal-header" class="modal-header">
+      预览
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <img-self-sale-plus :src="imgfilename"  :list="imgfilename" :width="750" :height="750"></img-self-sale-plus>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
+    </footer>
+  </modal>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+export default {
+    title: '附件上传记录',
+    props: {
+      row: ''
+    },
+    data () {
+      return {
+
+        upload_date: '',
+        fusetype: [],
+        imgfilename: '',
+        imgshow: false,
+        files: [],
+        fusetypes: [],
+        isDelete: '0', // 删除按钮，可以进行控制（权限等）
+        userinfo_id: '',
+        images: ''
+      }
+    },
+    methods: {
+
+      selfSearch () {
+        this.getFiles()
+      },
+      async getfusetypes () {
+        this.fusetypes.push({label: '全部', value: ''})
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'api/af-revenue/sql/singleTable_OrderBy',
+          {data: {items: 'fusetype',
+            tablename: 't_files',
+            condition: `fusetype is not null and fusetype != '安检照片' GROUP BY fusetype`,
+            orderitem: 'fusetype'}},
+          {resolveMsg: null, rejectMsg: '获取图片分类失败'})
+        res.data.forEach((item) => {
+          this.fusetypes.push({
+            label: item.fusetype, value: item.fusetype
+          })
+        })
+      },
+      delet (index, row) {
+        this.$resetdelete('api/af-revenue/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+          // this.files.splice(index, 1)
+          this.selfSearch()
+        })
+      },
+      imgShow (val) {
+        // this.imgfilename = `api/af-revenue/file/image/` + val
+        this.imgfilename = val
+        this.imgshow = true
+      },
+      imgclose () {
+        this.imgshow = false
+      },
+      getFiles () {
+        this.files = []
+        this.userinfo_id = this.row.f_userinfo_id
+        let condition = `CONVERT(varchar(200),f_blobid) = '${this.userinfo_id}' and fusetype != '安检照片'`
+        if (this.upload_date !== '') {
+          condition += `and CONVERT( VARCHAR ( 100 ), f_uploaddate, 23 )='${this.upload_date}' `
+        }
+        if (this.fusetype.length == 1) {
+          if (this.fusetype[0] !== '') {
+            condition += `and fusetype='${this.fusetype}' `
+          }
+        }
+        let http = new HttpResetClass()
+
+        if (this.userinfo_id) {
+          http.load('POST', 'api/af-revenue/logic/getAllFiles', {
+            data: {
+              condition: condition
+            }
+          }, {resolveMsg: null, rejectMsg: '获取附件出错！！！'}).then((res) => {
+            for (var i = 0; i < res.data.days.length; i++) {
+              // 循环日期。将files组织成[{day:'',array:''},{day:'',array:''}...]格式
+              this.files.push({
+                days: null,
+                arrays: []
+              })
+              this.files[i].days = res.data.days[i].uploadday
+              for (var j = 0; j < res.data.array.length; j++) {
+                // 循环查出来的所有附件
+
+                if (res.data.array[j].uploadday == this.files[i].days) {
+                  // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+                  if (res.data.array[j].fusetype && res.data.array[j].f_filetype.includes('xls')) {
+                    res.data.array[j].splice(i, 1)
+                    i--
+                    continue
+                  }
+                  if ((res.data.array[j].fusetype == '安检照片' && res.data.array[j].f_filename.includes('amr'))) {
+                    continue
+                  }
+                  let temp = res.data.array[j].f_downloadpath
+                  let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
+                  if (res.data.array[j].fusetype == '安检照片') {
+                    res.data.array[j].f_downloadURL = location.protocol + '//' + location.host + '/rs/image/file/' + res.data.array[j].f_filename
+                  } else {
+                    res.data.array[j].f_downloadURL = location.protocol + '//' + location.host + '/' + URL
+                  }
+                  console.log('res.data.array[j].f_downloadURL', res.data.array[j].f_downloadURL)
+                  this.files[i].arrays.push(res.data.array[j])
+                }
+              }
+            }
+          })
+        }
+      }
+
+    },
+    ready () {
+      if (this.$login.r.find(value => value == '上传附件删除')) {
+        // 有删除权限
+        this.isDelete = '1'
+      }
+      this.getFiles()
+      this.getfusetypes()
+    }
+  }
+</script>
+<style media="screen">
+  #work-history ul {
+    padding: 0px;
+  }
+  .showtext{
+    height:20px;
+  }
+  .modalContentRight {
+    float:right;
+  }
+</style>

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

@@ -175,6 +175,16 @@
                       :options='usetype' placeholder='使用类型'
                       close-on-select></v-select>
           </div>
+          <div class="col-sm-4 form-group">
+            <input type="text" v-model="row.f_meter_inspect_date" v-show="false">
+            <label  class="font_normal_body">表具检测日期</label>
+            <datepicker style="width:60%" placeholder="表具检测日期"
+                        v-model="row.f_meter_inspect_date"
+                        v-ref:f_meter_inspect_date
+                        :value.sync="row.f_meter_inspect_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+            ></datepicker>
+          </div>
         </div>
         <div>
           <a style="font-size: 16px;font-weight: 500;">气价信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>

package/src/filiale/shanxian/components/revenue/InsuranceAdd.vue

@@ -235,6 +235,7 @@
         if (JSON.stringify(this.row) != '{}') {
           this.model = {
             f_userinfo_id: this.row.f_userinfo_id,
+            f_userfiles_id: this.row.f_userfiles_id,
             f_ins_stop_date: this.row.f_ins_stop_date,
             f_user_name: this.row.f_user_name,
             f_idnumber: this.row.f_idnumber,

package/src/filiale/wuan/MeterMessage.vue

@@ -97,7 +97,7 @@
         } else {
           this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
         }
-        if (this.metermessage.f_meter_base > this.f_meter_base_max) {
+        if ((this.metermessage.f_meter_base - 0) > (this.f_meter_base_max - 0)) {
           this.$showAlert(`新表底数可录入的最大值为: ${this.f_meter_base_max}, 请核实后重新录入!!!`, 'warning', 3000)
           this.metermessage.f_meter_base = ''
         }

package/src/filiale/yangchun/BasicLivingList.vue

@@ -0,0 +1,281 @@
+<template>
+  <div @keyup.enter="search" class="flex" id="ss" style="flex:1;" v-el:sss>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria @condition-changed='$parent.selfSearch' partial='criteria' v-ref:cri>
+        <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+          <div class="row">
+            <res-select-group :style="$parent.$parent.$parent.isdetail?'col-sm-3 form-group':'col-sm-2 form-group'" :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getorg" v-ref:sel></res-select-group>
+            <div
+              :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-3':$parent.$parent.$parent.isdetail}"
+              class="form-group ">
+              <label class="font_normal_body">用户编号</label>
+              <input class="input_search" condition="f_userinfo_code like '%{}%'" placeholder="用户编号" style="width:60%"
+                     type="text" v-model="model.ename"
+              />
+            </div>
+            <div
+              :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-3':$parent.$parent.$parent.isdetail}"
+              class="form-group " v-if="!$parent.$parent.$parent.isdetail">
+              <label class="font_normal_body">用户姓名</label>
+              <input class="input_search" condition="f_user_name like '%{}%'" placeholder="用户姓名" style="width:60%"
+                     type="text" v-model="model.name" />
+            </div>
+<!--            <div-->
+<!--              :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-3':$parent.$parent.$parent.isdetail}"-->
+<!--              class="form-group "-->
+<!--              v-if="$parent.$parent.clientWidth>1600">-->
+<!--              <label class="font_normal_body">电&emsp;&emsp;话</label>-->
+<!--              <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search"-->
+<!--                     condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"-->
+<!--                     type="text"-->
+<!--                     v-model="model.f_user_phone">-->
+<!--            </div>-->
+<!--            <div-->
+<!--              :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-3':$parent.$parent.$parent.isdetail}"-->
+<!--              class="form-group "-->
+<!--              v-if="$parent.$parent.clientWidth<1600&&!$parent.$parent.$parent.isdetail">-->
+<!--              <label class="font_normal_body">电&emsp;&emsp;话</label>-->
+<!--              <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search"-->
+<!--                     condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"-->
+<!--                     type="text"-->
+<!--                     v-model="model.f_user_phone">-->
+<!--            </div>-->
+            <div class="form-group  button-range" style="padding-right: 10px">
+              <import-excel v-if="$parent.$parent.basicImport === '低保户导入'" template-name="低保户导入模板" logic-name="BasicLivingImport" import-json="basicLiving.json"></import-excel>
+              <button @click="$parent.$parent.search()" class="button_search button_spacing" v-el:cx>查询</button>
+              <button @click="$parent.$parent.add()" class="button_export button_spacing" style="width: max-content;" v-if="this.$login.r.includes('新增低保户')"
+                      v-el:cx>新增低保户
+              </button>
+              <export-excel
+                      :data="$parent.$parent.getCondition"
+                      :field="$parent.$parent.getfield"
+                      sqlurl="api/af-revenue/logic/saleExport" progress="saleGetExportProgress" sql-name="get_BasicLiving" template-name='低保户导出'
+                      v-if="this.$login.r.includes('低保户导出')"
+                      :choose-col="true">
+              </export-excel>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right"></div>
+            </div>
+          </div>
+          <div class="row" v-if="$parent.$parent.criteriaShow">
+            <div
+              :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-3':$parent.$parent.$parent.isdetail}"
+              class="form-group " v-if="$parent.$parent.$parent.isdetail">
+              <label class="font_normal_body">用户姓名</label>
+              <input class="input_search" condition="f_user_name like '%{}%'" placeholder="用户姓名" style="width:60%"
+                     type="text" v-model="model.name" />
+            </div>
+            <div
+              :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-3':$parent.$parent.$parent.isdetail}"
+              class="form-group ">
+              <label class="font_normal_body">电&emsp;&emsp;话</label>
+              <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search"
+                     condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"
+                     type="text"
+                     v-model="model.f_user_phone">
+            </div>
+            <div
+              :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-3':$parent.$parent.$parent.isdetail}"
+              class="form-group ">
+              <label class="font_normal_body">地&emsp;&emsp;址</label>
+              <input :size="model.f_address ? model.f_address.length * 2 : 4" class="input_search"
+                     condition="f_address like '%{}%'" placeholder='用户地址' style="width:60%"
+                     type="text"
+                     v-model="model.f_address">
+            </div>
+
+            <div
+              :class="{'col-sm-2':!$parent.$parent.$parent.isdetail,'col-sm-3':$parent.$parent.$parent.isdetail}"
+              class="form-group ">
+              <label class="font_normal_body">状&emsp;&emsp;态</label>
+              <v-select
+                :options='$parent.$parent.state'
+                :value-single="true"
+                :value.sync="model.f_state"
+                close-on-select
+                condition="f_state ='{}'"
+                v-model="model.f_state"></v-select>
+
+            </div>
+
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th style="text-align: center;">
+              <nobr>序号</nobr>
+            </th>
+            <th style="text-align: center;">
+              <nobr>用户编号</nobr>
+            </th>
+            <th style="text-align: center;">
+              <nobr>姓名</nobr>
+            </th>
+            <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>
+              <nobr>电话</nobr>
+            </th>
+            <th style="text-align: center;">
+              <nobr>地址</nobr>
+            </th>
+            <th style="text-align: center;" v-show='!$parent.$parent.$parent.$parent.isdetail'>
+              <nobr>气价</nobr>
+            </th>
+            <th style="text-align: center;"  v-show='!$parent.$parent.$parent.$parent.isdetail' >
+              <nobr>开始时间</nobr>
+            </th>
+            <th style="text-align: center;"  v-show='!$parent.$parent.$parent.$parent.isdetail' >
+              <nobr>结束时间</nobr>
+            </th>
+            <th style="text-align: center;"  v-show='!$parent.$parent.$parent.$parent.isdetail' >
+              <nobr>附件查看</nobr>
+            </th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center;"><nobr>{{$index+1}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
+          <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_user_phone}}</nobr></td>
+          <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
+          <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_price_name}}</nobr></td>
+          <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_start_date}}</nobr></td>
+          <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_end_date}}</nobr></td>
+          <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"> <nobr>
+            <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
+          </nobr></td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+        <upload  :blodid="selected.f_userinfo_id" isremark="true" :isremark="false" fusetype="低保户" v-ref:upload ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import Vue from 'vue'
+
+  export default {
+    data () {
+      return {
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        },
+        state: [{value: '', label: '全部'},
+          {value: '有效', label: '有效'},
+          {value: '过期', label: '过期'},
+          {value: '无效', label: '无效'}],
+        model: new PagedList('api/af-revenue/sql/get_BasicLiving', 20, {orderitem: '"' + this.orderitem + '"'}),
+
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+
+        f_orgid: '',
+        criteriaShow: false,
+        clientWidth: document.body.clientWidth,
+        showupload:false,
+        selected: {},
+        basicImport: '',
+        getfield: {
+          'f_userinfo_code': '用户编号',
+          'f_user_name': '姓名',
+          'f_user_phone': '电话',
+          'f_address': '地址',
+          'f_price_name': '气价',
+          'f_start_date': '开始时间',
+          'f_end_date': '结束时间'
+        }
+      }
+    },
+    props: {
+      orderitem: {
+        type: String,
+        default: 'f_price_id'
+      },
+      row: {}
+    },
+    compiled () {
+      window.onresize = () => {
+        return (() => {
+          this.clientWidth = document.body.clientWidth
+        })()
+      }
+  },
+    ready () {
+      this.getAuthority()
+      this.$refs.paged.$refs.cri.model.f_state = '有效'
+      this.search()
+    },
+    methods: {
+      getAuthority () {
+        if (this.$login.r.find(value => value == '低保户导入')) {
+          this.basicImport = '低保户导入'
+        }
+      },
+      view (row) {
+        this.showupload = true
+        this.selected = row
+        console.log('11', row)
+      },
+      async getRes (condition, obj) {
+        console.log('低保户condition =', condition)
+        console.log('低保户obj =', obj)
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+        // 更新抄表册
+        // this.meterbooks = [{label: '全部',value: ''}];
+        // if(this.lastorgstr != condition){
+        //   this.tempfalg = true;
+        //   this.lastorgstr = condition;
+        // }
+        // if(this.tempfalg && condition != null && condition!=''  && condition.indexOf("(")>-1){
+        //   this.tempfalg = false;
+        //   let a = condition.substring(condition.indexOf("(")+2)
+        // }
+        // this.orgCondtionStr = condition
+      },
+
+      search () {
+        this.$refs.paged.$refs.cri.search()
+        this.$dispatch('search')
+        console.log('低保户search,', this.f_orgid)
+      },
+      getorg (val) {
+        console.log('低保户的val', val)
+        this.f_orgid = val
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg('and f_orgid in' + '(\'' + [this.$login.f.orgid] + '\')')
+        }
+        console.log('查询。。。', this.f_orgid)
+        if (this.f_orgid) {
+         // args.condition = `${args.condition} and s.f_filialeid  in ${this.f_orgid}`
+          args.condition = `${args.condition}   ${this.f_orgid}`
+        }
+        this.model.search(args.condition, args.model)
+      },
+      add () {
+        this.$dispatch('add')
+      }
+    },
+    computed: {
+      getCondition () {
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.f_orgid}
+      }
+    }
+  }
+</script>

package/src/filiale/yangchun/BlackList/BlackRecordQuery.vue

@@ -36,6 +36,7 @@
                     :data="$parent.$parent.getCondition"
                     :field="$parent.$parent.getfield"
                     sqlurl="api/af-revenue/logic/saleExport" progress="saleGetExportProgress" sql-name="sale_blackRecordQuery" template-name='重点用户操作记录导出'
+                    v-if="this.$login.r.includes('重点用户操作记录导出')"
                     :choose-col="true">
                   </export-excel>
                   <div

package/src/filiale/yangchun/CardChangeFill.vue

@@ -625,7 +625,7 @@
       calText (val) {
         let str = ''
         val.forEach((item) => {
-          str = str + item.f_price + ' x ' + item.f_gas + '+'
+          str = str + item.f_price + ' x ' + (item.f_gas - 0).toFixed(2) + '+'
         })
         str = str.slice(0, str.length - 1)
         this.calculatedetail = str