apply-clients 3.0.4 → 3.0.5-ys

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

@@ -2,42 +2,93 @@
   <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 class="form-group col-sm-2" >
+                <label class="col-sm-6">所属公司:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.apply_org" placeholder='所属公司' condition="f_filiale = '{}'"
+                            v-model="model.f_filiale" @change="$parent.$parent.orgChange" :value.sync="model.f_filiale" close-on-select>
+                  </v-select>
+                </div>
               </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-2">
+                <label class="col-sm-6">项目名称:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.entry_name" placeholder='项目名称' condition="f_entry_name = '{}'"
+                            v-model="model.f_entry_name" @change="$parent.$parent.entryChange" :value.sync="model.f_entry_name" close-on-select>
+                  </v-select>
+                </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 '{}%'">
+              <div class="form-group col-sm-2">
+                <label class="col-sm-6">项目编号:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.entry_num" placeholder='项目编号' condition="f_entry_num = '{}'"
+                            v-model="model.f_entry_num" :value.sync="model.f_entry_num" close-on-select>
+                  </v-select>
+                </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 '{}%'">
+              <div class="form-group col-sm-2">
+                <label class="col-sm-6">用户地址:</label>
+                <div class="col-sm-6">
+                  <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="form-group col-sm-2">
+                <label class="col-sm-6">报建类型:</label>
+                <div class="col-sm-6">
+                  <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">
-                <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>
+            </div>
+            <div class="col-sm-12">
+              <div class="form-group 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">
+              <div class="form-group col-sm-2">
+                <label class="col-sm-6">经办人:</label>
+                <div class="col-sm-6">
+                  <input type="text" class="form-control" placeholder='经办人' v-model="model.f_apply_operator"
+                       v-on:keyup.enter="search"
+                       condition=" f_apply_operator like '%{}%' ">
+                </div>
               </div>
-              <div class="col-sm-1">
+<!--              <div class="form-group col-sm-2"></div>-->
+              <!-- <div class="form-group col-sm-2">
+                <label class="col-sm-6">项目类型:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.projecttype" placeholder='项目类型' condition="f_project_type  like '%{}%'"
+                            v-model="model.f_project_type" :value.sync="model.f_project_type" close-on-select>
+                  </v-select>
+                </div>
+              </div> -->
+              <div class="form-group col-sm-2">
+                <label class="col-sm-6">营业所:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.business_office" placeholder='营业所' condition="f_business_office  like '%{}%'"
+                            v-model="model.f_business_office" :value.sync="model.f_business_office" close-on-select>
+                  </v-select>
+                </div>
               </div>
-              <div class="col-sm-1">
-                <button class="btn btn-primary btn-sm width-80" type="button" @click="search(),$parent.$parent.close()">
-                  <span class="glyphicon glyphicon-search"></span>查询
-                </button>
+              <div class="form-group col-sm-2">
+                <label class="col-sm-6">查询/返回:</label>
+                <div class="col-sm-6">
+                  <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.close()">
+                    <span class="glyphicon glyphicon-search"></span>查询
+                  </button>
+                </div>
               </div>
             </div>
           </form>
@@ -52,13 +103,16 @@
                 <nobr>当前状态</nobr>
               </th>
               <th>
-                <nobr>报建编号</nobr>
+                <nobr>经办人</nobr>
+              </th>
+              <th>
+                <nobr>项目名称</nobr>
               </th>
               <th>
-                <nobr>客户名称</nobr>
+                <nobr>项目编号</nobr>
               </th>
               <th>
-                <nobr>用户类型</nobr>
+                <nobr>用户名称</nobr>
               </th>
               <th>
                 <nobr>电话</nobr>
@@ -72,6 +126,9 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
+              <!-- <th>
+                <nobr>项目类型</nobr>
+              </th> -->
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -79,34 +136,41 @@
           </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.f_apply_operator}}</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_entry_name}}</nobr>
+              </td>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.f_entry_num}}</nobr>
               </td>
-              <td @click="$parent.$parent.$parent.check(row)">
-                <nobr>{{row.f_user_type}}</nobr>
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+                <nobr>{{row.f_user_name}}</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_project_type}}</nobr>
+              </td> -->
+
+              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
             </tr>
@@ -118,29 +182,163 @@
 </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('报建类型'),
+        applytype:[{label:"零星散户",value:'零星散户'}],
+        // projecttype: this.$appdata.getParam('项目类型'),
+        business_office: this.$appdata.getParam('营业所'),
+        model: new PagedListLogic('rs/sql/supervisory', 20, {
           data: {
             id: `${this.$login.f.name}`,
-            fengongsi: `${this.$login.f.f_fengongsi}`
+            fengongsi: `${this.$login.f.orgs}`,
+            company: `${this.$login.f.orgs === '重庆盛焰集团' || this.$login.f.orgs === '湖南燎原燃气有限公司' ? "u.f_apply_num = '1' or 1 = 1" : '1 = 1'}`
           }
         }),
+        users:[],
+        defnames:[],
         condition: '',
-        select: ''
+        select: '',
+        entry_name: [],
+        entry_num: [],
+        apply_org: []
+
       }
     },
