apply-clients 3.5.4-2 → 3.5.4-21

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

@@ -43,28 +43,25 @@
                 type="button"
                 name="button"
                 class="btn btn-link"
-                :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
+                :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废' || row.f_back_state==='已退费' "
                 @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"
                 name="button"
                 class="btn btn-link"
-                :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
+                :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废' || row.f_back_state==='已退费'"
                 @click="$parent.$parent.showInvalidModal(row)"
               >作废</button>
-
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废' || row.f_back_state==='已退费'"
+                @click="$parent.$parent.showBackdModal(row)"
+              >退费</button>
               <button
                 type="button"
                 name="button"
@@ -588,6 +585,76 @@
         <button type="button" class="btn btn-primary" @click="print()">打印</button>
       </footer>
     </modal>
+    <modal v-if="showback" :show.sync="showback" 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" :class="charge.f_void_remarks ? '':'has-error'">
+          <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_void_remarks" />
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-primary" :disabled="!charge.f_void_remarks" @click="backApplyCharge()">确认退费</button>
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -609,6 +676,7 @@ export default {
   },
   data () {
     return {
+      showback: false,
       showCharge: false,  // 收费明细
       showInvalid: false, // 作废
       showPrint: false,   // 打印
@@ -669,6 +737,20 @@ export default {
         this.charge.f_outstanding_amount = this.selectdata.f_price
       }
     },
+    async backApplyCharge() {
+      let http = new HttpResetClass()
+      let data = {
+        apply: this.selectdata,
+        user: this.$login.f,
+        charge: this.charge
+      }
+      let res = await http.load('POST', 'rs/logic/backApplyCharge', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '退费失败！！！'
+      })
+      this.selectdata = res.data
+      this.$dispatch('breakControl', this.selectdata)
+    },
     async invalidApplyCharge() {
 
       let http = new HttpResetClass()
@@ -757,6 +839,10 @@ export default {
       this.charge = row
       this.showInvalid = true
     },
+    showBackdModal(row) {
+      this.charge = row
+      this.showback= true
+    },
     showConfirmModal(row,type){
       this.charge = row
       if (type == '确认收款'){
@@ -920,6 +1006,7 @@ export default {
     },
     // 关闭对话框
     closeModal() {
+      this.showback = false
       this.showCharge = false
       this.showInvalid = false
       this.showPrint = false

package/src/filiale/yangchunboneng/pc.js

@@ -12,7 +12,12 @@ let specialComp = {
   'add-material-science': (resolve) => { require(['./pc/addMaterialScience.vue'], resolve) },
   'apply-devices-management': (resolve) => { require(['./pc/devicesManagement.vue'], resolve) },
   'service-view': (resolve) => { require(['./pc/ServiceView.vue'], resolve) },
+  'supervisory-service-view': (resolve) => { require(['./pc/SupervisoryServiceView'], resolve) },
   'other-charge-management': (resolve) => { require(['./pc/otherchargeManagement.vue'], resolve) },
-  'supervisory-list': (resolve) => { require(['./pc/SupervisoryList.vue'], resolve) }
+  'supervisory-service-control': (resolve) => { require(['./pc/SupervisoryServiceControl'], resolve) },
+  'supervisory-service-control-new': (resolve) => { require(['./pc/SupervisoryServiceControlNew'], resolve) },
+  'supervisory-list': (resolve) => { require(['./pc/SupervisoryList.vue'], resolve) },
+  'supervisory-list-new': (resolve) => { require(['./pc/SupervisoryListNew.vue'], resolve) },
+  'supervisory-control-new': (resolve) => { require(['./pc/SupervisoryControlNew'], resolve) }
 }
 exports.specialComp = specialComp

package/src/main.js

@@ -1,23 +1,23 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import {ldap} from 'ldap-clients'
-import {system} from 'system-clients'
-import {sale} from 'sale-client'
-import {material} from 'material-client'
-
-import apply from './apply'
-
-all()
-apply('qianneng')
-ldap()
-sale('qianneng')
-material()
-system(false, 'qianneng')
-
-require('system-clients/src/styles/less/bootstrap.less')
-require('./expandcss.less')
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import {ldap} from 'ldap-clients'
+import {system} from 'system-clients'
+import {sale} from 'sale-client'
+import {material} from 'material-client'
+
+import apply from './apply'
+
+all()
+apply('qianneng')
+ldap()
+sale('qianneng')
+material()
+system(false, 'qianneng')
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('./expandcss.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})