apply-clients 3.4.94 → 3.4.96

package/src/filiale/yangchunboneng/pc/chargeManagement.vue

@@ -23,6 +23,8 @@
           <th class="textNoLineBreak">作废原因</th>
           <th class="textNoLineBreak">确认人</th>
           <th class="textNoLineBreak">确认时间</th>
+          <th class="textNoLineBreak">审核人</th>
+          <th class="textNoLineBreak">审核时间</th>
           <th class="textNoLineBreak">
             <button
               type="button"
@@ -95,15 +97,31 @@
           <td style="text-align: center;">
             <nobr>{{row.f_confirm_date}}</nobr>
           </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_auditor_person}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_auditor_date}}</nobr>
+          </td>
           <td style="text-align: center;">
             <nobr v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && row.f_confirm_person==null">
               <button
                 type="button"
                 name="button"
                 class="btn btn-link"
-                @click="$parent.$parent.showConfirmModal(row)"
+                :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
+                @click="$parent.$parent.showConfirmModal(row,'确认收款')"
               >确认收款</button>
           </nobr>
+            <nobr v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && row.f_confirm_person!=null&& row.f_auditor_person==null">
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
+                @click="$parent.$parent.showConfirmModal(row,'确认审核')"
+              >确认审核</button>
+            </nobr>
             <nobr v-if="row.f_charge_status !== '退款'">
               <button
                 type="button"
@@ -145,6 +163,19 @@
                 close-on-select ></input-select>
             </div>
           </div>
+<!--          <div class="form-group col-sm-12" :class="[$v.paymentterm.required ? 'has-error' : '']">
+            <label class="col-sm-2 control-label">收费项目：</label>
+            <div class="col-sm-10">
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.paymentterm.selectedItems" v-validate:paymentterm='{required: true }'>
+              <v-select width="100%"  class="select select_list" placeholder='请选择'
+                            v-model="charge.f_payment_term"
+                            :value.sync="charge.f_payment_term"
+                            :options='paymentTerm'
+                            :multiple="true"
+                            v-ref:paymentterm
+                             ></v-select>
+            </div>
+          </div>-->
           <div class="form-group col-sm-12" :class="[$v.f_payment_term.required ? 'has-error' : '']">
             <label class="col-sm-2 control-label">收费项目：</label>
             <div class="col-sm-10">
@@ -484,6 +515,124 @@
         <button type="button" class="btn btn-primary"  @click="ConfirmPayment()">确认收款</button>
       </footer>
     </modal>
+    <modal v-if="showauditor" :show.sync="showauditor" v-ref:modal :backdrop="false" title="确认审核">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+        <h4 class="modal-title">确认审核</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div class="form-group col-sm-12" v-if="false">
+          <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_useraddres" />
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <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_charge_money" />
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <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_payment_method" />
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <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_amount_words" />
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <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_charge_collectors" />
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <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_confirm_person" />
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">确认时间：</label>
+          <div class="col-sm-10">
+            <datepicker id="startDate" placeholder="确认时间"
+                        style="width: 60%!important;"
+                        v-model="charge.f_confirm_date"
+                        :value.sync="charge.f_confirm_date"
+                        readonly
+                        disabled
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true"
+            >
+            </datepicker>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">审核人：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   v-model="charge.f_auditor_person" />
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">审核时间：</label>
+          <div class="col-sm-10">
+            <datepicker id="startDate" placeholder="确认时间"
+                        style="width: 60%!important;"
+                        v-model="charge.f_auditor_date"
+                        :value.sync="charge.f_auditor_date"
+                        :default="true"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true"
+            >
+            </datepicker>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">备注：</label>
+          <div class="col-sm-10">
+            <input type="text"
+                   class="form-control input_view"
+                   style="width: 100%"
+                   v-model="charge.f_charge_remarks" />
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary"  @click="ConfirmPayment()">确认收款</button>
+      </footer>
+    </modal>
     <modal v-if="showPrint" :show.sync="showPrint" v-ref:modal :large="true" :backdrop="false" title="打印预览">
       <header slot="modal-header" class="modal-header">
         <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
@@ -521,6 +670,7 @@ export default {
       showInvalid: false, // 作废
       showPrint: false,   // 打印
       showConfirm: false, // 确认收款
+      showauditor: false, // 确认审核
       person:this.$login.f.name,
       model: {
         data: null
@@ -594,31 +744,84 @@ export default {
       }
       let res = await http.load('POST', 'rs/logic/confirmCharge', {data: data}, {
         resolveMsg: null,
-        rejectMsg: '确认收款失败！！！'
+        rejectMsg: '提交失败！！！'
       })
       if(res.data==200){
-        this.$showAlert('确认收款成功！！！', 'success', 3000)
+        this.$showAlert('提交成功！！！', 'success', 3000)
        //延时1s
         setTimeout(() => {
           this.showConfirm= false
+          this.showauditor= false
         }, 1000)
       }
      //重新查询
       this.search()
+      this.getbutton()
+    },
+    async getbutton(){
+      var defname = this.selectdata.defname
+      var processId = this.selectdata.f_process_id
+      let data = {
+        condition: `tc.f_process_id = '${processId}' and tc.defname = '${defname}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/getPaymentRatio`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '查询失败！！！'}
+      )
+      if(res.data.length!==0){
+        var f_due_money= res.data[0].f_due_money
+        var cumulative= res.data[0].f_charge_money
+        if (Number(f_due_money) == Number(cumulative)) {
+          let flag = true
+          let res1 = await http.load(
+            'POST',
+            `rs/sql/getfeeconfirmation`,
+            {data: data},
+            {resolveMsg: null, rejectMsg: '查询失败！！！'}
+          )
+          for (let i =0;i<res1.data.length;i++){
+            if (isEmpty(res1.data[i].f_confirm_person)  || isEmpty(res1.data[i].f_auditor_person)){
+              flag = false
+            }
+          }
+        if (flag){
+          let show_data = this.selectdata
+          show_data.user = this.$login.f
+          show_data.start_activity ='报装申请'
+          show_data.xmlfilename =this.selectdata.f_apply_type
+          show_data.button = {button_name:'提交'}
+          await this.$resetpost(
+            `rs/logic/ApplyProductService`,
+            {data: show_data},
+            {resolveMsg: null, rejectMsg: '数据保存失败'}
+          )
+         }
+        }
+      }
     },
     // 打开作废收费
     showInvalidModal(row) {
       this.charge = row
       this.showInvalid = true
     },
-    showConfirmModal(row){
+    showConfirmModal(row,type){
       this.charge = row
-      this.charge.f_confirm_person=this.person
-      this.showConfirm= true
+      if (type == '确认收款'){
+        this.charge.f_confirm_person=this.person
+        this.showConfirm= true
+      }
+      if (type == '确认审核'){
+        this.charge.f_auditor_person=this.person
+        this.showauditor= true
+      }
     },
     // 新增收费
     async saveCharge() {
       let http = new HttpResetClass()
+      this.charge.defname = this.selectdata.defname
       let data = {
         apply: this.selectdata,
         user: this.$login.f,
@@ -759,6 +962,7 @@ export default {
       this.showInvalid = false
       this.showPrint = false
       this.showConfirm = false
+      this.showauditor = false
       this.charge = {}
       this.search()
     }