apply-clients 3.1.36 → 3.1.37

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -1,203 +1,203 @@
-<template>
-  <div>
-    <div style="height: 20px; padding-left: 20px" v-if="print_dispatch && this.data.title == '派工单'">
-      <button type="button" class="btn btn-info head-but" @click="printDispatch()" v-el:cx>打印派工单</button>
-    </div>
-    <service-view :data="data" v-if="showview" v-ref:serviceview></service-view>
-
-    <!--派工单-->
-    <dispatch-list :selectdata="selectdata" v-if="dispatchlist"></dispatch-list>
-    <!-- 终止报建 -->
-    <stop-install :selectdata="selectdata" v-if="showstop"></stop-install>
-    <!-- 报建缴费 -->
-    <apply-charge-management :selectdata="selectdata" v-if="applycharge"></apply-charge-management>
-
-    <apply-record-cancel :selectdata="selectdata" v-if="showcancel"></apply-record-cancel>
-  </div>
-</template>
-<script>
-  import {HttpResetClass} from 'vue-client'
-  import Vue from "vue";
-  export default {
-    title: '报建功能业务控制层',
-    props: ['selectdata','funcdata'],
-    data () {
-      return {
-        data: null,
-        showview: false, // 控制通用页面
-        showstop: false, // 控制终止
-        showcancel: false, // 控制撤销
-        dispatchlist: false,//派工单
-        print_dispatch: true,
-        applycharge: false // 报建缴费
-      }
-    },
-    ready () {
-      this.hasChange()
-    },
-    methods: {
-      // json配置数据处理 比如下拉框的options
-      async initializtion() {
-        // selectdata 填充 data
-        let temp = Object.assign({},this.data,this.selectdata)
-        temp.fields.forEach(item => {
-          if (this.selectdata[item.field]) {
-            item.value = this.selectdata[item.field]
-          } else {
-            item.value = ''
-          }
-          // 如果配置类型为select,获取options
-          if(item.type ==='select'){
-            item.options = this.$appdata.getParam(item.label)
-          }
-        })
-
-
-        // onetomany 数据获取
-        if (this.data.onetomany) {
-          for (let index = 0; index < this.data.onetomany.length; index++) {
-            let http = new HttpResetClass()
-            let data = {
-              tablename: this.data.onetomany[index].tables[0],
-              condition: `f_process_id='${this.selectdata.f_process_id}'`
-            }
-
-            let res = await http.load('POST', 'rs/sql/applysingleTable', {data: data}, {
-              resolveMsg: null,
-              rejectMsg: 'onetomany查询失败'
-            })
-
-            // 初始化 onetomany
-            this.data.onetomany[index].rows = res.data
-
-            // 初始化onetomany中的fields
-            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
-              // 如果配置类型为select,优先从参数列表获取options
-              if (this.data.onetomany[index].fields[j].type === 'select') {
-                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                if (temp && temp.length > 0) {
-                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                }
-              }
-            }
-
-          }
-        }
-
-        this.data = JSON.parse(JSON.stringify(this.data))
-
-        this.$nextTick(() => {
-          this.showview = true
-        })
-      },
-      // 功能组件显示控制
-      hasChange(){
-        if(this.funcdata.fields) {
-          this.data = this.funcdata
-          // 初始化要展示的数据结构
-          this.initializtion()
-          this.showview = true
-          this.showstop = false
-          this.showcancel = false
-        }
-        if (this.funcdata.title === '终止报建' && !this.funcdata.fields) {
-          this.showview = false
-          this.showstop = true
-          this.showcancel = false
-        }
-        if (this.funcdata.title === '撤销' && !this.funcdata.fields) {
-          this.showview = false
-          this.showstop = false
-          this.showcancel = true
-        }
-        if (this.funcdata.title === '派工单' && !this.funcdata.fields) {
-          this.showview = false
-          this.dispatchlist = true
-          this.showcancel = false
-        }
-        if (this.funcdata.title === '报建缴费' && !this.funcdata.fields) {
-          this.showview = false
-          this.applycharge = true
-          this.showcancel = false
-        }
-
-      },
-      // 打印派工单
-      async printDispatch() {
-        this.print_dispatch = false
-        this.showview = false
-        this.dispatchlist = true
-      }
-    },
-    events: {
-      // 获取view层button事件
-      async 'button' (model){
-        model = Object.assign({}, this.selectdata, model)
-        // 下发，提交，保存，退回都在后台处理
-        let http = new HttpResetClass();
-        http.load('POST','rs/entity/t_apply',model, {resolveMsg: null, rejectMsg: '数据保存失败'})
-          .then(res => {
-            this.$dispatch('query')
-          })
-      },
-      // onetomany模态框默认监听监听事件
-      async 'onetomanydelete'(i, j) {
-        console.log('默认删除')
-        let http = new HttpResetClass()
-        let data = {
-          table: this.data.onetomany[i].tables[0],
-          row: this.data.onetomany[i].rows[j]
-        }
-        let res = await http.load('POST', 'rs/logic/onetomanyDefaultDeleteEvent', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: '删除失败'
-        })
-
-        if (res.data <= 0){
-          this.$showMessage('删除失败')
-          return
-        }
-
-        this.$dispatch('selfsearch')
-        this.$refs.serviceview.data.onetomany[i].rows.splice(j, 1)
-      },
-      async 'onetomanyadd'(inedx) {
-        let data = {
-          f_process_id : this.selectdata.f_process_id,
-          f_operator: this.$login.f.name,
-          f_operation_date: new Date().Format("yyyy-MM-dd HH:mm:ss"),
-          f_company: this.$login.f.orgs
-        }
-        this.data.onetomany[inedx].fields.forEach(item => {
-          data[item.field] = item.value
-        })
-        let res = await this.$resetpost(
-          `rs/entity/${this.data.onetomany[inedx].tables[0]}`,
-          data
-        )
-        // this.data.onetomany[inedx].rows.push(data)
-        this.$dispatch('selfsearch')
-        this.$refs.serviceview.data.onetomany[inedx].rows.push(data)
-      },
-      async 'onetomanyupdate'(i, j) {
-        let onetomany = this.data.onetomany[i]
-        let data = onetomany.rows[j]
-
-        onetomany.fields.forEach(item => {
-          data[item.field] = item.value
-        })
-        let res = await this.$resetpost(
-          `rs/entity/${this.data.onetomany[i].tables[0]}`,
-          data
-        )
-        this.$dispatch('selfsearch')
-        this.$refs.serviceview.data.onetomany[i].rows.splice(j,1,data)
-      },
-      // onetomany模态框监听事件
-      async 'check_modal'(index) {},
-      async 'oninput_modal'(index) {}
-    },
-    watch:{
-    }
-  }
-</script>
+<template>
+  <div>
+    <div style="height: 20px; padding-left: 20px" v-if="print_dispatch && this.data.title == '派工单'">
+      <button type="button" class="btn btn-info head-but" @click="printDispatch()" v-el:cx>打印派工单</button>
+    </div>
+    <service-view :data="data" v-if="showview" v-ref:serviceview></service-view>
+
+    <!--派工单-->
+    <dispatch-list :selectdata="selectdata" v-if="dispatchlist"></dispatch-list>
+    <!-- 终止报建 -->
+    <stop-install :selectdata="selectdata" v-if="showstop"></stop-install>
+    <!-- 报建缴费 -->
+    <apply-charge-management :selectdata="selectdata" v-if="applycharge"></apply-charge-management>
+
+    <apply-record-cancel :selectdata="selectdata" v-if="showcancel"></apply-record-cancel>
+  </div>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+  import Vue from "vue";
+  export default {
+    title: '报建功能业务控制层',
+    props: ['selectdata','funcdata'],
+    data () {
+      return {
+        data: null,
+        showview: false, // 控制通用页面
+        showstop: false, // 控制终止
+        showcancel: false, // 控制撤销
+        dispatchlist: false,//派工单
+        print_dispatch: true,
+        applycharge: false // 报建缴费
+      }
+    },
+    ready () {
+      this.hasChange()
+    },
+    methods: {
+      // json配置数据处理 比如下拉框的options
+      async initializtion() {
+        // selectdata 填充 data
+        let temp = Object.assign({},this.data,this.selectdata)
+        temp.fields.forEach(item => {
+          if (this.selectdata[item.field]) {
+            item.value = this.selectdata[item.field]
+          } else {
+            item.value = ''
+          }
+          // 如果配置类型为select,获取options
+          if(item.type ==='select'){
+            item.options = this.$appdata.getParam(item.label)
+          }
+        })
+
+
+        // onetomany 数据获取
+        if (this.data.onetomany) {
+          for (let index = 0; index < this.data.onetomany.length; index++) {
+            let http = new HttpResetClass()
+            let data = {
+              tablename: this.data.onetomany[index].tables[0],
+              condition: `f_process_id='${this.selectdata.f_process_id}'`
+            }
+
+            let res = await http.load('POST', 'rs/sql/applysingleTable', {data: data}, {
+              resolveMsg: null,
+              rejectMsg: 'onetomany查询失败'
+            })
+
+            // 初始化 onetomany
+            this.data.onetomany[index].rows = res.data
+
+            // 初始化onetomany中的fields
+            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
+              // 如果配置类型为select,优先从参数列表获取options
+              if (this.data.onetomany[index].fields[j].type === 'select') {
+                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                if (temp && temp.length > 0) {
+                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                }
+              }
+            }
+
+          }
+        }
+
+        this.data = JSON.parse(JSON.stringify(this.data))
+
+        this.$nextTick(() => {
+          this.showview = true
+        })
+      },
+      // 功能组件显示控制
+      hasChange(){
+        if(this.funcdata.fields) {
+          this.data = this.funcdata
+          // 初始化要展示的数据结构
+          this.initializtion()
+          this.showview = true
+          this.showstop = false
+          this.showcancel = false
+        }
+        if (this.funcdata.title === '终止报建' && !this.funcdata.fields) {
+          this.showview = false
+          this.showstop = true
+          this.showcancel = false
+        }
+        if (this.funcdata.title === '撤销' && !this.funcdata.fields) {
+          this.showview = false
+          this.showstop = false
+          this.showcancel = true
+        }
+        if (this.funcdata.title === '派工单' && !this.funcdata.fields) {
+          this.showview = false
+          this.dispatchlist = true
+          this.showcancel = false
+        }
+        if (this.funcdata.title === '报建缴费' && !this.funcdata.fields) {
+          this.showview = false
+          this.applycharge = true
+          this.showcancel = false
+        }
+
+      },
+      // 打印派工单
+      async printDispatch() {
+        this.print_dispatch = false
+        this.showview = false
+        this.dispatchlist = true
+      }
+    },
+    events: {
+      // 获取view层button事件
+      async 'button' (model){
+        model = Object.assign({}, this.selectdata, model)
+        // 下发，提交，保存，退回都在后台处理
+        let http = new HttpResetClass();
+        http.load('POST','rs/entity/t_apply',model, {resolveMsg: null, rejectMsg: '数据保存失败'})
+          .then(res => {
+            this.$dispatch('query')
+          })
+      },
+      // onetomany模态框默认监听监听事件
+      async 'onetomanydelete'(i, j) {
+        console.log('默认删除')
+        let http = new HttpResetClass()
+        let data = {
+          table: this.data.onetomany[i].tables[0],
+          row: this.data.onetomany[i].rows[j]
+        }
+        let res = await http.load('POST', 'rs/logic/onetomanyDefaultDeleteEvent', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '删除失败'
+        })
+
+        if (res.data <= 0){
+          this.$showMessage('删除失败')
+          return
+        }
+
+        this.$dispatch('selfsearch')
+        this.$refs.serviceview.data.onetomany[i].rows.splice(j, 1)
+      },
+      async 'onetomanyadd'(inedx) {
+        let data = {
+          f_process_id : this.selectdata.f_process_id,
+          f_operator: this.$login.f.name,
+          f_operation_date: new Date().Format("yyyy-MM-dd HH:mm:ss"),
+          f_company: this.$login.f.orgs
+        }
+        this.data.onetomany[inedx].fields.forEach(item => {
+          data[item.field] = item.value
+        })
+        let res = await this.$resetpost(
+          `rs/entity/${this.data.onetomany[inedx].tables[0]}`,
+          data
+        )
+        // this.data.onetomany[inedx].rows.push(data)
+        this.$dispatch('selfsearch')
+        this.$refs.serviceview.data.onetomany[inedx].rows.push(data)
+      },
+      async 'onetomanyupdate'(i, j) {
+        let onetomany = this.data.onetomany[i]
+        let data = onetomany.rows[j]
+
+        onetomany.fields.forEach(item => {
+          data[item.field] = item.value
+        })
+        let res = await this.$resetpost(
+          `rs/entity/${this.data.onetomany[i].tables[0]}`,
+          data
+        )
+        this.$dispatch('selfsearch')
+        this.$refs.serviceview.data.onetomany[i].rows.splice(j,1,data)
+      },
+      // onetomany模态框监听事件
+      async 'check_modal'(index) {},
+      async 'oninput_modal'(index) {}
+    },
+    watch:{
+    }
+  }
+</script>

