sale-client 3.6.468 → 3.6.469

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Thu Dec 12 12:54:07 CST 2024
+gradle.version=5.2.1

package/package.json

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

package/src/components/common/userinfo_detail/iot_detail/WatchCollection.vue

@@ -60,7 +60,7 @@
               <td style="text-align:center"><nobr>{{row.f_hand_date}}</nobr></td>
               <th style="text-align:center"><nobr>{{row.f_jval}}</nobr></th>
               <th style="text-align:center"><nobr>{{row.f_tablebase}}</nobr></th>
-              <th style="text-align:center"><nobr>{{row.f_valvestate == 0 ? '开阀' : '关阀'}}</nobr></th>
+              <th style="text-align:center"><nobr>{{row.f_valvestate == 0 ? '开阀' : row.f_valvestate === '1' ? '关阀' : '未上报'}}</nobr>
               <th style="text-align:center"><nobr>{{row.f_upload_type}}</nobr></th>
               <th style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></th>
               <th style="text-align:center"><nobr>{{row.f_meterdebitamt}}</nobr></th>

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -697,8 +697,11 @@ export default {
             }
             this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
-              this.$showAlert('换表失败，欠费已生成，清欠后请重新执行换表操作！！', 'error', 3)
+
               if (this.model.metermessage.f_meter_type[0] != '机表') {
+                console.log('换表失败，该表已产生欠费，清欠后重新进行换表操作1！')
+                this.$showAlert('换表失败，该表已产生欠费，请清欠后，重新进行换表操作！', 'warning', 5000)
+                console.log('换表失败，该表已产生欠费，清欠后重新进行换表操作2！')
                 this.$dispatch('refresh')
               } else {
                 this.saveobj()
@@ -893,8 +896,10 @@ export default {
             }
             this.$resetpost(url, {data: data}, {resolveMsg: '生成欠费成功', rejectMsg: '生成欠费失败'}).then((res) => {
               console.log('成功')
-              this.$showAlert('换表失败，欠费已生成，清欠后请重新执行换表操作！！', 'error', 3)
               if (this.row.f_meter_type.includes('物联网表')) {
+                console.log('换表失败，该表已产生欠费，清欠后重新进行换表操作1！')
+                this.$showAlert('换表失败，该表已产生欠费，请清欠后，重新进行换表操作！', 'warning', 5000)
+                console.log('换表失败，该表已产生欠费，清欠后重新进行换表操作2！')
                 this.$dispatch('refresh')
               } else {
                 this.$dispatch('resflushrowdata')

package/src/filiale/bayan/AddWarehousemain.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <p class="bg-info text-center" style="padding: 8px;font-size: 20px">操作记录</p>
+        <!-- <data-grid :model="inData" v-ref:grid  partial='list'>
+           <template partial='head'>-->
+        <table class="list_area table_sy" style="width: 600px">
+          <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>
+
+          <tr v-for="row in recordlist">
+            <td style="text-align: center;">{{$index + 1}}</td>
+            <td style="text-align: center;">{{row.chinesename}}</td>
+            <td style="text-align: center;">{{row.oldvalue}}</td>
+            <td style="text-align: center;">{{row.newvalue}}</td>
+            <td style="text-align: center;">{{row.state}}</td>
+            <td style="text-align: center;">{{row.modifitime}}</td>
+            <td style="text-align: center;">{{row.operator}}</td>
+          </tr>
+        </table>
+      </form>
+
+    </validator>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'addwarehouse',
+
+    data () {
+      return {
+        inData: [],
+        obj: {},
+        userid: this.$login.f.id
+
+      }
+    },
+    props: {
+      recordlist: Array
+    },
+    created () {
+    },
+    ready () {
+    },
+    methods: {
+
+    }
+  }
+</script>
+
+<style lang="less">
+</style>

package/src/filiale/bayan/ChargeList.vue

@@ -20,6 +20,36 @@
               <input type="text" class="input_search" style="width:60%"  v-model="model.f_user_name" placeholder='客户名称'
                      @keyup.enter="$parent.$parent.clean()" condition="f_user_name like '%{}%'">
             </div>
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">小&emsp;&emsp;区</label>
+              <input type="text" class="input_search" v-model="model.f_residential_area" placeholder='小区'
+                     condition="f_residential_area = '{}'" style="width:60%"
+              >
+            </div>
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">楼&emsp;&emsp;号</label>
+              <input type="text" class="input_search" v-model="model.f_building" placeholder='楼号'
+                     condition="f_building = '{}'" style="width:60%"
+              >
+            </div>
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body" >单&emsp;&emsp;元</label>
+              <input type="text" class="input_search" v-model="model.f_unit" placeholder='单元'
+                     condition="f_unit = '{}'" style="width:60%"
+              >
+            </div>
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body" >楼&emsp;&emsp;层</label>
+              <input type="text" class="input_search" v-model="model.f_floor" placeholder='楼层'
+                     condition="f_floor = '{}'" style="width:60%"
+              >
+            </div>
+            <div class="col-sm-3 form-group" >
+              <label class="font_normal_body">门&ensp;牌&ensp;号</label>
+              <input type="text" class="input_search" v-model="model.f_room" placeholder='门牌号'
+                     condition="f_room = '{}'" style="width:60%"
+              >
+            </div>
             <!--<div class="row" >-->
             <div  v-show="$parent.$parent.criteriaShow">
               <!--<div class="form-group col-sm-4"  v-if="$parent.$parent.clientWidth<1600">-->

package/src/filiale/bayan/ChargeRecordQuery.vue

@@ -77,7 +77,7 @@
       async getsalerecord () {
         let http = new HttpResetClass()
         // this.condition = `1=1 and f_user_id = '${this.searchdata.f_user_id}'`
-        this.condition = `1=1 and f_userfiles_id = '${this.searchdata.f_userfiles_id}'`
+        this.condition = `1=1 and f_userinfo_id = '${this.searchdata.f_userinfo_id}'`
         let record = await http.load('POST', 'rs/sql/sale_RecordQuery', {data: {condition: this.condition}}, {
           rejectMsg: '流水查询出错！！',
           resolveMsg: null