manage-client 3.2.44 → 3.2.48

package/src/filiale/tongchuan/ChargeQuery.vue

@@ -90,7 +90,19 @@
                             condition="f_residential_area in {}"
                             :options='$parent.$parent.residentialArea' placeholder='选择小区'
                             close-on-select>
-
+                  </v-select>
+                </div>
+                <div
+                  class="col-sm-2 form-group">
+                  <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;域</label>
+                  <v-select
+                    v-model="model.f_pcd"
+                    placeholder='选择区域'
+                    :value.sync="model.f_pcd"
+                    :options='$parent.$parent.pcdslist'
+                    condition="f_pcd_id = '{}'"
+                    style="width: 60%"
+                    close-on-select >
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -339,9 +351,9 @@
                   <nobr>客户电话</nobr>
                 </th>
 
-                <th>
-                  <nobr>片区</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>片区</nobr>-->
+<!--                </th>-->
                 <th>
 <!--                  <nobr>客户地址</nobr>-->
                   <data-order field="f_address" name="客户地址"
@@ -372,13 +384,13 @@
                   <nobr>气量</nobr>
                 </th>
                 <th>
-                  <nobr>金额</nobr>
+                  <nobr>气费金额</nobr>
                 </th>
                 <th>
                   <nobr>滞纳金</nobr>
                 </th>
                 <th>
-                  <nobr>燃气费</nobr>
+                  <nobr>应收金额</nobr>
                 </th>
                 <th>
                   <nobr>清缴金额</nobr>
@@ -386,11 +398,9 @@
                 <th>
                   <nobr>预存金额</nobr>
                 </th>
+
                 <th>
-                  <nobr>上期结余</nobr>
-                </th>
-                <th>
-                  <nobr>收款</nobr>
+                  <nobr>实际收款</nobr>
                 </th>
                 <!--<th>-->
 <!--&lt;!&ndash;                  <nobr>所属年月</nobr>&ndash;&gt;-->
@@ -406,6 +416,9 @@
                 <th>
                   <nobr>优惠金额</nobr>
                 </th>
+                <th>
+                  <nobr>上期结余</nobr>
+                </th>
                 <th>
                   <nobr>本期结余</nobr>
                 </th>
@@ -531,9 +544,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_phone}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_zones}}</nobr>
-              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_zones}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
@@ -576,9 +589,7 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_yucun}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr >{{row.f_balance}}</nobr>
-              </td>
+
               <td style="text-align: center;">
                 <nobr>{{row.f_collection}}</nobr>
               </td>
@@ -592,7 +603,9 @@
                 <nobr>{{row.f_privilege_money}}</nobr>
               </td>
 
-
+              <td style="text-align: center;">
+                <nobr >{{row.f_balance}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_curbalance}}</nobr>
 
@@ -717,19 +730,19 @@
               气量合计:&emsp;{{sumsmodel.f_pregas}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              应交金额合计:&emsp;{{sumsmodel.fee}}
+              气费金额合计:&emsp;{{sumsmodel.fee}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               滞纳金合计:&emsp;{{sumsmodel.f_delaypay}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              燃气费合计:&emsp;{{sumsmodel.f_preamount}}
+              应交金额合计:&emsp;{{sumsmodel.f_preamount}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               预存金额合计:&emsp;{{sumsmodel.f_yucun}}
             </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}}
+              实际收款合计:&emsp;{{sumsmodel.f_collection}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               优惠合计:&emsp;{{sumsmodel.f_privilege_money}}
@@ -822,6 +835,7 @@
         endDate1:'',
         resshow:['company','department','operator','slicearea'],
         other:[],
+        pcdslist:[],
 
         footer:[],
         config: {
@@ -999,7 +1013,8 @@
         let HttpReset = new HttpResetClass()
         var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
           data: {
-            condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+           // condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+          condition: `1=1`
           }
         }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
         console.log('小区',data)
@@ -1007,7 +1022,28 @@
         for (let row of data.data){
           house.push({label: row.f_residential_area, value: row.f_residential_area})
         }
+        console.log('开始获取区域')
+        var req = await HttpReset.load('POST','rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_pcd',
+            orderitem: 'id',
+            condition: `1=1`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
         this.residentialArea = house
+        let redata = []
+        console.log('区域是：',req)
+        req.data.forEach((row, n) => {
+          redata[n] = {
+            label: row.f_pcd,
+            value: row.id,
+            data: row,
+            id: row.id
+          }
+        })
+        console.log('获取到的小区',redata)
+        this.pcdslist = redata
       },
       //把数据库查询数据转换为下拉数据
       calculate(rows){