apply-clients 3.3.222 → 3.4.2-FuGu-4

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -14,16 +14,17 @@
               ></res-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">工程编号：</label>
-              <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="search"
                      condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">客户名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+              <label class="font_normal_body">项目名称：</label>
+              <input type="text" style="width:60%" 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-2 button-range">
               <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>
@@ -37,10 +38,14 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">联系电话：</label>
-              <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
-                     v-on:keyup.enter="search"
-                     condition="f_phone like '%{}%'">
+              <label class="font_normal_body">客户名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">联&ensp;系&ensp;人：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_contact"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_contact like '%{}%'" placeholder='联系人'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
@@ -73,6 +78,12 @@
                 :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" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
+                     v-on:keyup.enter="search"
+                     condition="f_phone like '%{}%'">
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户地址：</label>
               <input type="text" style="width:60%" class="input_search" placeholder='用户地址' v-model="model.f_address"
@@ -87,7 +98,7 @@
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="f_apply_date >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_apply_date >= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
@@ -98,7 +109,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="f_apply_date <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_apply_date <= '{}'">
               </datepicker>
             </div>
           </div>
@@ -108,12 +119,11 @@
         <template partial='head'>
           <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>
@@ -129,7 +139,7 @@
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_user_name}}</nobr>
+              <nobr>{{row.f_entry_name}}/{{row.f_user_name}}/{{row.f_contact}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>
@@ -140,9 +150,6 @@
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_address}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_source}}</nobr>
-            </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_type}}</nobr>
             </td>
@@ -168,33 +175,6 @@
     title: '勘探详情',
     props: ['showData'],
     data () {
-      if(this.$login.f.orgs==='华东大区' || this.$login.f.orgs==='华中大区'|| this.$login.f.orgs==='华北大区' || this.$login.f.orgs==='东北大区'
-        ||this.$login.f.orgs==='鲁北区域'|| this.$login.f.orgs==='广西区域' || this.$login.f.orgs==='苏皖区域'|| this.$login.f.orgs === '奥德装备集团'||
-        this.$login.f.orgs==='黑龙江区域'
-    ){
-      return {
-        model: new PagedList('rs/sql/supervisorydq', 20, {
-          data: {
-            orgs: this.$login.f.orgs
-          }
-        }),
-        curorgid: [this.$login.f.orgid],
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-        defnames: [{label: '全部', value: ''}], // 流程节点
-        criteriaShow: false
-      }}
-      if(this.$login.f.orgs==='设计院'){
-        return {
-          model: new PagedList('rs/sql/supervisorysjy', 20, {
-            data: {
-              orgid: this.$login.f.orgid
-            }
-          }),
-          curorgid: [this.$login.f.orgid],
-          applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-          defnames: [{label: '全部', value: ''}], // 流程节点
-          criteriaShow: false
-        }}
       return {
         model: new PagedList('rs/sql/supervisory', 20, {
           data: {
@@ -205,8 +185,8 @@
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
         defnames: [{label: '全部', value: ''}], // 流程节点
         criteriaShow: false
-    }
-      },
+      }
+    },
     ready () {
       // 调用查询
       this.search()

package/src/components/product/Supervisory/SupervisoryhCart.vue

@@ -13,7 +13,6 @@
 
 <script>
   import  {HttpResetClass} from 'vue-client'
-  import {isEmpty} from "../../Util";
   export default {
     title: "流程节点",
     props:['selectdata'],
@@ -28,80 +27,59 @@
     methods :{
       async initial () {
         // 获取流程节点信息
-        let http = new HttpResetClass()
+
         let data = {
           processid: this.selectdata.f_process_id
         }
 
-        let res = await http.load(
-          'POST',
+        let res = await this.$resetpost(
           'rs/sql/getAllNode',
           {data: data},
-          {resolveMsg: null, rejectMsg: '流程节点信息获取失败！！！'})
+          {resolveMsg: null, rejectMsg: '流程节点信息获取失败！！！'}
+        )
 
         this.defnames = res.data
       },
       //点击获取节点名
       getdefname (row) {
-        //发起节点都可查看
-        if(row.defname === this.$workflow_vue.start_activity){
-          row = Object.assign({},this.selectdata,row)
-          this.$dispatch('apply', row)
-          return
-        }
-        if(this.check(row.actorexpression)){
-          row = Object.assign({},this.selectdata,row)
-          this.$dispatch('apply', row)
-          return
-        }
-
-        if(this.$login.f.orgs==='华东大区' || this.$login.f.orgs==='华中大区'|| this.$login.f.orgs==='华北大区' || this.$login.f.orgs==='东北大区'
-          ||this.$login.f.orgs==='鲁北区域'|| this.$login.f.orgs==='广西区域' || this.$login.f.orgs==='苏皖区域'|| this.$login.f.orgs === '奥德装备集团'||
-          this.$login.f.orgs==='黑龙江区域'){
-          row = Object.assign({},this.selectdata,row)
-          this.$dispatch('apply', row)
-          return
-        }
-        this.$showMessage("对不起，您没有查看此节点的权限！")
-
-        // row = Object.assign({},this.selectdata,row)
-        // this.$dispatch('apply', row)
+        row = Object.assign({},this.selectdata,row)
+        this.$dispatch('apply', row)
+        return
+        // 发起节点都可查看
+        // if(row.defname === this.$workflow_vue.start_activity){
+        //   row = Object.assign({},this.selectdata,row)
+        //   this.$dispatch('apply', row)
+        //   return
+        // }
+        // if(this.check(row.actorexpression)){
+        //   row = Object.assign({},this.selectdata,row)
+        //   this.$dispatch('apply', row)
+        //   return
+        // }
+        // this.$showMessage("对不起，您没有查看此节点的权限！")
       },
       // 检测是否有权限
       check (actorexpression){
+        let flag = false
 
-        let str = null
+        // 获取标识
+        let mark = actorexpression.charAt(0)
 
-        if (isEmpty(actorexpression)) {
-          return true
-        }
-
-        if (actorexpression.indexOf('D') === 0) {
-          str = actorexpression.substring(2, actorexpression.length-1)
-          return this.$login.f.f_department_name.includes(str)
-        }
+        let str = actorexpression.substring(2, actorexpression.length-1)
 
-        if (actorexpression.indexOf('RS') === 0) {
-          for (str of actorexpression.substring(3, actorexpression.length-1).split(',')) {
-            return this.$login.f.f_role_name.includes(str)
-          }
+        if (mark === 'D' && this.$login.f.f_department_name.includes(str)) {
+          flag = true
         }
-
-        if (actorexpression.indexOf('R') === 0) {
-          str = actorexpression.substring(2, actorexpression.length-1)
-          return this.$login.f.f_role_name.includes(str)
+        if (mark === 'R' && this.$login.f.f_role_name.includes(str)) {
+          flag = true
         }
-
-        if (actorexpression.indexOf('PI') === 0) {
-          str = actorexpression.substring(3, actorexpression.length-1)
-          return this.$login.f.id.includes(str)
+        if (mark === 'P' && this.$login.f.id.includes(str)) {
+          flag = true
         }
-        if (actorexpression.indexOf('P') === 0) {
-          str = actorexpression.substring(2, actorexpression.length-1)
-          return this.$login.f.name.includes(str)
+        if (this.$login.f.f_role_name.includes('流程监控')) {
+          flag = true
         }
-
-        return this.$login.f.f_role_name.includes('流程监控')
+        return flag
       }
     },
     watch:{