apply-clients 5.0.35-ezhou-2 → 5.0.35-ezhou-4

package/src/components/app_apply/OneToMany.vue

@@ -0,0 +1,194 @@
+<template>
+  <div class="repair-bg auto" id="repair-first" style="padding-bottom:5px;overflow:auto">
+   <div style="text-align: center"> <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;" @click="addRow()">新增项目</button>
+   </div>
+    <div class="panel panel-default repair-info-content auto">
+      <div class="panel-body">
+        <div class="panel panel-default well"  v-for="row in rows"  >
+          <div class="panel-body bg-info" style="padding: 10px">
+            <div class="row form-group">
+              <div class="col-sm-12 col-xs-12 col-md-12">
+                <div class="row"  v-for="field in fields">
+                  <div class="col-sm-12 col-xs-12 col-md-12 padd-div-shu">
+                    {{field.label}}:{{row[field.field]}}
+                  </div>
+                </div>
+              </div>
+              <div class="col-sm-12 col-xs-12 col-md-12">
+                <button type="button" name="button" class="btn btn-primary" style="background-color:#499edf;float: right" @click="deleteRow(row)">删除</button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <modal :show.sync="show"   backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">新增</h3>
+      </header>
+      <article slot="modal-body">
+        <div class="row">
+          <label class=" col-sm-4 control-label">收费项目：</label>
+          <div class="col-sm-5">
+            <v-select :options="f_project_items" placeholder='收费项目'
+                      :width="100" style="width:100%"
+                      :value-single="true"
+                      v-model="model.f_project_item" :value.sync="model.f_project_item" close-on-select>
+            </v-select>
+          </div>
+        </div>
+        <div class="row">
+          <label class=" col-sm-4 control-label">数量：</label>
+          <div class="col-sm-5">
+            <input class="form-control" type="text" v-model="model.f_amount" >
+          </div>
+        </div>
+        <div class="row">
+          <label class=" col-sm-4 control-label">单价：</label>
+          <div class="col-sm-5">
+            <input class="form-control" type="text" v-model="model.f_price" >
+          </div>
+        </div>
+        <div class="row">
+          <label class=" col-sm-4 control-label">金额：</label>
+          <div class="col-sm-5">
+            <input class="form-control" type="text" v-model="model.f_money" >
+          </div>
+        </div>
+
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" @click='addclick()'>确定</button>
+        <button type="button" class="btn btn-default" @click='cancelclick()'>取消</button>
+      </footer>
+    </modal>
+  </div>
+
+</template>
+
+<script>
+import {HttpResetClass} from "vue-client";
+
+export default {
+  title: '收费项目',
+  props:['item'],
+  data () {
+    return {
+      model:{
+        f_amount: "",
+        f_apply_num: "",
+        f_filiale: "",
+        f_money: "",
+        f_price: "",
+        f_process_id: "",
+        f_project_item: ""
+      },
+      show:false,
+      f_project_items:[{label:'测试',value:'测试'}],
+      rows: [],
+      fields:[]
+    }
+  },
+  ready(){
+    console.log('item2',this.item)
+    const param = this.$appdata.getParam("收费项目")
+    if(param){
+      this.f_project_items = param
+    }
+    this.fields = this.item.fields
+    this.model.f_process_id = this.item.f_process_id
+    this.model.f_apply_num = this.item.f_apply_num
+    this.model.f_filiale = this.item.f_filiale
+    this.search()
+  },
+  methods:{
+    addclick(){
+      if(!this.model.f_project_item){
+        this.$showMessage('请选择收费项目')
+        return
+      }
+      if(!this.model.f_amount){
+        this.$showMessage('请输入数量')
+        return
+      }
+      if(!this.model.f_price){
+        this.$showMessage('请输入单价')
+        return
+      }
+      if(!this.model.f_money){
+        this.$showMessage('请输入金额')
+        return
+      }
+      console.log('this.model',this.model)
+      const data = {
+        row:this.model,
+        tables:this.item.tables
+      }
+
+      console.log('data',data)
+      let http=new HttpResetClass()
+      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/saveentity`,data).then(res=>{
+          console.log('res',res)
+        if(res.data.id){
+          this.$showMessage('添加成功')
+          this.cancelclick()
+          this.search()
+        }
+      })
+
+        },
+    addRow(){
+      this.show = true
+    },
+    cancelclick(){
+      this.model = Object.assign({},this.model,{
+        f_amount: "",
+        f_money: "",
+        f_price: "",
+        f_project_item: ""
+      })
+      this.show = false
+    },
+    deleteRow(row){
+      console.log('deleteRow',row)
+      let http=new HttpResetClass()
+      this.$showMessage('您确定要删除这条记录吗?',['confirm','cancel']).then(res=>{
+        if(res === 'confirm'){
+          const param ={
+            row:row,
+            tables:this.item.tables
+          }
+          http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/applyDeleteValue`,{data:param}).then(res=>{
+            console.log('res',res)
+            if(res.data.status === 200){
+              this.$showMessage('删除成功')
+              this.search()
+            }
+          })
+          }
+      })
+    },
+    search(){
+      const param = {
+        "items":"*",
+        "tablename":this.item.tables[0],
+        "condition":`f_process_id='${this.item.f_process_id}'`,
+        "orderitem":'id desc'
+      }
+      let http=new HttpResetClass()
+      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data:param}).then(res=>{
+        console.log(`前台本地报建代办工单查询结果data=>>>${JSON.stringify(res.data)}`)
+        if(res.data){
+          this.rows = res.data
+        }else{
+          this.rows = []
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/components/app_apply/PlaceControler.vue

@@ -191,6 +191,18 @@ export default {
         _this.$goto('feiminyongvv', {},'self')
       }
     },
+    'onetomany': function (val) {
+      console.log('6666666666')
+      console.log('item',val)
+      var _this = this
+      var pardate = {
+        _this: _this,
+        title: val.title,
+        safe: false
+      }
+      _this.$dispatch('gotoson',pardate)
+      _this.$goto('one-to-many', {item: val},'self')
+    },
     'close'() {
       //this.$back()
       this.$dispatch('confirm')

package/src/components/app_apply/ServiceControl.vue

@@ -1,13 +1,49 @@
 <template>
   <div>
-  <work-busy :is-busy="loading"></work-busy>
-  <service-view-app v-ref:service_show :data.sync="show_data.ppp" :model.sync="selectmodel" v-if="showview"></service-view-app>
+    <work-busy :is-busy="loading"></work-busy>
+    <service-view-app v-ref:service_show :data.sync="show_data.ppp" :model.sync="selectmodel" v-if="showview"></service-view-app>
   </div>
+  <modal :show.sync="stop_show" v-ref:modal stop_show="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeback"><span>&times;</span></button>
+      <h4 class="modal-title">终止备注</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <input type="text" class="form-control" v-model="models.f_stop_remarks"/>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="stop_show" type="button" class="btn btn-default" @click='stopapplys'>确认</button>
+    </footer>
+  </modal>
+  <modal :show.sync="apply_show" v-ref:modal apply_show="false" >
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeapply"><span>&times;</span></button>
+      <h4 class="modal-title">转单报建</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <v-select style="min-width: 80%;"
+                  placeholder='请选择'
+                  :options="applytypes"
+                  :search="false"
+                  v-model="apply_type"
+                  :value.sync="apply_type"
+                  close-on-select>
+        </v-select>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="apply_show" type="button" class="btn btn-default" @click='addactive()'>确认</button>
+    </footer>
+  </modal>
 </template>
 <script>
 import co from 'co'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import * as Util from "../Util";
 export default {
   title: '报建流程业务控制层',
   props: ['selectdata','selectmodel','show_data'],
@@ -19,11 +55,85 @@ export default {
       data:null, // 数据库数据，json配置文件数据的数据集合
       json_datas:null, // Json配置文件集合
       showview:false, // 控制显示service-view组件
-       // 给view层显示的数据
-      department_search:null // 当前部门下所有人
+      // 给view层显示的数据
+      department_search:null, // 当前部门下所有人
+      stop_show:false, // 终止备注开关
+      apply_show:false, // 转单报建开关
+      apply_type:'',
+      applytypes:[{label:"散户报装",value:"报装申请"},{label:"集体报装",value:"集体报装申请"}],// 报建类型
+      models: {
+        f_date: Util.toStandardTimeString(),
+        f_department: Vue.user.f_parentname,
+        f_operator: Vue.user.name,
+        f_filiale: Vue.user.f_fengongsi
+      },
+      models2:{}
     }
   },
   methods: {
+    // 转到报建
+    async addactive(){
+      this.selectdata.applyid = this.selectdata.id
+      // this.$resetpost('rs/logic/stopapply', {data: this.selectdata})
+      console.log(this.apply_type[0])
+      this.$workflow_vue.start_activity = this.apply_type[0]
+      let http = new HttpResetClass()
+      let res = await http.load('POST',this.$androidUtil.getProxyUrl() +'/rs/logic/ApplyGetProcessID',{data:{filename:this.$workflow_vue.workflow_xmlfilename,start_activity:this.$workflow_vue.start_activity}}, {resolveMsg: null, rejectMsg: '获取流程ID失败，请联系开发人员'})
+      let data = {
+        defname: this.$workflow_vue.start_activity,
+        f_process_id: res.data.f_process_id,
+        f_apply_date: Util.toStandardTimeString(),
+        f_product_id: res.data.f_product_id,
+        start_activity:this.$workflow_vue.start_activity,
+        f_user_type:this.models2.f_user_type,
+        f_user_name:this.models2.f_user_name,
+        f_phone:this.models2.f_phone,
+        f_area:this.models2.f_area,
+        f_street:this.models2.f_street,
+        f_residential_area:this.models2.f_residential_area,
+        f_building:this.models2.f_building,
+        f_unit:this.models2.f_unit,
+        f_floor:this.models2.f_floor,
+        f_room:this.models2.f_room,
+        f_address:this.models2.f_address,
+        f_idnumber:this.models2.f_social_credit_code,
+        f_apply_source:this.models2.f_apply_source,
+        f_sub_state:'未完工',
+        user:Vue.user
+      }
+      await http.load('POST',this.$androidUtil.getProxyUrl() +'/rs/logic/newaddApplyproduct',{data:data}, {resolveMsg: null, rejectMsg: '转发失败，请联系开发人员'})
+      var delteLocal = true
+      var url = this.$androidUtil.getProxyUrl() + '/rs/logic/ApplyProductService'
+      let btn = btn_operate(this, url, http, this.models2, delteLocal)
+      co(btn)
+      this.apply_show = false
+    },
+    // 终止报建
+    async stopapplys () {
+      this.models = Object.assign({}, this.selectdata, this.models)
+      this.models.id = null
+      this.models.applyid = this.selectdata.id
+      this.models.f_operat_type = '终止报建'
+      this.models.f_state = '有效'
+      this.models.f_describe = this.selectdata.f_user_name + '已终止报建'
+      let data ={
+        tablename:'t_project_stop',
+        parameters:this.models
+      }
+      let http = new HttpResetClass()
+      await  http.load('POST',this.$androidUtil.getProxyUrl() + '/rs/logic/save', {data:data},{resolveMsg: null, rejectMsg: "添加失败"})
+      await  http.load('POST',this.$androidUtil.getProxyUrl() +'/rs/logic/stopapply', {data:this.models},{resolveMsg: null, rejectMsg: "终止失败"})
+      this.closeback()
+      this.$dispatch('close')
+    },
+    // 关闭终止备注弹框
+    closeback() {
+      this.stop_show = false
+    },
+    // 关闭报建弹框
+    closeapply() {
+      this.apply_show = false
+    },
     // 特殊化处理
     saveCallBack(jo){
       console.log(JSON.stringify(jo))
@@ -62,13 +172,15 @@ export default {
       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: '流程异步下发据保存失败'})
+        // let res = await http.load('POST',this.$androidUtil.getProxyUrl() + '/rs/logic/syncprocess',{data:{model:model,loginUser:this.$login.f}}, {resolveMsg: null, rejectMsg: '流程异步下发据保存失败'})
+        let res = await http.load('POST',this.$androidUtil.getProxyUrl() + '/rs/logic/syncprocess',{data:{model:model,loginUser: Vue.user}}, {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: '流程异步完成数据保存失败'})
+        let res = await http.load('POST',this.$androidUtil.getProxyUrl() + '/rs/logic/stoprocess',{data:{model:model,loginUser: Vue.user}}, {resolveMsg: null, rejectMsg: '流程异步完成数据保存失败'})
+        // 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))
       }
     },
@@ -110,7 +222,6 @@ export default {
       // 下发人 options 处理，options初始化
       if(this.selectdata.actorexpression){
         //截取actorexpression
-
         let http = new HttpResetClass()
         var url = this.$androidUtil.getProxyUrl() + '/rs/search'
         console.log('即将请求后台获取下发人员，url=>' + url)
@@ -157,9 +268,35 @@ export default {
           console.log('$appdata中的缓存参数与单值=>' + JSON.stringify(this.$appdata))
           var param = this.$appdata.getParam(this.data.fields[i].label)
           console.log(param)
-          this.data.fields[i].options = param
+          if (param){
+            this.data.fields[i].options = param
+          }
 
         }
+        // 设置用户类型
+        if (this.data.fields[i].label == '用户类型') {
+          this.data.fields[i].options = [{label: '民用', value: '民用'},{label: '非民用', value: '非民用'}]
+        }
+        // 获取县区
+        if (this.data.fields[i].label == '县/区') {
+          let http = new HttpResetClass()
+          let area = await http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/applysingleTable`, {
+            data: {
+              // items: 'f_bill_url,f_url_code',
+              tablename: 't_pcd',
+              condition: `f_filialeids = '${Vue.user.f_orgids}'`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          let rs = []
+          for (let i = 0; i < area.data.length; i++) {
+            let temp = {
+              label: area.data[i].f_pcd,
+              value: area.data[i].f_pcd
+            }
+            rs.push(temp)
+          }
+          this.data.fields[i].options = [{label: '全部', value: ''}, ...rs]
+        }
       }
       // 初始化 buttons_fields
       for(let i=0;i<this.data.buttons.length;i++){
@@ -231,8 +368,57 @@ export default {
     }
   },
   events: {
+    '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[i].value==undefined){
+              this.$refs.service_show.data.fields[i].value=''
+            }
+            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[i].value=this.$refs.service_show.data.fields[i].value==undefined?'':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[i].value=this.$refs.service_show.data.fields[i].value==undefined?'':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;
+            }
+            //}
+          }
+        }
+      }
+      this.$refs.service_show.update()
+    },
     // 任意select选中时触发事件
-    'select_cascade'(index){
+    async 'select_cascade'(index){
       // this.$refs.service_show.model_temp // 子业务显示组件
       // 级联操作示例：
       /*
@@ -248,11 +434,148 @@ export default {
         }
       }
       */
+      if (this.$refs.service_show.data.fields[index].label === '县/区') {
+        let temp = this.$refs.service_show.data.fields[index].value
+        console.log('==============================县/区：' + temp)
+        for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+          // 控制设置级联
+          // 源select所选的值 this.$refs.service_show.data.activitys.fields[index].value
+          if (this.$refs.service_show.data.fields[i].label === '街道名称') {
+            await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/applysingleTable`, {
+              data: {
+                tablename: 't_street',
+                condition: `f_filialeids = '${Vue.user.f_orgids}' and f_pcd='${temp}'`
+              }
+            }, {resolveMsg: null, rejectMsg: null}).then(res => {
+              let streetrs = []
+              for (let i = 0; i < res.data.length; i++) {
+                let temp = {
+                  label: res.data[i].f_street,
+                  value: res.data[i].f_street
+                }
+                streetrs.push(temp)
+              }
+              this.$refs.service_show.data.fields[i].options = [{label: '全部', value: ''}, ...streetrs]
+              // console.log('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~option:', this.$refs.service_show.data.fields[i].options)
+              this.$refs.service_show.update()
+            })
+          }
+        }
+      }
+      if (this.$refs.service_show.data.fields[index].label === '街道名称') {
+        let temp = this.$refs.service_show.data.fields[index].value
+        console.log('=============================街道：' + temp)
+        for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+          // 控制设置级联
+          // 源select所选的值 this.$refs.service_show.data.activitys.fields[index].value
+          if (this.$refs.service_show.data.fields[i].label === '小区名称') {
+            await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/applysingleTable`, {
+              data: {
+                tablename: 't_area',
+                condition: `f_filialeids = '${Vue.user.f_orgids}' and f_street='${temp}'`
+              }
+            }, {resolveMsg: null, rejectMsg: null}).then(res => {
+              let arears = []
+              for (let i = 0; i < res.data.length; i++) {
+                let temp = {
+                  label: res.data[i].f_residential_area,
+                  value: res.data[i].f_residential_area
+                }
+                arears.push(temp)
+              }
+              this.$refs.service_show.data.fields[i].options = [{label: '全部', value: ''}, ...arears]
+              // console.log('~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~option:', this.$refs.service_show.data.fields[i].options)
+              this.$refs.service_show.update()
+            })
+          }
+        }
+      }
+      // 合成地址
+      if (
+        this.$refs.service_show.data.fields[index].label === '县/区' ||
+        this.$refs.service_show.data.fields[index].label === '街道名称' ||
+        this.$refs.service_show.data.fields[index].label === '小区名称' ||
+        this.$refs.service_show.data.fields[index].label === '楼号' ||
+        this.$refs.service_show.data.fields[index].label === '单元号' ||
+        this.$refs.service_show.data.fields[index].label === '楼层' ||
+        this.$refs.service_show.data.fields[index].label === '门牌号'
+      ) {
+        console.log('即将合成地址')
+        var address = ''
+        for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+          // 控制设置级联
+          // 源select所选的值 this.$refs.service_show.data.activitys.fields[index].value
+          // xxx xx xxx
+          if (this.$refs.service_show.data.fields[i].label === '县/区' && this.$refs.service_show.data.fields[i].value) {
+            address += this.$refs.service_show.data.fields[i].value
+          }
+          if (this.$refs.service_show.data.fields[i].label === '街道名称' && this.$refs.service_show.data.fields[i].value) {
+            address += this.$refs.service_show.data.fields[i].value
+          }
+          if (this.$refs.service_show.data.fields[i].label === '小区名称' && this.$refs.service_show.data.fields[i].value) {
+            address += this.$refs.service_show.data.fields[i].value
+          }
+          if (this.$refs.service_show.data.fields[i].label === '楼号' && this.$refs.service_show.data.fields[i].value) {
+            address += this.$refs.service_show.data.fields[i].value
+          }
+          if (this.$refs.service_show.data.fields[i].label === '楼号' && this.$refs.service_show.data.fields[i].value) {
+            address += '栋'
+          }
+          if (this.$refs.service_show.data.fields[i].label === '单元号' && this.$refs.service_show.data.fields[i].value) {
+            address += '-' +this.$refs.service_show.data.fields[i].value
+          }
+          if (this.$refs.service_show.data.fields[i].label === '单元号' && this.$refs.service_show.data.fields[i].value) {
+            address += '单元'
+          }
+          if (this.$refs.service_show.data.fields[i].label === '楼层' && this.$refs.service_show.data.fields[i].value) {
+            address += '-' +this.$refs.service_show.data.fields[i].value
+          }
+          if (this.$refs.service_show.data.fields[i].label === '楼层' && this.$refs.service_show.data.fields[i].value) {
+            address += '层'
+          }
+          if (this.$refs.service_show.data.fields[i].label === '门牌号' && this.$refs.service_show.data.fields[i].value) {
+            address += '-' +this.$refs.service_show.data.fields[i].value
+          }
+          if (this.$refs.service_show.data.fields[i].label === '门牌号' && this.$refs.service_show.data.fields[i].value) {
+            address += '室'
+          }
+
+        }
+        console.log('获取到的address=>' + address)
+        // 数据获取完毕时放入地址text
+        for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+          if (this.$refs.service_show.data.fields[i].label === '地址' || this.$refs.service_show.data.fields[i].label === '报装地址') {
+            this.$refs.service_show.data.fields[i].value = address
+            console.log('修改fields[i].value后的值=>' + this.$refs.service_show.data.fields[i].value)
+          }
+        }
+        this.$refs.service_show.update()
+      }
+      if (this.$refs.service_show.data.fields[index].label == '用户类型'){
+        if(this.$refs.service_show.data.fields[index].value == '非民用'){
+          for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+            if (this.$refs.service_show.data.fields[i].label === '小区名称') {
+              this.$refs.service_show.data.fields[i].required=false;
+            }
+          }
+        }else{
+          for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+            if (this.$refs.service_show.data.fields[i].label === '小区名称') {
+              this.$refs.service_show.data.fields[i].required=true;
+            }
+          }
+        }
+      }
     },
     // 获取view层button事件
     async 'button'(model){
+      if (this.data.defname==='踏勘'){
+        if (model.button.button_name === '终止'){
+          this.stop_show=true
+          return
+        }
+      }
       this.loading=true
-
       console.log('进入async button事件方法')
       var delteLocal = true
       // 点击保存与重置按钮不需要修改本地工单状态
@@ -276,9 +599,20 @@ export default {
       console.log("button事件接收参数model=>" + JSON.stringify(model))
       model=Object.assign({},this.selectdata,model)
       console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
+      if (this.data.defname==='踏勘'&&(model.button.button_name === '提交'||model.button.button_name === '通气')){
+        this.loading=false
+        this.apply_show=true
+        this.models2 = model
+        return
+      }
       let http = new HttpResetClass()
+      if (this.data.defname === '通气转单'&& model.button.button_name === '提交'){
+        model.f_sub_state = '完工'
+      }else {
+        model.f_sub_state = '未完工'
+      }
       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})
+     // let res = await http.load('POST',url,{data:data}, {resolveMsg: null, rejectMsg: null})
       // // 先判断是否包含code，如果服务端异常，可能不存在code
       // console.log("service处理完成返回数据=>" + res)
       // if(!res.code){
@@ -313,7 +647,7 @@ export default {
 
 let btn_operate = function * (self, url, http, model, delteLocal) {
   self.delteLocal=delteLocal
-
+console.log("model的信息",model)
   // 下发，提交，保存，退回都在后台处理
   console.log('即将请求后台url=>' + url)
   model.employeetemplate=''
@@ -322,8 +656,13 @@ let btn_operate = function * (self, url, http, model, delteLocal) {
   let param={
     employeetemplate:'',
     tables:self.data.tables,
-    start_activity:self.$workflow_vue.start_activity,
-    model:model,loginUser:Vue.user
+    workflow_xmlfilename : self.$workflow_vue.workflow_xmlfilename,
+    start_activity:model.start_activity,
+    model:model,
+    loginUser:Vue.user
+  }
+  if(param.model.defname === '现场勘查定价'){
+    param.model.f_unaccounts_money = param.model.f_total_cost
   }
   // 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})
   let paramStr = JSON.stringify(param)