apply-clients 5.0.35-2 → 5.0.35-20

package/src/components/app_apply/PlaceControler.vue

@@ -1,9 +1,9 @@
 <template>
   <!--<div class="app-botton" @click="back()">-->
-    <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
+  <!--<span class="glyphicon glyphicon-menu-left">返回</span>-->
   <!--</div>-->
-<!--  <back-page :need-back='true'  @flag="back()"></back-page>-->
-  <div class="no-close row android-repair-order" style="background-color: #ffffff">
+  <!--  <back-page :need-back='true'  @flag="back()"></back-page>-->
+  <div class="no-close row" style="background-color: #ffffff">
     <div class="col-sm-12 col-xs-12" >
       <ul class="nav nav-tabs" style="background:#ffffff;">
         <div>
@@ -33,224 +33,255 @@
 </template>
 
 <script>
-  import ApplyUserInfo from "./ApplyUserInfo";
-  import ApplyInfo from "./ApplyInfo";
-  // import FieldExploration from "./FieldExploration";
-  // import Ventilation from "./Ventilation";
-  // import Acceptance from "./Acceptance";
-  import ServiceControl from "./ServiceControl";
+import ApplyUserInfo from "./ApplyUserInfo";
+import ApplyInfo from "./ApplyInfo";
+// import FieldExploration from "./FieldExploration";
+// import Ventilation from "./Ventilation";
+// import Acceptance from "./Acceptance";
+import ServiceControl from "./ServiceControl";
 
