sale-client 3.6.238 → 3.6.240

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Jan 23 18:15:26 CST 2024
+gradle.version=5.2.1

package/build/dev-server.js

@@ -1,97 +1,97 @@
-var path = require('path')
-const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://127.0.0.1:8080']
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.dev.conf')
-var devConfig = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    host: '127.0.0.1',
-    port: 8089,
-    open: false,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-      '/invoice/rs/logic/getInvoice': {
-        target: serverRul
-      },
-      '/rs/file': {
-        target: serverRul
-      },
-      '/webapps': {
-        target: serverRul
-      },
-      '/rs/sql/singleTable': {
-        target: serverRul
-      },
-      '/invoice': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/search': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getLogin': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getInitData': {
-        target: serverRul
-      },
-      '/rs/logic/getSaleInitData': {
-        target: serverRul
-      },
-      // 用户登录服务地址
-      '/rs/user': {
-        target: serverRul
-      },
-      '/rs/path': {
-        target: serverRul
-      },
-      '/rs/data': {
-        target: serverRul
-      },
-      '/rs/license': {
-        target: serverRul
-      },
-      '/rs/db': {
-        target: serverRul
-      },
-      '/excel': {
-        target: serverRul
-      },
-      '/rs/config': {
-        target: serverRul
-      },
-      '/rs/report': {
-        target: serverRul
-      },
-      '/rs/vue': {
-        target: serverRul
-      },
-      // '/rs/logic/webHandReverse': {
-      //   target: 'http://localhost:8085'
-      // },
-      '/rs/logic': {
-        target: localUrl
-      },
-      '/rs/sql': {
-        target: localUrl
-      },
-      '/webmeter': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-        // changeOrigin: true
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: false,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+      '/invoice/rs/logic/getInvoice': {
+        target: serverRul
+      },
+      '/rs/file': {
+        target: serverRul
+      },
+      '/webapps': {
+        target: serverRul
+      },
+      '/rs/sql/singleTable': {
+        target: serverRul
+      },
+      '/invoice': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/search': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getLogin': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getInitData': {
+        target: serverRul
+      },
+      '/rs/logic/getSaleInitData': {
+        target: serverRul
+      },
+      // 用户登录服务地址
+      '/rs/user': {
+        target: serverRul
+      },
+      '/rs/path': {
+        target: serverRul
+      },
+      '/rs/data': {
+        target: serverRul
+      },
+      '/rs/license': {
+        target: serverRul
+      },
+      '/rs/db': {
+        target: serverRul
+      },
+      '/excel': {
+        target: serverRul
+      },
+      '/rs/config': {
+        target: serverRul
+      },
+      '/rs/report': {
+        target: serverRul
+      },
+      '/rs/vue': {
+        target: serverRul
+      },
+      '/rs/logic/webHandReverse': {
+        target: 'http://localhost:8085'
+      },
+      '/rs/logic': {
+        target: localUrl
+      },
+      '/rs/sql': {
+        target: localUrl
+      },
+      '/webmeter': {
+        target: serverRul
+      },
+      '/rs': {
+        target: serverRul
+        // changeOrigin: true
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/package.json

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

package/src/components/FilesManage/UserMeterInfoTest.vue

@@ -19,7 +19,7 @@
 <!--      <span class="glyphicon glyphicon-plus"></span>-->
 <!--      &lt;!&ndash;<img :src="imgmeter" alt="图片加载失败" class="img-rounded" style="width: 50px;margin:10px;">&ndash;&gt;-->
 <!--    </div>-->
-    <file-user-device-info :devicesinfo.sync="devicesinfo" :show_devices.sync="show_devices"
+    <file-user-device-info :devicesinfo.sync="devicesinfo" v-if="show_devices" :show_devices.sync="show_devices" :devicesinfonew.sync="devicesinfo"
                        :f_input_person="f_input_person"    :userinfoid='data.baseinfo.base.f_userinfo_id'></file-user-device-info>
      </div>
 </template>
@@ -109,11 +109,18 @@ export default {
 
       showDevices (index, row) {
         this.devicesinfo = []
-        this.show_devices = true
         this.devicesinfo = row.devicesinfo
         if (row.f_install_person[0]) {
           this.f_input_person = row.f_install_person[0]
         }
+        this.devicesinfo.forEach((row) => {
+          row.devicetypes = this.$appdata.getParam('设备类型')
+          row.pipetypes = []
+          row.pipeways = this.$appdata.getParam('连接方式')
+          row.devicebrands = [{label:'全部', value: '全部'}]
+        })
+        console.log('shebei', this.devicesinfo)
+        this.show_devices = true
         console.log('查看设备信息', this.devicesinfo)
       },
       showFire (index, row) {

package/src/components/charge/business/IOT/IotChangeFill.vue

@@ -196,7 +196,8 @@
         f_userinfo_id: self.row.f_userinfo_id,
         f_address: self.row.f_address,
         f_meter_brand: self.row.f_meter_brand,
-
+        f_meternumber: self.row.f_meternumber,
+        f_card_id: self.row.f_card_id,
         f_old_total_gas: self.row.f_total_gas,
         f_old_total_fee: self.row.f_total_fee,
 

package/src/components/common/userinfo_detail/ic_detail/HandQueryUser.vue

@@ -221,7 +221,12 @@
           'f_detailprice': '结算明细',
           'datas': '用气周期',
           'money1': '违约金',
-          'price1': '单价',
+          'f_stair1price': '一阶单价',
+          'f_stairamount1': '一阶用量',
+          'f_stair2price': '二阶单价',
+          'f_stair2amount': '二阶用量',
+          'f_stair3price': '三阶单价',
+          'f_stair3amount': '三阶用量',
           'f_oughtfee1': '应交金额',
           'f_inputtor': '抄表员',
           'f_input_date': '抄表日期',

package/src/components/common/userinfo_detail/ic_detail/WebHandQueryUser.vue

@@ -206,7 +206,12 @@
           'f_detailprice': '结算明细',
           'datas': '用气周期',
           'money1': '违约金',
-          'price1': '单价',
+          'f_stair1price': '一阶单价',
+          'f_stairamount1': '一阶用量',
+          'f_stair2price': '二阶单价',
+          'f_stair2amount': '二阶用量',
+          'f_stair3price': '三阶单价',
+          'f_stair3amount': '三阶用量',
           'f_oughtfee1': '应交金额',
           'f_inputtor': '抄表员',
           'f_input_date': '抄表日期',

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

@@ -47,14 +47,14 @@
                      placeholder="限购次数">
 
             </div>
-            <div class="col-sm-2 form-group" id="f_limit">
+            <div :class="[model.isshow ? 'col-sm-2 form-group' : 'col-sm-3 form-group']" id="f_limit">
               <!--              <label for="f_limit_times" class=" font_normal_body">限购次数</label>-->
+              <label v-if="model.isshow" class="font_normal_body">{{ f_limit }}</label>
               <v-select
                 v-model="f_limit"
                 :value.sync="f_limit"
                 :options='limites'
-                width="100%"
-                close-on-select>
+                width="80%" v-if="!model.isshow">
               </v-select>
             </div>
             <div class="col-sm-3 form-group" id="f_limit_gas" style="right: 3%;">
@@ -63,7 +63,7 @@
                      v-scale="[model.f_limit_value, 2]"
                      @click="gg()"
                      placeholder="限购气量">
-              <input class="input_search" type="number" v-if="f_limit=='限购金额'"
+              <input class="input_search" style="width:60%" type="number" v-if="f_limit=='限购金额'"
                      v-model="model.f_limit_amount"
                      v-scale="[model.f_limit_amount, 2]"
                      @click="gg()"
@@ -127,9 +127,15 @@
     self.model.f_address = res.data[0].f_address
     self.model.f_user_phone = res.data[0].f_user_phone
     self.model.version = res.data[0].version
-    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.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.isshow = true
+    if (typeof res.data[0].f_limit_type === 'undefined') {
+      self.f_limit = '限购气量'
+    } else {
+      self.f_limit = (res.data[0].f_limit_type === '金额') ? '限购金额' : '限购气量'
+    }
   }
 
   export default {
@@ -159,7 +165,8 @@
           // 限购气量
           f_limit_value: '',
           // 限购金额
-          f_limit_amount: ''
+          f_limit_amount: '',
+          isshow: false
 
         },
         // 编辑控制
@@ -262,7 +269,8 @@
           f_user_phone: '',
           f_comments: '',
           version: null,
-          isblacklist: 'false'
+          isblacklist: 'false',
+          isshow: false
         }
       },
       close () {

package/src/components/revenue/comprehen/wechatpay/wechatValidateManage.vue

@@ -4,16 +4,10 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <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.getorg"-->
-            <!--class="select select_list"-->
-            <!--restype='organization'-->
-            <!--style="width: 60%">-->
-            <!--</res-select>-->
-            <!--</div>-->
-            <div class="col-sm-2  form-group">
+
+<!--            <res-select-group :initres="$parent.$parent.initres" :show-component="['company']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
+
+              <div class="col-sm-2  form-group">
               <label for="startDate"  class="font_normal_body">开始日期</label>
               <datepicker id="startDate" placeholder="开始日期"
                           v-model="model.startDate"  style="width: 60%"
@@ -50,16 +44,7 @@
                 :options='$parent.$parent.letter'
                 close-on-select ></v-select>
             </div>
-            <div class="col-sm-2  form-group">
-              <label  class="font_normal_body" title="操作标识">操作标识</label>
-              <v-select
-                v-model="model.pay_state"
-                placeholder='操作标识'
-                condition="pay_state like '%{}%'"
-                :value.sync="model.pay_state"
-                :options='$parent.$parent.paystate'
-                close-on-select ></v-select>
-            </div>
+
             <div class="span" style="float:right;">
               <button class="button_search button_spacing width-60" @click="search()" v-el:cx>查询</button>
               <div
@@ -71,6 +56,16 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2  form-group">
+              <label  class="font_normal_body" title="操作标识">操作标识</label>
+              <v-select
+                v-model="model.pay_state"
+                placeholder='操作标识'
+                condition="pay_state like '%{}%'"
+                :value.sync="model.pay_state"
+                :options='$parent.$parent.paystate'
+                close-on-select ></v-select>
+            </div>
             <div class="form-group col-sm-2">
               <label class="font_normal_body">终端编号</label>
               <input type="text" class="input_search" style="width:60%"  v-model="model.f_terminal_num" placeholder='终端编号'
@@ -86,9 +81,9 @@
               <input type="text" class="input_search" style="width:60%"  v-model="model.f_user_phone" placeholder='电话'
                      condition="f_user_phone like '{}%'">
             </div>
-            <div class="form-group col-sm-4">
+            <div class="form-group col-sm-2">
               <label class="font_normal_body">客户地址</label>
-              <input type="text" class="input_search" style="width:80%" v-model="model.f_address" placeholder='客户地址'
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_address" placeholder='客户地址'
                      condition="f_address like '%{}%'">
             </div>
             <!--<div class="col-sm-2  form-group">-->
@@ -206,6 +201,10 @@
         criteriaShow: false,
         show: false,
         watchComment: '',
+        orgCondtionStr: '',
+        initres: {
+          org: [this.$login.f.orgid]
+        },
         msgData: []
       }
     },
