apply-clients 7.1.47 → 7.1.49

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

@@ -5,19 +5,19 @@
         <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" 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 col-sm-4">项目、客户名称:</label>
+                <input type="text" class="input_search col-sm-8" v-model="model.f_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()" condition=" (u.f_entry_name like '%{}%' or u.f_user_name like '%{}%' or u.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"
+                <label class="font_normal_body col-sm-4">报建编号：</label>
+                <input type="text" class="input_search col-sm-8" 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" class="input_search" placeholder='用户编号' v-model="model.f_userinfo_code"
+                <label class="font_normal_body col-sm-4">用户编号：</label>
+                <input type="text" class="input_search col-sm-8" placeholder='用户编号' v-model="model.f_userinfo_code"
                        v-on:keyup.enter="search"
                        condition="ui.f_userinfo_code like '%{}%'">
               </div>
@@ -27,61 +27,62 @@
                         @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_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-                <div
-                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                <button
+                  class="button_clear button_spacing"
                   @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
-                  class="button_spacing"
                   style="float: right">
-                </div>
+                  {{ $parent.$parent.criteriaShow ? '隐藏' : '显示'}}
+                </button>
               </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" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
+                <label class="font_normal_body col-sm-4">合同编号：</label>
+                <input type="text" class="input_search col-sm-8" 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>
+                <label class="font_normal_body col-sm-4">报建类型：</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"
+                  class="select select_list col-sm-8"
                   :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>
+                <label class="font_normal_body col-sm-4">办理环节：</label>
                 <v-select
                   v-model="model.defname"
                   placeholder='办理环节'
                   condition="defname = '{}'"
                   :value.sync="model.defname"
                   :options='$parent.$parent.defnames'
-                  class="select select_list"
+                  class="select select_list col-sm-8"
                   :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"
+                <label class="font_normal_body col-sm-4">联系电话：</label>
+                <input type="text" class="input_search col-sm-8" 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"
+                <label class="font_normal_body col-sm-4">用户地址：</label>
+                <input type="text" class="input_search col-sm-8" 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>
+                <label  for="startDate" class="font_normal_body col-sm-4">开始时间：</label>
                 <datepicker id="startDate" placeholder="开始日期"
+                            class="col-sm-8"
                             style="width: 60%!important;"
                             v-model="model.startDate"
                             :value.sync="model.startDate"
@@ -91,8 +92,9 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-3">
-                <label for="endDate" class="font_normal_body">结束时间：</label>
+                <label for="endDate" class="font_normal_body col-sm-4">结束时间：</label>
                 <datepicker id="endDate" placeholder="结束日期"
+                            class="col-sm-8"
                             style="width: 60%!important;"
                             v-model="model.endDate"
                             :value.sync="model.endDate"
