apply-clients 5.0.35-60 → 5.0.35-63

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

@@ -84,7 +84,27 @@
       <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 Vue from 'vue'
@@ -149,6 +169,9 @@
         bill: '',
         areaall:[],
         stop_show:false, // 终止备注开关
+        apply_show:false, // 转单报建开关
+        apply_type:'',
+        applytypes:[{label:"散户报装",value:"报装申请"},{label:"集体报装",value:"集体报装申请"}],// 报建类型
         models: {
           f_date: Util.toStandardTimeString(),
           f_department: this.$login.f.f_parentname,
@@ -162,10 +185,11 @@
               ============================================收费临时使用
       */
       // 转到报建
-      async addactive(modify) {
+      async addactive(){
         this.selectdata.applyid = this.selectdata.id
         // this.$resetpost('rs/logic/stopapply', {data: this.selectdata})
-        this.$workflow_vue.start_activity = modify
+         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','rs/logic/ApplyGetProcessID',{data:{filename:this.$workflow_vue.workflow_xmlfilename,start_activity:this.$workflow_vue.start_activity}}, {resolveMsg: null, rejectMsg: '获取流程ID失败，请联系开发人员'})
         let data = {
@@ -190,6 +214,7 @@
         }
         await http.load('POST','rs/logic/newaddApplyproduct',{data:data}, {resolveMsg: null, rejectMsg: '转发失败，请联系开发人员'})
         this.$dispatch('close')
+        this.apply_show = false
       },
       // 终止报建
       async stopapplys () {
@@ -213,6 +238,10 @@
       closeback() {
         this.stop_show = false
       },
+      // 关闭报建弹框
+      closeapply() {
+        this.apply_show = false
+      },
       closeAccept () {
         this.acceptprint = false
       },
@@ -1748,7 +1777,7 @@
             return
           }
         }
-        if (this.data.defname === '通气转单'){
+       /* if (this.data.defname === '通气转单'){
           if (model.button.button_name === '散户报装'){
             this.addactive('报装申请')
           }
@@ -1758,7 +1787,7 @@
           setTimeout(() => {
 
           }, 200)
-        }
+        }*/
 
         // 点击重置按钮就重置数据
         if (model.button.button_name === '重置') {
@@ -1898,7 +1927,11 @@
           this.showview = false
           // 特殊处理
           this.special(model)
-          this.$dispatch('close')
+          if (this.data.defname==='踏勘、建立工程编号'&&model.button.button_name === '提交'){
+              this.apply_show=true
+          }else {
+            this.$dispatch('close')
+          }
           this.initializtion()
         } else {
           if (res.data.msg) {