apply-clients 3.1.52 → 3.1.53

package/package.json

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

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

@@ -881,7 +881,7 @@ export default {
     async deleteDevice (row) {
       let data = {
         f_process_id: this.data.f_process_id,
-        f_ticket_number: row.f_ticket_number,
+        f_charge_id: row.id,
         user: this.$login.f
       }
       let res = await this.$resetpost(

package/src/components/product/Process/Service/ServiceControl.vue

@@ -847,8 +847,34 @@
 
 
 
-      }
+      },
+      async stopApply () {
+        console.log('终止报建！！！！！')
+
+        if (this.show_data.defname === '报建受理') {
+          this.show_data.f_stop_reason = this.show_data.f_accept_result
+        }
+        if (this.show_data.defname === '现场勘察') {
+          this.show_data.f_stop_reason = this.show_data.f_project_describe
+        }
+        if(!this.show_data.f_stop_reason){
+          this.show_data.f_stop_reason = '终止'
+        }
+        let data = {
+          selectdata: this.show_data,
+          loginUser: this.$login.f,
+          model: {f_stop_remarks: this.show_data.f_stop_reason}
+        }
+
+        let res = await this.$resetpost(
+          `rs/logic/stopApply`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '终止报建失败！！！'}
+        )
 
+        this.$dispatch('selfsearch')
+
+      }
     },
     events: {
       test(i, j){
@@ -857,6 +883,11 @@
       },
       // 获取view层button事件/
       async 'button'(model) {
+        //before事件
+        console.log("当前按钮",model.button)
+        if (model.button.before) {
+          await this[model.button.before]()
+        }
         // 点击重置按钮就重置数据
         if (model.button.button_name === '重置') {
           this.refurbish()

package/src/components/product/ServiceView.vue

@@ -399,6 +399,9 @@
         }
         buttondatas.button_name = button.button_name
         buttondatas.button_index = index
+        if (button.before){
+          buttondatas.before = button.before
+        }
         if (button.button_fields) {
           button.button_fields.forEach(item => {
             buttondatas.button_fields[item.field] = item.value