manage-client 3.2.209 → 3.2.210

package/src/filiale/WEINAN/UserAddressChange.vue

@@ -0,0 +1,58 @@
+<template>
+  <div class="span" style="width: auto;">
+    <p class="bg-info text-center" style="padding: 8px;" >{{'地址变更记录'}}</p>
+    <partial-view v-ref:pv @condition-changed="search">
+      <criteria-paged :model="model" v-ref:paged :pager="false">
+        <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid >
+          <template partial='head'>
+            <tr>
+              <th><nobr>序号</nobr></th>
+              <th><nobr>变更内容</nobr></th>
+              <th><nobr>旧值</nobr></th>
+              <th><nobr>新值</nobr></th>
+              <th><nobr>变更人</nobr></th>
+              <th><nobr>变更日期</nobr></th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center;">{{$index + 1}}</td>
+            <td style="text-align:center">{{row.f_field_name}}</td>
+            <td style="text-align:center">{{row.f_used_content}}</td>
+            <td style="text-align:center">{{row.f_new_content}}</td>
+            <td style="text-align:center">{{row.f_operator}}</td>
+            <td style="text-align:center">{{row.f_operate_date}}</td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </partial-view>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    title: '地址变更列表',
+    data () {
+      return {
+        model: new PagedList('rs/sql/address_singleTableOrderBy',20, {
+          tablename: `'t_address_change'`,items: `'*'`,
+          orderitem: `'f_operate_date desc'`}),
+      }
+    },
+    props: ['address_id'],
+    ready () {
+      this.search()
+    },
+    methods: {
+      search() {
+        this.model.search(`f_address_id = '${this.address_id}'`)
+      }
+    },
+    watch: {
+      'address_id' () {
+        this.search()
+      }
+    }
+  }
+</script>

package/src/filiale/WEINAN/sale.js

@@ -39,7 +39,11 @@ let specialComp = {
   // 购气稽查
   'inspect-list-gas': (resolve) => { require(['./InspectListGas'], resolve) },
   // 档案合并查询
-  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) }
+  'merge-file-query': (resolve) => { require(['./MergeFileQuery.vue'], resolve) },
+  //地址管理
+  'user-address': (resolve) => { require(['./UserAddress.vue'], resolve) },
+  //地址变更记录
+  'user-address-change': (resolve) => { require(['./UserAddressChange.vue'], resolve) },
 }
 exports.specialComp = specialComp
 

package/src/filiale/qianneng/OtherChargeQuery.vue

@@ -239,6 +239,9 @@
                 <th>
                   <nobr>收入</nobr>
                 </th>
+                <th>
+                  <nobr>违约金</nobr>
+                </th>
                 <th>
                   <nobr>付款方式</nobr>
                 </th>
@@ -324,6 +327,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_newcurbalance}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_old_overdue}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_payment}}</nobr>
               </td>
@@ -369,6 +375,9 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               应收合计:&emsp;{{sumsmodel.f_money}}
             </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              违约金合计:&emsp;{{sumsmodel.f_old_overdue}}
+            </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               收款合计:&emsp;{{sumsmodel.f_collection}}
             </td>
@@ -437,7 +446,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0, f_collection: 0,
+        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0, f_old_overdue: 0, f_collection: 0,
           f_newbalance: 0, f_newcurbalance: 0, hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',