Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -5,4 +5,4 @@ NODE_ENV=development
 VUE_APP_BASE_API = '/bdcdj'
 VUE_APP_BASE_API = '/bdcdj'
 
 
 # 开发环境
 # 开发环境
-VUE_APP_API_BASE_URL = 'http://192.168.2.95:8018'
+VUE_APP_API_BASE_URL = 'http://192.168.2.88:8018'

@@ -114,4 +114,14 @@ export function getZssyqkList (data) {
         data,
         data,
         showLoading: true
         showLoading: true
     })
     })
+}
+/* 
+证书管理-证书使用情况详情
+*/
+export function getZssyqkInfo (params) {
+    return request({
+        url: '/sys/zsgl/getZssyqkInfo',
+        method: 'get',
+        params
+    })
 }
 }
\ No newline at end of file

+import Vue from 'vue'
+import Popup from './index.vue'
+
+const PopupBox = Vue.extend(Popup)
+Popup.install = function (data) {
+  console.log(data)
+  let instance = new PopupBox({
+    data
+  }).$mount()
+
+  document.body.appendChild(instance.$el)
+
+  Vue.nextTick(() => {
+    instance.isShow = true
+  })
+}
+
+export default Popup
\ No newline at end of file

+<template>
+    <transition name="fade" mode="out-in" v-if="isShow">
+      <div class="ls-mask" v-loading="loading">
+        <div class="ls-mask-window" :style="{'width':width,'height':height}">
+          <div :style="{'text-align':titleStyle}"><b >{{title}}</b></div>
+          <i class="el-icon-close" @click="onCancel" ></i>
+          <div class="ls-mask-content">
+            <component :is="editItem" ref='childRef' @loading='loadingFn' />
+          </div>
+          <div class="ls-mask-footer">
+            <el-button type="primary" @click="onConfirm">{{confirmText}}</el-button>
+            <el-button @click="onCancel">{{cancelText}}</el-button>
+          </div>
+        </div>
+      </div>
+    </transition>
+  </template>
+  <script>
+    export default {
+      name: 'index',
+      data () {
+        return {
+          title: '提示',
+          cancelText: '取消',
+          confirmText: '确认',
+          isSync: false,
+          isShow: false,
+          editItem:"",
+          titleStyle:'',
+          width:"75%",
+          height:"500px",
+        }
+      },
+      props:{
+        loading: { type: Boolean, default: false },
+      },
+      watch:{
+          isShow(a,b){
+              this.editItem = this.loadViewFn(this.editItem)
+          },
+      },
+      methods: {
+        onCancel () {
+            this.isShow = false
+        },
+        onConfirm () {
+            this.loading = true  
+            this.$refs.childRef.childFn()
+        },
+        loadingFn(e){ //加载状态
+            this.loading = e
+        },
+        loadViewFn (view) {
+         return (r) =>
+          require.ensure([], () =>
+          r(require(`@/views/${view}.vue`))
+        );
+    },
+      }
+    }
+  </script>
+  <style scoped>
+    #app{
+      overflow: hidden;
+    }
+    .ls-mask{
+      width: 100%;
+      height: 100%;
+      z-index: 2001;
+      position: fixed;
+      left: 0;
+      top: 0;
+      background: rgba(0,0,0,0.3);
+    }
+    .ls-mask-window{
+      padding-top: 20px;
+      background: white;
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%,-50%);
+    }
+    .ls-mask-window b{
+      padding-left: 12px;
+    }
+    .ls-mask-content{
+      padding: 20px;
+      text-align: center;
+    }
+    .ls-mask-footer{
+      height: 45px;
+      border-top: 1px solid #f0f0f0;
+      display: flex;
+      justify-content: end;
+      padding: 2px;
+      position: absolute;
+        width: 98%;
+        bottom: 10px;
+        right: 12px;
+    }
+  /deep/.el-icon-close{
+    position: absolute;
+    top: 20px;
+    right: 12px;
+    font-size: 20px;
+    cursor: pointer;
+  }
+  /deep/.el-loading-mask{
+      background: none;
+  }
+  </style>
+  
\ No newline at end of file

@@ -14,6 +14,8 @@ import rules from './utils/rule.js'
 // 全局方法挂载
 // 全局方法挂载
 Vue.prototype.$rules = rules
 Vue.prototype.$rules = rules
 
 
+import Popup from './components/tanchuang/index'
+Vue.prototype.$popup = Popup.install
 
 
 import { theme } from "@/directive/theme.js"
 import { theme } from "@/directive/theme.js"
 Vue.directive("theme", theme)
 Vue.directive("theme", theme)

@@ -113,6 +113,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import { getZssyqkInfo} from "@/api/zsgl.js"
 export default {
 export default {
   props: {
   props: {
     value: { type: Boolean, default: false },
     value: { type: Boolean, default: false },
@@ -120,23 +121,7 @@ export default {
   data () {
   data () {
     return {
     return {
       myValue: this.value,
       myValue: this.value,
-      ruleForm: {
-        rkbh: '',
-        rksj: '',
-        rkry: '',
-        djjg: '',
-        bz: '',
-        ffbh: '',
-        lqsj: '',
-        // 证书信息
-        bdcqzh: '',
-        ywh: '',
-        bdcdyh: '',
-        zslx: '',
-        ysxlh: '',
-        sfzf: '',
-        zfyy: ''
-      }
+      ruleForm: {}
     }
     }
   },
   },
   watch: {
   watch: {
@@ -145,7 +130,12 @@ export default {
     },
     },
   },
   },
   methods: {
   methods: {
-    getDetail () {
+    getDetail (bsmZswj) {
+      getZssyqkInfo({"bsmZswj":bsmZswj}).then(res => {
+        if(res.code == 200){
+          this.ruleForm = res.result
+        }
+      })
     },
     },
     submitForm () {
     submitForm () {
     },
     },

@@ -44,7 +44,7 @@
         :data="tableData.data">
         :data="tableData.data">
       </lb-table>
       </lb-table>
     </div>
     </div>
-    <viewDialog v-model="isDialog" />
+    <viewDialog ref="viewDialog" v-model="isDialog" />
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -90,8 +90,11 @@ export default {
         }
         }
       })
       })
     },
     },
-    openDialog () {
+    openDialog (item) {
       this.isDialog = true
       this.isDialog = true
+      this.$nextTick(() => {
+        this.$refs.viewDialog.getDetail(item.bsmZswj);
+      })
     }
     }
   }
   }
 }
 }

@@ -82,7 +82,7 @@ class data extends filter {
         align: 'center',
         align: 'center',
         fixed: 'right',
         fixed: 'right',
         render: (h, scope) => {
         render: (h, scope) => {
-          return <el-button type="text" icon="el-icon-view" onClick={() => { vm.openDialog() }}>查看</el-button>
+          return <el-button type="text" icon="el-icon-view" onClick={() => { vm.openDialog(scope.row) }}>查看</el-button>
         }
         }
       }
       }
     ]
     ]