apply-clients 3.1.40 → 3.1.43

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

@@ -5,7 +5,7 @@
         <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>
+              <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_user_name like '%{}%' or f_contact like '%{}%') " placeholder='二选一输入'>
             </div>
@@ -13,16 +13,23 @@
               <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 like '%{}%'">
+                     condition="u.f_apply_num 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_contract_number"
-                   v-on:keyup.enter="search"
-                     condition="f_contract_number like '%{}%'">
+              <label class="font_normal_body">工程类型：</label>
+              <v-select
+                v-model="model.f_project_type"
+                placeholder='请选择'
+                condition="u.f_project_type like '%{}%'"
+                :value.sync="model.f_project_type"
+                :options='$parent.$parent.projectType'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
             </div>
             <div class="form-group col-sm-2 operate">
               <button type="button" class="btn btn-info head-but" @click="$parent.$parent.search(),$parent.$parent.close()" v-el:cx>查询</button>
+              <button type="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"
@@ -39,6 +46,18 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">小&emsp;&emsp;区：</label>
+              <v-select
+                v-model="model.f_residential_area"
+                placeholder='请选择'
+                condition="u.f_residential_area = '{}'"
+                :value.sync="model.f_residential_area"
+                :options='$parent.$parent.area'
+                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"
@@ -46,11 +65,17 @@
                      condition="f_address like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">票号：</label>
+              <label class="font_normal_body">票&emsp;&emsp;号：</label>
               <input type="text" class="input_search" placeholder='票号' v-model="model.f_ticket_number"
                      v-on:keyup.enter="search"
                      condition="c.f_ticket_number 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_contract_number"
+                     v-on:keyup.enter="search"
+                     condition="f_contract_number like '%{}%'">
+            </div>
             <div class="col-sm-3  form-group">
               <label class="font_normal_body">报建类型：</label>
               <v-select
@@ -169,18 +194,18 @@
         defnames:[], // 所有流程节点
         condition: '', // 查询条件
         criteriaShow: false,
-        processids: null,
+        area:[],
         getfield: {
-          'f_apply_num': '报建编号',
-          'defname': '当前环节',
-          'f_sub_state': '流程状态',
-          'f_user_name': '联系人',
-          'f_contact': '联系人',
-          'f_contract_number': '合同编号',
-          'f_phone': '电话',
-          'f_address': '地址',
-          'f_apply_type': '报建类型',
-          'f_apply_date': '报建日期'
+          'f_apply_num': ' 报 建 编 号 ',
+          'defname': ' 当 前 环 节 ',
+          'f_sub_state': ' 流 程 状 态 ',
+          'f_user_name': ' 客 户 名 称 ',
+          'f_contact': ' 联 系 人 ',
+          'f_contract_number': ' 合 同 编 号 ',
+          'f_phone': ' 电 话 ',
+          'f_address': ' 地 址 ',
+          'f_apply_type': ' 报 建 类 型 ',
+          'f_apply_date': '  报 建 日 期  '
         }
       }
     },
@@ -189,10 +214,36 @@
 
       // 获取所有办理环节
       this.getDefnames()
+      this.getAreaAll()
     },
     events: {
     },
     methods: {
+      clear () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = ''
+        })
+      },
+      //获取当前登录人已处理过的流程ID
+      async searchCondition() {
+        let http = new HttpResetClass()
+        let data = {
+          org: `${this.$login.f.orgs}`
+        }
+        let res = await http.load('POST', 'rs/sql/getActor', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '查询角色失败'
+        })
+        let x = []
+        for (let i = 0; i < res.data.length; i++) {
+          if (this.$login.f.f_role_name.includes(res.data[i].actor)) {
+            x.push(res.data[i].processid)
+          }
+        }
+        this.processids = JSON.stringify(x)
+
+        console.log("x的数据", this.processids)
+      },
       async search() {
         let http = new HttpResetClass()
         let data = {
@@ -242,6 +293,18 @@
           this.defnames = [{label: '全部', value: ''}, ...res.data]
         })
       },
+      async getAreaAll () {
+        let http = new HttpResetClass()
+        let condition = "f_filialeid = " + this.$login.f.orgid
+        let res = await http.load('POST','rs/logic/apply_queryArea',{data:{condition:condition}}, {resolveMsg: null, rejectMsg: null})
+
+        this.area = res.data.queryArea.map(item => {
+          return {
+            'label': item.f_residential_area,
+            'value': item.f_residential_area,
+          }
+        })
+      },
       check(val) {
         this.$dispatch('apply', val)
       },
@@ -250,6 +313,9 @@
       }
     },
     computed: {
+      projectType() {
+        return this.$appdata.getParam("工程类型")
+      },
       getCondition () {
         console.log("condition",this.$refs.cp.$refs.cri.condition)
         return {