apply-clients 4.1.16-weinan → 4.1.18-weinan

package/package.json

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

package/src/components/app_apply/AppTakePic.vue

@@ -59,8 +59,9 @@
 
         for (var i = 0; i < res.data.length; i++) {
           console.log('-----------地址----------------')
-          console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 3)}`)
-          res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 3)}`
+
+          console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
+          res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
         }
 
         this.fileList = res.data
@@ -92,7 +93,6 @@
       },
       cameraCallBack (fileName, fileUrl) {
         console.log('-----------cameraCallBack-----------------')
-
         let data = {
           blodid: HostApp.__this__.blobid,
           type: HostApp.__this__.type,

package/src/components/app_apply/ApplyToDoList.vue

@@ -104,7 +104,7 @@ export default{
       _this.$back()
     },
     search () {
-      var condition = "1=1  and (f_apply_type! = '居民报建' and f_apply_type! = '工商户报建'  or (f_apply_type = '居民报建' and defname = '现场勘察') or (f_apply_type = '工商户报建' and (defname = '现场勘察' or defname = '施工'))))"
+      var condition = "1=1  and (f_apply_type! = '居民报建' and f_apply_type! = '工商户报建'  or (f_apply_type = '居民报建' and defname = '入户安装') or (f_apply_type = '工商户报建' and (defname = '现场勘察' or defname = '施工')))"
       var param = {condition: condition,condValue:[],data:{"id": Vue.user.id,orgid: Vue.user.orgid}}
       let http = new HttpResetClass()
       http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,{data:param}).then(res=>{

package/src/components/app_apply/ServiceControl.vue

@@ -1,349 +1,349 @@
-<template>
-  <service-view-app v-ref:service_show :data="show_data" v-if="showview"></service-view-app>
-</template>
-<script>
-  import co from 'co'
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建流程业务控制层',
-    props: ['selectdata'],
-    data () {
-      return {
-        data:null, // 数据库数据，json配置文件数据的数据集合
-        json_datas:null, // Json配置文件集合
-        showview:false, // 控制显示service-view组件
-        show_data:null, // 给view层显示的数据
-        department_search:null // 当前部门下所有人
-      }
-    },
-    methods: {
-      // 特殊化处理
-      async special(model){
-        console.log('进入async special方法')
-        if(this.data.distribute_async && model.button.button_name==='下发'){
-          // 流程异步处理
-          let http = new HttpResetClass();
-          let res = await http.load('POST',this.$androidUtil.getProxyUrl() + '/rs/logic/syncprocess',{data:{model:model,loginUser:this.$login.f}}, {resolveMsg: null, rejectMsg: '流程异步下发据保存失败'})
-          console.log("流程的异步处理：",JSON.stringify(res.data))
-        }
-        if(this.data.distribute_async && model.button.button_name==='完成'){
-          // 强制结束
-          let http = new HttpResetClass();
-          let res = await http.load('POST',this.$androidUtil.getProxyUrl() + '/rs/logic/stoprocess',{data:{model:model,loginUser:this.$login.f}}, {resolveMsg: null, rejectMsg: '流程异步完成数据保存失败'})
-          console.log("流程的异步处理：",JSON.stringify(res.data))
-        }
-      },
-      // 组件初始化操作
-      async refurbish(){
-         let http = new HttpResetClass()
-         let xmldata = {
-           data: Vue.user,
-           workname: this.selectdata.processname
-         }
-         let res = await http.load('POST', this.$androidUtil.getProxyUrl() +'/rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
-        if (res.data.code && res.data.code === 200) {
-          Vue.prototype.$workflow_vue = res.data.workflow_vue
-        } else {
-          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-          return
-        }
-         if(!this.$workflow_vue){
-            this.$showMessage('流程配置文件不存在，请反馈系统管理员')
-            return
-         }
-         console.log('内存中的流程配置文件数据=>' + JSON.stringify(this.$workflow_vue))
-        this.json_datas=this.$workflow_vue
-        let sum = 0
-        let jsonData ={}
-         console.log(this.selectdata)
-        for(let i=0;i<this.json_datas.activitys.length;i++){
-          if(this.selectdata.defname==this.json_datas.activitys[i].title){
-            jsonData = this.json_datas.activitys[i]
-            sum++
-          }
-        }
-         console.log('sum=>' + sum)
-        if(sum==1){
-          this.data =null
-          this.data = jsonData
-          console.log('调用initializtion前的this.data=>' + JSON.stringify(this.data))
-          this.initializtion()
-
-        } else if(sum==0) {
-          this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
-        } else {
-          this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
-        }
-      },
-      // json配置数据处理 比如下拉框的options
-      async initializtion() {
-        console.log('进入initializtion()方法')
-        // 下发人 options 处理，options初始化
-        /*if(this.selectdata.actorexpression){
-          let http = new HttpResetClass()
-          var url = this.$androidUtil.getProxyUrl() + '/rs/search'
-          console.log('即将请求后台获取下发人员，url=>' + url)
-          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 = []
-          if(jsonString.startsWith("{")){
-            jsonArray.push(res.data)
-            res.data = jsonArray
-          }
-          this.department_search = res.data
-        }*/
-
-        // data 填充 selectdata
-        console.log('即将合并data与selectdata,selectdata数据=>' + JSON.stringify(this.selectdata))
-        this.data = Object.assign({},this.data, this.selectdata)
-        console.log('this.data的值=>' + JSON.stringify(this.data))
-
-        // 初始化 fields
-        console.log('this.data.fields.length=>' + this.data.fields.length)
-        for(let i=0;i<this.data.fields.length;i++){
-          // 如果selectdata有这些key，则把selectdata的value赋值给data的value
-          if(this.selectdata[this.data.fields[i].field]){
-            this.data.fields[i].value = this.selectdata[this.data.fields[i].field]
-          }
-          // 如果配置类型为select,优先从参数列表获取options
-          if (this.data.fields[i].type === 'select') {
-            if (this.data.fields[i].param) {
-              let temp = this.$appdata.getParam(this.data.fields[i].label)
-
-              if (temp && temp.length > 0) {
-                this.data.fields[i].options = temp
-              }
-
-              if (this.data.fields[i].paramLabel) {
-                temp = this.$appdata.getParam(this.data.fields[i].paramLabel)
-                if (temp && temp.length > 0) {
-                  this.data.fields[i].options = temp
-                }
-              }
-            }
-
-          }
-        }
-        // 初始化 buttons_fields
-        for(let i=0;i<this.data.buttons.length;i++){
-          if(this.data.buttons[i].button_fields){
-            for(let j=0;j<this.data.buttons[i].button_fields.length;j++){
-              // 如果selectdata有这些key，则把selectdata的value赋值给data的value
-              if(this.selectdata[this.data.buttons[i].button_fields[j].field]){
-                this.data.buttons[i].button_fields[j].value = this.selectdata[this.data.buttons[i].button_fields[j].field]
-              }
-              // 如果配置类型为select,优先从参数列表获取options
-              if(this.data.buttons[i].button_fields[j].type==='select'&&this.$appdata.getParam(this.data.buttons[i].button_fields[j].label)){
-                this.data.buttons[i].button_fields[j].options=this.$appdata.getParam(this.data.buttons[i].button_fields[j].label)
-              }
-              // 下发特殊配置
-              if(this.data.buttons[i].button_name==='下发'){
-                if(this.data.buttons[i].button_fields.length===1){
-                  // value初始化
-                  // if(this.department_search){
-                  if(this.selectdata[this.data.buttons[i].button_fields[0].field]){
-                    for(let k=0;k<this.department_search.length;k++){
-                      // 将id转换为name
-                      if(Number(this.department_search[k].id) === Number(this.selectdata[this.data.buttons[i].button_fields[0].field])){
-                        this.data.buttons[i].button_fields[0].value=this.department_search[k].name
-                      }
-                    }
-                  }
-
-                  if(this.department_search){
-                    let array = []
-                    for(let k=0;k<this.department_search.length;k++){
-                      array.push({label:this.department_search[k].name,value:this.department_search[k].name})
-                    }
-                    this.data.buttons[i].button_fields[0].options = array
-                  }
-                }else {
-                  this.$showMessage("下发按钮必须满足 当且仅当一个字段")
-                }
-              }
-            }
-          }
-        }
-        // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
-        let temp = JSON.parse(JSON.stringify(this.data))
-        // 退回原因展示
-        if(this.selectdata.f_back_reason){
-          temp['back_reason'] = this.selectdata.f_back_reason
-        }
-        console.log('即将给show_data赋值temp=>' + JSON.stringify(temp))
-        this.show_data = temp
-        console.log('initializtion()方法结束,showview')
-        this.showview = true
-        if (this.selectdata.defname === '现场勘察' || this.selectdata.defname ==='入户安装') {
-          for (const item of this.show_data.fields) {
-            if (item.label === '现场勘察人员' && !item.value) {
-              return item.value = Vue.user.name
-            }
-          }
-        }
-      },
-      deleteLocalApply(model){
-        console.log(`前台上传完成，开始删除本地报建工单`)
-        this.$androidUtil.bzLogic('deleteApply', {data:model})
-      },
-      stopapply(model1,model){
-        this.$showMessage('确定不具备条件,终止报建！',['confirm', 'cancel']).then((res)=>{
-          if (res=='confirm'){
-            this.selectdata = Object.assign( {},this.selectdata,model)
-            let data = {
-              loginUser: Vue.user,
-              selectdata: this.selectdata,
-              model: model1
-            }
-            let http = new HttpResetClass()
-            http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/stopApply', {data: data}, {resolveMsg: null,rejectMsg: '删除失败'})
-              .then(res => {
-                if (res.data === 200) {
-                  this.$dispatch('search')
-                  this.$dispatch('close')
-                } else {
-                  this.$showMessage('终止报建失败')
-                }
-              })
-           }
-        })
-      }
-    },
-    events: {
-      // 任意select选中时触发事件
-      'select_cascade'(index){
-        // this.$refs.service_show.model_temp // 子业务显示组件
-        // 级联操作示例：
-        /*
-         if(this.$refs.service_show.model_temp.activitys.ields[index].label==='报建类型'){
-          for(let i=0;i<this.$refs.service_show.model_temp.activitys.fields.length;i++){
-            // 控制设置级联
-            // 源select所选的值 this.$refs.service_show.model_temp.activitys.fields[index].value
-            if(this.$refs.service_show.model_temp.activitys.fields[i].label==='级联测试2'){
-              this.$refs.service_show.model_temp.activitys.fields[i].options=[
-                {label:'级联选项1',value:'级联选项1'},{label:'级联选项2',value:'级联选项2'},{label:'级联选项3',value:'级联选项3'}
-              ]
-            }
-          }
-        }
-        */
-      },
-      // 获取view层button事件
-      async 'button'(model){
-        console.log('进入async button事件方法')
-        var delteLocal = true
-        // 点击保存与重置按钮不需要修改本地工单状态
-        if(model.button.button_name == '保存' || model.button.button_name==='重置'){
-          delteLocal = false
-        }
-        // 点击重置按钮就重置数据
-        if(model.button.button_name==='重置'){
-          this.initializtion()
-          return
-        }
-        if(model.button.button_name==='下发'){
-           let person_name = model.button.button_fields[this.show_data.buttons[model.button.button_index].button_fields[0].field]
-          for(let i=0;i<this.department_search.length;i++){
-             // 找到人名为person_name 的人，然后把人名换成id
-            if(this.department_search[i].name === person_name){
-              model.button.button_fields[this.show_data.buttons[model.button.button_index].button_fields[0].field] = this.department_search[i].id
-            }
-          }
-        }
-        console.log("button事件接收参数model=>" + JSON.stringify(model))
-        model=Object.assign({},this.selectdata,model)
-        console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
-        let http = new HttpResetClass()
-        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_have == '否'&& model. model.button.button_name == '提交'){
-          let model1 ={
-            f_stop_remarks : '不具备安装条件'
-          }
-          this.stopapply(model1,model)
-          return
-        }
-        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装')  && model.f_is_aerate == '否' && model. model.button.button_name == '提交'){
-          let model1 ={
-            f_stop_remarks : '未通气'
-          }
-          this.stopapply(model1,model)
-          return
-        }
-        if(this.selectdata.defname =='现场勘察'  && this.selectdata.f_apply_type == '工商户报建'&& model. model.button.button_name == '提交'){
-          let http = new HttpResetClass()
-          let data = {
-            tablename: 't_files',
-            condition: `defname = '现场勘察' and f_blobid = '${this.selectdata.f_process_id}'`
-          }
-          let res = await http.load('POST', this.$androidUtil.getProxyUrl() + '/rs/sql/singleTable', {data: data}, {
-            resolveMsg: null,
-            rejectMsg: '查询失败'
-          })
-          console.log("数据长度：" + res.data.length)
-          if (res.data.length < 0) {
-             this.$showMessage("请上传照片！！！")
-            return
-          }
-
-        }
-        var url = this.$androidUtil.getProxyUrl() + '/rs/logic/ApplyProductService'
-        // let res = await http.load('POST',url,{data:{tables:this.data.tables,start_activity:this.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})
-        // // 先判断是否包含code，如果服务端异常，可能不存在code
-        // console.log("service处理完成返回数据=>" + res)
-        // if(!res.code){
-        //   console.log("service处理完成返回数据=>" + res)
-        //   this.$showMessage('操作异常,原因:' + res)
-        // }else{
-        //   console.log("service处理完成返回数据=>" + JSON.stringify(res))
-        //   if(res.code = 200){
-        //     this.showview = false
-        //     // 特殊处理
-        //     this.special(model)
-        //     this.$dispatch('close')
-        //     this.initializtion()
-        //     this.$showMessage('操作成功')
-        //   }else{
-        //     this.$showMessage('操作失败,原因:' + res.data.msg)
-        //   }
-        // }
-        let btn = btn_operate(this, url, http, model, delteLocal)
-        co(btn)
-      }
-    },
-    watch:{
-      // 监听selectdata的变化
-      'selectdata'() {
-          console.log('进入selectdata改变事件data=>' + JSON.stringify(this.selectdata))
-          this.refurbish()
-      },
-      deep:true
-    }
-  }
-
-  let btn_operate = function * (self, url, http, model, delteLocal) {
-    // 下发，提交，保存，退回都在后台处理
-    console.log('即将请求后台url=>' + url)
-    http.load('POST',url,{data:{tables:self.data.tables,start_activity:self.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})
-      .then((res) => {
-        console.log(JSON.stringify(res))
-        if(res.code = 200){
-          self.showview = false
-          // 如果需要删除本地记录则去删除
-          if(delteLocal){
-            self.deleteLocalApply(model)
-          }
-          // 特殊处理
-          self.special(model)
-          self.$dispatch('close')
-          self.initializtion()
-          self.$showMessage('操作成功')
-        }else{
-          self.$showMessage('操作失败,原因:' + res.data.msg)
-        }
-      })
-      .catch((ret) => {
-        self.$showMessage('操作异常,原因:' + JSON.stringify(ret.data))
-      })
-  }
-</script>
+<template>
+  <service-view-app v-ref:service_show :data="show_data" v-if="showview"></service-view-app>
+</template>
+<script>
+  import co from 'co'
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建流程业务控制层',
+    props: ['selectdata'],
+    data () {
+      return {
+        data:null, // 数据库数据，json配置文件数据的数据集合
+        json_datas:null, // Json配置文件集合
+        showview:false, // 控制显示service-view组件
+        show_data:null, // 给view层显示的数据
+        department_search:null // 当前部门下所有人
+      }
+    },
+    methods: {
+      // 特殊化处理
+      async special(model){
+        console.log('进入async special方法')
+        if(this.data.distribute_async && model.button.button_name==='下发'){
+          // 流程异步处理
+          let http = new HttpResetClass();
+          let res = await http.load('POST',this.$androidUtil.getProxyUrl() + '/rs/logic/syncprocess',{data:{model:model,loginUser:this.$login.f}}, {resolveMsg: null, rejectMsg: '流程异步下发据保存失败'})
+          console.log("流程的异步处理：",JSON.stringify(res.data))
+        }
+        if(this.data.distribute_async && model.button.button_name==='完成'){
+          // 强制结束
+          let http = new HttpResetClass();
+          let res = await http.load('POST',this.$androidUtil.getProxyUrl() + '/rs/logic/stoprocess',{data:{model:model,loginUser:this.$login.f}}, {resolveMsg: null, rejectMsg: '流程异步完成数据保存失败'})
+          console.log("流程的异步处理：",JSON.stringify(res.data))
+        }
+      },
+      // 组件初始化操作
+      async refurbish(){
+         let http = new HttpResetClass()
+         let xmldata = {
+           data: Vue.user,
+           workname: this.selectdata.processname
+         }
+         let res = await http.load('POST', this.$androidUtil.getProxyUrl() +'/rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
+        if (res.data.code && res.data.code === 200) {
+          Vue.prototype.$workflow_vue = res.data.workflow_vue
+        } else {
+          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
+          return
+        }
+         if(!this.$workflow_vue){
+            this.$showMessage('流程配置文件不存在，请反馈系统管理员')
+            return
+         }
+         console.log('内存中的流程配置文件数据=>' + JSON.stringify(this.$workflow_vue))
+        this.json_datas=this.$workflow_vue
+        let sum = 0
+        let jsonData ={}
+         console.log(this.selectdata)
+        for(let i=0;i<this.json_datas.activitys.length;i++){
+          if(this.selectdata.defname==this.json_datas.activitys[i].title){
+            jsonData = this.json_datas.activitys[i]
+            sum++
+          }
+        }
+         console.log('sum=>' + sum)
+        if(sum==1){
+          this.data =null
+          this.data = jsonData
+          console.log('调用initializtion前的this.data=>' + JSON.stringify(this.data))
+          this.initializtion()
+
+        } else if(sum==0) {
+          this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
+        } else {
+          this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
+        }
+      },
+      // json配置数据处理 比如下拉框的options
+      async initializtion() {
+        console.log('进入initializtion()方法')
+        // 下发人 options 处理，options初始化
+        /*if(this.selectdata.actorexpression){
+          let http = new HttpResetClass()
+          var url = this.$androidUtil.getProxyUrl() + '/rs/search'
+          console.log('即将请求后台获取下发人员，url=>' + url)
+          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 = []
+          if(jsonString.startsWith("{")){
+            jsonArray.push(res.data)
+            res.data = jsonArray
+          }
+          this.department_search = res.data
+        }*/
+
+        // data 填充 selectdata
+        console.log('即将合并data与selectdata,selectdata数据=>' + JSON.stringify(this.selectdata))
+        this.data = Object.assign({},this.data, this.selectdata)
+        console.log('this.data的值=>' + JSON.stringify(this.data))
+
+        // 初始化 fields
+        console.log('this.data.fields.length=>' + this.data.fields.length)
+        for(let i=0;i<this.data.fields.length;i++){
+          // 如果selectdata有这些key，则把selectdata的value赋值给data的value
+          if(this.selectdata[this.data.fields[i].field]){
+            this.data.fields[i].value = this.selectdata[this.data.fields[i].field]
+          }
+          // 如果配置类型为select,优先从参数列表获取options
+          if (this.data.fields[i].type === 'select') {
+            if (this.data.fields[i].param) {
+              let temp = this.$appdata.getParam(this.data.fields[i].label)
+
+              if (temp && temp.length > 0) {
+                this.data.fields[i].options = temp
+              }
+
+              if (this.data.fields[i].paramLabel) {
+                temp = this.$appdata.getParam(this.data.fields[i].paramLabel)
+                if (temp && temp.length > 0) {
+                  this.data.fields[i].options = temp
+                }
+              }
+            }
+
+          }
+        }
+        // 初始化 buttons_fields
+        for(let i=0;i<this.data.buttons.length;i++){
+          if(this.data.buttons[i].button_fields){
+            for(let j=0;j<this.data.buttons[i].button_fields.length;j++){
+              // 如果selectdata有这些key，则把selectdata的value赋值给data的value
+              if(this.selectdata[this.data.buttons[i].button_fields[j].field]){
+                this.data.buttons[i].button_fields[j].value = this.selectdata[this.data.buttons[i].button_fields[j].field]
+              }
+              // 如果配置类型为select,优先从参数列表获取options
+              if(this.data.buttons[i].button_fields[j].type==='select'&&this.$appdata.getParam(this.data.buttons[i].button_fields[j].label)){
+                this.data.buttons[i].button_fields[j].options=this.$appdata.getParam(this.data.buttons[i].button_fields[j].label)
+              }
+              // 下发特殊配置
+              if(this.data.buttons[i].button_name==='下发'){
+                if(this.data.buttons[i].button_fields.length===1){
+                  // value初始化
+                  // if(this.department_search){
+                  if(this.selectdata[this.data.buttons[i].button_fields[0].field]){
+                    for(let k=0;k<this.department_search.length;k++){
+                      // 将id转换为name
+                      if(Number(this.department_search[k].id) === Number(this.selectdata[this.data.buttons[i].button_fields[0].field])){
+                        this.data.buttons[i].button_fields[0].value=this.department_search[k].name
+                      }
+                    }
+                  }
+
+                  if(this.department_search){
+                    let array = []
+                    for(let k=0;k<this.department_search.length;k++){
+                      array.push({label:this.department_search[k].name,value:this.department_search[k].name})
+                    }
+                    this.data.buttons[i].button_fields[0].options = array
+                  }
+                }else {
+                  this.$showMessage("下发按钮必须满足 当且仅当一个字段")
+                }
+              }
+            }
+          }
+        }
+        // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
+        let temp = JSON.parse(JSON.stringify(this.data))
+        // 退回原因展示
+        if(this.selectdata.f_back_reason){
+          temp['back_reason'] = this.selectdata.f_back_reason
+        }
+        console.log('即将给show_data赋值temp=>' + JSON.stringify(temp))
+        this.show_data = temp
+        console.log('initializtion()方法结束,showview')
+        this.showview = true
+        if (this.selectdata.defname === '现场勘察' || this.selectdata.defname ==='入户安装') {
+          for (const item of this.show_data.fields) {
+            if (item.label === '现场勘察人员' && !item.value) {
+              return item.value = Vue.user.name
+            }
+          }
+        }
+      },
+      deleteLocalApply(model){
+        console.log(`前台上传完成，开始删除本地报建工单`)
+        this.$androidUtil.bzLogic('deleteApply', {data:model})
+      },
+      stopapply(model1,model){
+        this.$showMessage('确定不具备条件,终止报建！',['confirm', 'cancel']).then((res)=>{
+          if (res=='confirm'){
+            this.selectdata = Object.assign( {},this.selectdata,model)
+            let data = {
+              loginUser: Vue.user,
+              selectdata: this.selectdata,
+              model: model1
+            }
+            let http = new HttpResetClass()
+            http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/stopApply', {data: data}, {resolveMsg: null,rejectMsg: '删除失败'})
+              .then(res => {
+                if (res.data === 200) {
+                  this.$dispatch('search')
+                  this.$dispatch('close')
+                } else {
+                  this.$showMessage('终止报建失败')
+                }
+              })
+           }
+        })
+      }
+    },
+    events: {
+      // 任意select选中时触发事件
+      'select_cascade'(index){
+        // this.$refs.service_show.model_temp // 子业务显示组件
+        // 级联操作示例：
+        /*
+         if(this.$refs.service_show.model_temp.activitys.ields[index].label==='报建类型'){
+          for(let i=0;i<this.$refs.service_show.model_temp.activitys.fields.length;i++){
+            // 控制设置级联
+            // 源select所选的值 this.$refs.service_show.model_temp.activitys.fields[index].value
+            if(this.$refs.service_show.model_temp.activitys.fields[i].label==='级联测试2'){
+              this.$refs.service_show.model_temp.activitys.fields[i].options=[
+                {label:'级联选项1',value:'级联选项1'},{label:'级联选项2',value:'级联选项2'},{label:'级联选项3',value:'级联选项3'}
+              ]
+            }
+          }
+        }
+        */
+      },
+      // 获取view层button事件
+      async 'button'(model){
+        console.log('进入async button事件方法')
+        var delteLocal = true
+        // 点击保存与重置按钮不需要修改本地工单状态
+        if(model.button.button_name == '保存' || model.button.button_name==='重置'){
+          delteLocal = false
+        }
+        // 点击重置按钮就重置数据
+        if(model.button.button_name==='重置'){
+          this.initializtion()
+          return
+        }
+        if(model.button.button_name==='下发'){
+           let person_name = model.button.button_fields[this.show_data.buttons[model.button.button_index].button_fields[0].field]
+          for(let i=0;i<this.department_search.length;i++){
+             // 找到人名为person_name 的人，然后把人名换成id
+            if(this.department_search[i].name === person_name){
+              model.button.button_fields[this.show_data.buttons[model.button.button_index].button_fields[0].field] = this.department_search[i].id
+            }
+          }
+        }
+        console.log("button事件接收参数model=>" + JSON.stringify(model))
+        model=Object.assign({},this.selectdata,model)
+        console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
+        let http = new HttpResetClass()
+        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_have == '否'&& model. model.button.button_name == '提交'){
+          let model1 ={
+            f_stop_remarks : '不具备安装条件'
+          }
+          this.stopapply(model1,model)
+          return
+        }
+        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装')  && model.f_is_aerate == '否' && model. model.button.button_name == '提交'){
+          let model1 ={
+            f_stop_remarks : '未通气'
+          }
+          this.stopapply(model1,model)
+          return
+        }
+        if(this.selectdata.defname =='现场勘察'  && this.selectdata.f_apply_type == '工商户报建'&& model.button.button_name == '提交'){
+          let http = new HttpResetClass()
+          let data = {
+            tablename: 't_files',
+            condition: `defname = '现场勘察' and f_blobid = '${this.selectdata.f_process_id}'`
+          }
+          let res = await http.load('POST', this.$androidUtil.getProxyUrl() + '/rs/sql/singleTable', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: '查询失败'
+          })
+          console.log("数据长度：" + res.data.length)
+          if (res.data.length <= 0) {
+             this.$showMessage("请上传照片！！！")
+            return
+          }
+
+        }
+        var url = this.$androidUtil.getProxyUrl() + '/rs/logic/ApplyProductService'
+        // let res = await http.load('POST',url,{data:{tables:this.data.tables,start_activity:this.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})
+        // // 先判断是否包含code，如果服务端异常，可能不存在code
+        // console.log("service处理完成返回数据=>" + res)
+        // if(!res.code){
+        //   console.log("service处理完成返回数据=>" + res)
+        //   this.$showMessage('操作异常,原因:' + res)
+        // }else{
+        //   console.log("service处理完成返回数据=>" + JSON.stringify(res))
+        //   if(res.code = 200){
+        //     this.showview = false
+        //     // 特殊处理
+        //     this.special(model)
+        //     this.$dispatch('close')
+        //     this.initializtion()
+        //     this.$showMessage('操作成功')
+        //   }else{
+        //     this.$showMessage('操作失败,原因:' + res.data.msg)
+        //   }
+        // }
+        let btn = btn_operate(this, url, http, model, delteLocal)
+        co(btn)
+      }
+    },
+    watch:{
+      // 监听selectdata的变化
+      'selectdata'() {
+          console.log('进入selectdata改变事件data=>' + JSON.stringify(this.selectdata))
+          this.refurbish()
+      },
+      deep:true
+    }
+  }
+
+  let btn_operate = function * (self, url, http, model, delteLocal) {
+    // 下发，提交，保存，退回都在后台处理
+    console.log('即将请求后台url=>' + url)
+    http.load('POST',url,{data:{tables:self.data.tables,start_activity:self.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})
+      .then((res) => {
+        console.log(JSON.stringify(res))
+        if(res.code = 200){
+          self.showview = false
+          // 如果需要删除本地记录则去删除
+          if(delteLocal){
+            self.deleteLocalApply(model)
+          }
+          // 特殊处理
+          self.special(model)
+          self.$dispatch('close')
+          self.initializtion()
+          self.$showMessage('操作成功')
+        }else{
+          self.$showMessage('操作失败,原因:' + res.data.msg)
+        }
+      })
+      .catch((ret) => {
+        self.$showMessage('操作异常,原因:' + JSON.stringify(ret.data))
+      })
+  }
+</script>

package/src/components/app_apply/ServiceView.vue

@@ -18,7 +18,7 @@
                        :value="data.fields[index].value"
                        :readonly="item.readonly"
                        :disable="item.disable"
-                       @change="disabled_check(data.fields[index].required,data.fields[index].value)"
+                       @change="select_change(index)"
                        @blur ="check_disable"
                 />
               </div>
@@ -258,6 +258,17 @@
       closemodal(){
         this.showmodal=false
       },
+      // 是否禁用按钮
+      disableButton() {
+        let fields = this.data.fields
+        let flag = false
+        for (const item of fields) {
+          if (item.type === 'select' && item.label === '工程状态'&& (item.value === '正在施工' || item.value === '未开工' )&& item.disabledButton) {
+            flag = true
+          }
+        }
+        this.disable_button = flag
+      },
       // 点击按钮
       clicked(index,button){
         console.log(`点击了按钮index:${index}+button:${JSON.stringify(button)}`);
@@ -303,6 +314,7 @@
       },
       // 级联操作预留
       select_change(index){
+        this.disableButton()
         this.$dispatch('select_cascade',index)
       },
       // 检测按钮的disable

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

@@ -581,6 +581,75 @@ export default {
           throw `还有${res.data[0].num}户未安装，无法提交`
         }
       }
