manage-client 3.3.249 → 3.3.250

package/package.json

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

package/src/filiale/WEINAN/UserGasAll.vue

@@ -167,13 +167,6 @@
                               close-on-select
                               condition="f_house_type = '{}'"></v-select>
                   </div>
-                  <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">安装位置</label>
-                    <v-select :value.sync="model.f_position" v-model="model.f_position"
-                              :options='$parent.$parent.positions' placeholder='请选择'
-                              condition="f_position = '{}'"
-                              close-on-select></v-select>
-                  </div>
                   <div class="col-sm-2 form-group  flex-row" style="white-space: nowrap">
                     <label class="font_normal_body">期末结余</label>
                     <div class="row">
@@ -249,6 +242,9 @@
                   <th style="text-align:center">
                     <nobr>表号</nobr>
                   </th>
+                  <th style="text-align:center">
+                    <nobr>用气类型</nobr>
+                  </th>
                   <th style="text-align:center">
                     <nobr>用气性质</nobr>
                   </th>
@@ -303,6 +299,9 @@
               <template partial='body'>
                 <td>{{row.f_userinfo_code}}</td>
                 <td style="text-align:center">{{row.f_meternumber}}</td>
+                <td>
+                  <nobr>{{row.f_user_usetype}}</nobr>
+                </td>
                 <td style="text-align:center">{{row.f_gasproperties}}</td>
                 <td style="text-align:center">{{row.f_user_phone}}</td>
                 <!--<td style="text-align:center">{{row.f_gasproperties2}}</td>-->
@@ -424,6 +423,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
             'f_user_type':'客户类型',
             'f_gasproperties': '用气性质',
             'f_user_name': '客户名称',
+            'f_user_usetype': '用气类型',
             'f_user_phone':'客户电话',
             'f_residential_area': '小区',
             'f_price':'用气单价',

package/src/filiale/yangchun/OtherChargeQuery.vue

@@ -190,6 +190,14 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_bill_number_end"
                          condition="f_bill_number <= '{}'" placeholder="收据终止编号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">审核状态</label>
+                  <v-select :value.sync="model.f_audit_state"
+                            v-model="model.f_audit_state"
+                            :options='$parent.$parent.auditState' placeholder='请选择'
+                            condition="f_audit_state in {}"
+                  ></v-select>
+                </div>
               </div>
             </div>
           </criteria>
@@ -297,7 +305,11 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
+                <th>
+                  <nobr>审核状态</nobr>
+                </th>
                 <th><nobr>附件</nobr></th>
+                <th><nobr>操作</nobr></th>
                 <!--<th><nobr>查看详情</nobr></th>-->
               </tr>
             </template>
@@ -397,9 +409,15 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_audit_state}}</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 class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.confirmPay(row)">确认收款</button>
+              </nobr></td>
               <!--<td style="text-align: center;">-->
                 <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showchargedetail(row)">查看</button>-->
               <!--</td>-->
@@ -528,6 +546,20 @@
       })
     },
     methods: {
+      confirmPay(row){
+        console.log('---------',row)
+        this.otherchargeid = row.f_othercharge_id
+        this.$showMessage('是否确认收款?', ['confirm', 'cancel']).then(
+          (response) => {
+            if (response === 'confirm') {
+              let sql = `update t_othercharge set f_audit_state = '审核通过' where id = '${row.id}'`
+              let updateData = this.$resetpost('api/af-revenue/logic/runSQL', {data: {sql: sql}}, {resolveMsg: '已确认', rejectMsg: '审核失败!!!'})
+              this.search()
+            } else if (response === 'cancel') {
+              this.$dispatch('cancel')
+            }
+          })
+      },
       view(row){
         this.showupload = true
         this.selected= row
@@ -749,7 +781,10 @@
       },
       payments() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+      },
+      auditState() {
+        return [{label: '全部', value: ''}, {label: '未审核', value: '未审核'}, {label: '审核通过', value: '审核通过'}]
+        }
       }
-    }
   }
 </script>