sale-client 3.6.419 → 3.6.451

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Oct 30 09:57:55 CST 2024
+#Wed Nov 20 11:54:44 CST 2024
 gradle.version=5.2.1

package/package.json

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

package/src/components/revenue/comprehen/Maintenance/otherRecords/specificInformation.vue

@@ -114,13 +114,13 @@
             </div>
           </div>
           <div class="row auto">
-            <div class="form-group form-input-group" title="参数:操作时间, 权限:【其他收费金额修改】">
+            <div class="form-group form-input-group" title="权限:【其他收费金额修改】">
               <label for="" class="control-label">数量：</label>
               <input type="text" width="300px"  class="form-control" v-model="mingxi.number"   :disabled="!editcollection">
             </div>
           </div>
           <div class="row auto">
-            <div class="form-group form-input-group" title="参数:操作时间, 权限:【其他收费金额修改】">
+            <div class="form-group form-input-group" title="权限:【其他收费金额修改】">
               <label for="" class="control-label">单价：</label>
               <input type="text" width="300px"  class="form-control" v-model="mingxi.unitprice"  :disabled="!editcollection" >
             </div>

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackList.vue

@@ -88,11 +88,11 @@
           </div>
 
           <div style="text-align:right;height:auto;margin-top:6px;">
-            <button class="button_search" type="button" style="width:80px;" @click="confirm('拉黑')" v-show="!isBlackList && model.isblacklist =='false'" :disabled='!$v.valid'>
+            <button class="button_search" type="button" style="width:80px;" @click="confirm('拉黑')" v-show="model.isblacklist =='false'" :disabled='!$v.valid'>
               拉黑
             </button>
             <button class="button_search"  type="button"  style="width:80px;" @click="confirm('取消拉黑')"
-                    v-show="isBlackList || model.isblacklist =='true'" :disabled='!$v.valid'>
+                    v-show="model.isblacklist =='true'" :disabled='!$v.valid'>
               取消拉黑
             </button>
             <button class="button_export"  type="button"  style="width:80px;" @click="close()">取消</button>
@@ -130,6 +130,7 @@
     self.model.f_limit_value = res.data[0].f_limit_value
     self.model.f_limit_times = res.data[0].f_limit_times
     self.model.f_limit_amount = res.data[0].f_limit_amount
+    self.model.isblacklist = res.data[0].isblacklist
     self.model.isshow = true
     if (typeof res.data[0].f_limit_type === 'undefined') {
       self.f_limit = '限购气量'
@@ -179,22 +180,11 @@
       }
     },
     ready () {
-      if (this.data) {
-        this.isBlackList = true
-        initGen(this, this.data)
-      } else {
-        this.initModel()
-      }
+      initGen(this, this.data)
     },
     watch: {
       'data' (val) {
-        if (val) {
-          this.isBlackList = true
-          initGen(this, val)
-        } else {
-          this.isBlackList = false
-          this.initModel()
-        }
+        initGen(this, val)
       }
     },
     methods: {

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackListList.vue

@@ -155,6 +155,16 @@
         <template partial='foot'></template>
       </data-grid>
     </criteria-paged>
+    <modal :show.sync="selectShow" title="选择用户" v-ref:modal width="70%" backdrop="false">
+      <article slot="modal-body" class="modal-body">
+        <black-user-select
+          v-if="selectShow"
+          @select-changed="selected"
+        ></black-user-select>
+      </article>
+      <footer slot="modal-footer">
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -171,6 +181,7 @@
           user: []
         },
         criteriaShow: false,
+        selectShow: false,
         blackImport: '',
         model: new PagedList('rs/sql/sale_getBlackList', 20),
         // 公司下拉
