apply-clients 3.0.4 → 3.0.5-2

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

@@ -2,40 +2,57 @@
   <div class="d1">
     <div class="left col-sm-12">
       <criteria-paged :model="model" v-ref:cp>
-        <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri
+                  style="padding: 20px;background-color:  #f6f6f6;">
           <form novalidate class="" partial>
             <div class="col-sm-12">
-              <div class="col-sm-1">
-                <input type="text" class="form-control" placeholder='客户名称' v-model="model.f_user_name"
-                       v-on:keyup.enter="search"
-                       condition="f_user_name like '{}%'">
-              </div>
-              <div class="col-sm-1">
-                <input type="text" class="form-control" placeholder='报建编号' v-model="model.f_apply_num"
-                       v-on:keyup.enter="search"
-                       condition="f_apply_num like '{}%'">
+              <div class="form-group col-sm-4">
+                <label class=" col-sm-6" style="padding-top: 8px">联系人/项目名称/用户名称:</label>
+                <div class="col-sm-6">
+                  <input type="text" class="form-control" v-model="model.f_user_name"
+                         condition=" (f_user_name like '%{}%' or f_entry_name like '%{}%' or f_company_name like '%{}%') " placeholder='三选一输入'>
+                </div>
               </div>
               <div class="col-sm-1">
-                <input type="text" class="form-control" placeholder='用户地址' v-model="model.f_address"
-                       v-on:keyup.enter="search"
-                       condition="f_address like '{}%'">
+                <!--<label class="col-sm-6">合同编号</label>-->
+                <div class="col-sm-12">
+                  <input type="text" class="form-control" placeholder='合同编号' v-model="model.f_contract_number"
+                         v-on:keyup.enter="search"
+                         condition="f_contract_number like '%{}%'">
+                </div>
               </div>
               <div class="col-sm-1">
-                <input type="text" class="form-control" placeholder='小区名称' v-model="model.f_residential_area"
-                       v-on:keyup.enter="search"
-                       condition="f_residential_area like '{}%'">
+                <!--<label class="col-sm-6">用户地址</label>-->
+                <div class="col-sm-12">
+                  <input type="text" class="form-control" placeholder='用户地址' v-model="model.f_address"
+                         v-on:keyup.enter="search"
+                         condition="f_address like '%{}%'">
+                </div>
               </div>
               <div class="col-sm-1">
-                <v-select  :options="$parent.$parent.usertype" placeholder='用户类型' condition="f_user_type  like '{}%'"
-                          v-model="model.f_user_type" :value.sync="model.f_user_type" close-on-select>
-                </v-select>
+                <!--<label class="col-sm-6"> 报建类型：</label>-->
+                <div class="col-sm-12" v-if="!this.$login.f.f_fengongsi.includes('中燃')">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.applytype" placeholder='报建类型' condition="f_apply_type  like '%{}%'"
+                            v-model="model.f_apply_type" :value.sync="model.f_apply_type" close-on-select>
+                  </v-select>
+                </div>
               </div>
-              <div class="col-sm-1">
+              <div class="col-sm-2">
+                <label class="col-sm-6">办理环节:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'90%'" @change="$dispatch('setQueryCondition',model)" :options="$parent.$parent.defnames"
+                            condition="defname = '{}'" placeholder='办理环节'
+                            v-model="model.defname" :value.sync="model.defname" close-on-select>
+                  </v-select>
+                </div>
               </div>
               <div class="col-sm-1">
+                <input type="text" class="form-control" placeholder='经办人' v-model="model.f_survey_name"
+                       v-on:keyup.enter="search"
+                       condition=" (f_apply_kefu_employee like '%{}%' or  f_survey_name like '%{}%') ">
               </div>
               <div class="col-sm-1">
-                <button class="btn btn-primary btn-sm width-80" type="button" @click="search(),$parent.$parent.close()">
+                <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.close()">
                   <span class="glyphicon glyphicon-search"></span>查询
                 </button>
               </div>
@@ -52,10 +69,11 @@
                 <nobr>当前状态</nobr>
               </th>
               <th>
-                <nobr>报建编号</nobr>
+                <nobr>当前办理人</nobr>
               </th>
+              <th><nobr>联系人/项目名称/用户名称</nobr></th>
               <th>
-                <nobr>客户名称</nobr>
+                <nobr>合同编号</nobr>
               </th>
               <th>
                 <nobr>用户类型</nobr>
