apply-clients 7.1.35 → 7.1.36-yuchuan-1

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

@@ -1,13 +1,19 @@
 <template>
   <div class="flex-row">
     <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
+      <div :class="showData ? 'top' : 'auto'">
         <exploration-select v-ref:query :show-data="showData"></exploration-select>
       </div>
+<!--      <div v-if="showtotal">-->
+<!--        <new-exploration-user :selectdata="selectdata"></new-exploration-user>-->
+<!--      </div>-->
       <div v-if="showtotal" style="height: 89%">
-        <tabset v-ref:tabs :close="false">
+        <tabset v-ref:tabs :close="false" :active.sync="active">
           <tab :header='selectdata.defname'>
-            <service-control  v-ref:service :selectdata="selectdata"></service-control>
+            <service-control v-ref:service :selectdata="selectdata"></service-control>
+          </tab>
+          <tab header='地图'>
+            <apply-map-com :selectdata="selectdata"></apply-map-com>
           </tab>
           <tab header='附件'>
             <apply-upload :blodid="selectdata.f_process_id"
@@ -15,7 +21,7 @@
                           :isdelete="true"
                           :isusetype="true"
                           :isremark = "true"
-                          :takeimg="false"
+                          :takeimg="true"
                           :issearch="true"
                           :defname="selectdata.defname">
             </apply-upload>
@@ -26,113 +32,127 @@
   </div>
 </template>
 <script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建流程',