@@ -202,6 +213,11 @@
       this.search()
     },
     methods: {
+      selected (row) {
+        console.log(row)
+        this.selectShow = false
+        this.$dispatch('select-changed', row)
+      },
       getAuthority () {
         if (this.$login.r.find(value => value == '黑名单导入')) {
           this.blackImport = '黑名单导入'
@@ -251,7 +267,9 @@
           return
         }
         this.style = 'col-sm-3'
-        this.$dispatch('add')
+        // this.$dispatch('add')
+        this.selectShow = true
+        this.$parent.isdetail = false
       },
       dblclick (val) {
         console.log(val)

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackUserSelect.vue

@@ -0,0 +1,145 @@
+<template>
+  <div class="flex-auto" style="flex:1;">
+    <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 :show-component="['company']"
+                              :initres="$parent.$parent.initres"
+                              @re-res="$parent.$parent.getorg"
+                              :style="$parent.$parent.style"
+                              v-ref:sel>
+            </res-select-group>
+            <div class="form-group col-sm-3">
+              <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="form-group col-sm-3">
+              <label class="font_normal_body">用户姓名</label>
+              <input class="input_search" condition="f_user_name = '{}'" placeholder="用户姓名" style="width:60%" type="text" v-model="model.name"
+              />
+            </div>
+            <div class="form-group col-sm-3 button-range" style="padding-right: 10px">
+              <button @click="$parent.$parent.search()" class="button_search button_spacing"
+                      style="width:80px;margin-left:30px;" v-el:cx>查询
+              </button>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
+            </div>
+          </div>
+          <div class="row" v-if="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">电&emsp;&emsp;话</label>
+              <input class="input_search" condition="f_user_phone = '{}'" placeholder='电话' style="width:60%" type="text" v-model="model.f_user_phone">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">表&emsp;&emsp;号</label>
+              <input class="input_search" condition="f_meternumber = '{}'" placeholder='表号' style="width:60%" type="text" v-model="model.f_meternumber">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">卡&emsp;&emsp;号</label>
+              <input class="input_search" condition="f_card_id = '{}'" placeholder='卡号' style="width:60%" type="text" v-model="model.f_card_id">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">地&emsp;&emsp;址</label>
+              <input class="input_search" condition="f_address like '%{}%'" placeholder='用户地址' style="width:60%" type="text" v-model="model.f_address">
+            </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;">用户编号</th>
+            <th style="text-align: center;">姓名</th>
+            <th style="text-align: center;">表号</th>
+            <th style="text-align: center;">卡号</th>
+            <th style="text-align: center;">电话</th>
+            <th style="text-align: center;">地址</th>
+            <th style="text-align: center;">操作</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <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_meternumber }}</td>
+          <td style="text-align: center;">{{ row.f_card_id }}</td>
+          <td style="text-align: center;">{{ row.f_user_phone }}</td>
+          <td style="text-align: center;">{{ row.f_address }}</td>
+          <td style="text-align: center;" class="row auto">
+            <nobr>
+              <button type="button"
+                      name="button"
+                      class="button_search button_spacing width-60"
+                      @click.stop="$parent.$parent.$parent.select(row)">
+                选择
+              </button>
+            </nobr>
+          </td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      },
+      style: 'form-group col-sm-3',
+      criteriaShow: false,
+      f_orgid: '',
+      model: new PagedList('rs/sql/sale_getBlackSelectUser', 10)
+    }
+  },
+  props: {
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    select (row) {
+      console.log('选中了用户', row)
+      this.$dispatch('select-changed', { val: row })
+    },
+    async getRes (condition, obj) {
+      console.log('condition =', condition)
+      console.log('obj =', obj)
+    },
+    hidden () {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+      this.$dispatch('search')
+    },
+    getorg (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}  ${this.f_orgid} `
+      }
+      this.model.search(args.condition, args.model)
+    }
+  },
+  watch: {},
+  computed: {}
+}
+</script>

package/src/filiale/meihekou/CardHand.vue

@@ -274,12 +274,12 @@
                   <td style="text-align: center;">
                     <div class="form-group" style="margin-bottom:0px;"
                          v-if="row.f_meter_state === '未抄表' ">
-                      <input type="text" class="form-control" v-model="row.f_unused_gas"
+                      <input type="text" class="form-control" v-model="row.f_shengyu_gas"
                              v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'"
                       >
                     </div>
                     <div v-else>
-                      <span>{{row.f_unused_gas}}</span>
+                      <span>{{row.f_shengyu_gas}}</span>
                     </div>
                   </td>
 
@@ -613,7 +613,7 @@
               // || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(2) < 0
         if (row.f_tablebase) {
           row.f_actualtablebase = (row.f_tablebase - 0) - (row.f_last_tablebase - 0)
-          row.f_unused_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
+          row.f_shengyu_gas = (row.f_total_gas - (row.f_tablebase - row.f_initial_base)).toFixed(2)
                   /* this.$resetpost('rs/logic/cardhands', row, {resolveMsg: null, rejectMsg: '录入数据出错!!!'}).then((res) => {
                       console.log('返回数据', res)
                       row.id = res.data.id