manage-client 3.3.239 → 3.3.241

package/src/filiale/hantou/sale.js

@@ -5,4 +5,8 @@ export default function () {
   Vue.component('change-meter-query', (resolve) => {
     require(['./ChangeMeterQuery'], resolve)
   })
+  // 综合档案信息查询
+  Vue.component('record-info-query', (resolve) => {
+    require(['./RecordInfoQuery.vue'], resolve)
+  })
 }

package/src/filiale/kelai/NewAccountQuery.vue

@@ -60,11 +60,10 @@
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                   <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
 
-<!--                  <export-excel :data="$parent.$parent.getCondition"-->
-<!--                                :field="$parent.$parent.getfield"-->
-<!--                                v-if="$parent.$parent.authArr.includes('开户查询导出')"-->
-<!--                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="newAccountQuery" template-name='开户查询导出'-->
-<!--                                :choose-col="true"></export-excel>-->
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="newAccountQuery" template-name='开户查询导出'
+                                :choose-col="true"></export-excel>
 
 <!--                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
                 </div>
@@ -215,8 +214,7 @@
 
 <script>
   import {PagedList} from 'vue-client'
-  import defaultPrint from './../../components/sale/config/DefaultPrint'
-  import exportConfig from './../../components/sale/config/exportConfig'
+  import exportConfig from './exportConfig'
   import plugins from './../../plugins/GetLoginInfoService'
 
   let readySomething = async function (self) {
@@ -251,8 +249,8 @@
         fields: {},
         thead: '',
         tfoot: '',
-        orgCondtionStr: '(' + this.$login.f.orgid + ')',
-        // orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
+        //orgCondtionStr: '(' + this.$login.f.orgid + ')',
+        orgCondtionStr: ``,
         meterbrands: [],
         showinfo:false,
         rowdata:{},
@@ -395,15 +393,9 @@
         return this.$login.r ? this.$login.r : []
       },
       getCondition () {
-        var con = ""
-        if (this.orgCondtionStr) {
-          con = `${this.$refs.paged.$refs.cri.condition} and u.f_orgid in  (${this.orgCondtionStr})`
-        }
-        else {
-          con = `${this.$refs.paged.$refs.cri.condition}and u.f_orgid in ('${this.$login.f.orgid}' )`
-        }
         return {
-          condition: con
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_open_date desc"
         }
       },
       getfield() {

package/src/filiale/kelai/exportConfig.js

@@ -596,9 +596,12 @@ export default{
     'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司'
   },
   NewAccountConfig: {
-    'f_userinfo_code': '用户编号', 'f_user_name': '用户姓名', 'f_user_phone': '用户电话', 'f_idnumber': '身份证号', 'f_address': '客户地址', 'f_price_name': '气价名称',
-    'f_open_date': '开户时间', 'f_meternumber': '表号', 'f_gas_person': '置换员', 'f_gas_date': '通气时间',
-    'f_total_gas': '累购气量', 'f_meter_brand': '气表品牌', 'isbgl': '是否有壁挂炉', 'f_operator': '操作员'
+    'f_userinfo_code': '用户编号',
+    'f_user_name': '用户姓名',
+    'f_user_phone': '用户电话',
+    'f_idnumber': '身份证号',
+    'f_address': '客户地址',
+    'f_open_date': '开户时间'
   },
   Wrongquery: {
     'f_userinfo_code': '用户编号', 'f_meternumber': '表号', 'f_operator_date': '抄表时间', 'f_operator_type': '错误类型', 'f_error_type': '错误原因', 'f_bankname': '银行名称', 'f_msg': '错误信息'

package/src/filiale/yangchun/ChargeQuery.vue

@@ -575,7 +575,10 @@
                   <nobr>抵扣单价</nobr>
                 </th>
                 <th>
-                  <nobr>抵扣金额</nobr>
+                  <nobr>本次抵扣金额</nobr>
+                </th>
+                <th>
+                  <nobr>剩余抵扣金额</nobr>
                 </th>
                 <th v-show="$parent.$parent.$parent.authArr.includes('收费查询票据补打')">
                   <nobr>操作</nobr>
@@ -803,6 +806,9 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_current_deduct_amount }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_remaining_deduct_amount }}</nobr>
+              </td>
               <td style="text-align: center;" v-if="$parent.$parent.$parent.authArr.includes('收费查询票据补打')" ><nobr>
                 <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.batchPrintBill(row,'票据补打')">票据补打</button>
               </nobr></td>

package/src/filiale/yangchun/HandplanQuery.vue

@@ -501,7 +501,10 @@
                   <nobr>抵扣单价</nobr>
                 </th>
                 <th>
-                  <nobr>抵扣金额</nobr>
+                  <nobr>本次抵扣金额</nobr>
+                </th>
+                <th>
+                  <nobr>剩余抵扣金额</nobr>
                 </th>
                 <th>
                   <nobr>附件</nobr>
@@ -665,6 +668,9 @@
               <td style="text-align: center;">
                 <nobr>{{ row.f_current_deduct_amount }}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{ row.f_remaining_deduct_amount }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>
                   <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">

package/src/filiale/yangchun/config/exportConfig.js

@@ -254,7 +254,8 @@ export default {
     'f_residential_area': '小区',
     'f_serial_number': '业务单号',
     'f_gas_type': '抵扣单价',
-    'f_current_deduct_amount': '抵扣金额'
+    'f_current_deduct_amount': '本次抵扣金额',
+    'f_remaining_deduct_amount': '剩余抵扣金额'
   },
   loginQueryConfig: {
     'userid': '登录人编号', 'username': '登录人名称', 'logindate': '登录时间', 'type': '类型'
@@ -840,7 +841,8 @@ export default {
     'f_stair3fee': '三阶气费',
     'f_rest_date': '所属年月',
     'f_gas_type': '抵扣单价',
-    'f_current_deduct_amount': '抵扣金额'
+    'f_current_deduct_amount': '本次抵扣金额',
+    'f_remaining_deduct_amount': '剩余抵扣金额'
   },
   handplanInfoConfig: {
     'f_userinfo_code': '用户号',

package/src/main.js

@@ -6,7 +6,7 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/meihekou/sale'
+import ShanXianSaleManage from './filiale/hantou/sale'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'
 import newmanage from './newmanage'