package/src/components/product/Function/functions/ChargeManagement.vue

@@ -53,13 +53,13 @@
             </td>
             <td style="text-align: center;">
               <nobr>
-<!--                <button-->
-<!--                  type="button"-->
-<!--                  name="button"-->
-<!--                  class="btn btn-link"-->
-<!--                  :disabled="$parent.$parent.mark === 1 || row.f_charging_status === '作废'"-->
-<!--                  @click="$parent.$parent.showInvalidModal(row)"-->
-<!--                >作废</button>-->
+                <button
+                  type="button"
+                  name="button"
+                  class="btn btn-link"
+                  :disabled="$parent.$parent.mark === 1 || row.f_charging_status === '作废'"
+                  @click="$parent.$parent.showInvalidModal(row)"
+                >作废</button>
               </nobr>
             </td>
           </tr>
@@ -193,6 +193,76 @@
         <button type="button" class="btn btn-primary" @click="saveCharge()">新增收费</button>
       </footer>
     </modal>
+    <modal v-if="showInvalid" :show.sync="showInvalid" 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>
+        <h4 class="modal-title">作废收费</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+<!--        <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_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_operator" />
+          </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="invalidApplyCharge()">确认作废</button>
+      </footer>
+    </modal>
 
 
   </div>
@@ -234,17 +304,18 @@ export default {
       this.charge.f_useraddress_id = this.chargeUseraddress.id
     },
     async invalidApplyCharge() {
-      if (isEmpty(this.charge.f_void_remarks)) {
+      if (this.charge.f_void_remarks.length < 0) {
         this.$showAlert('请输入作废本次收费原因！！！', 'warning', 3000)
         return
       }
 
       let http = new HttpResetClass()
       let data = {
-        apply: this.selectdata,
+        apply: this.data,
         user: this.$login.f,
         charge: this.charge
       }
+      console.log("发送的数据：" + JSON.stringify(data))
       try {
         let res = await http.load('POST', 'rs/logic/invalidApplyCharge', {data:data}, {
           resolveMsg: null,
@@ -268,6 +339,7 @@ export default {
       this.charge.f_amount_words = this.smalltoBIG(e.target.value)
     },
     async saveCharge() {
+      this.apply_data()
       // if (isEmpty(this.charge.f_useraddress_id) && this.selectdata.f_apply_type !== '开发商集体报建') {
       //   this.$showAlert('请选择缴费的地址信息！！！', 'warning', 3000)
       //   return