sale-client 4.3.83 → 4.3.85

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed May 13 15:19:48 CST 2026
+#Wed Mar 18 10:18:57 CST 2026
 gradle.version=5.2.1

package/package.json

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

package/src/expandcss.less

@@ -0,0 +1,569 @@
+@import "./bootstrap/less/variables.less";
+
+@form-text-fout-size: @font-size-base;//引用bootstrap的字体大小
+@form-text-padding: 10px;//右padding
+/**
+文本表单flex布局实现固定label
+ */
+.form-fix-width{
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display:flex;
+}
+.form-fix-width>:first-child{
+  width: @form-text-padding+@form-text-fout-size*5;
+  -webkit-box-flex:none;
+  -webkit-flex:none;
+  -ms-flexbox-flex:none;
+  flex:none;
+}
+.form-fix-width>:last-child{
+  flex:1;
+  -webkit-box-flex:1;
+  -webkit-flex:1;
+  -ms-flexbox-flex:1;
+}
+/**
+固定checkbox的一些属性 后续继续扩增
+ */
+.checkbox-fix-width {
+  width: @form-text-fout-size*4+@form-text-padding+20px;
+  text-align: left;
+  margin-left: 0px !important;
+}
+
+#android-app {
+  font-size: 16px;
+}
+
+/* 解决chrome最小字体为12px问题 */
+.chrome_adjust {
+  font-size: 10px;
+  -webkit-transform: scale(0.85);
+  -o-transform: scale(1);    //针对能识别-webkit的opera browser设置
+}
+
+/* 表单内输入框 */
+.form-input-group-large {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  .control-label {
+    width: 100px;
+    line-height: @input-height-base;
+    text-align: right;
+    + * {
+      -webkit-box-flex:1;
+      -webkit-flex:1;
+      -ms-flexbox-flex:1;
+      flex: 1;
+      width: 100px; // 随意给的宽度，将有flex重新计算
+      box-sizing: border-box;
+      vertical-align:middle;
+    }
+  }
+}
+.form-input-group {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  .control-label {
+    // 居中对齐
+    line-height: @input-height-base;
+    width: 70px;
+    // padding-top: 6px;
+    text-align: right;
+    vertical-align: middle;
+    + * {
+      -webkit-box-flex:1;
+      -webkit-flex:1;
+      -ms-flexbox-flex:1;
+      flex: 1;
+      width: 100px; // 随意给的宽度，将有flex重新计算
+      box-sizing: border-box;
+      vertical-align:middle;
+    }
+  }
+}
+.form-input-group-small {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  label {
+    width: 50px;
+    line-height: @input-height-base;
+    text-align: right;
+    + * {
+      -webkit-box-flex:1;
+      -webkit-flex:1;
+      -ms-flexbox-flex:1;
+      flex: 1;
+      width: 100px; // 随意给的宽度，将有flex重新计算
+      box-sizing: border-box;
+      vertical-align:middle;
+    }
+  }
+}
+.bg-white {
+  background-color: white;
+}
+.mgb-5 {
+  margin-bottom: 5px;
+}
+.pdl-12 {
+  padding-left: 12px;
+}
+// 字体加粗
+.fwb {
+  font-weight: bold;
+}
+// 浮动右对齐
+.fr {
+  float: right;
+}
+.pl-12 {
+  padding-left: 12px;
+}
+.p-10 {
+  padding: 10px;
+}
+.pt-8 {
+  padding-top: 8px;
+}
+// 下拉选择框占据剩余全部空间
+.select-overspread {
+  .form-group {
+    // margin: 0px 5px 10px 0px;
+    .form-control {
+      margin-right: 0px;
+    }
+  }
+  .btn-group, .btn-group-vertical {
+    // width: 100%;
+    // padding-right: 5px;
+    button {
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+  }
+  .dropdown-menu {
+    min-width: 100%
+  }
+}
+  .app-bg {
+    background: #F5F5F5;
+  }
+  .app-input {
+    background: #FFF;
+    border-bottom: 1px solid #ccc;
+  }
+  .app-input input, .app-input label {
+    padding: 8px 10px;
+    border: none;
+    outline: none;
+    margin: 0px;
+  }
+  .app-textarea {
+    display: block;
+    padding: 10px 15px;
+    border: 0;
+    resize: none;
+    width: 100%;
+    color: inherit;
+    font-size: 1em;
+    line-height: inherit;
+    outline: 0;
+  }
+  .app-cells {
+    height: auto;
+    background-color: #FFFFFF;
+    font-size: 1.2em;
+    overflow: hidden;
+    position: relative;
+  }
+  .app-cells label {
+    padding: 10px;
+    margin: 0px;
+    color: #999999;
+    font-weight: normal;
+  }
+  .app-cells * + * {
+    border-top: 1px solid #D5D5D6;
+  }
+  .app-btn {
+    display: flex;
+    width: 100%;
+  }
+  .app-btn button{
+    flex: 1;
+    border-radius: 17px;
+    margin: 10px;
+  }
+  .app-btn button:focus, .app-btn button::selection {
+    outline: none;
+  }
+  .app-list {
+    margin-top: 8px;
+    background: #FFF;
+  }
+  .app-list div {
+    padding: 6px 10px;
+  }
+  .app-list div:first-child{
+    border-bottom: 1px solid #ccc;
+  }
+  .app-input .datepicker-input[readonly] {
+    border: none;
+    background: none;
+  }
+  div[contenteditable=true]{
+    height: 80px;
+    width: 100%;
+    outline: none;
+    padding: 8px;
+    overflow: scroll;
+  }
+
+  .flex-between {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .flex-between span {
+    padding-right: 10px;
+  }
+  .flex-full {
+    flex: 1;
+  }
+  /* app卡片样式 */
+  .app-preview {
+    position: relative;
+    background-color: #FFF;
+    height: auto;
+  }
+  .app-preview > .head > * {
+    padding: 0px;
+    margin: 0px;
+  }
+  .app-preview > .head {
+    display: flex;
+    justify-content: space-between;
+    padding: 10px 15px;
+    line-height: 2.5em;
+    border-bottom: 1px solid #D5D5D6;
+  }
+  .app-preview-btn-default {
+      color: #999999;
+  }
+  .app-preview-btn-success {
+      color: #3CC51F;
+  }
+  .app-preview > .body {
+    padding: 10px 15px;
+    border-bottom: 1px solid #D5D5D6;
+
+  }
+  .app-preview > .body > div > label {
+    text-align: justify;
+    text-align-last: justify;
+    min-width: 70px;
+  }
+  .app-preview > .foot {
+    display: flex;
+    height: 50px;
+  }
+  .app-preview > .foot > * {
+    flex: 1;
+    display: block;
+    flex: 1;
+
+    text-align: center;
+  }
+  .app-preview > .foot > * + * {
+    border-left: 1px solid #D5D5D6;
+  }
+  // 为工单列表样式
+  .compatible {
+    padding: 8px;
+  }
+  .compatible .form-input-group {
+    margin: 3px 0px;
+    padding: 0 8px;
+  }
+  @media screen and (min-width:992px) {
+    .hd-disappear{
+      display: none;
+    }
+  }
+
+  #work-history ul {
+    padding: 0px;
+  }
+
+  // 从order文件夹拷贝
+  // 为blockquote写的通用样式
+    // 大背景
+    .repair-bg {
+      background: #DBDBDB;
+    }
+    // 头部信息提示
+    .bq-parent {
+      height: auto;
+      background: #FFF;
+      padding: 10px 15px;
+      >blockquote {
+        padding: 0px;
+        padding-left: 8px;
+        margin: 0px;
+        font-size: 18px;
+        font-weight: bold;
+        border-left-color: #4C647A;
+      }
+    }
+    // 为移动端提供左侧修饰性边框
+    .lb-left {
+      padding-left: 8px;
+      border: none;
+      border-left: 5px solid #A2C2EB;
+    }
+    // 内容块
+    .repair-info-content {
+      margin: 15px;
+      background: #FFF;
+      border-radius: 5px;
+    }
+   @media screen and (max-width:768px) {
+      .repair-info-content {
+        margin: 0px;
+        padding: 8px;
+        background: #FFF;
+        border-radius: 0px;
+      }
+    }
+  // 为a标签：berfor伪元素写的通用样式
+    .tab-befor-img (@url) {
+      content: '';
+      background-image: url("@{url}");
+      background-size: 30px;
+      display: inline-block;
+      margin-right: 8px;
+      height: 30px;
+      width: 30px;
+      vertical-align: -35%;
+    }
+    .android-repair-order {
+      > div {
+       > ul {
+          background: #4C647A;
+          overflow: auto;
+          li {
+            display: block;
+            width: 100%;
+          }
+          > .active {
+            a {
+              background: #7599C4!important;
+              color: #FFF!important;
+              border: none;
+              display: block;
+              font-weight: bold;
+              &::after {
+                content: "";
+                width: 0px;
+                height: 0px;
+                border-width: 8px 8px 8px 0px;
+                border-color: transparent #FFF;
+                border-style: solid;
+                position: absolute;
+                right: 0;
+                top: 50%;
+                transform: translateY(-50%);
+              }
+              &:focus {
+                color: #FFF;
+                background: none;
+              }
+            }
+          }
+          a {
+            font-size: 18px;
+            color: #FFF;
+            padding: 13px 16px;
+          }
+        }
+      }
+    }
+
+    // 从app中考出
+    .no-close .nav-tabs a {
+      padding: 5px 12px;
+    }
+    /* checkbox和radio的样式 */
+    .magic-radio,
+    .magic-checkbox {
+      position: absolute;
+      display: none;
+    }
+
+    .magic-radio[disabled],
+    .magic-checkbox[disabled] {
+      cursor: not-allowed;
+    }
+
+    .magic-radio + label,
+    .magic-checkbox + label {
+      position: relative;
+      display: block;
+      padding-left: 30px;
+      cursor: pointer;
+      vertical-align: middle;
+      text-align: left;
+    }
+
+    .magic-radio + label:hover:before,
+    .magic-checkbox + label:hover:before {
+      animation-duration: 0.4s;
+      animation-fill-mode: both;
+      animation-name: hover-color;
+    }
+
+    .magic-radio + label:before,
+    .magic-checkbox + label:before {
+      position: absolute;
+      top: 0;
+      left: 0;
+      display: inline-block;
+      width: 20px;
+      height: 20px;
+      content: '';
+      border: 1px solid #c0c0c0;
+    }
+
+    .magic-radio + label:after,
+    .magic-checkbox + label:after {
+      position: absolute;
+      display: none;
+      content: '';
+    }
+
+    .magic-radio[disabled] + label,
+    .magic-checkbox[disabled] + label {
+      cursor: not-allowed;
+      color: #e4e4e4;
+    }
+
+    .magic-radio[disabled] + label:hover, .magic-radio[disabled] + label:before, .magic-radio[disabled] + label:after,
+    .magic-checkbox[disabled] + label:hover,
+    .magic-checkbox[disabled] + label:before,
+    .magic-checkbox[disabled] + label:after {
+      cursor: not-allowed;
+    }
+
+    .magic-radio[disabled] + label:hover:before,
+    .magic-checkbox[disabled] + label:hover:before {
+      border: 1px solid #e4e4e4;
+      animation-name: none;
+     }
+
+    .magic-radio[disabled] + label:before,
+    .magic-checkbox[disabled] + label:before {
+      border-color: #e4e4e4;
+    }
+
+    .magic-radio:checked + label:before,
+    .magic-checkbox:checked + label:before {
+      animation-name: none;
+    }
+
+    .magic-radio:checked + label:after,
+    .magic-checkbox:checked + label:after {
+      display: block;
+    }
+
+    .magic-radio + label:before {
+      border-radius: 50%;
+    }
+
+    .magic-radio + label:after {
+      top: 4px;
+      left: 4px;
+      width: 12px;
+      height: 12px;
+      border-radius: 50%;
+      background: #7697c4;
+    }
+
+    .magic-radio:checked + label:before {
+      border: 2px solid #7697c4;
+    }
+
+    .magic-radio:checked[disabled] + label:before {
+      border: 2px solid #c9e2f9;
+    }
+
+    /*.magic-radio:checked[disabled] + label:after {
+    background: #c9e2f9; }*/
+
+    .magic-checkbox + label:before {
+      border-radius: 3px;
+    }
+
+    .magic-checkbox + label:after {
+      top: 2px;
+      left: 7px;
+      box-sizing: border-box;
+      width: 6px;
+      height: 12px;
+      transform: rotate(45deg);
+      border-width: 2px;
+      border-style: solid;
+      border-color: #fff;
+      border-top: 0;
+      border-left: 0;
+    }
+
+    .magic-checkbox:checked + label:before {
+      border: #7697c4;
+      background: #7697c4;
+    }
+
+    .magic-checkbox:checked[disabled] + label:before {
+      border: #c9e2f9;
+      background: #c9e2f9;
+    }
+    /* 滚动条样式 */
+    /*---滚动条默认显示样式--*/
+    ::-webkit-scrollbar-thumb{
+    //  display: none;
+     background-color:rgba(0,0,0,0.2);
+     height:50px;
+     outline-offset:-2px;
+     /*outline:2px solid #fff;*/
+     -webkit-border-radius:4px;
+     /*border: 2px solid #fff;*/
+    }
+
+    /*---鼠标点击滚动条显示样式--*/
+    ::-webkit-scrollbar-thumb:hover{
+    //  display: inherit;
+     background-color:rgba(0,0,0,0.4);
+     height:50px;
+     -webkit-border-radius:4px;
+    }
+    /*---滚动条大小--*/
+    ::-webkit-scrollbar{
+     width:8px;
+     height:8px;
+    }
+    /*---滚动框背景样式--*/
+    ::-webkit-scrollbar-track-piece{
+    /* 全透明，不显示 */
+     background-color:rgba(255,255,255,0);
+     -webkit-border-radius:0;
+    }

package/src/filiale/beifangshiye/specificInformation.vue

@@ -155,7 +155,7 @@
 <script>
   import Vue from 'vue'
   import {HttpResetClass, PagedList} from 'vue-client'
-  import * as Util from "../../../../../Util";
+  import * as Util from "../../Util";
   // var data
   export default {
     title: '基本信息',

package/src/filiale/meihekou/CorrectBill.vue

@@ -0,0 +1,93 @@
+<template>
+  <div class="auto form-horizontal" >
+    <modal :show.sync="show"  v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">{{title}}</h3>
+      </header>
+      <article slot="modal-body" style = "display: flex;justify-content: center;" id="bill">
+        <div v-if="bill.data">
+          {{{bill.data}}}
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <div v-if="billConfig.hasBillManage">
+          <div class="col-sm-2">
+            <span><strong>发票号:{{model.f_using_number}}</strong></span>
+          </div>
+        </div>
+        <button type="button" class="btn btn-success" @click='print()'>打印</button>
+        <report-print id='bill' top='15mm' left='5mm'  width='90%'  height='70%' :notrepeat="true" :showbtn="false" v-ref:reportprint></report-print>
+        <button type="button" class="btn btn-default" @click='cancel()' v-if="!billManager">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import { DataModel } from 'vue-client'
+
+  let getBillData = async function (self, val) {
+    console.log('看看打票里面的data', self.data, self.billData, val)
+    self.bill = new DataModel(self.billData.url, {reprint: "'冲正'"}, 'af-revenue')
+    await self.bill.search(self.data.id)
+
+    self.model.f_using_number = self.billData.bill.number
+  }
+
+  export default {
+    title: '收费发票',
+    data () {
+      return {
+        model: {
+          f_using_number: null
+        },
+        bill: {},
+        messShow: false
+      }
+    },
+    props: ['show', 'data', 'billData', 'billConfig', 'title'],
+    ready () {
+      console.log('打票', this.billConfig, this.billData)
+    },
+    methods: {
+      cancel  () {
+        this.$dispatch('toggle')
+      },
+
+      async print () {
+        // 更新系统发票号
+        try {
+          console.log('开具冲红收据的参数：', this.data.id, this.data.f_type)
+          if (this.billConfig.hasBillManage) {
+            await this.$CommonService.correctPaperBill(this.data.id, this.data.f_type, this.data.f_use_type, this.billData.bill, 'newBill')
+          }
+          console.log('系统票号更新完毕')
+          this.$refs.reportprint.print()
+        } catch (error) {
+          this.$dispatch('refresh')
+        }
+      }
+    },
+    watch: {
+      'show' (val) {
+        if (val) {
+          getBillData(this, val).then(() => {
+            this.$emit('ready')
+          }).catch((error) => {
+            this.$emit('error', error)
+          })
+        }
+      }
+    },
+    events: {
+      'print' () {
+        // 对票据明细进行更新或插入操作
+        this.$dispatch('printok', '发票打印', this.data)
+      },
+      'print-error' () {
+        this.$dispatch('error', '发票打印', this.data, null)
+      }
+    }
+  }
+</script>
+<style >
+</style>

package/src/filiale/meihekou/RecordCancel.vue

@@ -48,7 +48,7 @@
       </footer>
     </modal>
     <correct-bill :show="print" :bill-config='config' :bill-data='billData'
-                  @printok="printok" @toggle="printCancel" :data='printModel' v-ref:printbill ></correct-bill>
+                  @printok="printok" @toggle="printCancel" :data='printModel' :title="`${data.type}撤销票据`" v-ref:printbill ></correct-bill>
   </div>
 </template>
 

package/src/filiale/meihekou/batch/batchEditFiles.vue

@@ -122,6 +122,73 @@
                     close-on-select
                     ></v-select>
         </div>
+        <div class="col-sm-6">
+          <label class="font_normal_body">用户等级</label>
+          <v-select :value.sync="model.f_user_level" v-model="model.f_user_level"
+                    :options='userlevels' placeholder='用户等级'
+                    close-on-select
+          ></v-select>
+        </div>
+      </div>
+      <div class="row" style="margin-top:6px;">
+        <div class="col-sm-6">
+          <label class="font_normal_body">用户状态</label>
+          <v-select :value.sync="model.f_user_state" v-model="model.f_user_state"
+                    :options='userstates' placeholder='用户状态'
+                    close-on-select
+          ></v-select>
+        </div>
+        <div class="col-sm-6">
+          <label class="font_normal_body">房屋类型</label>
+          <v-select :value.sync="model.f_house_type" v-model="model.f_house_type"
+                    :options='housetypes' placeholder='房屋类型'
+                    close-on-select
+          ></v-select>
+        </div>
+      </div>
+      <div class="row" style="margin-top:6px;">
+        <div class="col-sm-6">
+          <label class="font_normal_body">使用状态</label>
+          <v-select :value.sync="model.f_usetype" v-model="model.f_usetype"
+                    :options='usetypes' placeholder='使用状态'
+                    close-on-select
+          ></v-select>
+        </div>
+        <div class="col-sm-6">
+          <label class="font_normal_body">发卡状态</label>
+          <v-select :value.sync="model.f_whether_hairpin" v-model="model.f_whether_hairpin"
+                    :options='whetherhairpins' placeholder='发卡状态'
+                    close-on-select
+          ></v-select>
+        </div>
+      </div>
+      <div class="row" style="margin-top:6px;">
+        <div class="col-sm-6">
+          <label class="font_normal_body">表具年限</label>
+          <input type="number" class="input_search" style="width:60%" v-model="model.f_use_limit" placeholder='表具年限' min="1" step="1" @input="validateUseLimit"></input>
+        </div>
+        <div class="col-sm-6">
+          <label class="font_normal_body">出厂日期</label>
+          <datepicker style="width:60%" placeholder="表具出厂日期"
+                      v-model="model.f_factory_date"
+                      :value.sync="model.f_factory_date"
+                      class="datepicker"
+                      :format="'yyyy-MM-dd HH:mm:ss'"
+                      :show-reset-button="true">
+          </datepicker>
+        </div>
+      </div>
+      <div class="row" style="margin-top:6px;">
+        <div class="col-sm-6">
+          <label class="font_normal_body">报废日期</label>
+          <datepicker style="width:60%" placeholder="表具报废日期"
+                      v-model="model.f_scrap_date"
+                      :value.sync="model.f_scrap_date"
+                      class="datepicker"
+                      :format="'yyyy-MM-dd HH:mm:ss'"
+                      :show-reset-button="true">
+          </datepicker>
+        </div>
       </div>
       <div class="row" >
         <div class="col-sm-12">
@@ -165,9 +232,17 @@
           f_usestate: '',
           f_comments: '',
           f_overdue_set: '',
-          f_meter_book:'',
-          f_book_slice_area:'',
-          f_adjustable_id:''
+          f_meter_book: '',
+          f_book_slice_area: '',
+          f_adjustable_id: '',
+          f_user_level: '',
+          f_user_state: '',
+          f_house_type: '',
+          f_usetype: '',
+          f_whether_hairpin: '',
+          f_use_limit: '',
+          f_factory_date: '',
+          f_scrap_date: ''
         },
         uploadText: '换表',
         // 构建数组来存储对象
@@ -188,6 +263,17 @@
       readyGen(this)
     },
     methods: {
+      validateUseLimit () {
+        let val = this.model.f_use_limit
+        if (val !== '' && val !== null && val !== undefined) {
+          val = parseInt(val)
+          if (isNaN(val) || val < 1) {
+            this.model.f_use_limit = ''
+          } else {
+            this.model.f_use_limit = val
+          }
+        }
+      },
       async initSlice (val) {
         if (val) {
           let getAllArea = await this.$resetpost('/rs/search', {
@@ -253,7 +339,21 @@
 
     },
     computed: {
-
+      whetherhairpins () {
+        return this.$appdata.getParam('发卡状态')
+      },
+      usetypes () {
+        return this.$appdata.getParam('使用状态')
+      },
+      housetypes () {
+        return this.$appdata.getParam('房屋类型')
+      },
+      userstates () {
+        return this.$appdata.getParam('用户状态')
+      },
+      userlevels () {
+        return this.$appdata.getParam('用户等级')
+      },
       aroundmeters () {
         return this.$appdata.getParam('左右表')
       },

package/src/filiale/meihekou/batch/batchEditManage.vue

@@ -27,6 +27,7 @@
         files: {},
         pinfo: {},
         isdetail: true,
+        userinfo: ['f_user_level','f_user_state','f_house_type'],
         chinesename: {
           files: {
             'f_inputtor': '抄表员',
@@ -43,7 +44,15 @@
             'f_comments': '备注',
             'f_overdue_set': '违约金规则',
             'f_adjustable_name': '调 压 箱',
-            'f_book_slice_area': '表册片区'
+            'f_book_slice_area': '表册片区',
+            'f_user_level': '用户等级',
+            'f_user_state': '用户状态',
+            'f_house_type': '房屋类型',
+            'f_usetype': '使用状态',
+            'f_whether_hairpin': '发卡状态',
+            'f_use_limit': '表具年限',
+            'f_factory_date': '表具出厂日期',
+            'f_scrap_date': '表具报废日期'
           }
         }
       }
@@ -83,10 +92,14 @@
           if (this.files[item] instanceof Array) {
             this.files[item] = this.files[item].length > 0 ? this.files[item][0] : ''
           }
+          let tablename = 't_userfiles'
+          if (this.userinfo.includes(item)) {
+            tablename = 't_userinfo'
+          }
           var file = {
             chinesename: this.chinesename.files[item],
             fieldname: item,
-            tablename: 't_userfiles',
+            tablename: tablename,
             newvalue: this.files[item],
             state: '有效',
             modifitime: Util.toStandardDateString()

package/src/filiale/meihekou/batch/batchUserList.vue

@@ -36,6 +36,7 @@
                 <label class="font_normal_body">用户状态</label>
                 <v-select :value.sync="model.f_user_state" v-model="model.f_user_state"
                           :options='$parent.$parent.userstates' placeholder='用户状态'
+                          condition="u.f_user_state = '{}'"
                           close-on-select></v-select>
               </div>
               <div class="col-sm-3 form-group">
@@ -47,6 +48,39 @@
                         condition="u.f_meter_classify like '%{}'"
                        ></v-select>
               </div>
+                <div class="col-sm-3 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand" v-model="model.f_meter_brand"
+                            style="width:60%"
+                            :options='$parent.$parent.meterbrands' placeholder='气表品牌'
+                            close-on-select
+                            condition="u.f_meter_brand like '%{}'"
+                  ></v-select>
+                </div>
+                <div class="col-sm-3 form-group">
+                  <label class="font_normal_body">气表状态</label>
+                  <v-select :value.sync="model.f_table_state" v-model="model.f_table_state"
+                            :options='$parent.$parent.tablestates' placeholder='气表状态'
+                            condition="u.f_table_state = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-3 form-group" style="padding-right: 5px;">
+                  <label class="font_normal_body">设备类型</label>
+                  <v-select :value.sync="model.f_devices_type" v-model="model.f_devices_type"
+                            :options='$parent.$parent.devicetypes' placeholder='设备类型' :value-single="true"
+                            condition="u.f_devices_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-3 form-group">
+                  <label class="font_normal_body">设备品牌</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_brand"
+                         condition="f_brand like '%{}%'" placeholder='设备品牌'>
+                </div>
+                <div class="col-sm-3 form-group">
+                  <label class="font_normal_body">表号</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
                 <div class="col-sm-3 form-group">
                   <label class="font_normal_body" >抄&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor" placeholder='抄表员'
@@ -85,10 +119,24 @@
                             :options='$parent.$parent.bookSliceArea' placeholder='表册片区'
                             multiple
                             style="width:60%"
-                            @change="$parent.$parent.sliceChange"
                             close-on-select
                             condition="f_book_slice_area in {}"></v-select>
                 </div>
+                <!--抄表册-->
+                <div class="col-sm-3 form-group">
+                  <label class="font_normal_body">抄表册</label>
+                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
+                            :options='$parent.$parent.meterbooks' placeholder='抄表册'
+                            multiple
+                            style="width:60%"
+                            close-on-select
+                            condition="f_meter_book in {}"></v-select>
+                </div>
+                <div class="col-sm-3 form-group">
+                  <label class="font_normal_body">档案备注</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_comments"
+                         condition="f_comments like '%{}%'" placeholder='档案备注'>
+                </div>
                 <div class="col-sm-3 form-group">
                   <label class="font_normal_body">小&emsp;&emsp;区</label>
                   <input style="width:60%" type="text" class="form-control" v-model="model.f_residential_area"
@@ -98,25 +146,25 @@
                 <div class="col-sm-3 form-group">
                   <label class="font_normal_body">楼&emsp;&emsp;栋</label>
                   <input style="width:60%" type="text" class="form-control" v-model="model.f_building"
-                         condition="f_building like '%{}%'" placeholder='楼栋'
+                         condition="f_building = '{}'" placeholder='楼栋'
                   >
                 </div>
                 <div class="col-sm-3 form-group">
                   <label class="font_normal_body">单&emsp;&emsp;元</label>
                   <input style="width:60%" type="text" class="form-control" v-model="model.f_unit"
-                         condition="f_unit like '%{}%'" placeholder='单元'
+                         condition="f_unit = '{}'" placeholder='单元'
                   >
                 </div>
                 <div class="col-sm-3 form-group">
                   <label class="font_normal_body">楼&emsp;&emsp;层</label>
                   <input style="width:60%" type="text" class="form-control" v-model="model.f_floor"
-                         condition="f_floor like '%{}%'" placeholder='楼层'
+                         condition="f_floor = '{}'" placeholder='楼层'
                   >
                 </div>
                 <div class="col-sm-3 form-group">
                   <label class="font_normal_body">&emsp;门牌号</label>
                   <input style="width:60%" type="text" class="form-control" v-model="model.f_room"
-                         condition="f_room like '%{}%'" placeholder='门牌号'
+                         condition="f_room = '{}'" placeholder='门牌号'
                   >
                 </div>
               </div>
@@ -198,6 +246,7 @@
     // console.log('获取登录信息，', self.$login, self.$appdata, self.$appdata.getParam('用户类型'), Vue.$login.f.name)
     await self.search()
     await self.$LoadParams.loadParam()
+    await self.$LoadParams.loadMeterBook(self.$login.f.orgid)
     let overdueset = []
     let res = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {
       data: {
@@ -211,6 +260,7 @@
     self.overdueset = overdueset
     self.initAdjustables()
     self.initSlice(self.$login.f.orgid)
+    self.loadMeterBooks()
   }
 
   export default {
@@ -223,6 +273,9 @@
         overdueset: [],
         // 控制全选
         all: [],
+        meterbooks: [],
+        meterbrands: [],
+        devicetypes: this.$appdata.getParam('设备类型'),
         // 控制单选
         radio: [],
         criteriaShow: true,
@@ -235,42 +288,20 @@
       loadParamGem(this)
     },
     methods: {
-      async sliceChange () {
-        this.$set('$refs.paged.$refs.criteria.model.f_meter_book', [])
-        let val2 = this.$refs.paged.$refs.criteria.model.f_book_slice_area
-        if (val2.length > 0) {
-          let condition = ` 1=1 and f_orgid ='${this.f_filialeid}' and f_book_state='有效' `
-          let aaa = '('
-          val2.forEach((item) => {
-            aaa = aaa + `'${item}',`
-          })
-          aaa = aaa + `'')`
-          condition = condition + ` and f_book_slice_area in ${aaa} `
-          let param = {
-            items: '*',
-            tablename: 't_meter_book',
-            condition: condition,
-            orderitem: 'id'
-          }
-          let getMeterBooks = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {data: param}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-          if (getMeterBooks.data) {
-            if (getMeterBooks.data.length > 0) {
-              let rs = []
-              getMeterBooks.data.forEach((item) => {
-                let temp = {
-                  label: item.f_book_name,
-                  value: item.id
-                }
-                rs.push(temp)
-              })
-              this.meterbooks = [{label: '全部', value: ''}, ...rs]
-            } else {
-              this.meterbooks = [{label: '全部', value: ''}]
-            }
-          }
+      loadMeterBooks () {
+        console.log('$GetSaleParam.meterbooks:', this.$GetSaleParam.meterbooks)
+        console.log('$GetSaleParam.bookcodes:', this.$GetSaleParam.bookcodes)
+
+        let books = this.$GetSaleParam.meterbooks || []
+        if (books.length > 0) {
+          this.meterbooks = books.map(item => ({
+            label: item.label,
+            value: item.value
+          }))
         } else {
           this.meterbooks = [{label: '全部', value: ''}]
         }
+        console.log('最终 meterbooks:', this.meterbooks)
       },
       async initSlice (val) {
         if (val) {
@@ -298,15 +329,15 @@
           arr.push(temp)
         })
         this.adjustables = [{label: '全部', value: ''}, ...arr]
-        // // 初始化气表品牌
-        // let brandArr = []
-        // this.$GetSaleParam.getGasbrand().forEach((item) => {
-        //   let temp1 = {}
-        //   temp1.label = item.label
-        //   temp1.value = item.value.f_meter_brand
-        //   brandArr.push(temp1)
-        // })
-        // this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        // 初始化气表品牌
+        let brandArr = []
+        this.$GetSaleParam.getGasbrand().forEach((item) => {
+          let temp1 = {}
+          temp1.label = item.label
+          temp1.value = item.value.f_meter_brand
+          brandArr.push(temp1)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
       },
       search () {
         // this.$refs.paged.$refs.criteria.model.generate_state = '0'
@@ -467,6 +498,9 @@
       userstates () {
         return this.$appdata.getParam('用户状态')
       },
+      tablestates () {
+        return this.$appdata.getParam('表具状态')
+      },
       ischecked () {
         return function (index, i) {
           // console.log("计算属性")

package/src/filiale/meihekou/sale.js

@@ -87,4 +87,6 @@ export default function () {
   Vue.component('sale-safecheck-info', (resolve) => { require(['./SafeCheck'], resolve) })
   // 使用该气价的用户信息
   Vue.component('gasprice-user', (resolve) => { require(['./GasPriceUser'], resolve) })
+  // 冲正票据
+  Vue.component('correct-bill', (resolve) => { require(['./CorrectBill'], resolve) })
 }