apply-clients 4.1.3 → 4.1.4-weinan

package/src/components/product/Function/functions/StopInstall.vue

@@ -6,7 +6,7 @@
           <div class="col-sm-2">
             <label class="control-label col-sm-12">终止原因：</label>
           </div>
-          <div class="col-sm-10">
+          <div class="col-sm-8" :class="model.f_stop_remarks ? '':'has-error'">
             <textarea class="form-control" rows="3" v-model="model.f_stop_remarks"></textarea>
           </div>
         </div>
@@ -50,6 +50,9 @@
         <button type="button" @click="confirm()" :disabled="disabled" class="btn btn-primary" style="width: 100px">
           保存
         </button>
+        <button type="button" @click="search()" class="btn btn-primary" style="width: 100px">
+          取消
+        </button>
       </center>
     </div>
   </div>
@@ -90,6 +93,9 @@
               this.$showMessage('终止报建失败')
             }
           })
+      },
+      search () {
+        this.$dispatch('search')
       }
     },
     watch: {

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

@@ -5,21 +5,21 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
               <div class="form-group col-sm-4">
-                <label class="font_normal_body">项目名称/客户名称/联系人:</label>
-                <input type="text" class="input_search" v-model="model.f_user_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition=" (f_entry_name like '%{}%' or f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='三选一输入'>
+                <label class="font_normal_body">项目名称:</label>
+                <input type="text" class="input_search" v-model="model.f_entry_name"
+                       v-on:keyup.enter="$parent.$parent.search()" condition=" f_entry_name like '%{}%'  " placeholder='请输入'>
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">报建编号：</label>
+                <label  class="font_normal_body">报建编号：</label>
                 <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                        v-on:keyup.enter="$parent.$parent.search()"
-                       condition="f_apply_num = '{}'">
+                       condition="f_apply_num like '%{}%'">
               </div>
               <div class="form-group col-sm-5 button-range">
                 <button class="button_new button_spacing" style="width: max-content"
-                        v-if="this.$login.f.rolesnames.indexOf('市场部报装') !== -1 || this.$login.f.rolesnames.indexOf('工程部报装') !== -1"
+                        v-if="$parent.$parent.projectStart"
                         @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
-                <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+                <button  class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
                 <div
                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -34,7 +34,7 @@
                 <label class="font_normal_body">合同编号：</label>
                 <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
                        v-on:keyup.enter="$parent.$parent.search()"
-                       condition="f_contract_number = '{}'">
+                       condition="f_contract_number like '%{}%'">
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">报建类型：</label>
@@ -62,17 +62,29 @@
                   close-on-select ></v-select>
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">联系电话：</label>
-                <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="f_phone like '%{}%'">
-              </div>
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">用户地址：</label>
-                <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="f_address like '%{}%'">
+                <label class="font_normal_body">流程状态：</label>
+                <v-select
+                  v-model="model.f_sub_state"
+                  placeholder='流程状态'
+                  condition="f_sub_state = '{}'"
+                  :value.sync="model.f_sub_state"
+                  :options='$parent.$parent.f_sub_state'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
               </div>
+<!--              <div class="form-group col-sm-3">-->
+<!--                <label class="font_normal_body">联系电话：</label>-->
+<!--                <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"-->
+<!--                       v-on:keyup.enter="$parent.$parent.search()"-->
+<!--                       condition="f_phone like '%{}%'">-->
+<!--              </div>-->
+<!--              <div class="form-group col-sm-3">-->
+<!--                <label class="font_normal_body">用户地址：</label>-->
+<!--                <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"-->
+<!--                       v-on:keyup.enter="$parent.$parent.search()"-->
+<!--                       condition="f_address like '%{}%'">-->
+<!--              </div>-->
               <div class="form-group col-sm-3">
                 <label  for="startDate" class="font_normal_body">开始时间：</label>
                 <datepicker id="startDate" placeholder="开始日期"
@@ -103,10 +115,10 @@
           <tr>
             <th style="white-space: nowrap;">序号</th>
             <th style="white-space: nowrap;">报建编号</th>
-            <th style="white-space: nowrap;">项目名称/客户名称/联系人</th>
+            <th style="white-space: nowrap;">项目名称</th>
             <th style="white-space: nowrap;">合同编号</th>
-            <th style="white-space: nowrap;">电话</th>
-            <th style="white-space: nowrap;">地址</th>
+<!--            <th style="white-space: nowrap;">电话</th>-->
+<!--            <th style="white-space: nowrap;">地址</th>-->
             <th style="white-space: nowrap;">报建类型</th>
             <th style="white-space: nowrap;">办理环节</th>
             <th style="white-space: nowrap;">流程状态</th>
@@ -123,17 +135,17 @@
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
             <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
-              <nobr><font>{{row.f_entry_name}}/{{row.f_user_name}}/{{row.f_contact}}</font></nobr>
+              <nobr><font>{{row.f_entry_name}}</font></nobr>
             </td>
             <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
-              <nobr><font>{{row.f_phone}}</font></nobr>
-            </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
-              <nobr><font>{{row.f_address}}</font></nobr>
-            </td>
+<!--            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">-->
+<!--              <nobr><font>{{row.f_phone}}</font></nobr>-->
+<!--            </td>-->
+<!--            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">-->
+<!--              <nobr><font>{{row.f_address}}</font></nobr>-->
+<!--            </td>-->
             <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
@@ -180,7 +192,7 @@
               v-model="f_apply_type"
               placeholder='请选择需要发起的工程类型'
               :value.sync="f_apply_type"
-              :options='applytype'
+              :options='$appdata.getParam("报建类型")'
               :value-single="true"
               class="select select_list"
               :search="false"
@@ -200,9 +212,10 @@
     props: ['showData'],
     data () {
       return {
-        // applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
-        applytype: [{label: '全部', value: ''}, {label: '综合报建', value: '综合报建'}],
-        defnames: [{label: '全部', value: ''}], // 流程节点
+        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+        // applytype: [{label: '散户集体报建', value: '散户集体报建'}, {label: '散户报建', value: '散户报建'}, {label: '开发商集体报建', value: '开发商集体报建'},{label: '工业户报建', value: '工业户报建'}],
+        defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
+        f_sub_state:[{label: '全部', value: ''}, {label: '完工', value: '完工'}, {label: '正在进行', value: '正在进行'}],
         model: new PagedList('rs/sql/checkuser', 20, {
           data: {
             id: this.$login.f.id,
@@ -213,6 +226,7 @@
         // startname: null, // 启动节点
         criteriaShow: false, // 控制查询条件显示
         showModal: false // 控制发起类型选择
+
       }
     },
     ready () {
@@ -239,7 +253,7 @@
             this.defnames = [{label: '全部', value: ''}, ...res.data]
           })
         } else {
-          this.defnames = [{label: '全部', value: ''}]
+          this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
         }
       },
       // 获取流程id
@@ -261,42 +275,48 @@
         let val = {
           f_apply_type: this.f_apply_type
         }
-        // if (this.f_apply_type === '散户报建') {
-        //   val.defname = '用户受理'
-        //   val.processname = '散户报建流程'
-        // } else if (this.f_apply_type === '工业户报建') {
-        //   val.defname = '用户受理'
-        //   val.processname = '工商户报建流程'
-        // } else if (this.f_apply_type === '商业户报建') {
-        //   val.defname = '用户受理'
-        //   val.processname = '工商户报建流程'
-        // } else if (this.f_apply_type === '散户集体报建') {
-        //   val.defname = '用户受理'
-        //   val.processname = '散户集体报建流程'
-        // } else if (this.f_apply_type === '开发商集体报建') {
-        //   val.defname = '用户受理'
-        //   val.processname = '开发商集体报建流程'
-        // } else if (this.f_apply_type === '煤改气报建') {
-        //   val.defname = '用户受理'
-        //   val.processname = '散户集体报建流程'
-        // } else {
-        //   this.$showMessage('暂无此类报装')
-        //   return
-        // }
-        if (this.f_apply_type === '综合报建') {
+        if (this.f_apply_type === '散户报建') {
+          val.defname = '报建登记'
+          val.f_user_type='民用'
+          val.processname = '散户报建流程'
+        } else if (this.f_apply_type === '工商户报建') {
+          val.defname = '报建登记'
+          val.f_user_type='非民用'
+          val.processname = '工商户报建流程'
+        } else if (this.f_apply_type === '散户集体报建') {
+          val.defname = '报建登记'
+          val.f_user_type='民用'
+          val.processname = '散户集体报建流程'
+        } else if (this.f_apply_type === '开发商集体报建') {
+          val.f_user_type='民用'
+          val.defname = '报建登记'
+          val.processname = '开发商集体报建流程'
+        } else if (this.f_apply_type === '居民报建') {
+          val.f_user_type='民用'
+          val.defname = '报建登记'
+          val.processname = '居民报建流程'
+        } else if (this.f_apply_type === '煤改气报建') {
           val.defname = '报建登记'
-          val.processname = '报建流程'
+          val.processname = '散户集体报建流程'
+        } else if (this.f_apply_type === '拆改装报建') {
+          val.defname = '业务申请'
+          val.processname = '拆改装流程'
         } else {
           this.$showMessage('暂无此类报装')
           return
         }
+        // if (this.f_apply_type === '综合报建') {
+        //   val.defname = '报建登记'
+        //   val.processname = '报建流程'
+        // } else {
+        //   this.$showMessage('暂无此类报装')
+        //   return
+        // }
 
         val.f_sub_state = "新增"
         val.f_process_id = await this.getProcessId(val.processname)
-
         // 调用ExplorationUser事件
         this.$dispatch('apply', val)
-
         this.f_apply_type = null
         this.showModal = false
       },
@@ -306,6 +326,9 @@
       }
     },
     computed: {
+      projectStart () {
+        return this.$login.r.includes('报建发起')
+      }
     },
     watch: {
       'model.rows': {