apply-clients 4.0.66 → 4.1.1-weinan

package/src/components/app_apply/ServiceControl.vue

@@ -1,94 +1,10 @@
 <template>
-  <batch-item-app v-if="selectdata.defname=='工商现场勘查'||selectdata.defname=='民用现场勘查'||selectdata.defname=='户内安装'||selectdata.defname=='点火'"
-              v-ref:batch_item
-              :selectdata="selectdata"
-              :edit="true"></batch-item-app>
-  <hr>
-
-  <div class="form-group" v-if="selectdata.defname=='工商现场勘查'||selectdata.defname=='民用现场勘查'" >
-    <label class="col-sm-12 control-label">用户报装勘查业务申请表</label>
-    <div class="row" style="height: 240px;overflow: scroll;top: 1px" >
-      <div class="col-sm-4"  v-for="(index,img) in paper.f_apply_prospect_path">
-        <img-self  :src="img.f_apply_prospect_path" alt="用户报装勘查业务申请表" width="150" height="200"></img-self>
-        <img src="../../assets/删除.png" @click="delfile('f_apply_prospect_path', img.f_apply_prospect_path,index)" style="width: 15px;margin-top: -80px" alt="">
-      </div>
-    </div>
-    <div class="row text-right div-photo" v-if="selectdata.defname=='工商现场勘查'||selectdata.defname=='民用现场勘查'">
-      <button type="button" name="button" class="btn btn-photo" @click="takePic('f_apply_prospect_path', '用户报装勘查业务申请表')">拍照</button>
-    </div>
-  </div>
-  <div class="form-group" v-if="selectdata.defname=='工商现场勘查'||selectdata.defname=='民用现场勘查'" >
-    <label class="col-sm-12 control-label">现场勘查照片1</label>
-    <div class="row" style="height: 240px;overflow: scroll;top: 1px" >
-      <div class="col-sm-4"  v-for="(index,img) in paper.f_cat_pic1">
-        <img-self  :src="img.f_cat_pic1" alt="现场勘查照片1" width="150" height="200"></img-self>
-        <img src="../../assets/删除.png" @click="delfile('f_cat_pic1', img.f_cat_pic1,index)" style="width: 15px;margin-top: -80px" alt="">
-      </div>
-    </div>
-    <div class="row text-right div-photo" v-if="selectdata.defname=='工商现场勘查'||selectdata.defname=='民用现场勘查'">
-      <button type="button" name="button" class="btn btn-photo" @click="takePic('f_cat_pic1', '现场勘查照片1')">拍照</button>
-    </div>
-  </div>
-  <div class="form-group" v-if="selectdata.defname=='工商现场勘查'||selectdata.defname=='民用现场勘查'" >
-    <label class="col-sm-12 control-label">现场勘查照片2</label>
-    <div class="row" style="height: 240px;overflow: scroll;top: 1px" >
-      <div class="col-sm-4"  v-for="(index,img) in paper.f_cat_pic2">
-        <img-self  :src="img.f_cat_pic2" alt="现场勘查照片2" width="150" height="200"></img-self>
-        <img src="../../assets/删除.png" @click="delfile('f_cat_pic2', img.f_cat_pic2,index)" style="width: 15px;margin-top: -80px" alt="">
-      </div>
-    </div>
-    <div class="row text-right div-photo" v-if="selectdata.defname=='工商现场勘查'||selectdata.defname=='民用现场勘查'">
-      <button type="button" name="button" class="btn btn-photo" @click="takePic('f_cat_pic2', '现场勘查照片2')">拍照</button>
-    </div>
-  </div>
-
-  <div class="form-group"  v-if="selectdata.defname=='户内安装'">
-    <label class="col-sm-12 control-label">压力测试结果</label>
-    <div class="row" style="height: 240px;overflow: scroll;top: 1px" >
-      <div class="col-sm-4"  v-for="(index,img) in paper.f_yl">
-        <img-self  :src="img.f_yl" alt="压力测试结果" width="150" height="200"></img-self>
-        <img src="../../assets/删除.png" @click="delfile('f_yl', img.f_yl,index)" style="width: 15px;margin-top: -80px" alt="">
-      </div>
-    </div>
-    <div class="row text-right div-photo" v-if="selectdata.defname=='户内安装'">
-      <button type="button" name="button" class="btn btn-photo" @click="takePic('f_yl', '压力测试结果')">拍照</button>
-    </div>
-  </div>
-  <div class="form-group" v-if="selectdata.defname=='户内安装'" >
-    <label class="col-sm-12 control-label">用户确认</label>
-    <div class="row" style="height: 240px;overflow: scroll;top: 1px" >
-      <div class="col-sm-4"  v-for="(index,img) in paper.f_user_ok">
-        <img-self  :src="img.f_user_ok" alt="用户确认" width="150" height="200"></img-self>
-        <img src="../../assets/删除.png" @click="delfile('f_user_ok', img.f_user_ok,index)" style="width: 15px;margin-top: -80px" alt="">
-      </div>
-    </div>
-    <div class="row text-right div-photo" v-if="selectdata.defname=='户内安装'">
-      <button type="button" name="button" class="btn btn-photo" @click="takePic('f_user_ok', '用户确认')">拍照</button>
-    </div>
-  </div>
-
-  <div class="form-group" v-if="selectdata.defname=='点火'" >
-    <label class="col-sm-12 control-label">点火记录单</label>
-    <div class="row" style="height: 240px;overflow: scroll;top: 1px" >
-      <div class="col-sm-4"  v-for="(index,img) in paper.f_fire_record">
-        <img-self  :src="img.f_fire_record" alt="点火记录单" width="150" height="200"></img-self>
-        <img src="../../assets/删除.png" @click="delfile('f_fire_record', img.f_fire_record,index)" style="width: 15px;margin-top: -80px" alt="">
-      </div>
-    </div>
-    <div class="row text-right div-photo" v-if="selectdata.defname=='点火'">
-      <button type="button" name="button" class="btn btn-photo" @click="takePic('f_fire_record', '点火记录单')">拍照</button>
-    </div>
-  </div>
-  <hr>
-  <service-view-app v-ref:service_show  :data="show_data" v-if="showview"></service-view-app>
-
+  <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'
-  import * as Util from '../Utils'
-  // import serviceView from './ServiceView.vue'
   export default {
     title: '报建流程业务控制层',
     props: ['selectdata'],
@@ -98,120 +14,14 @@
         json_datas:null, // Json配置文件集合
         showview:false, // 控制显示service-view组件
         show_data:null, // 给view层显示的数据
-        department_search:null, // 当前部门下所有人
-        alldata:null,
-        apply_data:null,
-        app_data:null,
-        app_adjustable:null,
-        piece:{f_apply_prospect_path:'',f_cat_pic1:'',f_cat_pic2:'',f_yl:'',f_user_ok:'',f_fire_record:'' },
-        paper:{f_apply_prospect_path:[],f_cat_pic1:[],f_cat_pic2:[],f_yl:[],f_user_ok:[],f_fire_record:[]},
-          yusuansum:0,
-          jiesuansum:0
+        department_search:null // 当前部门下所有人
       }
     },
     methods: {
-      cameraCallBack(prop, fileName) {
-          let fileNameup=fileName.split("safecheck/")[1];
-          let updaloadfilename=fileName.split("///")[1];
-          let param={"filepath":updaloadfilename,"fileName":fileNameup}
-
-        //  var result = HostApp.readLocalFile(fileName)
-         // console.log("图片内容"+JSON.stringify(result));
-        console.log("回调的值"+prop + ',' + fileName)
-        console.log("需要遍历的值"+JSON.stringify(this.paper.f_apply_prospect_path));
-        //HostApp.__this__.$set(prop, fileName) doesnt work
-        if(prop == 'f_apply_prospect_path'){
-          let f_overall_path = fileName + '?' + Math.random();
-
-          console.log("当前的push的内容filename==>"+f_overall_path)
-
-          HostApp.__this__.paper.f_apply_prospect_path.push({
-            f_apply_prospect_path:f_overall_path
-          })
-        }else if(prop == 'f_cat_pic1'){
-            let f_overall_path = fileName + '?' + Math.random();
-            HostApp.__this__.paper.f_cat_pic1.push({
-                f_cat_pic1:f_overall_path
-            })
-        }else if(prop =='f_cat_pic2'){
-            let f_overall_path = fileName + '?' + Math.random();
-            HostApp.__this__.paper.f_cat_pic2.push({
-                f_cat_pic2:f_overall_path
-            })
-        }else if( prop =='f_yl'){
-            let f_overall_path = fileName + '?' + Math.random();
-            HostApp.__this__.paper.f_yl.push({
-                f_yl:f_overall_path
-            })
-        }else if(prop =='f_user_ok'){
-            let f_overall_path = fileName + '?' + Math.random();
-            HostApp.__this__.paper.f_user_ok.push({
-                f_user_ok:f_overall_path
-            })
-        }else if(prop=='f_fire_record'){
-            let f_overall_path = fileName + '?' + Math.random();
-            HostApp.__this__.paper.f_fire_record.push({
-                f_fire_record:f_overall_path
-            })
-        }else{
-            HostApp.__this__.piece[prop] = fileName + '?' + Math.random()
-            console.log("this.piece===>"+HostApp.__this__.piece[prop])
-        }
-          console.log("kaisi上传")
-          let res = this.$androidUtil.bzLogic('appupdatePic',param)
-       // let result = HostApp.organizeJSON({f_apply_prospect_path:this.paper.f_apply_prospect_path})
-        console.log(result)
-        HostApp.__callback__ = null
-        HostApp.__this__ = null
-      },
-      takePic(prop, title) {
-        HostApp.__callback__ = this.cameraCallBack
-        HostApp.__this__ = this
-        console.log('this.piece[prop]:' + this.piece[prop])
-        let fileName
-        if(!this.piece[prop] || this.piece[prop].includes("nopic.png")) {
-          fileName = Util.guid() +'-plumb-' +  prop + '.jpg'
-        } else {
-          fileName = Util.getFileName(this.piece[prop])
-        }
-        console.log("filename:"+fileName);
-        HostApp._open_a_page({type: 'boomerang',
-          page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
-          param: {file: fileName, requestCode: 111, callback:'javascript:HostApp.__callback__("' + prop +'", "%s");', watermark: title + '\t时间：'+ Util.toStandardTimeString()}
-        })
-      },
-      delfile(prop, fileName,index) {
-        if (fileName == Vue.nopic)
-          return
-        else {
-          if(prop == 'f_apply_prospect_path'){
-            this.paper.f_apply_prospect_path.splice(index,1)
-            HostApp.delfile(fileName)
-          }else if(prop == 'f_cat_pic1'){
-              this.paper.f_cat_pic1.splice(index,1)
-              HostApp.delfile(fileName)
-          }else if(prop =='f_cat_pic2'){
-                this.paper.f_cat_pic2.splice(index,1)
-                HostApp.delfile(fileName)
-          }else if(prop =='f_yl'){
-              this.paper.f_yl.splice(index,1)
-              HostApp.delfile(fileName)
-          }else if(prop=='f_user_ok'){
-              this.paper.f_user_ok.splice(index,1)
-              HostApp.delfile(fileName)
-          }else if(prop='f_fire_record'){
-              this.paper.f_fire_record.splice(index,1)
-              HostApp.delfile(fileName)
-          }else{
-            HostApp.delfile(fileName)
-            this.paper[prop] = Vue.nopic
-          }
-        }
-      },
       // 特殊化处理
       async special(model){
         console.log('进入async special方法')
-        if(this.data.distribute_async && miodel.button.button_name==='下发'){
+        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: '流程异步下发据保存失败'})
@@ -271,51 +81,6 @@
           }
           this.department_search = res.data
         }
