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

package/package.json

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

package/src/components/product/ApplyGuanXian/GuanXianExplorationSelect.vue

@@ -131,7 +131,7 @@ export default {
       model: new PagedList('rs/sql/getGuanXianApply', 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, // 控制发起类型选择
@@ -270,7 +270,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:'榆林.榆川天然气'
         }
       }
     }

package/src/components/product/ApplyGuanXian/GuanXianExplorationUser.vue

@@ -1,144 +1,144 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'">
-        <guan-xian-exploration-select v-ref:query :show-data="showData"></guan-xian-exploration-select>
-      </div>
-      <div v-if="showtotal" style="height: 89%">
-        <div class="col-sm-2" style="margin-top: 20px">
-          <guan-xian-supervisoryh-cart :selectdata="selectdata"></guan-xian-supervisoryh-cart>
-        </div>
-        <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-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: '管线建设流程',
-  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
-      }
-      let res = await this.$resetpost(
-        'rs/logic/ApplyGetConfigs',
-        {data: data},
-        {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-      )
-
-      Vue.prototype.$workflow_vue = res.data
-    }
-  },
-  events: {
-    '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/getGuanXianApply',
-          {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)
-    }
-  },
-  watch: {
-  }
-}
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'">
+        <guan-xian-exploration-select v-ref:query :show-data="showData"></guan-xian-exploration-select>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+        <div class="col-sm-2" style="margin-top: 20px">
+          <guan-xian-supervisoryh-cart :selectdata="selectdata"></guan-xian-supervisoryh-cart>
+        </div>
+        <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-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: '管线建设流程',
+  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
+      }
+      let res = await this.$resetpost(
+        'rs/logic/ApplyGetConfigs',
+        {data: data},
+        {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+      )
+
+      Vue.prototype.$workflow_vue = res.data
+    }
+  },
+  events: {
+    '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/getGuanXianApply',
+          {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)
+    }
+  },
+  watch: {
+  }
+}
+</script>

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

@@ -1,133 +1,133 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <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="selectdata.f_process_id"
-                          :isupload = "isupload"
-                          :isdelete="true"
-                          :isusetype="true"
-                          :isremark = "true"
-                          :takeimg="false"
-                          :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: '报建业务',
-    data () {
-      return {
-        selectdata: null,
-        showtotal: false, // 控制详情显示
-        showData: true,     // 控制列表数据
-        isupload: false
-      }
-    },
-    ready () {
-      this.getConfig()
-    },
-    methods: {
-      // 获取功能配置
-      async getConfig () {
-        let res = await this.$resetpost(
-          'rs/logic/ApplyGetFunction',
-          null,
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-        )
-        Vue.prototype.$function_vue = res.data
-      }
-    },
-    events: {
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-        let http = new HttpResetClass()
-        let data = {
-          condition: `u.id = ${servicedata.id}`,
-          data: {
-            f_filiale: this.$login.f.f_fengongsi
-          }
-        }
-
-        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.$nextTick(() => {
-          this.showtotal = true
-        })
-      },
-      // 查询
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        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.selectdata = Object.assign({}, funcdata, row)
-        this.isupload = funcdata.title === '图纸变更';
-        console.log("当前按钮",funcdata.title)
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-        // 关闭列表数据
-        this.showData = false
-
-        this.$nextTick(() => {
-          this.showtotal = 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">
+      <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="selectdata.f_process_id"
+                          :isupload = "isupload"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="false"
+                          :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: '报建业务',
+    data () {
+      return {
+        selectdata: null,
+        showtotal: false, // 控制详情显示
+        showData: true,     // 控制列表数据
+        isupload: false
+      }
+    },
+    ready () {
+      this.getConfig()
+    },
+    methods: {
+      // 获取功能配置
+      async getConfig () {
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetFunction',
+          null,
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+        Vue.prototype.$function_vue = res.data
+      }
+    },
+    events: {
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+        let http = new HttpResetClass()
+        let data = {
+          condition: `u.id = ${servicedata.id}`,
+          data: {
+            f_filiale: this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'
+          }
+        }
+
+        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.$nextTick(() => {
+          this.showtotal = true
+        })
+      },
+      // 查询
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        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.selectdata = Object.assign({}, funcdata, row)
+        this.isupload = funcdata.title === '图纸变更';
+        console.log("当前按钮",funcdata.title)
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+        // 关闭列表数据
+        this.showData = false
+
+        this.$nextTick(() => {
+          this.showtotal = 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>