apply-clients 7.1.35 → 7.1.36

package/src/components/product/Function/InstallFunction.vue

@@ -1,22 +1,28 @@
 <template>
   <div class="flex-row">
     <div class="basic-main">
-      <div class="col-sm-12">
-        <div :class="showData ? 'top' : 'auto'">
-          <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
-        </div>
-        <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
-          <div class="panel-heading head" style="background-color: #e8f4ff">{{funcdata.title}}</div>
-          <div class="panel-body" style="height: 89%">
-            <function-service-control v-ref:func :funcdata="funcdata" :selectdata="selectdata"></function-service-control>
-          </div>
-        </div>
+      <div :class="showData ? 'top' : 'auto'">
+        <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
+      </div>
+      <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='selectdata.title'>
+            <function-service-control  v-ref:service :selectdata="selectdata"></function-service-control>
+          </tab>
+          <tab header='附件'>
+            <apply-upload :blodid="show_data.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="false"
+                          :issearch="true"
+                          :defname="show_data.defname"
+            >
+            </apply-upload>
+          </tab>
+        </tabset>
       </div>
-      <!--
-        <div class="col-sm-2">
-          <stop-apply-cardlist v-ref:card></stop-apply-cardlist>
-        </div>
-      -->
     </div>
   </div>
 
@@ -29,30 +35,22 @@
     data () {
       return {
         selectdata: null,
-        funcdata: null, // 选中功能
         showtotal: false, // 控制详情显示
         showData: true     // 控制列表数据
       }
     },
-    created () {
+    ready () {
       this.getConfig()
     },
     methods: {
       // 获取功能配置
-      getConfig () {
-        let http = new HttpResetClass()
-        let data = {
-          data: this.$login.f
-        }
-        http.load('POST', 'rs/logic/ApplyGetFunction', {data: data}, {resolveMsg: null, rejectMsg: null}
-        ).then((res) => {
-          if (res.data.code && res.data.code === 200) {
-            Vue.prototype.$function_vue = res.data.function_vue
-          } else {
-            this.$showMessage('获取配置失败,原因:' + res.data.msg)
-            return
-          }
-        })
+      async getConfig () {
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetFunction',
+          null,
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+        Vue.prototype.$function_vue = res.data
       }
     },
     events: {
@@ -62,22 +60,22 @@
         let data = {
           condition: `u.id = ${servicedata.id}`,
           data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.f_orgids
+            f_filiale: this.$login.f.f_fengongsi
           }
         }
 
-        try {
-          let res = await http.load('POST', 'rs/sql/checkuserfunction', {data: data}, {resolveMsg: null, rejectMsg: null})
+        let res = await http.load('POST', 'rs/sql/checkuserfunction', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '数据更新失败！！！'
+        })
+
+        this.showtotal = false
+
+        this.selectdata = Object.assign({}, this.selectdata, res.data[0])
 
-          this.showtotal = false
-          this.selectdata = res.data[0]
-          this.$nextTick(() => {
-            this.showtotal = true
-          })
-        } catch (e) {
-          this.$showAlert('数据更新失败，请手查询更新！！！', 'danger', 3000)
-        }
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
       },
       // 查询
       'search' () {
@@ -90,10 +88,20 @@
         // 调用查询
         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)
+      },
       // 点击功能操作
       'func' (funcdata, row) {
-        this.funcdata = funcdata
-        this.selectdata = row
+        this.selectdata = Object.assign({}, funcdata, row)
+
         // 关闭分页
         this.$refs.query.$refs.cp.pager = false
         // 关闭列表数据
@@ -103,30 +111,6 @@
           this.showtotal = true
         })
       }
-      /*
-        'operate' (row) {
-          this.show = false
-          this.funcdata = {
-            title: '撤销'
-          }
-          let http = new HttpResetClass()
-          let data = {
-            tablename: 't_apply',
-            condition: `f_process_id='${row.processid}'`
-          }
-          http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null,rejectMsg: '工程查询失败'})
-            .then(res => {
-              console.log(res.data[0])
-              this.selectdata = res.data[0]
-              this.selectdata.stopapply = row
-              this.selectheight = '10%'
-              this.funcheight = '90%'
-              this.$refs.installselect.$refs.cp.pager = false
-              this.show = true
-            })
-        }
-
-      */
     }
   }
 </script>

package/src/components/product/Function/InstallInfoSelect.vue

@@ -4,19 +4,26 @@
       <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-5">
-              <label class="font_normal_body">项目名称/客户名称/联系人:</label>
-              <input type="text" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition=" (f_entry_name like '%{}%' or f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='三选一输入'>
-            </div>
-            <div class="form-group col-sm-4">
-              <label class="font_normal_body">报建编号：</label>
-              <input type="text" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
+            <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="$parent.$parent.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_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-3 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>
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -27,18 +34,18 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="form-group col-sm-4">
+            <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"
+              <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-4">
+            <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"
@@ -46,7 +53,7 @@
                 @change="$parent.$parent.applyTypeChange()"
                 close-on-select ></v-select>
             </div>
-            <div class="form-group col-sm-4">
+            <div class="form-group col-sm-3">
               <label class="font_normal_body">办理环节：</label>
               <v-select
                 v-model="model.defname"
@@ -58,36 +65,42 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
-            <div class="form-group col-sm-4">
-              <label class="font_normal_body">联系电话：</label>
-              <input type="text" class="input_search" placeholder='联系电话' v-model="model.f_phone"
-                     v-on:keyup.enter="$parent.$parent.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-4">
+            <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"
+              <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-4">
+            <div class="form-group col-sm-3">
               <label  for="startDate" class="font_normal_body">开始时间：</label>
               <datepicker id="startDate" placeholder="开始日期"
                           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>
             </div>
