apply-clients 7.1.36 → 7.1.39

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

@@ -1,258 +1,208 @@
-<template>
-  <div class="col-sm-12">
-    <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <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"
-                     v-on:keyup.enter="$parent.$parent.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='客户名称'>
-            </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="$parent.$parent.search()"
-                     condition="f_phone like '%{}%'">
-            </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_search button_spacing" @click="$parent.$parent.loadPage()">返回</button>
-              <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-              <export-excel :data="$parent.$parent.getCondition"
-                            :field="$parent.$parent.getfield"
-                            sqlurl="rs/logic/applyExportfile"
-                            sql-name="supervisory"
-                            template-name='报建记录信息导出'
-                            :choose-col="true"></export-excel>
-              <div
-                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
-                @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
-                class="button_spacing"
-                style="float: right">
-              </div>
-            </div>
-          </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_contract_number"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="f_contract_number = '{}'">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">报建类型：</label>
-              <v-select
-                v-model="model.f_apply_type"
-                placeholder='报建类型'
-                condition="f_apply_type = '{}'"
-                :value.sync="model.f_apply_type"
-                :options='$parent.$parent.applytype'
-                class="select select_list"
-                :value-single="true"
-                @change="$parent.$parent.applyTypeChange()"
-                close-on-select ></v-select>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">办理环节：</label>
-              <v-select
-                v-model="model.defname"
-                placeholder='办理环节'
-                condition="defname = '{}'"
-                :value.sync="model.defname"
-                :options='$parent.$parent.defnames'
-                class="select select_list"
-                :value-single="true"
-                close-on-select ></v-select>
-            </div>
-            <div class="form-group col-sm-3" v-if="false">
-              <label class="font_normal_body">报建性质：</label>
-              <v-select
-                v-model="model.f_apply_nature"
-                placeholder='报建性质'
-                condition="f_apply_nature = '{}'"
-                :value.sync="model.f_apply_nature"
-                :options='$parent.$parent.applyNatures'
-                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" style="width:60%" 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="开始日期"
-                          style="width: 60%!important;"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd 00:00:00'"
-                          :show-reset-button="true"
-                          condition="f_apply_date >= '{}'">
-              </datepicker>
-            </div>
-            <div class="form-group col-sm-3">
-              <label for="endDate" class="font_normal_body">结束时间：</label>
-              <datepicker id="endDate" placeholder="结束日期"
-                          style="width: 60%!important;"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd 23:59:59'"
-                          :show-reset-button="true"
-                          condition="f_apply_date <= '{}'">
-              </datepicker>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy">
-        <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>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{$index+1}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_num}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_user_name}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_contract_number}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_phone}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_nature}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.defname}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_order_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>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_sub_state}}</nobr>
-            </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_date}}</nobr>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-<script>
-  import {PagedList} from 'vue-client'
-  import {isEmpty} from '../../Util'
-  export default {
-    title: '勘探详情',
-    props: ['showData'],
-    data () {
-      return {
-        model: new PagedList('rs/sql/supervisory', 20, {
-          data: {
-            f_filiale: this.$login.f.f_fengongsi
-          }
-        }),
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-        defnames: [{label: '全部', value: ''}], // 流程节点
-        criteriaShow: false,
-        getfield: {
-          'f_apply_num': '工程编号',
-          'f_user_name': '客户名称',
-          'f_contract_number': '合同编号',
-          'f_phone': '电话',
-          'f_apply_nature': '报建性质',
-          'defname': '办理环节',
-          'f_order_address': '定位地址',
-          'f_apply_source': '来源',
-          'f_apply_type': '报建类型',
-          'f_sub_state': '流程状态',
-          'f_apply_date': '报建日期'
-        }
-      }
-    },
-    ready () {
-      // 调用查询
-      this.search()
-    },
-    events: {
-    },
-    methods: {
-      loadPage () {
-        this.$dispatch('loadPage')
-      },
-      // 查询
-      search () {
-        this.$dispatch('search')
-      },
-      check (val) {
-        this.$dispatch('apply', val)
-      },
-      async applyTypeChange () {
-        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
-          let res = await this.$resetpost('rs/logic/getDefnameByType',
-            { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
-            {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
-          )
-
-          this.defnames = [{label: '全部', value: ''}, ...res.data]
-        } else {
-          this.defnames = [{label: '全部', value: ''}]
-        }
-      },
-      clear () {
-        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = null
-        })
-      }
-    },
-    computed: {
-      getCondition () {
-        return {
-          condition: this.$refs.cp.$refs.cri.condition,
-          data: {
-            // orgid: this.$login.f.orgid
-            f_filiale: this.$login.f.f_fengongsi
-          }
-        }
-      }
-    }
-  }
-</script>
-<style scoped>
-</style>
+<template>
+  <div class="col-sm-12">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <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="search" condition=" (f_entry_name like '%{}%' or f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='三选一输入'>
+            </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_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" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
+                   v-on:keyup.enter="search"
+                     condition="f_contract_number = '{}'">
+            </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>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right">
+              </div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建类型：</label>
+              <v-select
+                v-model="model.f_apply_type"
+                placeholder='报建类型'
+                condition="f_apply_type like '%{}%'"
+                :value.sync="model.f_apply_type"
+                :options='$parent.$parent.applytype'
+                class="select select_list"
+                :value-single="true"
+                @change="$parent.$parent.applyTypeChange()"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">办理环节：</label>
+              <v-select
+                v-model="model.defname"
+                placeholder='办理环节'
+                condition="defname = '{}'"
+                :value.sync="model.defname"
+                :options='$parent.$parent.defnames'
+                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="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="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="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="true"
+                          condition="f_apply_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">结束时间：</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="true"
+                          condition="f_apply_date <= '{}'">
+              </datepicker>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <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>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_apply_num}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <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>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_phone}}</nobr>
+            </td>
+            <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_type}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.defname}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_sub_state}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_apply_date}}</nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+  import {HttpResetClass} from 'vue-client'
+  import {isEmpty} from '../../Util'
+  export default {
+    title: '勘探详情',
+    props: ['showData'],
+    data () {
+      return {
+        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+        model: new PagedList('rs/sql/supervisory', 20, {
+          data: {
+            id: `${this.$login.f.name}`,
+            orgid: this.$login.f.f_orgids
+          }
+        }),
+        defnames: [{label: '全部', value: ''}], // 流程节点
+        criteriaShow: false
+      }
+    },
+    ready () {
+      // 调用查询
+      this.search()
+    },
+    events: {
+    },
+    methods: {
+      // 查询
+      search () {
+        this.$dispatch('search')
+      },
+      clear () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = []
+        })
+      },
+      applyTypeChange () {
+        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+          let http = new HttpResetClass()
+          http.load('POST', 'rs/logic/getDefnameByType', {
+            f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            this.defnames = [{label: '全部', value: ''}, ...res.data]
+          })
+        } else {
+          this.defnames = [{label: '全部', value: ''}]
+        }
+      },
+      check (val) {
+        this.$dispatch('apply', val)
+      }
+    },
+    computed: {
+    }
+  }
+</script>
+<style scoped>
+</style>

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