-    data () {
-      return {
-        showQuery: true,       // 控制查询页
-        showData: true,     // 控制列表数据
-        showtotal: false, // 详情显示
-        selectdata: {},
-        xmlname: ''        // 配置文件名
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '报建流程',
+  data () {
+    return {
+      showData: true,     // 控制列表数据
+      showtotal: false, // 详情显示
+      selectdata: {},
+      xmlname: '',        // 配置文件名
+      active: 0        // 配置文件名
+    }
+  },
+  ready () {
+    console.log('=============用户信息=================')
+    console.log(this.$login.f)
+    console.log(this.$login.r)
+  },
+  methods: {
+    // 获取页面配置json文件
+    async loadName () {
+
+      let data = {
+        workname: this.selectdata.processname
       }
-    },
-    created () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let http = new HttpResetClass()
-        let xmldata = {
-          data: this.$login.f,
-          workname: this.selectdata.processname
-        }
-        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
+      let res = await this.$resetpost(
+        'rs/logic/ApplyGetConfigs',
+        {data: data},
+        {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+      )
 
-        if (res.data.code && res.data.code === 200) {
-          Vue.prototype.$workflow_vue = res.data.workflow_vue
-        } else {
-          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-          return
-        }
+      Vue.prototype.$workflow_vue = res.data
+    }
+  },
+  events: {
+    'locationclick' (res) {
+      console.log('/*/*/*/*/*/*/*/*/*/*/*/*/*/**/*/*/*/*')
+      if (res.pname){
+        this.$refs.service.setLabelValue('定位地址', res.pname + res.cityname + res.adname + res.address + res.name)
+      }else {
+        this.$refs.service.setLabelValue('定位地址', res.province + res.city + res.address + res.name)
       }
+      this.$refs.service.show_data.f_lng = res.location.lng
+      this.$refs.service.show_data.f_lat = res.location.lat
+      this.active = 0
     },
-    events: {
-      'onMessage' (data) {
-        console.log('接收消息')
-        console.log(data)
-        if (data.type === 'apply-task') {
-          this.$refs.query.$refs.cp.$refs.cri.search()
-        }
-      },
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
+    'onMessage' (data) {
+      console.log('接收消息')
+      console.log(data)
+      if (data.type === 'apply-task') {
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      }
+    },
+    // 刷新控制层
+    async 'breakControl' (servicedata) {
 
-        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
-            }
+      if (servicedata.id) {
+        let data = {
+          condition: `u.id = ${servicedata.id}`,
+          data: {
+            userid: this.$login.f.id,
+            f_filiale: this.$login.f.f_fengongsi
           }
-          let res = await http.load('POST', 'rs/sql/checkuser', {data: data}, {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'})
-
-          this.selectdata = res.data[0]
-        } else {
-          this.selectdata = servicedata
         }
+        let res = await this.$resetpost(
+          'rs/sql/checkuser',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+        )
 
-        this.showtotal = false
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
+        this.selectdata = res.data[0]
+      } else {
+        this.selectdata = servicedata
+      }
 
-      },
-      // 初始化
-      async 'apply' (val) {
-        this.showtotal = false
-        this.selectdata = val
+      this.showtotal = false
+      this.$nextTick(() => {
+        this.showtotal = true
+      })
 
-        // if (this.selectdata.f_apply_type === '集体报建') {
-        //   this.xmlname = '集体报建流程'
-        // } else if (this.selectdata.f_apply_type === '散户报建') {
-        //   this.xmlname = '散户报建流程'
-        // } else {
-        //   this.$showMessage('暂无此类报装')
-        //   return
-        // }
+    },
+    // 初始化
+    async 'apply' (val) {
+      this.showtotal = false
+      this.selectdata = val
 
-        // 次方法必须同步执行，否则后续会出问题
-        // 获取页面json配置文件
-        await this.loadName()
+      // 次方法必须同步执行，否则后续会出问题
+      // 获取页面json配置文件
+      await this.loadName()
 
-        // 显示详细
-        this.showtotal = true
-        // 关闭列表数据
-        this.showData = false
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-      },
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      }
+      // 显示详细
+      this.showtotal = true
+      // 关闭列表数据
+      this.showData = false
+      // 关闭分页
+      this.$refs.query.$refs.cp.pager = false
+    },
+    'search' () {
+      this.selectdata = {}
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData = true
+      // 显示分页
+      this.$refs.query.$refs.cp.pager = true
+      // 调用查询
+      this.$refs.query.$refs.cp.$refs.cri.search()
     },
-    watch: {
+    'loadPage' () {
+      this.selectdata = {}
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData = true
+      // 显示分页
+      this.$refs.query.$refs.cp.pager = true
+      // 调用查询
+      this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
     }
+  },
+  watch: {
   }
+}
 </script>

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

@@ -0,0 +1,184 @@
+<template>
+  <div style="height: 89%">
+    <tabset v-ref:tabs :close="false" :active.sync="active">
+      <tab :header='selectdata.defname'>
+        <service-control v-ref:service :selectdata="selectdata"></service-control>
+      </tab>
+      <tab header='地图'>
+        <apply-map-com :selectdata="selectdata"></apply-map-com>
+      </tab>
+      <tab header='附件'>
+        <apply-upload :blodid="selectdata.f_process_id"
+                      :isupload="true"
+                      :isdelete="true"
+                      :isusetype="true"
+                      :isremark="true"
+                      :takeimg="true"
+                      :issearch="true"
+                      :defname="selectdata.defname">
+        </apply-upload>
+      </tab>
+    </tabset>
+  </div>
+
+  <!--  <div>-->
+  <!--    <button @click="openTab(1)">打开标签页1</button>-->
+  <!--    <button @click="openTab(2)">打开标签页2</button>-->
+  <!--    <button @click="openTab(3)">打开标签页3</button>-->
+  <!--    <div v-for="(item, index) in tabs" :key="index">-->
+  <!--      <component :is="item.component" :data="item.data"></component>-->
+  <!--    </div>-->
+  <!--  </div>-->
+</template>
+
+<script>
+import Vue from 'vue'
+
+export default {
+  title: '新报建业务流程',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      active: 0        // 配置文件名
+    }
+  },
+  ready() {
+    // 调用查询
+    console.log("进来啦", this.selectdata)
+    this.apply(this.selectdata)
+  },
+  methods: {
+    async apply(val) {
+      this.showtotal = false
+      this.selectdata = val
+
+      // 次方法必须同步执行，否则后续会出问题
+      // 获取页面json配置文件
+      await this.loadName()
+
+      // 显示详细
+      this.showtotal = true
+      // 关闭列表数据
+      // this.showData = false
+      // 关闭分页
+      // this.$refs.query.$refs.cp.pager = false
+    },
+    // 获取页面配置json文件
+    async loadName() {
+
+      let data = {
+        workname: this.selectdata.processname
+      }
+      let res = await this.$resetpost(
+        'rs/logic/ApplyGetConfigs',
+        {data: data},
+        {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+      )
+
+      Vue.prototype.$workflow_vue = res.data
+
+    }
+    // openTab(id) {
+    //   this.tabs.push({
+    //     component: TabComponent,
+    //     data: {
+    //       id
+    //     }
+    //   })
+    // }
+  },
+  events: {
+    'locationclick'(res) {
+      console.log('/*/*/*/*/*/*/*/*/*/*/*/*/*/**/*/*/*/*')
+      if (res.pname) {
+        this.$refs.service.setLabelValue('定位地址', res.pname + res.cityname + res.adname + res.address + res.name)
+      } else {
+        this.$refs.service.setLabelValue('定位地址', res.province + res.city + res.address + res.name)
+      }
+      this.$refs.service.show_data.f_lng = res.location.lng
+      this.$refs.service.show_data.f_lat = res.location.lat
+      this.active = 0
+    },
+    'onMessage'(data) {
+      console.log('接收消息')
+      console.log(data)
+      if (data.type === 'apply-task') {
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      }
+    },
+    // 刷新控制层
+    async 'breakControl'(servicedata) {
+
+      if (servicedata.id) {
+        let data = {
+          condition: `u.id = ${servicedata.id}`,
+          data: {
+            userid: this.$login.f.id,
+            f_filiale: this.$login.f.f_fengongsi
+          }
+        }
+        let res = await this.$resetpost(
+          'rs/sql/checkuser',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+        )
+
+        this.selectdata = res.data[0]
+      } else {
+        this.selectdata = servicedata
+      }
+
+      this.showtotal = false
+      this.$nextTick(() => {
+        this.showtotal = true
+      })
+
+    },
+    // 初始化
+    async 'apply'(val) {
+      this.showtotal = false
+      this.selectdata = val
+
+      // 次方法必须同步执行，否则后续会出问题
+      // 获取页面json配置文件
+      await this.loadName()
+
+      // 显示详细
+      this.showtotal = true
+      // 关闭列表数据
+      this.showData = false
+      // 关闭分页
+      this.$refs.query.$refs.cp.pager = false
+    },
+    'search'() {
+      this.selectdata = {}
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData = true
+      // 显示分页
+      this.$refs.query.$refs.cp.pager = true
+      // 调用查询
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    'loadPage'() {
+      this.selectdata = {}
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData = true
+      // 显示分页
+      this.$refs.query.$refs.cp.pager = true
+      // 调用查询
+      this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+    }
+  }
+  // components: {
+  //   TabComponent
+  // }
+}
+</script>