-    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.getEntry()
+      this.getOrgName()
       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: {
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.$parent.f_orgid = this.f_orgid
+      },
       generateUUID() {
         var d = new Date().getTime()
         var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
@@ -151,6 +349,7 @@
         return uuid
       },
       check(val) {
+        console.log("val:" + JSON.stringify(val))
         this.$dispatch('check', val)
       },
       close() {
@@ -160,6 +359,166 @@
         val === '完工'
         console.log('完工', val)
         return false
+      },
+      async getEntry(val) {
+        // 获取项目名称和项目编号
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_apply',
+          condition: this.$login.f.orgs === '重庆盛焰集团' || this.$login.f.orgs === '湖南燎原燃气有限公司' ? " 1 = 1" : " f_filiale = '" + this.$login.f.orgs + "'"
+        }
+        // 判断是不是总公司得账号
+        if (this.$login.f.orgs == '重庆盛焰集团' || this.$login.f.orgs == '湖南燎原燃气有限公司') {
+          data.condition = " f_filiale = '" + val + "'"
+        }
+        let res = await http.load('POST','rs/sql/applysingleTable',{data:data}, {
+          resolveMsg: null,
+          rejectMsg: '获取项目名称和项目编号失败'
+        })
+        for (let i = 0; i < res.data.length; i++) {
+          //  项目名称
+          let data = []
+          let array = []
+          data = res.data.map(item => {
+            return item.f_entry_name;
+          })
+          for (let q = 0; q < data.length; q++) {
+            let arraydata = {
+              'label': data[q],
+              'value': data[q]
+            }
+            if (array.length != 0) {
+              for (let w = 0; w < array.length; w++) {
+                if (array[w].label == data[q]) {
+                  break
+                }
+                while (w == array.length - 1) {
+                  array.push(arraydata)
+                  break
+                }
+              }
+            } else {
+              array.push(arraydata)
+            }
+          }
+          this.entry_name = array
+          //  项目编号
+          // let data1 = []
+          // let array1 = []
+          // data1 = res.data.map(item => {
+          //   return item.f_entry_num;
+          // })
+          // for (let q = 0; q < data1.length; q++) {
+          //   let arraydata = {
+          //     'label': data1[q],
+          //     'value': data1[q]
+          //   }
+          //   if (array1.length != 0) {
+          //     for (let w = 0; w < array1.length; w++) {
+          //       if (array1[w].label == data1[q]) {
+          //         break
+          //       }
+          //       while (w == array1.length - 1) {
+          //         array1.push(arraydata)
+          //         break
+          //       }
+          //     }
+          //   } else {
+          //     array1.push(arraydata)
+          //   }
+          // }
+          // this.entry_num = array1
+        }
+      },
+      async getNum(val) {
+        // 获取项目名称和项目编号
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_apply',
+          condition: this.$login.f.orgs === '重庆盛焰集团' || this.$login.f.orgs === '湖南燎原燃气有限公司' ? "f_entry_name = '" + val + "'" : "f_filiale = '" + this.$login.f.orgs + "'" + " and f_entry_name = '" + val + "'"
+        }
+        let res = await http.load('POST','rs/sql/applysingleTable',{data:data}, {
+          resolveMsg: null,
+          rejectMsg: '获取项目名称和项目编号失败'
+        })
+        for (let i = 0; i < res.data.length; i++) {
+          //  项目编号
+          let data1 = []
+          let array1 = []
+          data1 = res.data.map(item => {
+            return item.f_entry_num;
+          })
+          for (let q = 0; q < data1.length; q++) {
+            let arraydata = {
+              'label': data1[q],
+              'value': data1[q]
+            }
+            if (array1.length != 0) {
+              for (let w = 0; w < array1.length; w++) {
+                if (array1[w].label == data1[q]) {
+                  break
+                }
+                while (w == array1.length - 1) {
+                  array1.push(arraydata)
+                  break
+                }
+              }
+            } else {
+              array1.push(arraydata)
+            }
+          }
+          this.entry_num = array1
+        }
+      },
+      entryChange(val) {
+        console.log("被选中的数据:" + val)
+        this.getNum(val)
+      },
+      orgChange(val) {
+        console.log("被选中的数据:" + val)
+        this.getEntry(val)
+      },
+      // 获取所有组织名称
+      async getOrgName() {
+        let http = new HttpResetClass()
+        let org = this.$login.f.orgs === '重庆盛焰集团' || this.$login.f.orgs === '湖南燎原燃气有限公司' ? " 1 = 1" : " name = '" + this.$login.f.orgs + "'"
+        let data = {
+          tablename: 't_organization',
+          condition: " name != '组织机构' and " + org
+
+        }
+        let res = await http.load('POST','rs/sql/applysingleTable',{data:data}, {
+          resolveMsg: null,
+          rejectMsg: '获取公司名称失败'
+        })
+        for (let i = 0; i < res.data.length; i++) {
+          //  所属公司
+          let data1 = []
+          let array1 = []
+          data1 = res.data.map(item => {
+            return item.name;
+          })
+          for (let q = 0; q < data1.length; q++) {
+            let arraydata = {
+              'label': data1[q],
+              'value': data1[q]
+            }
+            if (array1.length != 0) {
+              for (let w = 0; w < array1.length; w++) {
+                if (array1[w].label == data1[q]) {
+                  break
+                }
+                while (w == array1.length - 1) {
+                  array1.push(arraydata)
+                  break
+                }
+              }
+            } else {
+              array1.push(arraydata)
+            }
+          }
+          this.apply_org = array1
+        }
       }
     },
     computed: {
@@ -175,9 +534,9 @@
       defnameType() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('流程状态')]
       },
-      applytype() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]
-      }
+      // applytype() {
+      //   return [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')]
+      // }
     }
   }
 </script>
@@ -186,5 +545,4 @@
     background-color: #6666ff;
   }
 
-
 </style>

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

@@ -24,7 +24,7 @@
           if(row.defname === this.$supervisory_vue.start_activity){
             row = Object.assign({},this.selectdata,row)
             this.$dispatch('check', row)
-          }else if(this.check(row.actorexpression)){
+          }else if(row.actorexpression){
             row = Object.assign({},this.selectdata,row)
             this.$dispatch('check', row)
           }else{
@@ -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
             }
           }
@@ -68,6 +70,7 @@
               }
             }
             this.defnames = temp
+
           }
         }
       }