-            <div class="form-group col-sm-4">
+            <div class="form-group col-sm-3">
               <label for="endDate" class="font_normal_body">结束时间：</label>
               <datepicker id="endDate" placeholder="结束日期"
                           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,12 +112,14 @@
         <template partial='head'>
           <tr class="title">
             <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>
@@ -113,35 +128,41 @@
         </template>
         <template partial='body'>
           <tr>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{$index+1}}</nobr>
+            <td style="text-align: center;">
+              <nobr><font>{{$index+1}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_num}}</nobr>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_num}}</font></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>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_user_name}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_contract_number}}</nobr>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_contract_number}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_phone}}</nobr>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_phone}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_order_address}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_source}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_address}}</nobr>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_type}}</nobr>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_nature}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.defname}}</nobr>
+            <td style="text-align: center;">
+              <nobr><font>{{row.defname}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_sub_state}}</nobr>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_sub_state}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_apply_date}}</nobr>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_date}}</font></nobr>
             </td>
             <td style="text-align: center;">
               <dropdown>
@@ -149,7 +170,7 @@
                   <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
                 </button>
                 <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-                  <li v-for="(index,func) in $parent.$parent.$parent.funcs" v-if="$parent.$parent.$parent.$parent.showFunc(func)">
+                  <li v-for="(index,func) in $parent.$parent.$parent.funcs" v-if="$parent.$parent.$parent.$parent.showFunc(func.personexpression)">
                     <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
                   </li>
                 </ul>
@@ -162,7 +183,6 @@
   </div>
 </template>
 <script>
-  import {HttpResetClass} from 'vue-client'
   import {PagedList} from 'vue-client'
   import {isEmpty} from '../../Util'
   export default {
@@ -170,16 +190,15 @@
     props: ['showData'],
     data () {
       return {
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-        defnames: [{label: '全部', value: ''}], // 流程节点
         model: new PagedList('rs/sql/checkuserfunction', 20, {
           data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.f_orgids
+            f_filiale: this.$login.f.f_fengongsi
           }
         }),
         funcs: [], // 功能列表
-        criteriaShow: false // 控制查询条件
+        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+        defnames: [{label: '全部', value: ''}], // 流程节点
+        criteriaShow: false
       }
     },
     ready () {
@@ -187,50 +206,37 @@
       this.search()
     },
     methods: {
-      clear () {
-        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = []
-        })
-      },
       // 查询
       search () {
         this.$dispatch('search')
       },
-      // 根据类型获取对应的流程节点
-      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]
-          })
-        } else {
-          this.defnames = [{label: '全部', value: ''}]
-        }
+      loadPage () {
+        this.$dispatch('loadPage')
       },
       // 获取配置
       async checkfuncs (row) {
+
         this.funcs = []
-        let functions = this.$function_vue.functions
-        for (let i = 0; i < functions.length; i++) {
+        let functions = JSON.parse(JSON.stringify(this.$function_vue.functions))
+
+        for (const item of functions) {
           // 显示类型
-          if (functions[i].showApplyTypes) {
-            if (functions[i].showApplyTypes.indexOf(row.f_apply_type) === -1) {
+          if (item.showApplyTypes) {
+            if (item.showApplyTypes.indexOf(row.f_apply_type) === -1) {
               continue
             }
           }
           // 显示节点
-          if (functions[i].showDefnames) {
-            if (functions[i].showDefnames.indexOf(row.defname) === -1) {
+          if (item.showDefnames) {
+            if (item.showDefnames.indexOf(row.defname) === -1) {
               continue
             }
           }
-
-          if ((row.f_apply_type === '散户集体报建' || row.f_apply_type === '煤改气报建') && (row.defname === '竣工验收' || row.defname === '完工') && functions[i].title === '收费') {
+          // 显示设备
+          if (item.device && item.device !== 'pc') {
             continue
           }
-          this.funcs.push(functions[i])
+          this.funcs.push(item)
         }
       },
       // 点击功能操作
@@ -238,37 +244,44 @@
         this.$dispatch('func', func, row)
       },
       // 权限控制
-      showFunc (func) {
-        // 没有配置所有人都可以看
-        if (!func.personexpression) {
+      showFunc (personexpression) {
+
+        if (isEmpty(personexpression)) {
           return true
         }
-        if (isEmpty(func.personexpression)) {
+
+        let mark = personexpression.charAt(0)
+
+        let str = personexpression.substring(2, personexpression.length-1)
+
+        if (mark === 'D' && this.$login.f.f_department_name.includes(str)) {
           return true
         }
-        if (func.personexpression.startsWith('P') || func.personexpression.startsWith('R') || func.personexpression.startsWith('D')) {
-          let personexpression = func.personexpression.substring(func.personexpression.indexOf('(') + 1, func.personexpression.indexOf(')'))
-          if (func.personexpression.startsWith('P')) {
-            if (this.$login.f.name === personexpression) {
-              return true
-            }
-            return false
-          }
-          if (func.personexpression.startsWith('R')) {
-            if (this.$login.f.f_role_name.indexOf(personexpression) !== -1) {
-              return true
-            }
-            return false
-          }
-          if (func.personexpression.startsWith('D')) {
-            if (this.$login.f.f_department_name === personexpression) {
-              return true
-            }
-            return false
-          }
-        } else {
+        if (mark === 'R' && this.$login.f.f_role_name.includes(str)) {
+          return true
+        }
+        if (mark === 'P' && this.$login.f.id.includes(str)) {
           return true
         }
+
+        return false
+      },
+      async applyTypeChange () {
+        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+          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: ''}]
+        }
+      },
+      clear () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = null
+        })
       }
     },
     computed: {