apply-clients 3.5.6-25 → 3.5.6-27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.5.6-25",
+  "version": "3.5.6-27",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/filiale/jinhuang/pc/Applybatchdispatch.vue

@@ -47,7 +47,7 @@
                               template-name='批量业务信息导出'
                               :choose-col="true"></export-excel>
                 <button v-if="false" class="button_export button_spacing" @click="$parent.$parent.batchdispatch('打印')">批量打印</button>
-                <button v-if="model.defname ==='合同签订'" class="button_export button_spacing" @click="$parent.$parent.batchdispatch('提交')">批量提交</button>
+                <button v-if="model.defname ==='合同签订' || model.defname ==='缴费审核'" class="button_export button_spacing" @click="$parent.$parent.batchdispatch('提交')">批量提交</button>
                 <button v-if="model.defname ==='工程派工' || model.defname ==='点火申请'" class="button_export button_spacing" @click="$parent.$parent.showModal = !$parent.$parent.showModal">批量下派</button>
                 <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
@@ -537,6 +537,7 @@ export default {
         {label: '合同签订', value: '合同签订'},
         {label: '工程派工', value: '工程派工'},
         {label: '点火申请', value: '点火申请'},
+        {label: '缴费审核', value: '缴费审核'}
       ],
       gasNatures: [
         {label: '全部',value: ''},

package/src/filiale/shexian/android/AppExplorationUser.vue

@@ -14,6 +14,7 @@
                       v-model="model.f_residential_area"
                       condition="(u.f_residential_area = '{}' or ua.f_residential_area = '{}')"
                       @change="$parent.$parent.getbuilds"
+                      :value-single="true"
                       close-on-select clear-button>
             </v-select>
             <!--            楼栋-->
@@ -426,18 +427,27 @@
         }
       },
       getbuilds(areas) {
+        // 检查是否为事件对象
+        let selectedValue
+        if (areas && areas.target) {
+          // 如果是事件对象，获取实际的值
+          selectedValue = this.$refs.cp.$refs.cri.model.f_residential_area
+        } else {
+          // 如果是直接传值
+          selectedValue = areas
+        }
         this.buildOptions = []
         this.unitOptions = []
         this.floorOptions = []
         this.$refs.cp.$refs.cri.model.f_building = ''
         this.$refs.cp.$refs.cri.model.f_unit = ''
         this.$refs.cp.$refs.cri.model.f_floor = ''
-        if(areas.length == 0){
+        if(isEmpty(selectedValue)){
           return
         }
         let o = []
         for (const item of this.addressData) {
-          if (item.f_residential_area == areas[0] && item.f_building){
+          if (item.f_residential_area == selectedValue && item.f_building){
             o.push(item.f_building)
           }
         }

package/src/filiale/yangchunboneng/android/AppChargeManagement.vue

@@ -48,7 +48,7 @@
               <p class="col-xs-8 text-left input-font">{{ row.f_confirm_date }}</p>
             </div>
             <div class="row">
-              <button v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && $parent.$parent.isEmpty1(row.f_confirm_person)&& Vue.user.f_role_name.includes('确认收款')" style="background-color:#499edf;float: right"  class="btn btn-info" @click="$parent.$parent.showConfirmModal(row)">确认收款</button>
+              <button v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && $parent.$parent.isEmpty1(row.f_confirm_person) && $parent.$parent.showConfirmrole" style="background-color:#499edf;float: right"  class="btn btn-info" @click="$parent.$parent.showConfirmModal(row)">确认收款</button>
             </div>
           </div>
         </div>
@@ -491,6 +491,9 @@ export default {
     showadd() {
       return Vue.user.f_role_name.includes('报建收费')
     },
+    showConfirmrole() {
+      return Vue.user.f_role_name.includes('确认收款')
+    },
     paymentMethod() {
       return this.$appdata.getParam("付款方式")
     },