apply-clients 4.1.2 → 4.1.3-weinan

package/src/components/product/Process/Processes/chargeManagement.vue

@@ -20,6 +20,7 @@
               <button
                 type="button"
                 class="btn btn-info head-but"
+                v-if="$parent.$parent.mark !== 1"
                 @click="$parent.$parent.showChargeModal()"
               >新增收费</button>
             </th>
@@ -72,16 +73,16 @@
                   type="button"
                   name="button"
                   class="btn btn-link"
-                  :disabled="$parent.$parent.mark === 1 || row.f_charging_status === '作废'"
+                  :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
                   @click="$parent.$parent.showInvalidModal(row)"
                 >作废</button>
 
-                <button
-                  type="button"
-                  name="button"
-                  class="btn btn-link"
-                  @click="$parent.$parent.showPrintModal(row)"
-                >打印预览</button>
+<!--                <button-->
+<!--                  type="button"-->
+<!--                  name="button"-->
+<!--                  class="btn btn-link"-->
+<!--                  @click="$parent.$parent.showPrintModal(row)"-->
+<!--                >打印预览</button>-->
               </nobr>
             </td>
           </tr>
@@ -94,25 +95,25 @@
         <h4 class="modal-title">收费明细</h4>
       </header>
       <article slot="modal-body" class="modal-body clearfix">
-        <div class="form-group col-sm-12" :class="chargeUseraddress ? '':'has-error'" v-if="selectdata.f_apply_type !== '开发商集体报建'">
-          <label class="col-sm-2 control-label">缴费地址：</label>
-          <div class="col-sm-10">
-            <input-select
-              v-model="chargeUseraddress"
-              placeholder='请选择'
-              :value.sync="chargeUseraddress"
-              :options='useraddressList'
-              @change="changeUseraddress()"
-              class="select select_list"
-              :value-single="true"
-              width="100%"
-              close-on-select ></input-select>
-          </div>
-        </div>
+<!--        <div class="form-group col-sm-12" :class="chargeUseraddress ? '':'has-error'" v-if="selectdata.f_apply_type == '散户报建'">-->
+<!--          <label class="col-sm-2 control-label">缴费地址：</label>-->
+<!--          <div class="col-sm-10">-->
+<!--            <input-select-->
+<!--              v-model="chargeUseraddress"-->
+<!--              placeholder='请选择'-->
+<!--              :value.sync="chargeUseraddress"-->
+<!--              :options='useraddressList'-->
+<!--              @change="changeUseraddress()"-->
+<!--              class="select select_list"-->
+<!--              :value-single="true"-->
+<!--              width="100%"-->
+<!--              close-on-select ></input-select>-->
+<!--          </div>-->
+<!--        </div>-->
         <div class="form-group col-sm-12" :class="charge.f_charge_money ? '':'has-error'">
           <label class="col-sm-2 control-label">收费金额：</label>
           <div class="col-sm-10">
-            <input type="number"
+            <input type="input"
                    class="form-control input_view"
                    style="width: 100%"
                    placeholder="0.00"
@@ -146,7 +147,7 @@
           </div>
         </div>
         <div class="form-group col-sm-12"
-          v-if="selectdata.f_apply_type === '散户集体报建' || selectdata.f_apply_type === '煤改气报建'"
+          v-if="selectdata.f_apply_type === '散户集体报建'"
         >
           <label class="col-sm-2 control-label">单价（户）：</label>
           <div class="col-sm-10">
@@ -158,7 +159,7 @@
           </div>
         </div>
         <div class="form-group col-sm-12"
-             v-if="selectdata.f_apply_type === '散户集体报建' || selectdata.f_apply_type === '煤改气报建'"
+             v-if="selectdata.f_apply_type === '散户集体报建'"
         >
           <label class="col-sm-2 control-label">累计缴费金额：</label>
           <div class="col-sm-10">
@@ -170,7 +171,7 @@
           </div>
         </div>
         <div class="form-group col-sm-12"
-             v-if="selectdata.f_apply_type === '散户集体报建' || selectdata.f_apply_type === '煤改气报建'"
+             v-if="selectdata.f_apply_type === '散户集体报建'"
         >
           <label class="col-sm-2 control-label">未结金额：</label>
           <div class="col-sm-10">