@@ -228,6 +227,9 @@
         await Vue.resetpost('rs/logic/commonCancel', {data: param}, {resolveMsg: '撤销成功', rejectMsg: '撤销失败'})
         this.$refs.paged.$refs.cri.search()
       },
+      async getRes(condition,obj) {
+        this.orgCondtionStr = condition
+      },
       // 微信单方账单，系统可缴费
       async charge (row) {
           row.f_operator=Vue.$login.f.name,
@@ -279,6 +281,12 @@
       selfSearch (args) {
         this.model.params.startDate = this.$refs.paged.$refs.cri.model.startDate
         this.model.params.endDate = this.$refs.paged.$refs.cri.model.endDate
+        // if (!this.orgCondtionStr) {
+        //   args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        // } else {
+        //   args.condition = `${args.condition}` + this.orgCondtionStr
+        // }
+        args.condition = `${args.condition}` + `and f_orgid = '${this.$login.f.orgid}'`
         this.model.search(args.condition, args.model)
       }
 

package/src/components/revenue/machineHandManage/machineDown.vue

@@ -584,7 +584,7 @@
         msg: '',
         condition: '',
         headers: {'username': Vue.$login.f.name, 'blodid': Vue.$login.guid()},
-        orderDefault: 'f_userinfo_id',
+        orderDefault: 'f_userfiles_id',
         orderFields: {
           f_userinfo_id: 'no'
         },

package/src/filiale/lixianV3/machineHand.vue

@@ -281,9 +281,9 @@
               <th>
                 <nobr>上期结余</nobr>
               </th>
-              <th>
-                <nobr>实际结余</nobr>
-              </th>
+<!--              <th>-->
+<!--                <nobr>实际结余</nobr>-->
+<!--              </th>-->
               <th>
                 <nobr>表号</nobr>
               </th>
@@ -307,6 +307,9 @@
               <th>
                 <nobr>应交金额</nobr>
               </th>
+              <th>
+                <nobr>总欠费金额</nobr>
+              </th>
               <th>
                 <nobr>抄表结果状态</nobr>
               </th>
@@ -379,7 +382,7 @@
             <!--<td>{{row.f_room}}</td>-->
             <td>{{row.belongmonth}}</td>
             <td style="text-align: center;">{{row.f_balance}}</td>
-            <td style="text-align: center;" >{{row.owefee}}</td>
+<!--        <td style="text-align: center;" >{{row.owefee}}</td>-->
 
             <td>{{row.f_meternumber}}</td>
             <td>{{row.f_user_phone}}</td>
@@ -416,7 +419,7 @@
               </div>
             </td>
             <td style="text-align: center;">{{row.f_oughtfee}}</td>
-
+            <td style="text-align: center;">{{row.f_all_oughtfee}}</td>
             <td>
               <div class="form-group" style="margin-bottom:0px;display: contents;" :class="{
                        'has-success has-feedback': !row.error,
@@ -435,6 +438,7 @@
               </div>
             </td>
             <td style="text-align: center;">{{row.f_whether_pay}}</td>
+
             <td>{{row.f_last_input_date}}</td>
             <td>{{row.f_hand_date}}</td>
             <td>
@@ -830,49 +834,49 @@ export default {
       }),
       config: {
 
-        // 导出列要和查询列相同
-        excelHeaders: {
-          'f_user_id': '表编号',
-          'f_meternumber': '表号',
-          'f_inputtor': '抄表员',
-          'f_balance': '上期结余',
-          'owefee': '实际结余',
-          'f_last_input_date': '上次抄表',
-          'f_hand_date': '下发时间',
-          'f_input_date': '抄表日期',
-          'f_userinfo_code': '客户编号',
-          'f_address': '客户地址',
-          'f_residential_area': '小区名称',
-          'f_user_name': '客户姓名',
-          'f_last_tablebase': '上期底数',
-          'f_tablebase': '本期指数',
-          'f_oughtfee': '应交金额',
-          'f_oughtamount': '应交气量',
-          'f_whether_pay': '是否缴费',
-          'f_book_name': '抄表册',
-          'f_meter_book_sort': '册内排序',
-          'f_input_person': '录入人员',
-          'f_operator': '下发人员',
-          'f_meter_classify': '气表分类',
-          'f_meter_style': '气表型号',
-          'f_accounts_state': '下账标识',
-          'f_user_phone': '客户电话',
-          'f_adjustable_id': '表箱号'
+          // 导出列要和查询列相同
+          excelHeaders: {
+            'f_user_id': '表编号',
+            'f_meternumber': '表号',
+            'f_inputtor': '抄表员',
+            'f_balance': '上期结余',
+            'f_last_input_date': '上次抄表',
+            'f_hand_date': '下发时间',
+            'f_input_date': '抄表日期',
+            'f_userinfo_code': '客户编号',
+            'f_address': '客户地址',
+            'f_residential_area': '小区名称',
+            'f_user_name': '客户姓名',
+            'f_last_tablebase': '上期底数',
+            'f_tablebase': '本期指数',
+            'f_oughtfee': '应交金额',
+            'f_oughtamount': '应交气量',
+            'f_whether_pay': '是否缴费',
+            'f_all_oughtfee': '总欠费金额',
+            'f_book_name': '抄表册',
+            'f_meter_book_sort': '册内排序',
+            'f_input_person': '录入人员',
+            'f_operator': '下发人员',
+            'f_meter_classify': '气表分类',
+            'f_meter_style': '气表型号',
+            'f_accounts_state': '下账标识',
+            'f_user_phone': '客户电话',
+            'f_adjustable_id': '表箱号'
+          },
+          examine: true,
+          customCal: false
         },
-        examine: true,
-        customCal: false
-      },
-      meter_state: false, // 是否显示计划下发按钮
-      downModel: {
-        downDate: Vue.$login.toStandardTimeString(),
-        downWay: 'downWithUserfiles',
-        downInputtor: []
-      },
-      inputtorModel: {
-        inputtor: [],
-        reason: ''
-      },
-      auditState: [{label: '全部', value: ''}, {label: '未抄表', value: '未抄表'}, {label: '待审核', value: '待审核'}, {label: '已抄表', value: '已抄表'}],
+        meter_state: false, // 是否显示计划下发按钮
+        downModel: {
+          downDate: Vue.$login.toStandardTimeString(),
+          downWay: 'downWithUserfiles',
+          downInputtor: []
+        },
+        inputtorModel: {
+          inputtor: [],
+          reason: ''
+        },
+        auditState: [{label: '全部', value: ''}, {label: '未抄表', value: '未抄表'}, {label: '待审核', value: '待审核'}, {label: '已抄表', value: '已抄表'}],
 
       plans: [], // 记录当前行是否被勾选
       all: false, // 是否全选