-          // onetomany 数据获取
-          if (this.data.onetomany) {
-              console.log('判断是onetomany,this.data.onetomany的数据为=>' + JSON.stringify(this.data.onetomany))
-              for (let index = 0; index < this.data.onetomany.length; index++) {
-                  let http = new HttpResetClass()
-                  let data = {
-                      tablename: this.data.onetomany[index].tables[0],
-                      condition: `f_apply_num = '${this.selectdata.f_apply_num}'  and f_process_id='${this.selectdata.f_process_id}'`
-                  }
-                  let res = await http.load('POST', this.$androidUtil.getProxyUrl() + '/rs/sql/singleTable', {data: data}, {
-                      resolveMsg: null,
-                      rejectMsg: 'onetomany查询失败'
-                  })
-                  // 初始化 onetomany
-                  let rows = []
-                  console.log('查询返回结果res.data=>' + JSON.stringify(res.data))
-                  this.data.onetomany[index].rows = res.data
-                  console.log(JSON.stringify('this.data.onetomany[index].rows=>' + JSON.stringify(this.data.onetomany[index].rows)))
-
-                  // 初始化onetomany中的fields
-                  for(let j =0;j<this.data.onetomany[index].fields.length;j++){
-                      // 如果配置类型为select,优先从参数列表获取options
-                      if (this.data.onetomany[index].fields[j].type === 'select') {
-                          let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                          if (temp && temp.length > 0) {
-                              this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                          }
-                      }
-                  }
-
-              }
-          }
-        //获取t_apply中的数据
-
-        console.log('------app开始查询t_apply数据------')
-        var condition = ` 1=1 and u.f_apply_num='${Vue.prototype.$activity_id}'`
-        var param = {"condition": condition,"id": Vue.user.id}
-        console.log(`param=>>>${JSON.stringify(param)}`)
-        //获取当前流程的 data数据
-        let res = this.$androidUtil.bzLogic('getAppApplyData',param)
-        if(res.data){
-          this.app_data = res.data.rows[0]
-        }else{
-          this.app_data = []
-        }
 
         // data 填充 selectdata
         console.log('即将合并data与selectdata,selectdata数据=>' + JSON.stringify(this.selectdata))
