manage-client 4.0.88 → 4.0.89-linshi

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "4.0.88",
+    "version": "4.0.89-linshi",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/filiale/qianneng/GasLossQuery.vue

@@ -87,6 +87,14 @@
                             condition="f_payment in {}"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="参数:收费状态">收费状态</label>
+                  <v-select :value.sync="model.f_state"
+                            v-model="model.f_state"
+                            :options='$parent.$parent.paymentState' placeholder='请选择'
+                            condition="f_state = '{}'"
+                            close-on-select></v-select>
+                </div>
 
               </div>
             </div>
@@ -135,6 +143,9 @@
                 <th>
                   <nobr>支付单号</nobr>
                 </th>
+                <th>
+                  <nobr>收费状态</nobr>
+                </th>
                 <th>
                   <nobr>详情</nobr>
                 </th>
@@ -196,6 +207,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_pay_id}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.detail}}</nobr>
               </td>
@@ -570,6 +584,9 @@
       payment() {
         return [{label: '全部', value: ''},...this.$appdata.getParam('付款方式查询')]
       },
+      paymentState() {
+        return [{label: '全部', value: ''},...this.$appdata.getParam('收费状态')]
+      },
       gaslosstypes() {
         return [{label: '全部', value: ''},...this.$appdata.getParam('气损分类')]
       }

package/src/filiale/qianneng/exportConfig.js

@@ -77,7 +77,7 @@ export default{
     'f_number': '数量', 'f_unitprice': '单价', 'f_collection': '金额',
     'f_payment': '付款方式', 'f_bill_style': '打印格式',
     'f_serial_id': '流水号', 'f_pay_id': '支付单号', 'detail': '详细信息', 'f_charge_date': '缴费日期',
-    'f_orgname': '公司', 'f_depname': '部门', 'f_operator': '操作员'
+    'f_orgname': '公司', 'f_depname': '部门', 'f_operator': '操作员', 'f_state': '收费状态'
   },
   batchBankConfig2: {
     'f_userinfo_code': '客户编号', 'f_userinfo_id': '用户编号', 'phone': '客户电话', 'f_user_name': '客户姓名', 'f_address': '客户地址',

package/src/filiale/rongcheng/DeviceQuery.vue

@@ -72,13 +72,14 @@
                             condition="f_meternumber like '%{}%'" placeholder='所属表(表号)'>
                   </div>
 
-                  <div class="col-sm-2 form-group" >
-                    <label class="font_normal_body">设备类型</label>
+                  <div class="col-sm-2 form-group">
+                    <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='请选择'
+                              :options='$parent.$parent.devicestype' placeholder='请选择'
                               condition="f_devices_type = '{}'"
-                              close-on-select></v-select>
+                              close-on-select :search="false">
+                    </v-select>
                   </div>
                   <div class="col-sm-2 form-group" >
                     <label class="font_normal_body">购买方式</label>
@@ -226,15 +227,6 @@
                     </v-select>
                   </div>
                   <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body" >设备类型</label>
-                    <v-select :value.sync="model.f_devices_type"
-                              v-model="model.f_devices_type"
-                              :options='$parent.$parent.devicestype' placeholder='请选择'
-                              condition="f_devices_type = '{}'"
-                              close-on-select :search="false">
-                    </v-select>
-                  </div>
                 </div>
               </div>
             </criteria>

package/src/filiale/rongcheng/businessquery/ChangeMeterQuery.vue

@@ -325,10 +325,6 @@
               </tr>
             </template>
             <template partial='body'>
-              <td style="text-align: center;"><nobr>
-                <button v-if="!row.f_changetables_check_state && $login.r.includes('换表审核') && row.f_state !== '终止'" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.checkData(row)">审核</button>
-                <span v-if="row.f_changetables_check_state">{{row.f_changetables_check_state}}</span>
-              </nobr></td>
               <td style="text-align: center;"><nobr>
                 <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
               </nobr> </td>

package/src/filiale/rongcheng/exportConfig.js

@@ -199,7 +199,7 @@ export default {
     'f_sendsuccess': '表同步状态',
     'f_has_bjq': '是否安装报警器',
     'f_has_qdf': '是否有切断阀',
-    'f_has_zbq': '是否有自闭阀'
+    'f_has_zbf': '是否有自闭阀'
   },
 
   changemeterConfig: {

package/src/main.js

@@ -6,8 +6,8 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/qianneng/sale'
-import ShanXianwebSaleManage from './filiale/qianneng/webmeterManage'
+import ShanXianSaleManage from './filiale/rongcheng/sale'
+import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Tue Apr 15 16:40:30 CST 2025
-gradle.version=8.5