manage-client 4.0.87 → 4.0.88

package/.gradle/buildOutputCleanup/cache.properties

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

package/build/dev-server.js

@@ -33,11 +33,17 @@ var proxyTable = {
     target: 'http://203.57.101.233:9001/'
 
   },
-  '/api/af-revenue/sql/compreQuery': {
+  '/api/af-revenue/sql/WeChatPaydetail': {
     pathRewrite: {
-      '^/api/af-revenue': '/'
+      '^/api/af-revenue': '/rs'
     },
-    target: 'http://127.0.0.1:9026/'
+    target: 'http://127.0.0.1:8080/'
+  },
+  '/api/af-revenue/sql/WeChatPayment': {
+    pathRewrite: {
+      '^/api/af-revenue': '/rs'
+    },
+    target: 'http://127.0.0.1:8080/'
   },
   '/api': {
     target: 'http://192.168.50.67:31567/'

package/package.json

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

package/src/filiale/qianneng/OtherChargeQuery.vue

@@ -128,7 +128,18 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
                          condition="f_card_id = '{}'" placeholder='卡号'>
                 </div>
-
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">收费来源</label>
+                  <v-select id="f_state"
+                            v-model="model.f_charge_source"
+                            placeholder='请选择'
+                            condition="f_charge_source in {}"
+                            multiple="true"
+                            :value.sync="model.f_charge_source"
+                            :options='$parent.$parent.chargesource'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">收费状态</label>
                   <v-select id="f_state"
@@ -154,6 +165,18 @@
                             close-on-select clear-button>
                   </v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">银行名称</label>
+                  <v-select id="f_payment"
+                            v-model="model.f_bank_type"
+                            placeholder='请选择'
+                            multiple="true"
+                            condition="f_bank_type in {}"
+                            :value.sync="model.f_bank_type"
+                            :options='$parent.$parent.banktype'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
                   <v-select :value.sync="model.f_meter_classify" multiple
@@ -199,6 +222,7 @@
                 <th>
                   <nobr>收费编号</nobr>
                 </th>
+
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
@@ -226,6 +250,9 @@
                 <th>
                   <nobr>卡号</nobr>
                 </th>
+                <th>
+                  <nobr>收费来源</nobr>
+                </th>
                 <th>
                   <nobr>收据票号</nobr>
                 </th>
@@ -263,6 +290,9 @@
                 <th>
                   <nobr>付款方式</nobr>
                 </th>
+                <th>
+                  <nobr>银行名称</nobr>
+                </th>
                 <th>
                   <nobr>状态</nobr>
                 </th>
@@ -326,7 +356,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_card_id}}</nobr>
               </td>
-
+              <td style="text-align: center;">
+                <nobr>{{row.f_charge_source}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_bill_number}}</nobr>
               </td>
@@ -363,6 +395,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bank_type}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_state}}</nobr>
               </td>
@@ -695,9 +730,15 @@
       chargeState() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
       },
+      chargesource() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费来源')]
+      },
       metertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
       },
+      banktype() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('银行名称')]
+      },
       payments() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
       }

package/src/filiale/qianneng/exportConfig.js

@@ -89,7 +89,7 @@ export default{
     'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_contact_phone': '安装联系电话', 'f_meter_classify': '气表类型',
     'f_meter_brand': '气表品牌', 'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
     'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量', 'f_money': '应收',
-    'f_collection': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_state': '状态',
+    'f_collection': '收款', 'f_newbalance': '支出', 'f_newcurbalance': '收入', 'f_payment': '付款方式', 'f_bank_type': '银行名称', 'f_state': '状态',
     'f_old_overdue': '违约金', 'f_operate_date': '收费日期', 'f_serial_id': '流水编号', 'f_service_person': '服务人员', 'f_comments': '备注',
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   },

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

@@ -209,7 +209,6 @@
           <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid @dblclick="$parent.$parent.toBusiness">
             <template partial='head'>
               <tr>
-                <th><nobr>审核状态</nobr></th>
                 <th>
                   <!--<nobr>客户编号</nobr>-->
                   <data-order field="f_userinfo_code" name="客户编号"