@@ -207,7 +209,7 @@
     data () {
       return {
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
-        defnames: [{label: '全部', value: ''}], // 流程节点
+        defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
         model: new PagedList('rs/sql/checkuser', 20, {
           data: {
             id: this.$login.f.id,
@@ -245,7 +247,7 @@
             this.defnames = [{label: '全部', value: ''}, ...res.data]
           })
         } else {
-          this.defnames = [{label: '全部', value: ''}]
+          this.defnames = [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')]
         }
       },
       // 获取流程id
@@ -342,7 +344,21 @@
   }
 </script>
 <style scoped>
-
+  .select_list {
+    width: 200px;
+    height: 34px;
+  }
+  .input_search{
+    padding: 7px;
+    width: 200px;
+    height: 34px;
+    background-color: #ffffff;
+    border-radius: 2px;
+    border: solid 1px #c7c7c7 !important;
+    color: #333333 !important;
+    font-size: 15px !important;
+    font-family: PingFang;
+  }
   .p1 {
     color: #dc0b12;
     font-weight:bold

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

@@ -1,135 +1,135 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main" style="overflow: auto;width: 100%">
-      <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
-        <exploration-select v-ref:query :show-data="showData"></exploration-select>
-      </div>
-      <div v-if="showtotal" style="height: 89%">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='selectdata.defname'>
-            <service-control  v-ref:service :selectdata="selectdata"></service-control>
-          </tab>
-          <tab header='附件'>
-            <apply-upload :blodid="selectdata.f_process_id"
-                          :isupload = "true"
-                          :isdelete="true"
-                          :isusetype="true"
-                          :isremark = "true"
-                          :takeimg="false"
-                          :issearch="true"
-                          :defname="selectdata.defname">
-            </apply-upload>
-          </tab>
-        </tabset>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建流程',
-    data () {
-      return {
-        showQuery: true,       // 控制查询页
-        showData: true,     // 控制列表数据
-        showtotal: false, // 详情显示
-        selectdata: {},
-        xmlname: ''        // 配置文件名
-      }
-    },
-    created () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let http = new HttpResetClass()
-        let xmldata = {
-          data: this.$login.f,
-          workname: this.selectdata.processname
-        }
-        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
-
-        if (res.data.code && res.data.code === 200) {
-          Vue.prototype.$workflow_vue = res.data.workflow_vue
-        } else {
-          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-          return
-        }
-      }
-    },
-    events: {
-      'onMessage' (data) {
-        console.log('接收消息')
-        console.log(data)
-        if (data.type === 'apply-task') {
-          this.$refs.query.$refs.cp.$refs.cri.search()
-        }
-      },
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-
-        if (servicedata.id) {
-          let http = new HttpResetClass()
-          let data = {
-            condition: `u.id = ${servicedata.id}`,
-            data: {
-              id: this.$login.f.id,
-              orgid: this.$login.f.f_orgids,
-              company: this.$login.f.f_parentname === '安检部门' ? "u.f_operation_center like '%" + this.$login.f.name + "%'" : " 1 = 1"
-            }
-          }
-          let res = await http.load('POST', 'rs/sql/checkuser', {data: data}, {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'})
-
-          this.selectdata = res.data[0]
-        } else {
-          this.selectdata = servicedata
-        }
-
-        this.showtotal = false
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-
-      },
-      // 初始化
-      async 'apply' (val) {
-        this.showtotal = false
-        this.selectdata = val
-
-        // if (this.selectdata.f_apply_type === '集体报建') {
-        //   this.xmlname = '集体报建流程'
-        // } else if (this.selectdata.f_apply_type === '散户报建') {
-        //   this.xmlname = '散户报建流程'
-        // } else {
-        //   this.$showMessage('暂无此类报装')
-        //   return
-        // }
-
-        // 次方法必须同步执行，否则后续会出问题
-        // 获取页面json配置文件
-        await this.loadName()
-
-        // 显示详细
-        this.showtotal = true
-        // 关闭列表数据
-        this.showData = false
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-      },
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      }
-    },
-    watch: {
-    }
-  }
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main" style="overflow: auto;width: 100%">
+      <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
+        <exploration-select v-ref:query :show-data="showData"></exploration-select>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='selectdata.defname'>
+            <service-control  v-ref:service :selectdata="selectdata"></service-control>
+          </tab>
+          <tab header='附件'>
+            <apply-upload :blodid="selectdata.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="false"
+                          :issearch="true"
+                          :defname="selectdata.defname">
+            </apply-upload>
+          </tab>
+        </tabset>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建流程',
+    data () {
+      return {
+        showQuery: true,       // 控制查询页
+        showData: true,     // 控制列表数据
+        showtotal: false, // 详情显示
+        selectdata: {},
+        xmlname: ''        // 配置文件名
+      }
+    },
+    created () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let http = new HttpResetClass()
+        let xmldata = {
+          data: this.$login.f,
+          workname: this.selectdata.processname
+        }
+        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
+
+        if (res.data.code && res.data.code === 200) {
+          Vue.prototype.$workflow_vue = res.data.workflow_vue
+        } else {
+          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
+          return
+        }
+      }
+    },
+    events: {
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.query.$refs.cp.$refs.cri.search()
+        }
+      },
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+
+        if (servicedata.id) {
+          let http = new HttpResetClass()
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              id: this.$login.f.id,
+              orgid: this.$login.f.f_orgids,
+              company: this.$login.f.f_parentname === '安检部门' ? "u.f_operation_center like '%" + this.$login.f.name + "%'" : " 1 = 1"
+            }
+          }
+          let res = await http.load('POST', 'rs/sql/checkuser', {data: data}, {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'})
+
+          this.selectdata = res.data[0]
+        } else {
+          this.selectdata = servicedata
+        }
+
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+
+      },
+      // 初始化
+      async 'apply' (val) {
+        this.showtotal = false
+        this.selectdata = val
+
+        // if (this.selectdata.f_apply_type === '集体报建') {
+        //   this.xmlname = '集体报建流程'
+        // } else if (this.selectdata.f_apply_type === '散户报建') {
+        //   this.xmlname = '散户报建流程'
+        // } else {
+        //   this.$showMessage('暂无此类报装')
+        //   return
+        // }
+
+        // 次方法必须同步执行，否则后续会出问题
+        // 获取页面json配置文件
+        await this.loadName()
+
+        // 显示详细
+        this.showtotal = true
+        // 关闭列表数据
+        this.showData = false
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+      },
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      }
+    },
+    watch: {
+    }
+  }
+</script>