apply-clients 5.0.36-2 → 5.0.37-2

package/src/components/product/Process/ExplorationSelect.vue

@@ -109,10 +109,19 @@
                 </div>
               </div>
 
+              <!-- <div class="col-sm-2" style="float: left">
+                <label class="col-sm-4 control-label">报装来源</label>
+                <div class="col-sm-8">
+                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="$parent.$parent.alloption"
+                            condition="f_apply_source = '{}'" placeholder='报装来源'
+                            v-model="model.f_apply_source" :value.sync="model.f_apply_source" close-on-select>
+                  </v-select>
+                </div>
+              </div> -->
               <div class="col-sm-2" style="float: left">
                 <label class="col-sm-4 control-label">报装来源</label>
                 <div class="col-sm-8">
-                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},{label:'燃气系统',value:'燃气系统'},{label:'微信',value:'微信'},{label:'住建局',value:'住建局'}]"
+                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'住建局',value:'住建局'},{label:'燃气系统',value:'燃气系统'},{label:'电话预约',value:'电话预约'},{label:'微信预约',value:'微信预约'}]"
                             condition="f_apply_source = '{}'" placeholder='报装来源'
                             v-model="model.f_apply_source" :value.sync="model.f_apply_source" close-on-select>
                   </v-select>
@@ -120,7 +129,6 @@
               </div>
 
 
-
             </div>
             <div class="col-sm-12 " style="margin-top:5px">
               <div class="col-sm-2">
@@ -314,6 +322,7 @@
         condition: '',
         select: '',
         alloptions:[],
+        alloption:[],
         button_name:"查询",
         showstopinfoflag:false,
         stopremarks:"",
@@ -372,11 +381,9 @@
         param.push({label:"全部",value:""})
         str.activitys.forEach(function(item){
           let title = item.title;
-          console.log(title)
           param.push({label:title,value:title});
         })
         this.alloptions = param;
-
       },
       generateUUID() {
         var d = new Date().getTime()
@@ -410,8 +417,16 @@
 
       },
       async addactive(modify) {
+        // 动态获取报装来源
+        // let ces = [];
+        // http.load('POST', 'rs/sql/findParameter').then((res) => {
+        //       console.log("这是报装来源:" + res.name)
+        // res.forEach(function(res){
+        //   ces.push({label:res.name,value:res.name});
+        //     })
+        //     this.alloption = ces;
+        // })
         this.button_name ="返回"
-        debugger
         var workflow_xmlfilename='鄂州报建流程'
         if(this.$login.f.filialenames === '迪泰天然气' && modify==='集体报装申请'){
          workflow_xmlfilename = '鄂州报建流程迪泰'
@@ -423,6 +438,7 @@
         let http = new HttpResetClass()
         let res = await http.load('POST','rs/logic/ApplyGetProcessID',{data:{filename:workflow_xmlfilename,start_activity:this.$workflow_vue.start_activity}}, {resolveMsg: null, rejectMsg: '获取流程ID失败，请联系开发人员'})
         this.$refs.cp.pager = false
+        debugger
         let val = {
           defname: this.$workflow_vue.start_activity,
           f_process_id: res.data.f_process_id,