@@ -221,11 +220,17 @@
                 <th>
                   <nobr>档案编号</nobr>
                 </th>
+                <th>
+                  <nobr>用户电话</nobr>
+                </th>
                 <th>
                   <nobr>付款方式</nobr>
                 </th>
                 <th>
-                  <nobr>气表底数</nobr>
+                  <nobr>上期底数</nobr>
+                </th>
+                <th>
+                  <nobr>本期底数</nobr>
                 </th>
                 <th>
                   <nobr>表上余额</nobr>
@@ -256,9 +261,9 @@
                 <th>
                   <nobr>新表号</nobr>
                 </th>
-                <th>
-                  <nobr>表封号</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>表封号</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>旧气表品牌</nobr>
                 </th>
@@ -271,9 +276,9 @@
                 <th>
                   <nobr>补气金额</nobr>
                 </th>
-                <th>
-                  <nobr>订单编号</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>订单编号</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>备注</nobr>
                 </th>
@@ -299,8 +304,21 @@
                 </th>
                 <th><nobr>旧表类型</nobr></th>
                 <th><nobr>新表类型</nobr></th>
+                <th>
+                  <nobr>上期底数</nobr>
+                </th>
+                <th>
+                  <nobr>本期底数</nobr>
+                </th>
+                <th>
+                  <nobr>换表前气价名称</nobr>
+                </th>
+                <th>
+                  <nobr>换表后气价名称</nobr>
+                </th>
                 <th><nobr>用户类型</nobr></th>
-                <th><nobr>附件</nobr></th>
+                <th><nobr>查看</nobr></th>
+                <th><nobr>审核状态</nobr></th>
                 <th><nobr>审核时间</nobr></th>
                 <th><nobr>审核人</nobr></th>
                 <th><nobr>审核原因</nobr></th>
@@ -308,7 +326,7 @@
             </template>
             <template partial='body'>
               <td style="text-align: center;"><nobr>
-                <button v-if="!row.f_changetables_check_state && $login.r.includes('换表审核')" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.checkData(row)">审核</button>
+                <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>
@@ -320,12 +338,18 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_olduserinfo_code}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_base}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_using_base_old}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_balance_amount}}</nobr>
               </td>
@@ -354,9 +378,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_metertitles}}</nobr>
-              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_metertitles}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_brand_old}}</nobr>
               </td>
@@ -369,9 +393,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_remanent_money}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_serial_number}}</nobr>
-              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_serial_number}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
               </td>
@@ -399,12 +423,28 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meter_type}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_type_old === '机表' ? row.f_meter_base_old : '' }}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{(row.f_meter_type_old === '气量卡表' || row.f_meter_type_old === '机表') ? row.f_meter_base : ''}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_type_old === '机表' ? row.f_used_content : ''}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_type_old === '机表' ? row.f_new_content : ''}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_type}}</nobr>
               </td>
               <td style="text-align: center;"><nobr>
                 <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
               </nobr></td>
+              <td style="text-align: center;"><nobr>
+                <button v-if="!row.f_changetables_check_state && $login.r.includes('换表审核')" 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>{{row.f_changetables_check_date}}</nobr>
               </td>
@@ -472,7 +512,7 @@
     </div>
     <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
       <article slot="modal-body">
-        <upload  :blodid="selected.f_userinfo_id" v-ref:upload :isremark="false" fusetype="换表&清零" ></upload>
+        <upload  :blodid="selected.f_userinfo_id" v-ref:upload :isremark="false" fusetype="换表" ></upload>
       </article>
       <footer slot="modal-footer" class="modal-footer">
       </footer>

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/yangchun/sale'
-import ShanXianwebSaleManage from './filiale/yangchun/webmeterManage'
+import ShanXianSaleManage from './filiale/qianneng/sale'
+import ShanXianwebSaleManage from './filiale/qianneng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'
@@ -45,7 +45,6 @@ all()
 // sale()
 ldap()
 system(false)
-
 saleManage()
 webmeterManage()
 ManageHome()