Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/api/integration.js

@@ -8,6 +8,45 @@ export function fetchPatientList(params) {
   })
 }
 
+export function saveinspectionsysitemid(params) {
+  return request({
+    url: '/api/patienthis/saveinspectionsysitemid',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getsysinspectionlist(params) {
+  return request({
+    url: '/api/integration/sysinspectionlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getsynclist(params) {
+  return request({
+    url: '/api/integration/synclist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function saveInterface(params) {
+  return request({
+    url: '/api/patienthis/saveinterface',
+    method: 'post',
+    params: params
+  })
+}
+
+export function getInterface(params) {
+  return request({
+    url: '/api/patienthis/getinterface',
+    method: 'post',
+    params: params
+  })
+}
 
 export function fetchAdminList(params) {
   return request({
@@ -17,7 +56,6 @@ export function fetchAdminList(params) {
   })
 }
 
-
 export function createPatientHis(params) {
   return request({
     url: '/api/patienthis/create',
@@ -33,8 +71,6 @@ export function editPatientHis(params) {
   })
 }
 
-
-
 export function createAdminHis(params) {
   return request({
     url: '/api/adminhis/create',

src/lang/zh.js

@@ -138,7 +138,7 @@ export default {
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
 
-    warehouseReceipt: '出入库',
+    warehouseReceipt: '耗材出入库',
     warehouseReceiptOther: '其他出入库',
     stockInOrder: '耗材入库单',
     salesReturnOrder: '耗材退货单',

src/router/modules/integration.js

@@ -10,17 +10,28 @@ export default {
     title: 'integration_config',
     icon: 'excel'
   },
-  children: [
-    {
-      path: '/integration/his',
-      component: () => import('@/xt_pages/integration/his_config'),
-      name: 'his_config',
-      meta: {
-        title: 'his_config',
-        noCache: true,
-
-      }
-    },
+  children: [{
+    path: '/data/hisconfig',
+    component: () => import('@/xt_pages/integration/his_config'),
+    name: 'HIS集成',
+    meta: {
+      title: 'HIS集成'
+    }
+  }, {
+    path: '/data/lisconfig',
+    component: () => import('@/xt_pages/integration/lis_config'),
+    name: 'LIS集成',
+    meta: {
+      title: 'LIS集成'
+    }
+  }, {
+    path: '/data/sisconfig',
+    component: () => import('@/xt_pages/integration/sis_config'),
+    name: '质控集成',
+    meta: {
+      title: '质控集成'
+    }
+  }
 
   ]
 }

src/router/modules/stock.js

@@ -1,114 +1,114 @@
-import Layout from "@/views/layout/Layout";
+import Layout from '@/views/layout/Layout'
 
 export default {
-  path: "/stock",
+  path: '/stock',
   component: Layout,
-  redirect: "noredirect",
-  name: "stockManage",
+  redirect: 'noredirect',
+  name: 'stockManage',
   alwaysShow: true,
   meta: {
-    title: "stockManage",
-    icon: "stock",
+    title: 'stockManage',
+    icon: 'stock',
     isChild: true
   },
   children: [
     {
-      path: "/stock/warehouseReceipt/",
+      path: '/stock/warehouseReceipt/',
       component: Layout,
-      redirect: "/stock/in",
-      name: "warehouseReceipt",
+      redirect: '/stock/in',
+      name: 'warehouseReceipt',
       parentNum: 1,
       meta: {
         isChild: true,
-        title: "warehouseReceipt",
-        noCache: true,
+        title: 'warehouseReceipt',
+        noCache: true
 
       }
     },
     {
-      path: "/stock/warehouseReceiptOther/",
+      path: '/stock/warehouseReceiptOther/',
       component: Layout,
-      redirect: "/stock/in/other",
-      name: "warehouseReceiptOther",
+      redirect: '/stock/in/other',
+      name: 'warehouseReceiptOther',
       parentNum: 2,
       meta: {
         isChild: true,
-        title: "warehouseReceiptOther",
-        noCache: true,
+        title: 'warehouseReceiptOther',
+        noCache: true
 
       }
     },
     {
-      path: "/stock/in",
-      component: () => import("@/xt_pages/stock/stockInOrder"),
-      name: "stockInOrder",
+      path: '/stock/in',
+      component: () => import('@/xt_pages/stock/stockInOrder'),
+      name: 'stockInOrder',
       hidden: true,
       is_menu: false,
       num: 1,
-      meta: { title: "stockInOrder", noCache: true }
+      meta: { title: 'stockInOrder', noCache: true }
     },
     {
-      path: "/stock/return",
-      component: () => import("@/xt_pages/stock/salesReturnOrder"),
-      name: "salesReturnOrder",
+      path: '/stock/return',
+      component: () => import('@/xt_pages/stock/salesReturnOrder'),
+      name: 'salesReturnOrder',
       hidden: true,
       is_menu: false,
       num: 1,
-      meta: { title: "salesReturnOrder", noCache: true }
+      meta: { title: 'salesReturnOrder', noCache: true }
     },
     {
-      path: "/stock/out",
-      component: () => import("@/xt_pages/stock/stockOutOrder"),
-      name: "stockOutOrder",
+      path: '/stock/out',
+      component: () => import('@/xt_pages/stock/stockOutOrder'),
+      name: 'stockOutOrder',
       hidden: true,
       is_menu: false,
       num: 1,
-      meta: { title: "stockOutOrder", noCache: true }
+      meta: { title: 'stockOutOrder', noCache: true }
     },
     {
-      path: "/stock/cancel",
-      component: () => import("@/xt_pages/stock/cancelStockOrder"),
-      name: "cancelStockOrder",
+      path: '/stock/cancel',
+      component: () => import('@/xt_pages/stock/cancelStockOrder'),
+      name: 'cancelStockOrder',
       hidden: true,
       is_menu: false,
       num: 1,
-      meta: { title: "cancelStockOrder", noCache: true }
+      meta: { title: 'cancelStockOrder', noCache: true }
     },
     {
-      path: "/stock/in/other",
-      component: () => import("@/xt_pages/stock/otherStockInOrder"),
-      name: "otherStockInOrder",
+      path: '/stock/in/other',
+      component: () => import('@/xt_pages/stock/otherStockInOrder'),
+      name: 'otherStockInOrder',
       hidden: true,
       is_menu: false,
       num: 2,
-      meta: { title: "otherStockInOrder", noCache: true }
+      meta: { title: 'otherStockInOrder', noCache: true }
     },
     {
-      path: "/stock/return/other",
-      component: () => import("@/xt_pages/stock/otherSalesReturnOrder"),
-      name: "otherSalesReturnOrder",
+      path: '/stock/return/other',
+      component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
+      name: 'otherSalesReturnOrder',
       hidden: true,
       is_menu: false,
       num: 2,
-      meta: { title: "otherSalesReturnOrder", noCache: true }
+      meta: { title: 'otherSalesReturnOrder', noCache: true }
     },
     {
-      path: "/stock/out/other",
-      component: () => import("@/xt_pages/stock/otherStockOutOrder"),
-      name: "otherStockOutOrder",
+      path: '/stock/out/other',
+      component: () => import('@/xt_pages/stock/otherStockOutOrder'),
+      name: 'otherStockOutOrder',
       hidden: true,
       is_menu: false,
       num: 2,
-      meta: { title: "otherStockOutOrder", noCache: true }
+      meta: { title: 'otherStockOutOrder', noCache: true }
     },
     {
-      path: "/stock/cancel/other",
-      component: () => import("@/xt_pages/stock/otherCancelStockOrder"),
-      name: "otherCancelStockOrder",
+      path: '/stock/cancel/other',
+      component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
+      name: 'otherCancelStockOrder',
       hidden: true,
       is_menu: false,
       num: 2,
-      meta: { title: "otherCancelStockOrder", noCache: true }
+      meta: { title: 'otherCancelStockOrder', noCache: true }
     },
     // {
     //   path: "/stock/",
@@ -161,105 +161,105 @@ export default {
     //   ]
     // },
     {
-      path: "/stock/query",
-      component: () => import("@/xt_pages/stock/stockQuery"),
-      name: "stockQuery",
-      meta: { title: "stockQuery", noCache: true }
+      path: '/stock/query',
+      component: () => import('@/xt_pages/stock/stockQuery'),
+      name: 'stockQuery',
+      meta: { title: 'stockQuery', noCache: true }
     },
     {
-      path: "/stock/detail",
-      component: () => import("@/xt_pages/stock/stockDetailIndex"),
-      name: "stockDetail",
-      meta: { title: "stockDetail", noCache: true }
+      path: '/stock/detail',
+      component: () => import('@/xt_pages/stock/stockDetailIndex'),
+      name: 'stockDetail',
+      meta: { title: 'stockDetail', noCache: true }
     },
     {
-      path: "/stock/in/add",
-      component: () => import("@/xt_pages/stock/stockInOrderAdd"),
-      name: "stockInOrderAdd",
+      path: '/stock/in/add',
+      component: () => import('@/xt_pages/stock/stockInOrderAdd'),
+      name: 'stockInOrderAdd',
       hidden: true,
       is_menu: false,
-      meta: { title: "stockInOrderAdd", noCache: true }
+      meta: { title: 'stockInOrderAdd', noCache: true }
     },
     {
-      path: "/stock/in/detail",
-      component: () => import("@/xt_pages/stock/stockInDetail"),
-      name: "stockInDetail",
+      path: '/stock/in/detail',
+      component: () => import('@/xt_pages/stock/stockInDetail'),
+      name: 'stockInDetail',
       hidden: true,
       is_menu: false,
-      meta: { title: "stockInDetail", noCache: true }
+      meta: { title: 'stockInDetail', noCache: true }
     },
     {
-      path: "/stock/return/detail",
-      component: () => import("@/xt_pages/stock/salesReturnDetail"),
-      name: "salesReturnDetail",
+      path: '/stock/return/detail',
+      component: () => import('@/xt_pages/stock/salesReturnDetail'),
+      name: 'salesReturnDetail',
       hidden: true,
       is_menu: false,
-      meta: { title: "salesReturnDetail", noCache: true }
+      meta: { title: 'salesReturnDetail', noCache: true }
     },
     {
-      path: "/stock/return/add",
-      component: () => import("@/xt_pages/stock/salesReturnOrderAdd"),
-      name: "salesReturnOrderAdd",
+      path: '/stock/return/add',
+      component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
+      name: 'salesReturnOrderAdd',
       hidden: true,
       is_menu: false,
-      meta: { title: "salesReturnOrderAdd", noCache: true }
+      meta: { title: 'salesReturnOrderAdd', noCache: true }
     },
     {
-      path: "/stock/out/add",
-      component: () => import("@/xt_pages/stock/stockOutOrderAdd"),
-      name: "stockOutOrderAdd",
+      path: '/stock/out/add',
+      component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
+      name: 'stockOutOrderAdd',
       hidden: true,
       is_menu: false,
-      meta: { title: "stockOutOrderAdd", noCache: true }
+      meta: { title: 'stockOutOrderAdd', noCache: true }
     },
     {
-      path: "/stock/out/detail",
-      component: () => import("@/xt_pages/stock/stockOutDetail"),
-      name: "stockOutDetail",
+      path: '/stock/out/detail',
+      component: () => import('@/xt_pages/stock/stockOutDetail'),
+      name: 'stockOutDetail',
       hidden: true,
       is_menu: false,
-      meta: { title: "stockOutDetail", noCache: true }
+      meta: { title: 'stockOutDetail', noCache: true }
     },
     {
-      path: "/stock/cancel/add",
-      component: () => import("@/xt_pages/stock/cancelStockOrderAdd"),
-      name: "cancelStockOrderAdd",
+      path: '/stock/cancel/add',
+      component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+      name: 'cancelStockOrderAdd',
       hidden: true,
       is_menu: false,
-      meta: { title: "cancelStockOrderAdd", noCache: true }
+      meta: { title: 'cancelStockOrderAdd', noCache: true }
     },
     {
-      path: "/stock/cancel/detail",
-      component: () => import("@/xt_pages/stock/cancelStockDetail"),
-      name: "cancelStockDetail",
+      path: '/stock/cancel/detail',
+      component: () => import('@/xt_pages/stock/cancelStockDetail'),
+      name: 'cancelStockDetail',
       hidden: true,
       is_menu: false,
-      meta: { title: "cancelStockDetail", noCache: true }
+      meta: { title: 'cancelStockDetail', noCache: true }
     },
     {
-      path: "/stock/config",
-      component: () => import("@/xt_pages/stock/index"),
-      name: "config",
-      meta: { title: "config", noCache: true }
+      path: '/stock/config',
+      component: () => import('@/xt_pages/stock/index'),
+      name: 'config',
+      meta: { title: 'config', noCache: true }
     },
     {
-      path: "/stock/print",
-      component: () => import("@/xt_pages/stock/detail/print"),
+      path: '/stock/print',
+      component: () => import('@/xt_pages/stock/detail/print'),
       hidden: true,
       is_menu: false,
-      name: "stock_print",
+      name: 'stock_print',
       meta: {
-        title: "库存打印",
+        title: '库存打印',
         noCache: true
       }
     },
     {
-      path: "/stock/user/detail",
-      component: () => import("@/xt_pages/stock/stockUserDetail"),
-      name: "user_detail",
+      path: '/stock/user/detail',
+      component: () => import('@/xt_pages/stock/stockUserDetail'),
+      name: 'user_detail',
       hidden: true,
       is_menu: false,
-      meta: { title: "user_detail", noCache: true }
+      meta: { title: 'user_detail', noCache: true }
     }
   ]
-};
+}

src/router/modules/systems.js

@@ -118,13 +118,6 @@ export default {
     meta: {
       title: 'printTemplate'
     }
-  }, {
-    path: '/data/hisconfig',
-    component: () => import('@/xt_pages/data/hisConfig'),
-    name: 'hisconfig',
-    meta: {
-      title: 'hisconfig'
-    }
-  },
+  }
   ]
 }

src/utils/admin_info_cache.js

@@ -1,13 +1,13 @@
-const userInfoKey = "admin_user_info"
+const userInfoKey = 'admin_user_info'
 
 export function getAdminUserInfoCache() {
-    return window.sessionStorage.getItem(userInfoKey)
+  return window.sessionStorage.getItem(userInfoKey)
 }
 
 export function cacheAdminUserInfo(infoJSONStr) {
-    window.sessionStorage.setItem(userInfoKey, infoJSONStr)
+  window.sessionStorage.setItem(userInfoKey, infoJSONStr)
 }
 
 export function removeAdminUserInfoCache() {
-    window.sessionStorage.removeItem(userInfoKey)
-}
+  window.sessionStorage.removeItem(userInfoKey)
+}

src/views/layout/components/Navbar.vue

@@ -272,12 +272,18 @@ export default {
     },
     toClick() {
       window.location.href = "https://testsso.sgjyun.com/help";
+    },
+    getCreatorName() {
+      getCreatorName().then(response => {});
     }
   },
   created() {
     getOrgs().then(response => {
       if (response.data.state === 1) {
         this.orgs = response.data.data.orgs;
+        console.log("org", this.orgs);
+        var creator = response.data.data.creator;
+        console.log("creator", creator);
         for (let i = 0; i < this.orgs.length; i++) {
           if (this.orgs[i].id == this.org_id) {
             this.org_name = this.orgs[i].org_name;
@@ -285,6 +291,7 @@ export default {
         }
       }
     });
+    this.getCreatorName();
   }
 };
 </script>

src/xt_pages/dialysis/bulletinBoard.vue

@@ -235,7 +235,7 @@ export default {
         } else {
           if (r.data.boards.length == 0) {
             this.currentPage = 1;
-            this.getBoards();
+            // this.getBoards();
           } else {
             this.today = r.data.today;
             this.week =

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -600,7 +600,7 @@ export default {
       visible: false,
       edit: false,
       current_row_class: "current-box-class",
-
+      creator:0,
       patient_id: 0,
       schedule_date: 0,
       template_id: 0,
@@ -773,6 +773,10 @@ export default {
         this.$message.error("请选择一条监测记录");
         return;
       }
+      this.creator = this.table_current_row.creator
+      console.log( this.table_current_row)
+      console.log( this.table_current_row.creator)
+      console.log(this.creator)
       this.setEditMonitor(this.table_current_row);
       this.$refs.table.setCurrentRow(null);
       this.edit = true;
@@ -785,6 +789,7 @@ export default {
     },
     tableCurrentRowChange: function(currentRow) {
       this.table_current_row = currentRow;
+
       // console.log("tableCurrentRowChange", currentRow)
     },
     setEditMonitor: function(monitor) {
@@ -965,7 +970,7 @@ export default {
       let mode = "1"
        if(this.form.id > 0){
          mode = "2"
-         if(this.form.monitoring_nurse > 0 && this.form.monitoring_nurse != this.$store.getters.xt_user.user.id){
+         if(this.creator > 0 && this.creator!= this.$store.getters.xt_user.user.id){
           mode = "3"
          }
       }

src/xt_pages/integration/his/fieldConfig.vue

@@ -0,0 +1,151 @@
+<template>
+  <div style="display:flex;">
+    <el-tabs tabPosition="left" type="border-card" style="display:inline-black;">
+      <el-tab-pane v-for="item in sysInspec" :key="item.project_id" :label="item.project_name" >
+        <el-table :data="item.inspection_reference" border style="width: 100%">
+          <el-table-column
+            prop="item_name"
+            label="检验名称"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="id"
+            label="item_id"
+            width="180">
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+
+    <template v-if="ownerInspec">
+      <el-tabs  tabPosition="left" type="border-card" style="display:inline-black;margin-left:100px;">
+        <el-tab-pane v-for="owner in ownerInspec" :key="owner.project_id" :label="owner.project_name" >
+          <el-table :data="owner.inspection_reference" border style="width: 100%">
+            <el-table-column
+              prop="item_name"
+              label="检验名称"
+              width="180">
+            </el-table-column>
+            <el-table-column label="item_id"  width="180"> 
+              <template slot-scope="scope">
+                <span v-if="scope.row.sys_item_id > 0">{{scope.row.sys_item_id}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="编辑" width="180">
+              <template slot-scope="scope">
+              <el-button size="mini"  @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+    </template>
+    <el-dialog title="编辑item_id" :visible.sync="dialogFormVisible">
+      <el-form :model="form">
+        <el-form-item label="检验检查名称" :label-width="formLabelWidth">
+          <el-input v-model="form.item_name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="系统item_id" :label-width="formLabelWidth">
+          <el-input v-model="form.sys_item_id" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveinspection()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getsysinspectionlist, saveinspectionsysitemid } from '@/api/integration'
+
+export default {
+  name: 'patientHisConfig',
+
+  created() {
+    this.getsysinspectionlist()
+  },
+  data() {
+    return {
+      dialogFormVisible: false,
+      ownerInspec: {},
+      sysInspec: {},
+      form: []
+    }
+  },
+  methods: {
+    handleEdit: function(index, row) {
+      this.form = row
+      this.dialogFormVisible = true
+    },
+    saveinspection: function() {
+      saveinspectionsysitemid(this.form).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.ownerInspec[this.form.project_id]['inspection_reference']['sys_item_id'] = this.form.sys_item_id
+          this.dialogFormVisible = false
+        }
+      })
+    },
+    getsysinspectionlist: function() {
+      getsysinspectionlist().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.ownerInspec = response.data.data.ownerInspec
+          this.sysInspec = response.data.data.sysInspec
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/integration/his/interfaceConfig.vue

@@ -0,0 +1,250 @@
+<template>
+  <el-form ref="form" :model="form" label-width="140px" style="margin-top:40px;">
+    <el-form-item label="同步模式">
+      <el-select v-model="form.pattern" placeholder="请选择同步模式"  style="width :600px;">
+        <el-option v-for="item in patterns" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="数据库地址" v-if="form.pattern == 1 || form.pattern == 0" >
+      <el-input v-model.trim="form.dbhost" maxlength="200" style="width :600px;"></el-input>
+    </el-form-item>
+    <el-form-item label="用户名" v-if="form.pattern == 1 || form.pattern == 0" >
+      <el-input v-model.trim="form.dbuser" maxlength="200" style="width :600px;"></el-input>
+    </el-form-item>
+    <el-form-item label="密码" v-if="form.pattern == 1 || form.pattern == 0" >
+      <el-input v-model.trim="form.dbpassword" maxlength="200" style="width :600px;"></el-input>
+    </el-form-item>
+    <el-form-item label="数据库名" v-if="form.pattern == 1 || form.pattern == 0" >
+      <el-input v-model.trim="form.dbname" maxlength="200" style="width :600px;"></el-input>
+    </el-form-item>
+    <el-form-item label="接口地址" v-if="form.pattern == 2" >
+      <el-input v-model.trim="form.interface_url" maxlength="200" style="width :600px;"></el-input>
+    </el-form-item>
+    <el-form-item label="密钥" v-if="form.pattern == 2" >
+      <el-input v-model.trim="form.interface_token" maxlength="200" style="width :600px;"></el-input>
+    </el-form-item>
+    <el-form-item label="可访问IP" v-if="form.pattern == 3" >
+      <el-input v-model.trim="form.allow_ip" maxlength="200" style="width :600px;"></el-input>
+    </el-form-item>
+    <el-form-item label="密钥" v-if="form.pattern == 3" >
+      <el-input v-model.trim="form.allow_token" maxlength="200" style="width :600px;"></el-input>
+    </el-form-item>
+    <el-form-item label="同步频率">
+      <el-select v-model="form.sync_frequency" placeholder="请选择同步频率" style="width :600px;">
+        <el-option v-for="item in sync_frequencys" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="Tips" v-if="form.pattern == 3" >
+      <div style="width :600px;">本接口方位地址为：https://api.kuyicloud.com/api/sync?org_id=xx?str=xxx?timestamp=xxx?titck=xxx
+需要传递的参数有，org_id（机构id），str（随机字符串），timestamp（当前时间戳），和titck（签名）
+签名生成规则：org_id+str+timestamp,以md5加密钥的方式生成字符串</div>
+    </el-form-item>
+  
+    <el-form-item>
+      <el-button type="primary" @click="onSubmit">保存</el-button>
+      <el-button>重置</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { getInterface, saveInterface } from '@/api/integration'
+export default {
+  name: 'interfaceConfig',
+
+  created() {
+    this.getInterface()
+  },
+  data() {
+    return {
+      sync_frequencys: [{
+        value: 1,
+        label: '1分钟/次'
+      }, {
+        value: 2,
+        label: '10分钟/次'
+      }, {
+        value: 3,
+        label: '30分钟/次'
+      }, {
+        value: 4,
+        label: '1小时/次'
+      }, {
+        value: 5,
+        label: '6小时/次'
+      }, {
+        value: 6,
+        label: '12小时/次'
+      }, {
+        value: 7,
+        label: '1天/次'
+      }],
+      patterns: [{
+        value: 1,
+        label: '访问数据库模式'
+      }, {
+        value: 2,
+        label: '调用接口模式'
+      }, {
+        value: 3,
+        label: '数据接收模式'
+      }],
+      form: {
+        id: 0,
+        pattern: '',
+        dbhost: '',
+        dbuser: '',
+        dbpassword: '',
+        dbname: '',
+        interface_url: '',
+        interface_token: '',
+        allow_ip: '',
+        allow_token: '',
+        sync_frequency: ''
+      }
+    }
+  },
+  methods: {
+    getInterface: function() {
+      getInterface().then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          var interfaceinfo = response.data.data.interfaceinfo
+          if (interfaceinfo != null) {
+            this.form.id = interfaceinfo.id
+            this.form.pattern = interfaceinfo.pattern
+            this.form.dbhost = interfaceinfo.dbhost
+            this.form.dbuser = interfaceinfo.dbuser
+            this.form.dbpassword = interfaceinfo.dbpassword
+            this.form.dbname = interfaceinfo.dbname
+            this.form.interface_url = interfaceinfo.interface_url
+            this.form.interface_token = interfaceinfo.interface_token
+            this.form.allow_ip = interfaceinfo.allow_ip
+            this.form.allow_token = interfaceinfo.allow_token
+            this.form.sync_frequency = interfaceinfo.sync_frequency
+          }
+        }
+      })
+    },
+    onSubmit() {
+      if (this.form.pattern === '') {
+        this.$message.error('请选择同步模式')
+        return false
+      }
+      if (this.form.pattern == 1) {
+        if (this.form.dbhost.length <= 0) {
+          this.$message.error('请输入数据库地址')
+          return false
+        }
+        if (this.form.dbuser.length <= 0) {
+          this.$message.error('请输入数据库用户名')
+          return false
+        }
+        if (this.form.dbpassword.length <= 0) {
+          this.$message.error('请输入数据库密码')
+          return false
+        }
+        if (this.form.dbname.length <= 0) {
+          this.$message.error('请输入数据库名')
+          return false
+        }
+      }
+      if (this.form.pattern == 2) {
+        if (this.form.interface_url.length <= 0) {
+          this.$message.error('请输入接口地址')
+          return false
+        }
+        if (this.form.interface_token.length <= 0) {
+          this.$message.error('请输入密钥')
+          return false
+        }
+      }
+      if (this.form.pattern == 3) {
+        if (this.form.allow_ip.length <= 0) {
+          this.$message.error('请输入可访问IP地址')
+          return false
+        }
+        if (this.form.allow_token.length <= 0) {
+          this.$message.error('请输入密钥')
+          return false
+        }
+      }
+      if (this.form.sync_frequency === '') {
+        this.$message.error('请选择同步频率')
+        return false
+      }
+
+      saveInterface(this.form).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          var interfaceinfo = response.data.data.interfaceinfo
+          if (interfaceinfo != null && interfaceinfo.length > 0) {
+            this.form.id = interfaceinfo.id
+            this.form.pattern = interfaceinfo.pattern
+            this.form.dbhost = interfaceinfo.dbhost
+            this.form.dbuser = interfaceinfo.dbuser
+            this.form.dbpassword = interfaceinfo.dbpassword
+            this.form.dbname = interfaceinfo.dbname
+            this.form.interface_url = interfaceinfo.interface_url
+            this.form.interface_token = interfaceinfo.interface_token
+            this.form.allow_ip = interfaceinfo.allow_ip
+            this.form.allow_token = interfaceinfo.allow_token
+            this.form.sync_frequency = interfaceinfo.sync_frequency
+          }
+          this.$message({ message: '提交成功', type: 'success' })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/integration/his/patientHisConfig.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog width="1010px"
-               :title="his_id.length == 0?'添加his_id':'修改his_id'" :visible.sync="dialogFormVisible">
+               :title="his_id.length == 0?'添加his_user_id':'修改his_user_id'" :visible.sync="dialogFormVisible">
       <el-form
         :rules="rules"
         ref="dataForm"
@@ -195,7 +195,6 @@
           } else {
             this.total = response.data.data.total
             this.patientData = response.data.data.list
-
           }
         })
       },
@@ -265,18 +264,16 @@
         }
         this.form.other_age = this.getAge(row)
         this.form.infectious = this.getInfectiousName(row)
-        console.log("111111")
+        console.log('111111')
         console.log(this.getInfectiousName(row))
 
         if (row.his_patient.id > 0) {
           this.his_record_id = row.his_patient.id
         }
-
       }, getAge: function(val) {
         if (val.birthday > 0) {
           return jsGetAge(uParseTime(val.birthday, '{y}-{m}-{d}'), '-')
         }
-
       }, getInfectiousName: function(val) {
         var names = []
         for (let i = 0; i < val.contagions.length; i++) {
@@ -286,14 +283,13 @@
       }, GetName: function(id) {
         for (let i = 0; i < this.contagions.length; i++) {
           if (this.contagions[i].id == id) {
-
             return this.contagions[i].name
           }
         }
       }, createData: function(formName) {
         this.$refs[formName].validate(valid => {
           if (valid) {
-            let params = {
+            const params = {
               id: this.patient_id,
               his_user_id: this.form.his_user_id
 
@@ -305,18 +301,16 @@
                 this.$message.success('创建成功')
                 this.patientData[this.current_index].his_patient.his_user_id = response.data.data.patient.his_user_id
                 this.patientData[this.current_index].his_patient.id = response.data.data.patient.id
-
               } else {
                 this.$message.error(response.data.msg)
               }
             })
           }
         })
-
       }, modifyData: function(formName) {
         this.$refs[formName].validate(valid => {
           if (valid) {
-            let params = {
+            const params = {
               id: this.his_record_id,
               his_user_id: this.form.his_user_id
             }
@@ -331,7 +325,6 @@
               }
             })
           }
-
         })
       }
 

src/xt_pages/integration/his/syncList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <el-row :gutter="12" style="margin-top: 10px">
+      <el-table :data="patientData"  border :row-style="{ color: '#303133' }" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)', color: '#606266' }" >
+        <el-table-column label="同步时间" align="center" width="200">
+          <template slot-scope="scope">{{getTime( scope.row.sync_time ,'{y}-{m}-{d} {h}:{i}:{s}')}}</template>
+        </el-table-column>
+
+        <el-table-column label="同步结果" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.sync_result_type == 1">成功</span>
+            <span v-if="scope.row.sync_result_type == 2">失败</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="同步信息" align="center">
+          <template slot-scope="scope">{{scope.row.sync_result_remark }}</template>
+        </el-table-column>
+
+        <el-table-column label="同步条数" align="center">
+          <template slot-scope="scope">{{scope.row.sync_total_num }}</template>
+        </el-table-column>
+
+        <el-table-column label="上传条数" align="center">
+            <template slot-scope="scope">{{scope.row.sync_success_num }}</template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
+        background
+        style="margin-top:20px;float: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      ></el-pagination>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getsynclist } from '@/api/integration'
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  name: 'patientHisConfig',
+
+  created() {
+    this.getsynclist()
+  },
+  data() {
+    return {
+      dialogFormVisible: false,
+      page: 1,
+      limit: 10,
+      total: 0,
+      pageTotal: 0,
+      pageSelect: 0,
+      adminUserOptions: [],
+      patientData: [],
+      contagions: [],
+      patient_id: 0,
+      his_record_id: 0,
+      his_id: '',
+      current_index: 0,
+      name: '',
+
+      form: {
+        his_user_id: '',
+        name: '',
+        sex: '',
+        other_age: '',
+        infectious: ''
+      },
+      rules: {
+        his_user_id: [
+          { required: true, message: '请输入his_id', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    getsynclist: function() {
+      const Params = {
+        page: this.page,
+        limit: this.limit
+      }
+      getsynclist(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          return false
+        } else {
+          this.total = response.data.data.total
+          this.patientData = response.data.data.list
+        }
+      })
+    },
+    handleSizeChange(val) {
+      this.limit = val
+      this.getsynclist()
+    },
+    handleCurrentChange(val) {
+      this.page = val
+      this.getsynclist()
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    }
+
+  }
+}
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+</style>

src/xt_pages/integration/his_config.vue

@@ -12,6 +12,15 @@
           <el-tab-pane label="医护配置">
             <admin-his-config></admin-his-config>
           </el-tab-pane>
+          <el-tab-pane label="接口配置">
+            <interface-config></interface-config>
+          </el-tab-pane>
+          <el-tab-pane label="同步列表">
+            <sync-list></sync-list>
+          </el-tab-pane>
+          <!-- <el-tab-pane label="字段配置">
+            <field-config></field-config>
+          </el-tab-pane> -->
         </el-tabs>
       </div>
     </div>
@@ -19,16 +28,21 @@
 </template>
 
 <script>
-
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import PatientHisConfig from './his/patientHisConfig'
   import AdminHisConfig from './his/adminHisConfig'
+  import InterfaceConfig from './his/interfaceConfig'
+  import SyncList from './his/syncList'
+  import FieldConfig from './his/fieldConfig'
 
   export default {
     name: 'his_config',
     components: {
       AdminHisConfig,
       PatientHisConfig,
+      InterfaceConfig,
+      SyncList,
+      FieldConfig,
       BreadCrumb
     },
     data() {

src/xt_pages/integration/lis_config.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="service-box">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="接口配置" name="first">
+            <interface-config></interface-config>
+          </el-tab-pane>
+          <el-tab-pane label="同步列表">
+            <sync-list></sync-list>
+          </el-tab-pane>
+          <el-tab-pane label="字段配置">
+            <field-config></field-config>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import InterfaceConfig from './his/interfaceConfig'
+  import SyncList from './his/syncList'
+  import FieldConfig from './his/fieldConfig'
+
+  export default {
+    name: 'his_config',
+    components: {
+      InterfaceConfig,
+      SyncList,
+      FieldConfig,
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '集成配置' },
+          { path: '/integration/his', name: 'HIS集成配置' }
+        ],
+        activeName: 'first'
+
+      }
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event, this.activeName)
+      }
+    }
+  }
+</script>
+
+
+
+
+
+

src/xt_pages/integration/sis_config.vue

@@ -0,0 +1,60 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="service-box">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="接口配置" name="first">
+            <interface-config></interface-config>
+          </el-tab-pane>
+          <el-tab-pane label="同步列表">
+            <sync-list></sync-list>
+          </el-tab-pane>
+          <!-- <el-tab-pane label="字段配置">
+            <field-config></field-config>
+          </el-tab-pane> -->
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import InterfaceConfig from './his/interfaceConfig'
+  import SyncList from './his/syncList'
+  import FieldConfig from './his/fieldConfig'
+
+  export default {
+    name: 'his_config',
+    components: {
+      InterfaceConfig,
+      SyncList,
+      FieldConfig,
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '集成配置' },
+          { path: '/integration/his', name: 'HIS集成配置' }
+        ],
+        activeName: 'first'
+
+      }
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event, this.activeName)
+      }
+    }
+  }
+</script>
+
+
+
+
+
+