apply-clients 7.1.35 → 7.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.35",
+  "version": "7.1.38",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

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

@@ -1,147 +1,147 @@
-<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>
-      <!--
-        <div class="col-sm-2">
-          <stop-apply-cardlist v-ref:card></stop-apply-cardlist>
-        </div>
-      -->
-    </div>
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建业务',
-    data () {
-      return {
-        selectdata: null,
-        funcdata: null, // 选中功能
-        showtotal: false, // 控制详情显示
-        showData: true     // 控制列表数据
-      }
-    },
-    created () {
-      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
-          }
-        })
-      }
-    },
-    events: {
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-        let http = new HttpResetClass()
-        let data = {
-          condition: `u.id = ${servicedata.id}`,
-          data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.f_orgids
-          }
-        }
-
-        try {
-          let res = await http.load('POST', 'rs/sql/checkuserfunction', {data: data}, {resolveMsg: null, rejectMsg: null})
-
-          this.showtotal = false
-          this.selectdata = res.data[0]
-          this.$nextTick(() => {
-            this.showtotal = true
-          })
-        } catch (e) {
-          this.$showAlert('数据更新失败，请手查询更新！！！', 'danger', 3000)
-        }
-      },
-      // 查询
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      },
-      // 点击功能操作
-      'func' (funcdata, row) {
-        this.funcdata = funcdata
-        this.selectdata = row
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-        // 关闭列表数据
-        this.showData = false
-
-        this.$nextTick(() => {
-          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>
-<style scoped>
-  /*清除浮动*/
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-  .head{
-    height: auto;
-    font-weight: bold;
-    color: #000000;
-    font-family: 微软雅黑;
-  }
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main" style="overflow: auto;width: 100%">
+      <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>
+      <!--
+        <div class="col-sm-2">
+          <stop-apply-cardlist v-ref:card></stop-apply-cardlist>
+        </div>
+      -->
+    </div>
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建业务',
+    data () {
+      return {
+        selectdata: null,
+        funcdata: null, // 选中功能
+        showtotal: false, // 控制详情显示
+        showData: true     // 控制列表数据
+      }
+    },
+    created () {
+      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
+          }
+        })
+      }
+    },
+    events: {
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+        let http = new HttpResetClass()
+        let data = {
+          condition: `u.id = ${servicedata.id}`,
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.f_orgids
+          }
+        }
+
+        try {
+          let res = await http.load('POST', 'rs/sql/checkuserfunction', {data: data}, {resolveMsg: null, rejectMsg: null})
+
+          this.showtotal = false
+          this.selectdata = res.data[0]
+          this.$nextTick(() => {
+            this.showtotal = true
+          })
+        } catch (e) {
+          this.$showAlert('数据更新失败，请手查询更新！！！', 'danger', 3000)
+        }
+      },
+      // 查询
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      // 点击功能操作
+      'func' (funcdata, row) {
+        this.funcdata = funcdata
+        this.selectdata = row
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+        // 关闭列表数据
+        this.showData = false
+
+        this.$nextTick(() => {
+          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>
+<style scoped>
+  /*清除浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+  .head{
+    height: auto;
+    font-weight: bold;
+    color: #000000;
+    font-family: 微软雅黑;
+  }
+</style>

package/src/components/product/Process/ExplorationUser.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex-row">
-    <div class="basic-main">
+    <div class="basic-main" style="overflow: auto;width: 100%">
       <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
         <exploration-select v-ref:query :show-data="showData"></exploration-select>
       </div>
@@ -72,15 +72,12 @@
 
         if (servicedata.id) {
           let http = new HttpResetClass()
-          let result = this.$login.f.f_parentname === '安检部门' ? "u.f_operation_center like '%" + this.$login.f.name + "%'" : " 1 = 1"
-          console.log("结果：" + this.$login.f.f_parentname === '安检部门')
-          console.log("结果：" + result)
           let data = {
             condition: `u.id = ${servicedata.id}`,
             data: {
               id: this.$login.f.id,
               orgid: this.$login.f.f_orgids,
-              company: result
+              company: this.$login.f.f_parentname === '安检部门' ? "u.f_operation_center like '%" + this.$login.f.name + "%'" : " 1 = 1"
             }
           }
           let res = await http.load('POST', 'rs/sql/checkuser', {data: data}, {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'})