@@ -79,34 +97,37 @@
           </template>
           <template partial='body'>
             <tr>
-              <td @click="$parent.$parent.$parent.check(row)">
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{$index+1}}</nobr>
               </td>
-              <td @click="$parent.$parent.$parent.check(row)">
+              <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)">
-                <nobr>{{row.f_apply_num}}</nobr>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.applysite}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.f_user_name}}/{{row.f_entry_name}}/{{row.f_company_name}}</nobr>
               </td>
-              <td @click="$parent.$parent.$parent.check(row)">
-                <nobr>{{row.f_user_name}}</nobr>
+              <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)">
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_user_type}}</nobr>
               </td>
-              <td @click="$parent.$parent.$parent.check(row)">
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_phone}}</nobr>
               </td>
-              <td @click="$parent.$parent.$parent.check(row)">
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
-              <td @click="$parent.$parent.$parent.check(row)">
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.defname}}</nobr>
               </td>
-              <td @click="$parent.$parent.$parent.check(row)">
+              <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)">
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
             </tr>
@@ -118,28 +139,148 @@
 </template>
 <script>
   import AppData from '../../../stores/AppData.js'
-  import {
-    PagedList
-  } from 'vue-client'
+  import PagedListLogic from '../../../stores/PagedListLogic'
   import getNowDate from '../../getNowDate.js'
