apply-clients 7.1.33 → 7.1.36

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

@@ -1,121 +1,110 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'">
-        <supervisory-list v-ref:query :show-data="showData"></supervisory-list>
-      </div>
-      <div v-if="showtotal" style="height: 89%">
-        <div class="col-sm-2">
-          <supervisory-chart :selectdata="selectdata"></supervisory-chart>
-        </div>
-        <div class="col-sm-10">
-          <tabset v-ref:tabs :close="false">
-            <tab :header='selectdata.defname'>
-              <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
-            </tab>
-            <tab header='附件'>
-              <apply-upload :blodid="selectdata.f_process_id"
-                            :isupload = "false"
-                            :isdelete="false"
-                            :isusetype="true"
-                            :isremark = "true"
-                            :takeimg="false"
-                            :issearch="true"
-                            :defname="selectdata.defname">
-              </apply-upload>
-            </tab>
-          </tabset>
-        </div>
-      </div>
-    </div>
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '流程监控',
-    data () {
-      return {
-        showtotal: false, // 控制详细信息显示
-        showData: true,
-        selectdata: {},
-        xmlname: '' // 配置文件名称
-      }
-    },
-    created () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let http = new HttpResetClass()
-        let xmldata = {
-          data: this.$login.f,
-          workname: this.xmlname
-        }
-        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.queryuser.$refs.cp.$refs.cri.search()
-        }
-      },
-      async 'apply' (val) {
-        this.selectdata = val
-        this.showtotal = false
-
-        if (this.selectdata.f_apply_type === '开发商集体报装') {
-          this.xmlname = '开发商集体报建流程'
-        } else if (this.selectdata.f_apply_type === '散户报建') {
-          this.xmlname = '散户报建流程'
-        } else if (this.selectdata.f_apply_type === '工业户报装') {
-          this.xmlname = '工商户报建流程'
-        } else if (this.selectdata.f_apply_type === '商业户报建') {
-          this.xmlname = '工商户报建流程'
-        } else if (this.selectdata.f_apply_type === '工商户报装') {
-          this.xmlname = '工商户报建流程'
-        } else if (this.selectdata.f_apply_type === '散户集体报装') {
-          this.xmlname = '散户集体报建流程'
-        } else if (this.selectdata.f_apply_type === '煤改气报建') {
-          this.xmlname = '散户集体报建流程'
-        } else {
-          this.$showMessage('暂无此类报装')
-          return
-        }
-
-        // 获取配置文件
-        await this.loadName()
-
-        this.$refs.query.$refs.cp.pager = false
-        this.showData = false
-
-        this.showtotal = true
-      },
-      '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">
+      <div :class="showData ? 'top' : 'auto'">
+        <supervisory-list v-ref:query :show-data="showData"></supervisory-list>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+        <div class="col-sm-2" style="margin-top: 20px">
+          <new-supervisory-chart :selectdata="selectdata"></new-supervisory-chart>
+        </div>
+        <div class="col-sm-10" style="margin-top: 20px">
+          <tabset v-ref:tabs :close="false">
+            <tab :header='selectdata.defname'>
+              <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
+            </tab>
+            <tab header='附件'>
+              <apply-upload :blodid="selectdata.f_process_id"
+                            :isupload = "false"
+                            :isdelete="false"
+                            :isusetype="true"
+                            :isremark = "true"
+                            :takeimg="false"
+                            :issearch="true"
+                            :defname="selectdata.defname">
+              </apply-upload>
+            </tab>
+          </tabset>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '流程监控',
+    data () {
+      return {
+        showtotal: false, // 控制详细信息显示
+        showData: true,
+        selectdata: {},
+        xmlname: '' // 配置文件名称
+      }
+    },
+    created () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let data = {
+          workname: this.selectdata.processname
+        }
+
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetConfigs',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+
+        Vue.prototype.$workflow_vue = res.data
+      }
+    },
+    events: {
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        }
+      },
+      async 'apply' (val) {
+        this.selectdata = val
+        this.showtotal = false
+
+        // 获取配置文件
+        await this.loadName()
+
+        this.$refs.query.$refs.cp.pager = false
+        this.showData = false
+
+        this.showtotal = true
+      },
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      }
+    },
+
+    watch: {
+    }
+  }
+</script>

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

@@ -4,26 +4,33 @@
       <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"
+              <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" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
-                   v-on:keyup.enter="search"
-                     condition="f_contract_number = '{}'">
+              <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"
@@ -33,12 +40,18 @@
             </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 like '%{}%'"
+                condition="f_apply_type = '{}'"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
                 class="select select_list"
@@ -58,16 +71,22 @@
                 :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 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" class="input_search" placeholder='用户地址' v-model="model.f_address"
-                     v-on:keyup.enter="search"
+              <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">
@@ -76,7 +95,7 @@
                           style="width: 60%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
                           condition="f_apply_date >= '{}'">
               </datepicker>
@@ -87,7 +106,7 @@
                           style="width: 60%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
                           condition="f_apply_date <= '{}'">
               </datepicker>
@@ -99,13 +118,15 @@
         <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>
+            <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>
@@ -119,7 +140,7 @@
               <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>
+              <nobr>{{row.f_user_name}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>
@@ -128,13 +149,19 @@
               <nobr>{{row.f_phone}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_address}}</nobr>
+              <nobr>{{row.f_apply_nature}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_type}}</nobr>
+              <nobr>{{row.defname}}</nobr>
             </td>
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.defname}}</nobr>
+              <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>
@@ -150,22 +177,33 @@
 </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
+            f_filiale: this.$login.f.f_fengongsi
           }
         }),
+        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
         defnames: [{label: '全部', value: ''}], // 流程节点
-        criteriaShow: false
+        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 () {
@@ -175,32 +213,44 @@
     events: {
     },
     methods: {
+      loadPage () {
+        this.$dispatch('loadPage')
+      },
       // 查询
       search () {
         this.$dispatch('search')
       },
-      clear () {
-        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = []
-        })
+      check (val) {
+        this.$dispatch('apply', val)
       },
-      applyTypeChange () {
+      async 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]
-          })
+          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: ''}]
         }
       },
-      check (val) {
-        this.$dispatch('apply', val)
+      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>