-  export default {
-    title: '报建代办详情',
-    props: {
-      //分辨平板还是pc
-      system: '',
-      // 要处理的工单
-      row: {
-        type: Object
-      },
-      // 要显示的维修单
-      apply: {
-        type: Object
-      },
-      // 是否是显示
-      show: {
-        type: Boolean,
-        default: false
-      }
+export default {
+  title: '报建代办详情',
+  props: {
+    //分辨平板还是pc
+    system: '',
+    // 要处理的工单
+    row: {
+      type: Object
     },
-
-
-    data() {
-      return {
-        routeShow:true,
-        number:0,
-        // shupingshow:false,
-        pipeline: {},
-        componentName: 'apply-user-info',
-        tabs: {
-          // 参数全部设置成空，在ready时，等model处理好了，再添加
-          'apply-user-info': {
-            header: '基本信息', class: 'apply-user-info-class', props: null
-          },
-          'apply-info': {
-            header: '流程信息', class: 'apply-info-class', props: null
-          },
-          'apply-defame-work': {
-            header: null, class: 'apply-info-class', props: null
-          }
-        },
-        // actName: this.$appdata.getParam('用气类型'),  // 报建app需提取的流程名称
-        faultshow: 8     // 控制 故障汇总 在 菜单里显示与否
-      }
+    // 要显示的维修单
+    apply: {
+      type: Object
     },
+    // 是否是显示
+    show: {
+      type: Boolean,
+      default: false
+    }
+  },
 
-    methods: {
-      imgback(val){
-        if(val && this.routeShow){
-          return require('../../assets/xiangxia1.png')
-        }else{
-          return require('../../assets/xiangyou1.png')
-        }
+
+  data() {
+    return {
+      show_data: {
+        ppp:{}
       },
-      back () {
-        let _this = this
-        this.$showMessage('您是否确认返回', ['confirm', 'cancel']).then((res) => {
-          if (res === 'confirm') {
-            _this.$back()
-          }
-        })
+      routeShow:true,
+      model:{
+        button:{
+          button_name:null,
+          button_index:null
+        },
+        f_filiale:null,
+        f_parentname:null,
+        f_operate_date:null,
+        f_operator:null,
+        f_hege:false
       },
-      // 选择tab
-      tabSelect (name,number) {
-        this.number = number
-        this.tabs[name].props = null
-        // 处理关闭/显示 内容
-        if(this.componentName == name && !this.routeShow ){
-          this.routeShow = true
-        }else if(this.componentName == name && this.routeShow){
-          this.routeShow = false
-        }else if(this.componentName != name){
-          this.routeShow = true
-        }
-        this.componentName = name
-        console.log('name=>' + name)
-        if(name == 'apply-user-info' || name == 'apply-info'){
-          this.tabs[name].props = {service: this.row, shutype: 'shu'}
-        }else{
-          this.row.defname = this.row.f_order_type
-          // this.row.fields = new Array()
-          // this.row.buttons = new Array()
-          this.tabs[name].props = {selectdata: this.row}
-          console.log("将去往第三个界面")
-          console.log("这就是我要的selectdata"+JSON.stringify(this.row))
+      number:0,
+      // shupingshow:false,
+      pipeline: {},
+      componentName: 'apply-user-info',
+      tabs: {
+        // 参数全部设置成空，在ready时，等model处理好了，再添加
+        'apply-user-info': {
+          header: '基本信息', class: 'apply-user-info-class', props: null
+        },
+        'apply-info': {
+          header: '流程信息', class: 'apply-info-class', props: null
+        },
+        'apply-defame-work': {
+          header: null, class: 'apply-info-class', props: null
         }
-        console.log('即将goto=>' + name + ',props:' + JSON.stringify(this.tabs[name].props))
-        this.$goto(name, this.tabs[name].props, 'apply')
-        // this.shupingshow = true
       },
-      setProps() {
-        // 给各自组件添加参数
-        this.tabs['apply-user-info'].props = {service: this.row, shutype: 'shu'}
-        // this.tabs['apply-info'].props = {service: this.row, shutype: 'shu'}
-        // this.tabs['apply-defame-work'].props = {model: this.row, shutype: 'shu'}
+      // actName: this.$appdata.getParam('用气类型'),  // 报建app需提取的流程名称
+      faultshow: 8     // 控制 故障汇总 在 菜单里显示与否
+    }
+  },
 
-        this.$goto('apply-user-info', this.tabs[this.componentName].props, 'apply')
-      },
+  methods: {
+    imgback(val){
+      if(val && this.routeShow){
+        return require('../../assets/xiangxia1.png')
+      }else{
+        return require('../../assets/xiangyou1.png')
+      }
+    },
+    back () {
+      let _this = this
+      this.$showMessage('您是否确认返回', ['confirm', 'cancel']).then((res) => {
+        if (res === 'confirm') {
+          _this.$back()
+        }
+      })
     },
-    ready () {
-      var keyName = 'apply-defame-work'
-      var valueHeader = this.row.f_order_type
-      var value = {
-        header:valueHeader,
-        class: 'apply-info-class',
-        props: null
+    // 选择tab
+    tabSelect (name,number) {
+      this.number = number
+      this.tabs[name].props = null
+      // 处理关闭/显示 内容
+      if(this.componentName == name && !this.routeShow ){
+        this.routeShow = true
+      }else if(this.componentName == name && this.routeShow){
+        this.routeShow = false
+      }else if(this.componentName != name){
+        this.routeShow = true
       }
-      this.tabs[keyName] = value
-      console.log( 'this.number=>' + this.number)
-      // this.$set('tabs.' + keyName ,value)
-      this.setProps()
+      this.componentName = name
+      console.log('name=>' + name)
+      if(name == 'apply-user-info' || name == 'apply-info'){
+        this.tabs[name].props = {service: this.row, shutype: 'shu'}
+      }else{
+        this.row.defname = this.row.defname
+        // this.row.fields = new Array()
+        // this.row.buttons = new Array()
+        this.tabs[name].props = {selectdata: this.row,show_data:this.show_data,selectmodel:this.model}
+        console.log("将去往第三个界面")
+        console.log("这就是我要的selectdata"+JSON.stringify(this.row))
+      }
+      console.log('即将goto=>' + name + ',props:' + JSON.stringify(this.tabs[name].props))
+      this.$goto(name, this.tabs[name].props, 'apply')
+      // this.shupingshow = true
     },
-    components: {
-      'apply-info': ApplyInfo,
-      'apply-user-info':ApplyUserInfo,
-      // 'fieldexploration': FieldExploration,
-      // 'acceptance': Acceptance,
-      // 'ventilation':Ventilation
-      'apply-defame-work': ServiceControl
+    setProps() {
+      // 给各自组件添加参数
+      this.tabs['apply-user-info'].props = {service: this.row, shutype: 'shu'}
+      // this.tabs['apply-info'].props = {service: this.row, shutype: 'shu'}
+      // this.tabs['apply-defame-work'].props = {model: this.row, shutype: 'shu'}
+
+      this.$goto('apply-user-info', this.tabs[this.componentName].props, 'apply')
     },
-    events: {
-      'close'() {
-        //this.$back()
-        this.$dispatch('confirm')
+  },
+  ready () {
+    var keyName = 'apply-defame-work'
+    var valueHeader = this.row.defname
+    var value = {
+      header:valueHeader,
+      class: 'apply-info-class',
+      props: null
+    }
+    this.tabs[keyName] = value
+    console.log( 'this.number=>' + this.number)
+    // this.$set('tabs.' + keyName ,value)
+    this.setProps()
+  },
+  components: {
+    'apply-info': ApplyInfo,
+    'apply-user-info':ApplyUserInfo,
+    // 'fieldexploration': FieldExploration,
+    // 'acceptance': Acceptance,
+    // 'ventilation':Ventilation
+    'apply-defame-work': ServiceControl
+  },
+  events: {
+    'gotonewpage': function (val) {
+      console.log("wheregoto")
+      var _this = this
+      var pardate = {
+        _this: _this,
+        title: '合同',
+        safe: false
       }
+      _this.$dispatch('gotoson',pardate)
+      if (val=='民用'){
+        _this.$goto('minyong', {},'self')
+      }else if (val=='非民用1'){
+        _this.$goto('feiminyongv', {},'self')
+      }else {
+        _this.$goto('feiminyongvv', {},'self')
+      }
+    },
+    'close'() {
+      //this.$back()
+      this.$dispatch('confirm')
     }
   }
+}
 </script>
 <style lang="less">
-  /*@import "../../../src/bootstrap/less/variables.less";*/
+/*@import "../../../src/bootstrap/less/variables.less";*/
 
-  .tab-befor-img (@url) {
-    content: '';
-    background-image: url("@{url}");
-    background-size: 20px;
-    display: inline-block;
-    margin-right: 8px;
-    margin-top: 0.3em;
-    height: 1.3em;
-    width: 1.3em;
-    vertical-align: -35%;
-  }
+.tab-befor-img (@url) {
+  content: '';
+  background-image: url("@{url}");
+  background-size: 20px;
+  display: inline-block;
+  margin-right: 8px;
+  margin-top: 0.3em;
+  height: 1.3em;
+  width: 1.3em;
+  vertical-align: -35%;
+}
 
 
-  .apply-info-class {
+.apply-info-class {
 
   &::before {
-   .tab-befor-img("../../assets/baoxiuxinxi1.png");
-   }
+    .tab-befor-img("../../assets/baoxiuxinxi1.png");
   }
+}
 
-  .apply-user-info-class {
+.apply-user-info-class {
   &::before {
-   .tab-befor-img("../../assets/jibenxinxi1.png")
-   }
+    .tab-befor-img("../../assets/jibenxinxi1.png")
   }
+}
 
-  .field-exploration-class {
+.field-exploration-class {
   &::before {
-   .tab-befor-img("../../assets/feiyong1.png")
-   }
+    .tab-befor-img("../../assets/feiyong1.png")
   }
-  .acceptance-class {
+}
+.acceptance-class {
   &::before {
-   .tab-befor-img("../../assets/feiyong1.png")
-   }
+    .tab-befor-img("../../assets/feiyong1.png")
   }
-  .ventilation-class {
+}
+.ventilation-class {
   &::before {
-   .tab-befor-img("../../assets/feiyong1.png")
-   }
+    .tab-befor-img("../../assets/feiyong1.png")
   }
+}
 
-  .job-upload-class {
+.job-upload-class {
   &::before {
-   .tab-befor-img("../../assets/guzhanghuizong1.png")
-   }
-  }
-  .butt2 {
-    display: inline;
-    width: 10px;
-    text-align: center;
-    align-items:center;
-  }
-  .linesty{
-    display: inline-block;
-    height:1px;
-    width:100%;
-    background:#d0d0d0;
-    overflow:hidden;
-    vertical-align: middle;
-  }
-  .spanboder{
-    border-bottom:2px solid #499edf;
-    padding-bottom: 8px
-  }
-  .app-botton {
-    position:fixed;
-    background: #87b2dd;
-    color: #FFF;
-    padding: 8px;
-    text-align: center;
-    font-size: 1.2em;
-    z-index: 10;
-    opacity:0.5;
-    bottom: 50px;
-    margin-top: -10px;
-    height: 40px;
+    .tab-befor-img("../../assets/guzhanghuizong1.png")
   }
-  /*.android-apply-order > div > ul a {*/
-  /*  font-size: 12px;*/
-  /*  color: #333333;*/
-  /*  padding: 13px 16px;*/
-  /*}*/
+}
+.butt2 {
+  display: inline;
+  width: 10px;
+  text-align: center;
+  align-items:center;
+}
+.linesty{
+  display: inline-block;
+  height:1px;
+  width:100%;
+  background:#d0d0d0;
+  overflow:hidden;
+  vertical-align: middle;
+}
+.spanboder{
+  border-bottom:2px solid #499edf;
+  padding-bottom: 8px
+}
+.app-botton {
+  position:fixed;
+  background: #87b2dd;
+  color: #FFF;
+  padding: 8px;
+  text-align: center;
+  font-size: 1.2em;
+  z-index: 10;
+  opacity:0.5;
+  bottom: 50px;
+  margin-top: -10px;
+  height: 40px;
+}
+/*.android-apply-order > div > ul a {*/
+/*  font-size: 12px;*/
+/*  color: #333333;*/
+/*  padding: 13px 16px;*/
+/*}*/
 </style>

package/src/components/app_apply/ServiceControl.vue

@@ -1,5 +1,8 @@
 <template>
-  <service-view-app v-ref:service_show :data="show_data" v-if="showview"></service-view-app>
+  <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>
+  </div>
 </template>
 <script>
 import co from 'co'
@@ -7,15 +10,16 @@ import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 export default {
   title: '报建流程业务控制层',
-  props: ['selectdata'],
+  props: ['selectdata','selectmodel','show_data'],
   data () {
     return {
       model:'',
       delteLocal:false,
+      loading:false,
       data:null, // 数据库数据，json配置文件数据的数据集合
       json_datas:null, // Json配置文件集合
       showview:false, // 控制显示service-view组件
-      show_data:null, // 给view层显示的数据
+       // 给view层显示的数据
       department_search:null // 当前部门下所有人
     }
   },
@@ -41,7 +45,7 @@ export default {
           // 特殊处理
           this.special(this.model)
           console.log("hhhhhhhhhhhhhhhhh7")
-
+          this.loading=false
           this.$dispatch('close')
           console.log("hhhhhhhhhhhhhhhhh8")
           this.initializtion()
@@ -210,7 +214,14 @@ export default {
         temp['back_reason'] = this.selectdata.f_back_reason
       }
       console.log('即将给show_data赋值temp=>' + JSON.stringify(temp))
-      this.show_data = temp
+      console.log(JSON.stringify(this.show_data.ppp))
+      if (JSON.stringify(this.show_data.ppp)=='{}'){
+        this.show_data.ppp = temp
+        console.log("重新赋值")
+
+      }else{
+        console.log("不重新赋值")
+      }
       console.log('initializtion()方法结束,showview')
       this.showview = true
     },
@@ -240,6 +251,8 @@ export default {
     },
     // 获取view层button事件
     async 'button'(model){
+      this.loading=true
+
       console.log('进入async button事件方法')
       var delteLocal = true
       // 点击保存与重置按钮不需要修改本地工单状态

package/src/components/app_apply/ServiceView.vue

@@ -91,8 +91,8 @@
             <!--select-->
             <div v-if="item.type==='select'"  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
               <label  :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{item.label}}：</label>
-              <input-select :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'" @blur ="check_disable"  @change="select_change(index),disabled_check(data.fields[index].required,data.fields[index].value)" :readonly="item.readonly" :disable="item.disabled"  :value.sync="data.fields[index].value" v-model="data.fields[index].value"
-                            :options='item.options' :valueSingle="true"></input-select>
+              <v-select :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'" @blur ="check_disable"  @change="select_change(index),disabled_check(data.fields[index].required,data.fields[index].value)" :readonly="item.readonly" :disable="item.disabled"  :value.sync="data.fields[index].value" v-model="data.fields[index].value"
+                            :options='item.options' :valueSingle="true"></v-select>
 
             </div>