+  import {HttpResetClass} from 'vue-client'
 
   export default {
     title: '勘探详情',
     data() {
       return {
-        model: new PagedList('rs/sql/supervisory', 20, {
+        applytype: this.$appdata.getParam('报建类型'),
+        model: new PagedListLogic('rs/sql/supervisory', 20, {
           data: {
             id: `${this.$login.f.name}`,
             fengongsi: `${this.$login.f.f_fengongsi}`
           }
         }),
+        users:[],
+        defnames:[],
         condition: '',
         select: ''
       }
     },
-    ready() {
+    async ready() {
+      let http3 = new HttpResetClass()
+      http3.load('POST', 'rs/sql/getDefnamesForActivityins', {data:{}}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res)=>{
+        //  先获取所有流程环节
+        this.defnames = [{label: '全部', value: ''}]
+        for(let i=0;i<res.data.length;i++){
+          this.defnames.push({label:res.data[i].defname,value:res.data[i].defname})
+        }
+      })
+
+      let http = new HttpResetClass()
+      let data = {
+        columnname: 'id,name',
+        tablename: 't_user',
+        condition: '1=1'
+      }
+      let res = await http.load('POST','rs/sql/singleTable',{data:data}, {
+        resolveMsg: null,
+          rejectMsg: '获取人员失败'
+      })
+      this.users = res.data
       this.$refs.cp.$refs.cri.search()
     },
+    events: {
+      async dataGrid() {
+        // //获取购货方信息
+        // let data = {
+        //   tablename: 't_user',
+        //   condition: `1=1`
+        // }
+        // let buyerinfos = await this.$resetpost('rs/sql/singleTable', {data: data}, {
+        //   resolveMsg: null,
+        //   rejectMsg: '获取user失败'
+        // })
+        // let users = buyerinfos.data
+        if (!this.$refs.cp.$refs.grid.model.rows) return
+        let rows = this.$refs.cp.$refs.grid.model.rows
+        for (let i = 0; i < rows.length; i++) {
+          let expe = rows[i].actorexpression
+          if(expe.includes('getChildren')||expe.includes('getChildByName')){//{source:'this.getParentByType($organization$).getChildByName($客户服务部门$).getChildByName($客户服务部负责人$).getChildren()','userid':'12290'
+            let arr = expe.split('$')
+            this.$refs.cp.$refs.grid.model.rows[i].applysite = arr[arr.length - 2]
+          }else{ //{source: 'this', userid: '12290'}
+            let arr = expe.split('\'')
+            let userid = arr[arr.length - 2]
+            for(let j =0;j<this.users.length;j++){
+              if(this.users[j].id == userid){
+                this.$refs.cp.$refs.grid.model.rows[i].applysite = this.users[j].name
+              }
+            }
+          }
+
+
+
+          //
+          // if (expe.indexOf("'this'") == -1) {
+          //   let arr = expe.split('$')
+          //   this.$refs.cp.$refs.grid.model.rows[i].applysite = arr[arr.length - 2]
+          // } else if (rows[i].f_survey_name && typeof rows[i].f_survey_name == 'string' && rows[i].f_survey_name.includes("\"")) {
+          //   // 如果是属于工程技术部的就给工程技术部
+          //   let flag = ''
+          //   let str = this.$appdata.getSingleValue("客户服务部")
+          //   let str2 = this.$appdata.getSingleValue("工程技术部")
+          //   let arr = str.split(",")
+          //   let arr2 = str2.split(",")
+          //   for (let p = 0; p < arr.length; p++) {
+          //     if (arr[p] == rows[i].f_apply_type) {
+          //       flag = '客户服务部'
+          //       console.log(rows[i].f_apply_num, flag)
+          //       break
+          //     }
+          //   }
+          //   for (let p = 0; p < arr2.length; p++) {
+          //     if (arr2[p] == rows[i].f_apply_type) {
+          //       flag = '工程技术部'
+          //       console.log(rows[i].f_apply_num, flag)
+          //       break
+          //     }
+          //   }
+          //
+          //   if (flag == '工程技术部') {
+          //     let js = JSON.parse(rows[i].f_survey_name)
+          //     this.$refs.cp.$refs.grid.model.rows[i].applysite = js.name
+          //   } else if (flag == '客户服务部') {
+          //     let rows2 = this.$refs.cp.$refs.grid.model.rows
+          //     for (let i = 0; i < rows2.length; i++) {
+          //       if (!this.$refs.cp.$refs.grid.model.rows[i].applysite) {
+          //         if (rows2[i].f_apply_kefu_employee) {
+          //           if (rows2[i].f_apply_kefu_employee.startsWith("{")) {
+          //             let obj = JSON.parse(rows2[i].f_apply_kefu_employee)
+          //             this.$refs.cp.$refs.grid.model.rows[i].applysite = obj.name
+          //           } else {
+          //             this.$refs.cp.$refs.grid.model.rows[i].applysite = rows2[i].f_apply_kefu_employee
+          //           }
+          //         }
+          //       }
+          //     }
+          //   }
+          // }
+          // let numReg = /^[0-9]+$/
+          // let numRe = new RegExp(numReg)
+          // if (numRe.test(this.$refs.cp.$refs.grid.model.rows[i].applysite)) {
+          //   let querydata = {
+          //     tablename: 't_user',
+          //     condition: `id = ${this.$refs.cp.$refs.grid.model.rows[i].applysite}`
+          //   }
+          //   let http = new HttpResetClass()
+          //   http.load('POST','rs/sql/singleTable', {data: querydata}, {
+          //     resolveMsg: null,
+          //     rejectMsg: '获取人员失败'
+          //   }).then((res)=>{
+          //     this.$refs.cp.$refs.grid.model.rows[i].applysite = res.data[0].name
+          //   })
+          // }
+        }
+
+      }
+    },
     methods: {
       generateUUID() {
         var d = new Date().getTime()
@@ -151,6 +292,7 @@
         return uuid
       },
       check(val) {
+        console.log("val:" + JSON.stringify(val))
         this.$dispatch('check', val)
       },
       close() {
@@ -186,5 +328,4 @@
     background-color: #6666ff;
   }
 
-
 </style>

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

@@ -35,9 +35,11 @@
         check(actorexpression){
           let array = this.$login.f.rolesnames.split(',')
           for(let i=0;i<array.length;i++){
-            if(actorexpression.includes(array[i])){
+            if(array[i] && actorexpression.includes(array[i])){
               return true
-            }else if(actorexpression.includes(this.$login.f.name)){ // P(张三)  // 张三
+            }else if(actorexpression.includes(this.$login.f.id)){ // P(张三)  // 张三
+              return true
+            }else if(array[i]=='报装流程监控'){
               return true
             }
           }

package/src/components/product/VueUtils/Tree.vue

@@ -0,0 +1,330 @@
+<template>
+  <div id="treemx" class="tree fonte" v-if="refreshed" style="overflow-x: scroll;max-height: 80vh" >
+    <ul v-for='(rootindex,item) in menulist' :key="item.id">
+      <!-- 没有子集 -->
+      <li v-if='!item._child'>
+        <div class="treeItem" @click="selected(item)">
+          <a href="#">{{item.catename}}</a>
+          <div class="liright">
+            <span :class="item.enabled_text == '启用'?'bgYes':'bgNo'">{{item.enabled_text}}</span>
+          </div>
+        </div>
+      </li>
+      <!-- 有子集 -->
+      <li v-if='item._child'>
+        <div class="onechild treeItem" >
+          <a href="#" @click.native='toggleChildren(rootindex)'>{{item.expanded?'▼ ':'►'}}{{item.catename}}</a>
+          <div class="liright">
+            <span :class="item.enabled_text == '启用'?'bgYes':'bgNo'">{{item.enabled_text}}</span>
+          </div>
+        </div>
+        <ul v-show='item.expanded' class="childs" style="overflow-x: auto;">
+          <li v-for='(parentindex,child) in item._child' :key="child.id" >
+            <!-- 没有子集 -->
+            <div class="twochild treeItem marginL60" v-if="!child._child" @click="selected(child,rootindex)"><a href="#">{{child.catename}}</a>
+              <div class="liright">
+                <span :class="child.enabled_text == '启用'?'bgYes':'bgNo'">{{child.enabled_text}}</span>
+              </div>
+            </div>
+            <!-- 有子集 -->
+            <div class="twochild marginL60" v-if="child._child">
+              <div class="treeItem" >
+                <a href="#" @click.native='toggleChildren(rootindex,parentindex)'>{{child.expanded?'▼ ':'►'}}{{child.catename}}</a>
+                <div class="liright">
+                  <span :class="child.enabled_text == '启用'?'bgYes':'bgNo'">{{child.enabled_text}}</span>
+                </div>
+              </div>
+
+              <ul v-show='child.expanded'>
+                <!-- 遍历第三层 -->
+                <li class="threechild" v-for="(childIndex,child1) in child._child" :key="child1.id" style="overflow-x: auto;">
+                  <div class="treeItem marginL60">
+                      <a href="#" @click.native="add(rootindex,parentindex,childIndex)">{{child1.catename}}   <span v-if="child1.count">数量：{{child1.count}}</span></a>
+                  </div>
+                </li>
+              </ul>
+            </div>
+          </li>
+        </ul>
+      </li>
+
+    </ul>
+  </div>
+
+  <modal :show.sync="addshow2" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeadd"><span>&times;</span></button>
+      <h4 class="modal-title">数量</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <input class="form-control" style="background-color: #f7fbff;"
+             type="number"
+             v-model="inputvalue"
+             :value="inputvalue"
+      />
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <!--<button type="button" class="btn btn-default" @click='addclose'>取消</button>-->
+      <button type="button" class="btn btn-success" @click='addconfirm2'>确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+  export default {
+    title: 'new',
+    props: {
+      menulist: {
+        type: Array,
+        default: []
+      },
+      scrolltop:{
+        default:0
+      }
+    },
+    data() {
+      return {
+        rootindex:null,
+        parentindex:null,
+        childIndex:null,
+        inputvalue:null,
+        addshow2:false,
+        refreshed:true, //强制刷新
+        menulist: [{
+          catename: '水果',
+          expanded: false,
+          _child: [{
+            catename: '苹果',
+          }, {
+            catename: '荔枝'
+          }, {
+            catename: '葡萄'
+          }, {
+            catename: '火龙果',
+            expanded: false,
+            _child: [
+              {
+                id: 0,
+                catename: '白心',
+              }, {
+                id: 1,
+                catename: '红心',
+              },
+            ]
+          }]
+        }]
+      }
+    },
+    ready(){
+      this.updatecrollTop(this.scrolltop)
+    },
+    methods: {
+      updatecrollTop(hight){
+        console.log("scrollTop",hight)
+        let doc = document.getElementById("treemx")
+        doc.scrollTop = 0
+        doc.scrollTop = hight
+        // document.getElementById("treemx").scrollTop = hight
+        // document.documentElement.scrollTop = hight
+        // window.pageYOffset = hight
+        // document.body.scrollTop = hight
+      },
+      closeadd(){
+        this.rootindex = null
+        this.parentindex = null
+        this.childIndex = null
+        this.inputvalue = null
+        this.addshow2 = false
+      },
+      addconfirm2(){
+        this.menulist[this.rootindex]._child[this.parentindex]._child[this.childIndex].count = this.inputvalue
+        this.$dispatch('menulistSelected', this.menulist[this.rootindex]._child[this.parentindex]._child[this.childIndex],this.rootindex,this.parentindex)
+        this.closeadd()
+      },
+      add(rootindex,parentindex,childIndex){
+        this.rootindex = rootindex
+        this.parentindex = parentindex
+        this.childIndex = childIndex
+        this.addshow2 = true
+      },
+      selectedFormat(rootindex,parentindex,childIndex){
+        if(this.menulist[rootindex]._child[parentindex]._child[childIndex].showButton == undefined){
+          this.menulist[rootindex]._child[parentindex]._child[childIndex].showButton = false
+        }
+        this.menulist[rootindex]._child[parentindex]._child[childIndex].showButton = !this.menulist[rootindex]._child[parentindex]._child[childIndex].showButton
+        // this.refreshed = false
+        // this.$nextTick(()=>{
+        //   this.refreshed = true
+        // })
+      },
+      selectedCount(rootindex,parentindex,childIndex){
+        this.menulist[rootindex]._child[parentindex]._child[childIndex].expanded = true
+      },
+      inputCount(item,parentindex,childIndex){
+        console.log('count',item.count)
+        this.$dispatch('menulistSelected', item,val1,val2)
+      },
+      selected(item,val1,val2) {
+        console.log('item', item)
+        this.$dispatch('menulistSelected', item,val1,val2)
+      },
+      toggleChildren(rootindex,parentindex) {
+        if(parentindex!=undefined){
+          this.menulist[rootindex]._child[parentindex].expanded = !this.menulist[rootindex]._child[parentindex].expanded
+          // this.refreshed = false
+          // this.$nextTick(()=>{
+          //   this.refreshed = true
+          // })
+        }else if(rootindex!=undefined) {
+          this.menulist[rootindex].expanded = !this.menulist[rootindex].expanded
+        }
+        this.$dispatch('updateTree')
+
+      },
+    }
+  }
+</script>
+
+
+<style scoped>
+
+  ul {
+    display: block;
+    list-style-type: disc;
+    margin-block-start: 1em;
+    margin-block-end: 1em;
+    margin-inline-start: 0px;
+    margin-inline-end: 0px;
+    padding-inline-start: 40px;
+  }
+
+  .addressBox {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 5.1rem;
+    z-index: 9;
+    background: #f5f5f5;
+    display: block !important;
+  }
+
+  span:focus {
+    background-color: silver;
+  }
+
+  a {
+    font-size: 20px;
+    text-decoration: none;
+    color: black;
+  }
+
+  a:hover {
+    font-size: 20px;
+    text-decoration: none;
+    color: deepskyblue;
+    /*background-color: silver;*/
+  }
+
+  .addressBox ul {
+    width: 33%;
+    height: 5.1rem;
+    background: #E6E6E6;
+    overflow-y: scroll;
+    overflow-x: auto;
+  }
+
+  .addressBox li {
+    height: 0.62rem;
+    font: normal 0.26rem/0.62rem "微软雅黑";
+    color: #666;
+    text-align: center;
+  }
+
+  .cityBox {
+    position: absolute;
+    top: 0;
+    left: 33%;
+    width: 100%;
+    height: 5.1rem;
+    display: none;
+    overflow-y: scroll;
+    z-index: 19;
+    background: #E6E6E6;
+    -webkit-overflow-scrolling: touch;
+    overflow-x: auto;
+  }
+
+  .cityBox ul {
+    width: 100%;
+    height: 5.1rem;
+  }
+
+  .cityBox li {
+    padding-left: 0.17rem;
+    text-align: left;
+    border-bottom: 0.01rem solid #e6e6e6;
+  }
+
+  .areaBox {
+    position: absolute;
+    top: 0;
+    left: 33%;
+    width: 33%;
+    height: 5.1rem;
+    display: none;
+    overflow-y: scroll;
+    z-index: 9999;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  /*模态框*/
+  .model {
+    position: absolute;
+    top: 0%;
+    left: 0%;
+    background: rgba(0, 0, 0, 0.3);
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    z-index: 9999;
+  }
+
+  .model-content {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: .15rem;
+    margin: auto;
+    background-color: #ffffff;
+    text-align: center;
+  }
+
+  input {
+    font-size: 0.32rem;
+    width: 100%;
+    text-align: center;
+    margin-top: .3rem;
+    border: 1px solid #ccc;
+  }
+
+  /*点击省份，出现城市*/
+  .addressBox .active {
+    background: #f5f5f5;
+  }
+
+  .addressBox .active .cityBox {
+    display: block;
+  }
+
+  /*点击城市，出现区域*/
+  .cityBox .active {
+    background: #f5f5f5;
+  }
+
+  .cityBox .active .areaBox {
+    display: block;
+  }
+
+</style>