apply-clients 5.0.35-59 → 5.0.35-61

package/package.json

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

package/src/components/app_apply/Gongcheng.vue

@@ -216,8 +216,8 @@ export default {
             }
             setTimeout(() => {
             }, 200)
-            http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/newaddApplyproduct`, {data: data})
             this.click(data)
+            http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/newaddApplyproduct`, {data: data})
           })
         }
       })
@@ -229,7 +229,6 @@ export default {
         title: row.defname,
         safe: true
       })
-
       this.$goto('service-control-app', {selectdata: row,show_data: {ppp: {}},selectmodel: this.model}, 'self', _this.search)
     }
   },
@@ -247,7 +246,7 @@ export default {
       return
     }
     var data = JSON.parse(result.data)
-    /* var data={
+    /*var data={
       "start_activitys": [
         "集体报装申请",
         "报装申请",
@@ -451,7 +450,8 @@ export default {
               "required": true,
               "value": null,
               "hidden": true,
-              "options": []
+              "options": [
+              ]
             },
             {
               "label": "电话号码",
@@ -474,7 +474,8 @@ export default {
               "disabled": false,
               "required": true,
               "value": null,
-              "options": []
+              "options": [
+              ]
             },
             {
               "label": "勘察人员",
@@ -833,7 +834,7 @@ export default {
               "type": "input",
               "bootstraped": "col-sm-3",
               "field": "f_total_cost",
-              "readonly": true,
+              "readonly": false,
               "required": true,
               "hidden": false
             },
@@ -1913,7 +1914,8 @@ export default {
           "tables": [
             "t_apply"
           ],
-          "fields": [],
+          "fields": [
+          ],
           "buttons": [
             {
               "button_name": "保存"
@@ -1928,7 +1930,8 @@ export default {
           "tables": [
             "t_apply"
           ],
-          "fields": []
+          "fields": [
+          ]
         },
         {
           "title": "报装申请",
@@ -2225,7 +2228,8 @@ export default {
               "disabled": false,
               "hidden": true,
               "value": null,
-              "options": []
+              "options": [
+              ]
             },
             {
               "label": "电话号码",
@@ -2248,7 +2252,8 @@ export default {
               "disabled": false,
               "required": true,
               "value": null,
-              "options": []
+              "options": [
+              ]
             },
             {
               "label": "勘察人员",
@@ -2300,7 +2305,8 @@ export default {
               "readonly": true,
               "required": true,
               "value": "1",
-              "options": []
+              "options": [
+              ]
             },
             {
               "label": "证件号码",
@@ -2472,7 +2478,7 @@ export default {
               "type": "input",
               "bootstraped": "col-sm-3",
               "field": "f_total_cost",
-              "readonly": true,
+              "readonly": false,
               "required": true,
               "hidden": false
             },
@@ -3139,7 +3145,7 @@ export default {
               "required": false
             },
             {
-              "label": "施工是否完成",
+              "label": "办理施工手续是否完成",
               "type": "select",
               "bootstraped": "col-sm-3",
               "field": "f_shigong_upload_state",
@@ -3395,7 +3401,8 @@ export default {
               "required": false
             }
           ],
-          "onetomany": [],
+          "onetomany": [
+          ],
           "buttons": [
             {
               "button_name": "保存"
@@ -3537,7 +3544,6 @@ export default {
         }
       ]
     }*/
-
     console.log('前台存入缓存中的data=>' + JSON.stringify(data))
     Vue.workflow_vue = Vue.prototype.$workflow_vue = data
   }

package/src/components/app_apply/ServiceControl.vue