@@ -1,19 +1,18 @@
 <template>
-    <div style="overflow: auto;background-color: #FFFFFF;">
+    <div style="overflow: auto;background-color: #FFFFFF;margin-top: 20px">
       <div class="row" v-for="(i,row) in defnames">
         <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="getdefname(row)" >
-          {{ row.defname }}
+          {{row.defname}}
           <br>
           {{i === (defnames.length) - 1 ? row.sendtime : row.finishtime}}
         </div>
-        <div class="arrow glyphicon glyphicon-menu-down" v-if="i !== defnames.length-1" aria-hidden="true"></div>
+        <div class="arrow glyphicon glyphicon-menu-down" v-if="i != defnames.length-1" aria-hidden="true"></div>
       </div>
     </div>
 </template>
 
 <script>
   import  {HttpResetClass} from 'vue-client'
-  import {isEmpty} from '../../Util'
   export default {
     title: "流程节点",
     props:['selectdata'],
@@ -26,69 +25,54 @@
       this.initial()
     },
     methods :{
-      async initial () {
+      async initial() {
         // 获取流程节点信息
-
-        let data = {
-          processid: this.selectdata.f_process_id
+        let http = new HttpResetClass()
+        let temp = []
+        if(this.selectdata && this.selectdata.f_process_id){
+          let res = await http.load('POST','rs/sql/getAllNode',{data:{processid: this.selectdata.f_process_id}},{resolveMsg:null, rejectMsg:null})
+          //循环去除回退导致重复的节点
+          // for (let i = 0; i < res.data.length; i++) {
+          //   let flag = true
+          //   for (let j = 0; j < temp.length; j++) {
+          //     if (res.data[i].defname === temp[j].defname) {
+          //       flag = false
+          //     }
+          //   }
+          //   if(flag){
+          //     temp.push(res.data[i])
+          //   }
+          // }
+          this.defnames = res.data
         }
-
-        let res = await this.$resetpost(
-          'rs/sql/getAllNode',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '流程节点信息获取失败！！！'}
-        )
-
-        this.defnames = res.data
       },
       //点击获取节点名
-      getdefname (row) {
-        // 发起节点都可查看
+      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)){
+        }else if(this.check(row.actorexpression)){
           row = Object.assign({},this.selectdata,row)
           this.$dispatch('apply', row)
-          return
+        }else{
+          this.$showMessage("对不起，您没有查看此节点的权限！")
         }
-        this.$showMessage("对不起，您没有查看此节点的权限！")
       },
       // 检测是否有权限
-      check (actorexpression){
-        let str = null
-
-        if (isEmpty(actorexpression)) {
-          return true
-        }
-
-        if (actorexpression.indexOf('D') === 0) {
-          str = actorexpression.substring(2, actorexpression.length-1)
-          return this.$login.f.f_parentname.includes(str)
-        }
-        if (actorexpression.indexOf('RS') === 0) {
-          for (str of actorexpression.substring(3, actorexpression.length-1).split(',')) {
-            return this.$login.f.rolesnames.includes(str)
-          }
-        }
-
-        if (actorexpression.indexOf('R') === 0) {
-          str = actorexpression.substring(2, actorexpression.length-1)
-          return this.$login.f.rolesnames.includes(str)
+      check(actorexpression){
+        let sign = actorexpression.charAt(0)
+        let str = actorexpression.substring(2,actorexpression.length-1)
+        let flag = false
+        if (sign === 'D' && this.$login.f.f_department_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 (sign === 'R' && this.$login.f.rolesnames.includes(str)) {
+          flag = true
         }
-        if (actorexpression.indexOf('P') === 0) {
-          str = actorexpression.substring(2, actorexpression.length-1)
-          return this.$login.f.name.includes(str)
+        if (sign === 'P' && this.$login.f.id.includes(str)) {
+          flag = true
         }
-
-        return this.$login.f.rolesnames.includes('流程监控')
+        return flag
       }
     },
     watch:{