apply-clients 7.1.36-yuchuan-9 → 7.1.36-yuchuan-11

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

@@ -1,201 +1,201 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData1 ? 'top' : 'auto'">
-        <new-exploration-select v-ref:query :show-data="showData1"></new-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" :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>
-  </div>
-</template>
-<script>
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '报建流程',
-  props: ['xselectdata', 'mark'],
-  data () {
-    return {
-      showData1: false,     // 控制列表数据
-      showtotal: false, // 详情显示
-      selectdata: {},
-      xmlname: '',        // 配置文件名
-      active: 0        // 配置文件名
-    }
-  },
-  ready () {
-    console.log('=============用户信息=================')
-    console.log(this.$login.f)
-    console.log(this.$login.r)
-
-    this.selectdata = this.xselectdata
-    // this.loadName().then(res=>{
-    //   this.showtotal = true
-    // })
-  },
-  methods: {
-    // 获取页面配置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
-    },
-    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
-      })
-
-    },
-  },
-  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.showData1 = false
-      // 关闭分页
-      // this.$refs.query.$refs.cp.pager = false
-    },
-    'search' () {
-      this.selectdata = {}
-      // 关闭详细
-      this.showtotal = false
-      // 显示列表数据
-      this.showData1 = false
-      // 显示分页
-      // this.$refs.query.$refs.cp.pager = false
-      // // 调用查询
-      // this.$refs.query.$refs.cp.$refs.cri.search()
-    },
-    'loadPage' () {
-      this.selectdata = {}
-      // 关闭详细
-      this.showtotal = false
-      // 显示列表数据
-      this.showData1 = false
-      // 调用查询
-      // this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
-      this.$dispatch('loadPage1', this.mark)
-    }
-  },
-  watch: {
-     "xselectdata"(val) {
-      console.log("当前数据显示一下",this.xselectdata)
-      this.selectdata = val
-      if (val){
-        this.loadName().then(res=>{
-          this.showtotal = true
-        })
-      }else {
-        this.showtotal = false
-      }
-    }
-  }
-}
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData1 ? 'top' : 'auto'">
+        <new-exploration-select v-ref:query :show-data="showData1"></new-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" :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>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '报建流程',
+  props: ['xselectdata', 'mark'],
+  data () {
+    return {
+      showData1: false,     // 控制列表数据
+      showtotal: false, // 详情显示
+      selectdata: {},
+      xmlname: '',        // 配置文件名
+      active: 0        // 配置文件名
+    }
+  },
+  ready () {
+    console.log('=============用户信息=================')
+    console.log(this.$login.f)
+    console.log(this.$login.r)
+
+    this.selectdata = this.xselectdata
+    // this.loadName().then(res=>{
+    //   this.showtotal = true
+    // })
+  },
+  methods: {
+    // 获取页面配置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
+    },
+    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?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
+      })
+
+    },
+  },
+  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?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.showData1 = false
+      // 关闭分页
+      // this.$refs.query.$refs.cp.pager = false
+    },
+    'search' () {
+      this.selectdata = {}
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData1 = false
+      // 显示分页
+      // this.$refs.query.$refs.cp.pager = false
+      // // 调用查询
+      // this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    'loadPage' () {
+      this.selectdata = {}
+      // 关闭详细
+      this.showtotal = false
+      // 显示列表数据
+      this.showData1 = false
+      // 调用查询
+      // this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      this.$dispatch('loadPage1', this.mark)
+    }
+  },
+  watch: {
+     "xselectdata"(val) {
+      console.log("当前数据显示一下",this.xselectdata)
+      this.selectdata = val
+      if (val){
+        this.loadName().then(res=>{
+          this.showtotal = true
+        })
+      }else {
+        this.showtotal = false
+      }
+    }
+  }
+}
+</script>

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

@@ -342,7 +342,7 @@ export default {
       model: new PagedList('rs/sql/checkuser', 20, {
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.f_fengongsi
+          f_filiale: this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'
         }
       }),
       // showModal: false, // 控制发起类型选择
@@ -532,7 +532,7 @@ export default {
         condition: this.$refs.cp.$refs.cri.condition,
         data: {
           userid: this.$login.f.id,
-          f_filiale: this.$login.f.f_fengongsi
+          f_filiale: this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'
         }
       }
     }