@@ -442,6 +442,50 @@ export default {
       // }
       let btn = btn_operate(this, url, http, model, delteLocal)
       co(btn)
+    },
+    'checkboxSelectControl'(index,index2){
+      if(this.$refs.service_show.data.fields[index].label=="施工提交资料"){
+        for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+
+          if(this.$refs.service_show.data.fields[i].label=="施工已上传文件"){
+            //增加和删除框中的内容
+            if(this.$refs.service_show.data.fields[index].items[index2].value == false){
+              this.$refs.service_show.data.fields[i].value+=this.$refs.service_show.data.fields[index].items[index2].label+" ";
+              this.$refs.service_show.data.fields[index].items[index2].value=true;
+            }else{
+              let deleteValue = this.$refs.service_show.data.fields[index].items[index2].label;
+              let values =this.$refs.service_show.data.fields[i].value;
+              let result = values.split(" ").filter((item)=>{
+                return item!=deleteValue;
+              }).join(" ")
+              this.$refs.service_show.data.fields[i].value =result;
+              this.$refs.service_show.data.fields[index].items[index2].value=false;
+            }
+            //}
+          }
+        }
+      }
+      if(this.$refs.service_show.data.fields[index].label=="验收提交资料"){
+        for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+
+          if(this.$refs.service_show.data.fields[i].label=="验收已上传文件"){
+            //增加和删除框中的内容
+            if(this.$refs.service_show.data.fields[index].items[index2].value == false){
+              this.$refs.service_show.data.fields[i].value+=this.$refs.service_show.data.fields[index].items[index2].label+" ";
+              this.$refs.service_show.data.fields[index].items[index2].value=true;
+            }else{
+              let deleteValue = this.$refs.service_show.data.fields[index].items[index2].label;
+              let values =this.$refs.service_show.data.fields[i].value;
+              let result = values.split(" ").filter((item)=>{
+                return item!=deleteValue;
+              }).join(" ")
+              this.$refs.service_show.data.fields[i].value =result;
+              this.$refs.service_show.data.fields[index].items[index2].value=false;
+            }
+            //}
+          }
+        }
+      }
     }
   },
   watch:{

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

@@ -532,6 +532,7 @@
           this.$dispatch('success')
         }
         this.$showMessage('是否冲正此条记录?', ['confirm', 'cancel']).then((res) => {
+          debugger
           if (res === 'confirm') {
             let param = {
               row: this.model.rows[index]
@@ -712,6 +713,7 @@
           this.model.f_charge_money = 0
           this.model.f_amount_words = ''
         } else {
+          debugger
           //获取购货方信息
           http = new HttpResetClass()
           data = {
@@ -773,6 +775,7 @@
             parameters: this.addItem
           }
           // 生成收费记录的id
+          debugger
           let sellid = ''
           let ret = await http.load('POST', 'rs/logic/saveentity', {data: data})
           this.model.chargeid = ret.data.id
@@ -782,7 +785,8 @@
             f_unaccounts_money: flag2,
             f_apply_num: this.infee.f_apply_num
           }
-          //开始收费
+          //开始收费 正
+          debugger
           for (let i = 0; i < this.charges.length; i++) {
             let saveen = this.charges[i]
             saveen.f_project_item = this.charges[i].f_project_item[0]
@@ -794,6 +798,21 @@
               }
             }, {resolveMsg: null, rejectMsg: "失败"})
           }
+      debugger
+          for (let i = 0; i < this.charges.length; i++) {
+            let saveen = this.charges[i]
+            debugger
+            saveen.f_money= 0 - saveen.f_money
+            saveen.f_project_item = this.charges[i].f_project_item[0]
+            saveen.f_charge_record_id = parseFloat(ret.data.id);
+            await http.load('POST', 'rs/logic/saveentity', {
+              data: {
+                tablename: 't_charge_record_item',
+                parameters: saveen
+              }
+            }, {resolveMsg: null, rejectMsg: "失败"})
+          }
+
 
           await http.load('POST', 'rs/logic/updatechargemoney', {data: data}, {resolveMsg: null, rejectMsg: "添加累计金额失败"})
             .then((res) => {
@@ -869,6 +888,7 @@
         this.showview = false
       },
       async tovoid(index) {
+        debugger
         console.log(index)
         console.log(JSON.stringify(this.model.rows))
         this.model.rows[index].f_amount_words = "负" + this.model.rows[index].f_amount_words;
@@ -879,6 +899,7 @@
         this.charges = [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}],
           console.log(JSON.stringify(val))
         // this.charges =[{f_project_item:'合同总额', f_amount: 0, f_price: 0,f_money:0}],
+        debugger
         if (val.f_is_correct === '是' || val.f_charging_status !== '有效' || val.f_is_correct === '冲正中') {
           this.$showMessage('已冲正或正在冲正，不能操作！')
         } else {