apply-clients 3.0.10-192 → 3.0.10-195

package/package.json

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

package/src/components/app_apply/ApplyToDoList.vue

@@ -105,7 +105,7 @@ export default{
         // 回调执行方法名，key必须为callback
         'callback': 'javascript:HostApp.__this__.search()',
         // logic执行需要的业务参数
-        'data': {"workflow_names":"'报建缴费','核对','安装施工','通气'"},
+        'data': {"workflow_names":"'报建缴费','现场勘察','通气'"},
         // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
         // 执行回调方法传入key为backresult
         // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}

package/src/components/app_apply/ServiceControl.vue

@@ -76,13 +76,7 @@
           let http = new HttpResetClass()
           var url = this.$androidUtil.getProxyUrl() + '/rs/search'
           console.log('即将请求后台获取下发人员，url=>' + url)
-          // R(安装员报装)
-
-          let actorexpression=this.selectdata.actorexpression
-          //let actorexpression="R(安装员报装)"
-          let actor=actorexpression.substring(actorexpression.indexOf('(')+1,actorexpression.indexOf(')'))
-          console.log("看看角色"+JSON.stringify(actor))
-          let res = await http.load('POST', url, {source:`tool.getChildrenOfResName($${actor}$)`,userid:Vue.user.id}, {resolveMsg: null, rejectMsg: '获取当前部门人员失败'})
+          let res = await http.load('POST', url, this.selectdata.actorexpression, {resolveMsg: null, rejectMsg: '获取当前部门人员失败'})
           console.log("请求后台获取下发人员结果转换=>" + JSON.stringify(res))
           let jsonString = JSON.stringify(res.data)
           let jsonArray = []
@@ -1361,6 +1355,12 @@
   let btn_operate = function * (self, url, http, model, delteLocal) {
     // 下发，提交，保存，退回都在后台处理
     console.log('即将请求后台url=>' + url)
+    for (const selfKey in model) {
+      if(model[selfKey]=="null"){
+        delete model[selfKey]
+      }
+
+    }
     model.employeetemplate=''
     http.load('POST',url,{data:{employeetemplate:'',tables:self.data.tables,start_activity:self.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})
       .then((res) => {

package/src/components/app_apply/ServiceView.vue

@@ -487,19 +487,22 @@ export default {
           })
         }
       }
-      if (this.data.title=='报建缴费'){
-        if (index==14){
+      if (this.data.title=='报建缴费' || this.data.title=='现场勘察'){
+        if (index==14 && this.data.title=='报建缴费'){
           console.log("14141414")
-          let unaccounts_money=parseInt(this.data.fields[13].value)-parseInt(this.data.fields[14].value)
-          let bignumber=this.smalltoBIG(parseInt(this.data.fields[14].value))
+          let unaccounts_money=this.data.fields[13].value?parseInt(this.data.fields[13].value):0-this.data.fields[14].value?parseInt(this.data.fields[14].value):0
+          let bignumber=this.smalltoBIG(this.data.fields[14].value?parseInt(this.data.fields[14].value):0)
           this.$set('data.fields[15].value',unaccounts_money)
           this.$set('data.fields[17].value',bignumber)
 
         }
         if (index==11||index==12){
-          this.countmoney[index-11]=parseInt(this.data.fields[index].value)
+          this.countmoney[index-11]=this.data.fields[index].value?parseInt(this.data.fields[index].value):0
           console.log(this.data.fields[index].value)
           console.log("做出了改变")
+        }else{
+          this.countmoney[0]=this.data.fields[11].value?parseInt(this.data.fields[11].value):0
+          this.countmoney[1]=this.data.fields[12].value?parseInt(this.data.fields[12].value):0
         }
         console.log(JSON.stringify(this.countmoney))
         let money=0

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

@@ -2665,6 +2665,17 @@
       ,
       // 获取view层button事件/
       async 'button'(model) {
+        if(model.button.button_name === '退回' && this.selectdata.defname === '现场勘察'){
+          let http = new HttpResetClass()
+          let files =  await http.load('post','rs/sql/singleTable',{data: {
+              tablename: 't_files',
+              condition: `f_blobid = '${model.f_process_id}' and defname = '${this.selectdata.defname}' and fusetype = '勘察退回'`
+            }})
+          if(files.data.length <= 0){
+            this.$showAlert('请至少上传一张现场勘察失败照片！', 'warning', 2000)
+            return
+          }
+        }
         console.log("应收金额：" + model.f_contract_money)
 
         // 交费逻辑

package/src/components/product/ReportForm/PaymentRecordBad.vue

@@ -514,12 +514,13 @@
         if (this.model.condition) {
           condition = this.model.condition
         }
-        if (this.f_orgid) {
-          condition += `and f_filiale in ${this.f_orgid} `
-        } else {
-          console.log('12143124')
-          condition += `and f_filiale = '${this.$login.f.orgs}'` + ` and ${this.$login.f.orgs === '重庆盛焰集团' || this.$login.f.orgs === '湖南燎原燃气有限公司' ? "f_filiale = '1' or 1 = 1" : '1 = 1'}`
-        }
+        // if (this.f_orgid) {
+        //   condition += `and f_filiale in ${this.f_orgid} `
+        // } else {
+        //   console.log('12143124')
+          // condition += `and f_filiale = '${this.$login.f.orgs}'` + ` and ${this.$login.f.orgs === '重庆盛焰集团' || this.$login.f.orgs === '湖南燎原燃气有限公司' ? "f_filiale = '1' or 1 = 1" : '1 = 1'}`
+          // condition += `and f_filiale = '${this.$login.f.orgs}'` + ` and ${this.$login.f.orgs === '重庆盛焰集团' || this.$login.f.orgs === '湖南燎原燃气有限公司' ? "f_filiale = '1' or 1 = 1" : '1 = 1'}`
+        // }
         let data = {
           condition: condition,
           data: {