+      if (
+        model.f_apply_type === '工商户报建' &&
+        model.button.button_name === '提交' &&
+        (model.defname === '设计出图' || model.defname === '竣工验收' || model.defname === '合同签订'  )
+      ) {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_files',
+          condition: `defname = '${model.defname}' and f_blobid = '${this.selectdata.f_process_id}'`
+        }
+        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '查询失败'
+        })
+        console.log("数据长度：" + res.data.length)
+        if (res.data.length <= 0) {
+          throw '请上传附件！！！'
+        }
+
+      }
+      if (
+        model.f_apply_type === '工商户报建' &&
+        model.button.button_name === '提交' &&
+        model.defname === '报建登记'
+      ) {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_files',
+          condition: `defname = '${model.defname}' and f_blobid = '${this.selectdata.f_process_id}'`
+        }
+        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '查询失败'
+        })
+        console.log("数据长度：" , res.data)
+        if (res.data.length <= 0) {
+          throw '请上传附件！！！'
+        }
+        let inc=true
+        let name1 = ''
+        let wenjian = ['营业执照','身份证','非居民用户申请表','灶具五证','厨房设备布置设计图']
+        for (let name = 0;name<wenjian.length;name++){
+          let has=false
+          for (let i=0;i<res.data.length;i++){
+            if(res.data[i].f_filename.includes(wenjian[name])){
+              has=true
+            }
+          }
+          if(!has){
+            name1=name1+wenjian[name]+','
+            inc=false
+          }
+        }
+        if (inc==false){
+          throw '请上传'+name1+'附件！！！'
+        }
+        /*for (let i=0;i<res.data.length;i++){
+          if (!(
+            res.data[i].f_filename.includes('营业执照')
+            || res.data[i].f_filename.includes('身份证')
+            || res.data[i].f_filename.includes('非居民用户申请表')
+            || res.data[i].f_filename.includes('灶具五证')
+            || res.data[i].f_filename.includes('厨房设备布置设计图')
+          )){
+            throw '请检查当前节点的附件,只能上传以下文件 营业执照/'
+            return
+          }
+        }*/
+      }
       return model
     },
     // ========================= 武安 =================================
@@ -893,7 +962,7 @@ export default {
       //     }
       //   }
       // }
-      if(this.show_data.defname === '现场勘察' || this.selectdata.defname ==='入户安装') {
+      if(this.show_data.defname === '现场勘察' || this.show_data.defname ==='入户安装') {
         console.log("this.shdata",this.show_data)
         if (this.show_data.fields[index].label === '是否具备安装条件') {
           for (const button of this.show_data.buttons) {

package/src/components/product/ServiceView.vue

@@ -534,6 +534,10 @@
           if (item.type === 'select' && (item.value === '否' || item.value === '未开工') && item.disabledButton) {
             flag = true
           }
+          // 任何选择框只要是否都不能提交
+          if (item.type === 'select' && item.label === '工程状态'&& item.value === '正在施工'&& item.disabledButton) {
+            flag = true
+          }
         }
 
         let count = 0