@@ -325,162 +90,18 @@
         // 初始化 fields
         console.log('this.data.fields.length=>' + this.data.fields.length)
         for(let i=0;i<this.data.fields.length;i++){
-
-
-          if(this.selectdata.f_adjust_box != null && this.selectdata.f_adjust_box.includes("[")){
-            if(this.selectdata.f_adjust_box.length-1 ==this.selectdata.f_adjust_box.indexOf("]")){
-              this.selectdata.f_adjust_box="";
-            }
-          }
-          if(this.selectdata.f_connection_way!=null && this.selectdata.f_connection_way.includes("[")){
-            this.selectdata.f_connection_way="";
-          }
-          if(this.selectdata.f_gasinto!=null && this.selectdata.f_gasinto.includes("[")){
-            this.selectdata.f_gasinto="";
-          }
-          if(this.selectdata.f_is_gas!=null && this.selectdata.f_is_gas.includes("[")){
-            this.selectdata.f_is_gas="";
-          }
-          if(this.selectdata.f_pocket_watch!=null && this.selectdata.f_pocket_watch.includes("[")){
-            this.selectdata.f_pocket_watch="";
-          }
-          console.log("存储app_data的数据"+JSON.stringify(this.app_data))
           // 如果selectdata有这些key，则把selectdata的value赋值给data的value
-          if(this.app_data[this.data.fields[i].field]){
-            if(this.app_data[this.data.fields[i].field]=="null"){
-              this.app_data[this.data.fields[i].field]="";
-            }
-            console.log(this.app_data[this.data.fields[i].field]);
-             this.data.fields[i].value = this.app_data[this.data.fields[i].field]
+          if(this.selectdata[this.data.fields[i].field]){
+            this.data.fields[i].value = this.selectdata[this.data.fields[i].field]
           }
-          // //将新数据保存起来
-          // if(this.alldata[this.data.fields[i].field]){
-          //   this.data.fields[i].value = this.alldata[this.data.fields[i].field]
-          // }
-
-          if(this.data.fields[i].type.label== "预算" ){
-            this.data.fields[i].type.readonly = "false";
-          }
-
-
           // 如果配置类型为select,优先从参数列表获取options
           if(this.data.fields[i].type == 'select'){
             console.log('进入下拉框参数获取方法,参数名称=>' + this.data.fields[i].label)
             console.log('$appdata中的缓存参数与单值=>' + JSON.stringify(this.$appdata))
-            console.log(JSON.stringify(this.data.fields[i].options));
             var param = this.$appdata.getParam(this.data.fields[i].label)
-            if(!param === undefined){
-              this.data.fields[i].options = param
-            }
-
-          }
-
-          //初始化调压箱
-          if(this.data.fields[i].label == '调压箱'){
-            let arr = [];
-            console.log("this.appAdjustabledaga数据"+JSON.stringify(this.$appAdjustableData))
-            let asss =this.$appAdjustableData.adjustables;
-            for(let i=0;i<asss.length;i++){
-              let item = asss[i];
-              let temp = {}
-              temp.label = `[${item.value.f_adjustable_id}]-${item.label}`
-              temp.value = `[${item.value.f_adjustable_id}]-${item.value.f_adjustable_name}`
-              arr.push(temp)
-            }
-            if(arr.length != 0){
-              this.data.fields[i].options = arr
-            }
-          }
-          console.log("燃气表品牌")
-          if(this.data.fields[i].label == '燃气表品牌'){
-            let arr = [];
-            console.log("this.appAdjustabledaga数据"+JSON.stringify(this.$appAdjustableData))
-            let bransdata =this.$appAdjustableData.grsbrand.f_meter_brand;
-            for(let i=0;i<bransdata.length;i++){
-              let item = bransdata[i];
+            console.log(param)
+            this.data.fields[i].options = param
 
-              let temp = {}
-              temp.label = `${item.name.label}`;
-              temp.value = `${item.name.value}`;
-              arr.push(temp)
-            }
-            if(arr.length != 0){
-              this.data.fields[i].options = arr
-            }
-          }
-          console.log("燃气表型号")
-          if(this.data.fields[i].label == '燃气表型号'){
-            let arr = [];
-            console.log("this.appAdjustabledaga数据"+JSON.stringify(this.$appAdjustableData))
-            let bransdata =this.$appAdjustableData.grsbrand.f_meter_brand;
-            for(let i=0;i<bransdata.length;i++){
-              let item = bransdata[i];
-              for(let j=0;j<item.f_meter_style.length;j++){
-                let newitem = item.f_meter_style[j];
-                let temp = {}
-                temp.label = `${newitem.label}`;
-                temp.value = `${newitem.value}`;
-                arr.push(temp)
-              }
-            }
-            if(arr.length != 0){
-              this.data.fields[i].options = arr
-            }
-          }
-          console.log("生产厂家")
-          if(this.data.fields[i].label == '生产厂家'){
-            let arr = [];
-            console.log("this.appAdjustabledaga数据"+JSON.stringify(this.$appAdjustableData))
-            let manudata =this.$appAdjustableData.grsbrand.f_manufacturers;
-            for(let i=0;i<manudata.length;i++){
-              let item = manudata[i];
-              let temp = {}
-              temp.label = `${item.label}`;
-              temp.value = `${item.value}`;
-              arr.push(temp)
-            }
-            if(arr.length != 0){
-              this.data.fields[i].options = arr
-            }
-          }
-          console.log("开始获取材料费------------------------")
-          if(this.data.fields[i].label == '工料费'||this.data.fields[i].label == '延伸服务费'||this.data.fields[i].label =='金额'||this.data.fields[i].label =='不锈钢波纹管费合计') {
-              this.data.fields[i].readonly = true
-              let http = new HttpResetClass()
-              console.log("开始执行ApplyPaySearch")
-              let res = await http.load('POST',this.$androidUtil.getProxyUrl() +'/rs/sql/ApplyPaySearch', {data:{condition: ` f_apply_num ='${this.selectdata.f_apply_num}'`}},{resolveMsg: null, rejectMsg: '获取工料费和延伸服务费失败!'})
-              console.log("执行ApplyPaySearch结果:"+JSON.stringify(res))
-              if(this.data.fields[i].label == '工料费'){
-                  this.data.fields[i].value = res.data[0].f_glf
-              }else if(this.data.fields[i].label == '延伸服务费'&&!this.data.fields[i].value){
-                  this.data.fields[i].value = res.data[0].f_ysfwf
-              }else if(this.selectdata.defname == '点火'&&this.data.fields[i].label =='不锈钢波纹管费合计'){
-                  this.data.fields[i].value = res.data[0].f_dhbxgbwg
-              }else if(this.selectdata.defname == '点火申请'&&this.data.fields[i].label =='金额'){
-                  this.data.fields[i].value = res.data[0].f_ysfwf
-              }
-          }
-          console.log("气价类型")
-          if(this.data.fields[i].label == '气价类型'){
-            let arr = [];
-              let temp = {}
-              temp.label = "固定气价";
-              temp.value = "固定气价";
-              arr.push(temp)
-            if(arr.length != 0){
-              this.data.fields[i].options = arr
-            }
-          }
-          console.log("气价名称")
-          if(this.data.fields[i].label == '气价名称'){
-            let arr = [];
-            let temp = {}
-            temp.label = "居民用气";
-            temp.value = "居民用气";
-            arr.push(temp)
-            if(arr.length != 0){
-              this.data.fields[i].options = arr
-            }
           }
         }
         // 初始化 buttons_fields
@@ -523,26 +144,6 @@
             }
           }
         }