@@ -232,16 +233,6 @@
         <h4 class="modal-title">作废收费</h4>
       </header>
       <article slot="modal-body" class="modal-body clearfix">
-        <div class="form-group col-sm-12" v-if="selectdata.f_apply_type !== '开发商集体报建'">
-          <label class="col-sm-2 control-label">缴费地址：</label>
-          <div class="col-sm-10">
-            <input type="text"
-                   class="form-control input_view"
-                   style="width: 100%"
-                   readonly
-                   v-model="charge.f_useraddress" />
-          </div>
-        </div>
         <div class="form-group col-sm-12">
           <label class="col-sm-2 control-label">收费金额：</label>
           <div class="col-sm-10">
@@ -391,10 +382,10 @@ export default {
       this.charge.f_amount_words = this.smalltoBIG(e.target.value)
     },
     async saveCharge() {
-      if (isEmpty(this.charge.f_useraddress_id) && this.selectdata.f_apply_type !== '开发商集体报建') {
-        this.$showAlert('请选择缴费的地址信息！！！', 'warning', 3000)
-        return
-      }
+      // if (isEmpty(this.charge.f_useraddress_id) && this.selectdata.f_apply_type == '散户报建') {
+      //   this.$showAlert('请选择缴费的地址信息！！！', 'warning', 3000)
+      //   return
+      // }
       if (Number(this.charge.f_charge_money) === 0 || isEmpty(this.charge.f_charge_money)) {
         this.$showAlert('单笔收费不能为0元！！！', 'warning', 3000)
         return
@@ -403,16 +394,16 @@ export default {
         this.$showAlert('单笔收费不能超过未交总金额！！！', 'warning', 3000)
         return
       }
-      if (this.selectdata.f_apply_type === '散户集体报建' || this.selectdata.f_apply_type === '煤改气报建') {
-        if (Number(this.charge.f_charge_money) > Number(this.selectdata.f_price)) {
-          this.$showAlert('单笔收费不能超过单价！！！', 'warning', 3000)
-          return
-        }
-        if (Number(this.charge.f_charge_money) > Number(this.outstandingAmount)) {
-          this.$showAlert('单笔收费不能超过当前用户未结金额！！！', 'warning', 3000)
-          return
-        }
-      }
+      // if (this.selectdata.f_apply_type === '散户集体报建' || this.selectdata.f_apply_type === '散户报建') {
+      //   if (Number(this.charge.f_charge_money) > Number(this.selectdata.f_price)) {
+      //     this.$showAlert('单笔收费不能超过单价！！！', 'warning', 3000)
+      //     return
+      //   }
+      //   if (Number(this.charge.f_charge_money) > Number(this.outstandingAmount)) {
+      //     this.$showAlert('单笔收费不能超过当前用户未结金额！！！', 'warning', 3000)
+      //     return
+      //   }
+      // }
       if (isEmpty(this.charge.f_payment_method)) {
         this.$showAlert('请选择付款方式！！！', 'warning', 3000)
         return
@@ -432,8 +423,6 @@ export default {
       } catch (e) {
         this.$showAlert(e.data, 'danger', 3000)
       }
-
-
       this.$dispatch('breakControl', this.selectdata)
     },
     // 金额转大写
@@ -474,7 +463,7 @@ export default {
       })
 
       this.useraddressList = res.data
-      if (this.selectdata.f_apply_type === '散户集体报建' || this.selectdata.f_apply_type === '煤改气报建') {
+      if (this.selectdata.f_apply_type === '开发商集体报建' || this.selectdata.f_apply_type === '散户报建') {
         // 去除累计缴费金额大于等于单价的用户地址
         this.useraddressList = res.data.filter(item => {
           let f_cumulative_payment_money = isEmpty(item.f_cumulative_payment_money) ? 0 : item.f_cumulative_payment_money
@@ -494,6 +483,11 @@ export default {
 
     },
     async showChargeModal() {
+      let http = new HttpResetClass()
+       await http.load('POST', 'rs/entity/t_apply', {data:this.selectdata}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       this.getUserAddress()
 
       this.showCharge = true