apply-clients 3.4.2 → 3.4.4

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

@@ -1,100 +1,137 @@
-<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">
-          <supervisory-chart :selectdata="selectdata"></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()
-      }
-    },
-
-    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">
+          <supervisory-chart :selectdata="selectdata"></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="true"
+                            :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: {
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+
+        if (servicedata.id) {
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              orgid: this.$login.f.orgid
+            }
+          }
+          let res = await this.$resetpost(
+            'rs/sql/supervisory',
+            {data: data},
+            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+          )
+          this.selectdata = Object.assign({}, this.selectdata, res.data[0])
+        } else {
+          this.selectdata = servicedata
+        }
+
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+
+      },
+      '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 = null
+        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,30 +4,36 @@
       <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" 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>
               <res-select
                 restype='organization'
-                :initresid='$parent.$parent.curorgid'
+                :initresid='$parent.$parent.curorgid'·
                 @res-select="$parent.$parent.getorg"
                 is-mul="false"
               ></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"
-                     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_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>-->
+            <!--              <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-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"
@@ -37,15 +43,28 @@
             </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" 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" 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" 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">联&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='联系人'>
+              <label class="font_normal_body">合同金额：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='合同金额' v-model="model.f_contract_money"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_contract_money 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_phone"
+                     v-on:keyup.enter="search"
+                     condition="f_phone like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
@@ -58,7 +77,7 @@
               <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"
@@ -79,10 +98,28 @@
                 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 '%{}%'">
+              <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>
+              <v-select
+                v-model="model.f_sub_state"
+                placeholder='流程状态'
+                condition="f_sub_state = '{}'"
+                :value.sync="model.f_sub_state"
+                :options='$parent.$parent.subStates'
+                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>
@@ -96,7 +133,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>
@@ -107,11 +144,52 @@
                           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>
             </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_construction_unit"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_construction_unit like '%{}%'" placeholder='施工单位'>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">表&emsp;&emsp;号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='表号' v-model="model.f_meternumber"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="meternumber 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.lyr"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="lyr 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.fyr"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="fyr 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_operator"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_operator like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">领用状态：</label>
+              <v-select
+                v-model="model.frstate"
+                placeholder='流程状态'
+                condition="frstate = '{}'"
+                :value.sync="model.frstate"
+                :options='$parent.$parent.lyStates'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -119,15 +197,24 @@
         <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>
+            <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'>
@@ -139,7 +226,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>
@@ -150,6 +237,9 @@
             <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>
@@ -162,6 +252,30 @@
             <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_date}}</nobr>
             </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.ftime}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_install_project}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_construction_unit}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_construction_date}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_cumulative_payment_money}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.lyr}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.fyr}}</nobr>
+            </td>
+            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_operator}}</nobr>
+            </td>
           </tr>
         </template>
       </data-grid>
@@ -181,10 +295,52 @@
             orgid: this.$login.f.orgid
           }
         }),
+        orgid:'',
         curorgid: [this.$login.f.orgid],
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
         defnames: [{label: '全部', value: ''}], // 流程节点
-        criteriaShow: false
+        applyNatures: [{label: '全部', value: ''}], // 报建性质
+        criteriaShow: false,
+        subStates: [
+          {label: '全部', value: ''},
+          {label: '新增', value: '新增'},
+          {label: '暂停', value: '暂停'},
+          {label: '终止', value: '终止'},
+          {label: '完工', value: '完工'},
+          {label: '正在进行', value: '正在进行'}
+        ], // 流程状态
+        lyStates: [
+          {label: '全部', value: ''},
+          {label: '已领', value: '已领'},
+          {label: '未领', value: '未领'}
+
+        ], // 流程状态
+        getfield: {
+          'f_apply_num': '工程编号',
+          'f_user_name': '客户名称',
+          'f_contract_number': '合同编号',
+          'f_phone': '电话',
+          'f_address': '地址',
+          'f_apply_type': '报建类型',
+          'f_apply_nature': '报建性质',
+          'f_cumulative_payment_money': '收费金额',
+          'defname': '办理环节',
+          'f_sub_state': '流程状态',
+          'f_apply_date': '报建日期',
+          'ftime': '派单时间',
+          'f_apply_remarks': '备注',
+          'f_payment_remarks': '缴费备注',
+          'f_install_project': '安装项目',
+          'f_construction_unit': '施工单位',
+          'f_construction_date': '施工时间',
+          'f_operator': '发起人',
+          'f_depname':'发起人部门',
+          'lyr': '领用人',
+          'fdnyr':'领用人部门',
+          'fyr': '发货人',
+          'fdnfr':'发货人部门',
+          'meternumber':'表号'
+        }
       }
     },
     ready () {
@@ -194,6 +350,9 @@
     events: {
     },
     methods: {
+      loadPage () {
+        this.$dispatch('loadPage')
+      },
       // 查询
       search () {
         this.$dispatch('search')
@@ -209,8 +368,11 @@
           )
 
           this.defnames = [{label: '全部', value: ''}, ...res.data]
+
+          this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
         } else {
           this.defnames = [{label: '全部', value: ''}]
+          this.applyNatures = [{label: '全部', value: ''}]
         }
       },
       clear () {
@@ -223,9 +385,18 @@
           return
         }
         this.model.params.data.orgid = val[0]
+        this.orgid=  val[0]
       }
     },
     computed: {
+      getCondition () {
+        return {
+          condition: this.model.condition,
+          data: {
+            orgid: this.orgid
+          }
+        }
+      }
     }
   }
 </script>