-          if (this.data.onetomany) {
-              for (let i = 0; i < this.data.onetomany.length; i++) {
-                  if (this.data.onetomany[i].tables[0]==='t_fire_material'){
-                      console.log('1111111')
-                      for (let j = 0; j < this.data.onetomany[i].fields.length; j++) {
-                          if (this.data.onetomany[i].fields[j].label==='材料名称'){
-                              console.log('2222222')
-                              let http = new HttpResetClass()
-                              let res = await http.load('POST',this.$androidUtil.getProxyUrl()+'/rs/logic/getMaterialItem', {data: {condition: `1=1 and f_use_type='点火用材料'`}},{resolveMsg: null, rejectMsg: '获取材料失败!'})
-                              let house = []
-                              for (let row of res.data.material){
-                                  house.push({label: row.f_name,value: row.f_name})
-                              }
-                              this.data.onetomany[i].fields[j].options = house
-                              console.log('3333333')
-                          }
-                      }
-                  }
-              }
-          }
         // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
         let temp = JSON.parse(JSON.stringify(this.data))
         // 退回原因展示
@@ -551,150 +152,15 @@
         }
         console.log('即将给show_data赋值temp=>' + JSON.stringify(temp))
         this.show_data = temp
-
-          for (let i = 0; i < this.show_data.fields.length; i++) {
-              if (this.show_data.fields[i].label === '预算') {
-                  this.show_data.fields[i].value = this.yusuansum
-              }
-          }
         console.log('initializtion()方法结束,showview')
         this.showview = true
       },
       deleteLocalApply(model){
         console.log(`前台上传完成，开始删除本地报建工单`)
         this.$androidUtil.bzLogic('deleteApply', {data:model})
-      },
-      saveLocalApply(model){
-        console.log(`前台上传完成，开始删除本地报建工单`)
-        this.$androidUtil.bzLogic('saveAppApply', {data:model})
       }
     },
     events: {
-        'get-price' (val,type) {
-            console.log("开始预算"+val+"  "+type)
-            if(type =='预算'){
-                this.yusuansum = val
-                if(this.show_data&&this.show_data.fields){
-                    for (let i = 0; i < this.show_data.fields.length; i++) {
-                        if (this.show_data.fields[i].label === '预算') {
-                            this.show_data.fields[i].value = this.yusuansum
-                        }
-                    }
-                }
-
-            }else if(type =='结算'){
-                this.jiesuansum = val
-                if(this.show_data&&this.show_data.fields) {
-                    for (let i = 0; i < this.show_data.fields.length; i++) {
-                        if (this.show_data.fields[i].label === '结算费用') {
-                            this.show_data.fields[i].value = this.jiesuansum
-                        }
-                    }
-                }
-            }else{
-                this.price = val
-            }
-
-            this.initializtion()
-        },
-        //获取view层confirm事件
-        async 'confirm'(tables, row,showadd_index,j) {
-            var _this = this
-            for (let i = 0; i < tables.length; i++) {
-                let datas = {
-                    tables: tables,
-                    row: row
-                }
-                datas.row['f_process_id'] = this.selectdata.f_process_id
-                datas.row['f_apply_num'] = this.selectdata.f_apply_num
-                datas.row['f_filiale'] = this.selectdata.f_filiale
-                let http = new HttpResetClass()
-                if (tables[i] == 't_charge_record') {
-                    await http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/applycharge', datas, {
-                        resolveMsg: null,
-                        rejectMsg: '收费保存失败'
-                    }).then((res) => {
-                        // 刷新列表数据
-                        this.$dispatch('selfsearch')
-                        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].value = res.data.f_cumulative_money
-                            }
-
-                            if (this.$refs.service_show.data.fields[i].label == '未结总金额') {
-                                this.$refs.service_show.data.fields[i].value = res.data.f_unaccounts_money
-                            }
-                        }
-                        _this.initializtion()
-                        this.$showMessage("保存成功！");
-                    })
-                } else if (tables[i] == 't_batch_fire') {
-                    console.log('即将要保存的数据：',datas)
-                    datas.row.f_cash = (datas.row.f_number*datas.row.f_price)
-                    await http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/saveentity', datas, {
-                        resolveMsg: null,
-                        rejectMsg: 'onetomany保存失败'
-                    }).then((res) => {
-                        // 刷新列表数据
-                        this.$dispatch('selfsearch')
-                        let temp = _this.$refs.service_show.model.rows[showadd_index][j]
-                        temp.id = res.data.id
-                        _this.$refs.service_show.model.rows[showadd_index][j] = temp
-                        _this.initializtion()
-                        this.$showMessage("保存成功！");
-                    })
-                }else {
-                    await http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/saveentity', datas, {
-                        resolveMsg: null,
-                        rejectMsg: 'onetomany保存失败'
-                    }).then((res) => {
-                        // 刷新列表数据
-                      //  this.$dispatch('selfsearch')
-                        let temp = _this.$refs.service_show.model.rows[showadd_index][j]
-                        temp.id = res.data.id
-                        console.log("a");
-                        _this.$refs.service_show.model.rows[showadd_index][j] = temp
-                        console.log("b");
-                        _this.initializtion()
-                        for(let i =0;i<this.show_data.fields.length;i++){
-                            if(this.show_data.fields[i].label == '工料费'||this.show_data.fields[i].label == '延伸服务费'||this.show_data.fields[i].label =='金额'||this.show_data.fields[i].label =='不锈钢波纹管费合计') {
-                                this.show_data.fields[i].readonly = true
-                                let httpf = new HttpResetClass()
-                                let resf =  httpf.load('POST',this.$androidUtil.getProxyUrl()+'/rs/sql/ApplyPaySearch', {data:{condition: ` f_apply_num ='${this.selectdata.f_apply_num}'`}},{resolveMsg: null, rejectMsg: '获取工料费和延伸服务费失败!'})
-                                if(this.show_data.fields[i].label == '工料费'){
-                                    this.show_data.fields[i].value = resf.data[0].f_glf
-                                }else if(this.data.fields[i].label == '延伸服务费'&&!this.show_data.fields[i].value){
-                                    this.show_data.fields[i].value = resf.data[0].f_ysfwf
-                                }else if(this.selectdata.defname == '点火'&&this.show_data.fields[i].label =='不锈钢波纹管费合计'){
-                                    this.show_data.fields[i].value = resf.data[0].f_dhbxgbwg
-                                }else if(this.selectdata.defname == '点火申请'&&this.show_data.fields[i].label =='金额'){
-                                    this.show_data.fields[i].value = resf.data[0].f_ysfwf
-                                }
-                            }
-                        }
-                        this.$showMessage("保存成功！");
-                    })
-                }
-            }
-
-
-        },
-        async 'onetomanydelete'(i, j) {
-            let http = new HttpResetClass()
-            let data = {
-                tables: this.show_data.onetomany[i].tables,
-                row: this.$refs.service_show.model.rows[i][j]
-            }
-            await  http.load('POST', this.$androidUtil.getProxyUrl()+'/rs/logic/applyDeleteValue', {data: data}, {
-                resolveMsg: null,
-                rejectMsg: 'onetomanydelete失败'
-            }).then(() => {
-                this.$dispatch('selfsearch')
-                this.$refs.service_show.model.rows[i].splice(j, 1)
-            })
-            this.initializtion()
-        },
       // 任意select选中时触发事件
       'select_cascade'(index){
         // this.$refs.service_show.model_temp // 子业务显示组件
@@ -740,12 +206,6 @@
         console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
         let http = new HttpResetClass()
         var url = this.$androidUtil.getProxyUrl() + '/rs/logic/ApplyProductService'
-        let btn = btn_operate(this, url, http, model, delteLocal)
-        this.selectdata = model;
-        this.alldata = model;
-        // this.data = model;
-        co(btn)
-
         // 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)
@@ -765,115 +225,9 @@
         //     this.$showMessage('操作失败,原因:' + res.data.msg)
         //   }
         // }
-
-      },
-
-        // onetomany模态框监听事件
-        async 'select_cascade_modal'(i,j){
-            let house = []
-            if (this.data.onetomany[i].tables[0]==='t_fire_material'){
-                console.log('1111111')
-
-                if (this.data.onetomany[i].fields[j].label ==='材料名称'){
-                    console.log('2222222')
-                    let a =this.$refs.service_show.showadd_fields.fields[j].value
-                    let http = new HttpResetClass()
-                    http.load('POST',this.$androidUtil.getProxyUrl()+'/rs/logic/getMaterialItem', {data: {condition: `f_name='${a}' and f_use_type='点火用材料'`}},{resolveMsg: null, rejectMsg: '获取材料失败!'}).then((res)=>{
-                        for (let row of res.data.material){
-                            house.push({label: row.f_unit,value: row.f_unit})
-                        }
-                        for (let m = 0; m < this.data.onetomany[i].fields.length; m++) {
-                            if (this.data.onetomany[i].fields[m].label==='材料单位'){
-                                console.log('传值',house)
-                                this.$refs.service_show.showadd_fields.fields[m].options= house
-                                console.log(house[0].value);
-                                this.$refs.service_show.showadd_fields.fields[m].value= house[0].value;
-                                this.$refs.service_show.update();
-                                // this.$refs.service_show.update_modal()
-                                console.log(`3333333=====>${this.$refs.service_show.showadd_fields.fields[m].options}`)
-                                // this.data.onetomany[i].fields[m].options
-                            }
-                            if(this.data.onetomany[i].fields[m].label==='单价'){
-                                this.$refs.service_show.showadd_fields.fields[m].value= res.data.material[0].f_price
-                            }
-                        }
-                    })
-
-                }
-                if (this.data.onetomany[i].fields[j].label ==='数量'){
-                    let danjia = 0
-                    let shuliang = this.$refs.service_show.showadd_fields.fields[j].value
-                    for (let m = 0; m < this.data.onetomany[i].fields.length; m++) {
-                        if(this.data.onetomany[i].fields[m].label==='单价'){
-                            danjia = this.$refs.service_show.showadd_fields.fields[m].value
-                        }
-                        if(this.data.onetomany[i].fields[m].label==='金额'){
-                            this.$refs.service_show.showadd_fields.fields[m].value= danjia*shuliang
-                        }
-                    }
-                }
-            }
-
-
-            if (this.data.onetomany[i].tables[0]==='t_fire_machine') {
-                let a = 0
-
-                if (this.data.onetomany[i].fields[j].label === '燃气具') {
-                    if (this.$refs.service_show.showadd_fields.fields[j].value === '燃气灶') {
-                        a = 1
-                    }
-                    if (this.$refs.service_show.showadd_fields.fields[j].value === '热水器') {
-                        a = 2
-                    }
-                }
-
-
-                for (let m = 0; m < this.data.onetomany[i].fields.length; m++) {
-                    if (a === 1) {
-                        console.log('燃气灶')
-                        if (this.data.onetomany[i].fields[m].label === '安装方式') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = false
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '面板') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = false
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '连接方式') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = false
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '安装位置') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = true
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '排烟方式') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = true
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '容积') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = true
-                        }
-                    }
-                    if (a === 2) {
-                        console.log('热水器')
-                        if (this.data.onetomany[i].fields[m].label === '安装位置') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = false
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '排烟方式') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = false
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '容积') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = false
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '安装方式') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = true
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '面板') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = true
-                        }
-                        if (this.data.onetomany[i].fields[m].label === '连接方式') {
-                            this.$refs.service_show.showadd_fields.fields[m].hidden = true
-                        }
-                    }
-                }
-            }
-        }
+        let btn = btn_operate(this, url, http, model, delteLocal)
+        co(btn)
+      }
     },
     watch:{
       // 监听selectdata的变化
@@ -888,101 +242,6 @@
   let btn_operate = function * (self, url, http, model, delteLocal) {
     // 下发，提交，保存，退回都在后台处理
     console.log('即将请求后台url=>' + url)
-    if(model.f_contact == undefined){
-      model.f_contact ="";
-    }
-    if(model.f_supervisory_engineer == undefined){
-      model.f_supervisory_engineer ="";
-    }
-    if(model.f_construction_representative == undefined){
-      model.f_construction_representative ="";
-    }
-    if(model.f_installation_project == undefined){
-      model.f_installation_project ="";
-    }
-    if(model.f_construction_unit == undefined){
-      model.f_construction_unit ="";
-    }
-    if(model.f_suspension_position == undefined){
-      model.f_suspension_position ="";
-    }
-    if(model.f_meter_brand == undefined){
-      model.f_meter_brand ="";
-    }
-    if(model.f_meter_style == undefined){
-      model.f_meter_style ="";
-    }
-    if(model.f_meter_direction == undefined){
-      model.f_meter_direction ="";
-    }
-    if(model.f_manufacturers == undefined){
-      model.f_manufacturers ="";
-    }
-    if(model.f_price_type == undefined){
-      model.f_price_type ="";
-    }
-    if(model.f_price_name == undefined){
-      model.f_price_name ="";
-    }
-    if(model.f_payment_clerk == undefined){
-      model.f_payment_clerk ="";
-    }
-    if(model.f_dispatch_telephone == undefined){
-      model.f_dispatch_telephone ="";
-    }
-    if(model.f_ventilation == undefined){
-      model.f_ventilation ="";
-    }
-    if(model.f_fixed_conditions == undefined){
-      model.f_fixed_conditions ="";
-    }
-    if(model.f_alarm_brand == undefined){
-      model.f_alarm_brand ="";
-    }
-    if(model.f_alarm_type == undefined){
-      model.f_alarm_type ="";
-    }
-    if(model.f_alarm_manufacturer == undefined){
-      model.f_alarm_manufacturer ="";
-    }
-    if(model.f_pressure == undefined){
-      model.f_pressure ="";
-    }
-    if(model.f_alarm_installation_location == undefined){
-      model.f_alarm_installation_location ="";
-    }
-    if(model.f_retention_time == undefined){
-      model.f_retention_time ="";
-    }
-    if(model.f_disposal_opinions == undefined){
-      model.f_disposal_opinions ="";
-    }
-    if(model.f_fire_fee_person == undefined){
-      model.f_fire_fee_person ="";
-    }
-    if(model.f_dh_payment == undefined){
-      model.f_dh_payment ="";
-    }
-    if(model.f_summation == undefined){
-      model.f_summation ="";
-    }
-    if(model.f_handler == undefined){
-      model.f_handler ="";
-    }
-    if(model.f_calibration_time == undefined){
-      model.f_calibration_time ="";
-    }
-    if(model.f_is_qualified == undefined){
-      model.f_is_qualified ="";
-    }
-    if(model.f_unignited_reason == undefined){
-      model.f_unignited_reason ="";
-    }
-    if(model.f_transfer_person == undefined){
-      model.f_transfer_person ="";
-    }
-    let newmodel = model;
-    console.log("newmodel的制作"+JSON.stringify(newmodel))
     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))
@@ -990,10 +249,7 @@
           self.showview = false
           // 如果需要删除本地记录则去删除
           if(delteLocal){
-            self.deleteLocalApply(newmodel)
-          }else{
-            //保存数据
-            self.saveLocalApply(newmodel);
+            self.deleteLocalApply(model)
           }
           // 特殊处理
           self.special(model)