Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

package-lock.json

@@ -2767,6 +2767,12 @@
         "randomfill": "^1.0.3"
       }
     },
+    "crypto-js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==",
+      "dev": true
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -4751,8 +4757,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4775,15 +4780,13 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4799,22 +4802,19 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4944,8 +4944,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4959,7 +4958,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4976,7 +4974,6 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4984,15 +4981,13 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5013,7 +5008,6 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5101,8 +5095,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5116,7 +5109,6 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5211,8 +5203,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5254,7 +5245,6 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5276,7 +5266,6 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5324,15 +5313,13 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

package.json

@@ -92,6 +92,7 @@
     "chalk": "2.3.0",
     "copy-webpack-plugin": "4.3.0",
     "cross-env": "5.1.1",
+    "crypto-js": "^4.1.1",
     "css-loader": "0.28.7",
     "eslint": "4.13.1",
     "eslint-friendly-formatter": "3.0.0",

src/api/his/his.js

@@ -607,13 +607,6 @@ export function getHisDoctorAdviceInfo(id, params) {
 
 
 
-export function getHisHospitalPatientList(params) {
-  return request({
-    url: '/api/hospitalchargedetail/list',
-    method: 'get',
-    params: params
-  })
-}
 
 
 export function getHisHospitalDetailList(params) {
@@ -631,3 +624,17 @@ export function getHisHospitalDetailInfo(params) {
     params: params
   })
 }
+
+
+
+export function getMonthHisHospitalDetailInfo(params) {
+  return request({
+    url: '/api/monthhospitaldetail/get',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+

src/lang/zh.js

@@ -261,7 +261,8 @@ export default {
 
     summary_tool: '项目消费明细汇总',
     labelPrint: '标签打印',
-    faPiao: '发票设置'
+    faPiao: '发票设置',
+    chargeDetailManagement:'收费明细'
   },
   navbar: {
     logOut: '退出登录',

src/views/layout/components/Navbar.vue

@@ -125,33 +125,33 @@
       <div>
         <!-- <i class="el-icon-question"></i>
         <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a> -->
-        <div class="fixedBox">
-          <div class="fixed-item" @mouseover="mouseOver" @mouseleave="leave">
-            <i class="el-icon-chat-line-round"></i>
-            <div class="fixed-text">联系客户经理</div>
-            <div class="fixed-wrap" v-show="wrap1">
-              <div class="fixed-inner">
-                <div class="fixed-inner-item">您的专属客户经理:{{ information.name }}</div>
-                <div class="fixed-inner-item">电话:{{ information.phone }}</div>
-                <div class="fixed-inner-item">微信:{{ information.wechat }}</div>
-                <div class="fixed-inner-item">QQ:{{ information.qqchat }}</div>
-                <div class="fixed-inner-item">邮箱:{{ information.email }}</div>
-                <div class="fixed-inner-triangle"></div>
-              </div>
-            </div>
-          </div>
-          <div class="fixed-item" @mouseover="mouseOver1" @mouseleave="leave1">
-            <i class="el-icon-full-screen"></i>
-            <div class="fixed-text">微信联系</div>
-            <div class="fixed-wrap" v-show="wrap2">
-              <div class="fixed-inner">
-                <img :src="information.wechat_link" alt="">
-                <div>扫码加微信</div>
-                <div class="fixed-inner-triangle"></div>
-              </div>
-            </div>
-          </div>
-        </div>
+<!--        <div class="fixedBox">-->
+<!--          <div class="fixed-item" @mouseover="mouseOver" @mouseleave="leave">-->
+<!--            <i class="el-icon-chat-line-round"></i>-->
+<!--            <div class="fixed-text">联系客户经理</div>-->
+<!--            <div class="fixed-wrap" v-show="wrap1">-->
+<!--              <div class="fixed-inner">-->
+<!--                <div class="fixed-inner-item">您的专属客户经理:{{ information.name }}</div>-->
+<!--                <div class="fixed-inner-item">电话:{{ information.phone }}</div>-->
+<!--                <div class="fixed-inner-item">微信:{{ information.wechat }}</div>-->
+<!--                <div class="fixed-inner-item">QQ:{{ information.qqchat }}</div>-->
+<!--                <div class="fixed-inner-item">邮箱:{{ information.email }}</div>-->
+<!--                <div class="fixed-inner-triangle"></div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--          <div class="fixed-item" @mouseover="mouseOver1" @mouseleave="leave1">-->
+<!--            <i class="el-icon-full-screen"></i>-->
+<!--            <div class="fixed-text">微信联系</div>-->
+<!--            <div class="fixed-wrap" v-show="wrap2">-->
+<!--              <div class="fixed-inner">-->
+<!--                <img :src="information.wechat_link" alt="">-->
+<!--                <div>扫码加微信</div>-->
+<!--                <div class="fixed-inner-triangle"></div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
       </div>
     </div>
   </div>
@@ -320,11 +320,11 @@ export default {
       axios.get('/api/index/gettoken/'+ orgId + '/'+ adminUserId
         ).then((res) => {
         console.log('res',res.data)
-        
+
         if(res.data.code == 0){
           let token = res.data.data.token
           localStorage.setItem("token",token)
-          let http = 'wss://socket.sgjyun.com?token=' 
+          let http = 'wss://socket.sgjyun.com?token='
           // let http = 'ws://socket.szjkhd.com?token='//测试
           console.log(this.$store.state.user.websocket)
           this.$store.state.user.websocket = new ReconnectingWebSocket(
@@ -336,7 +336,7 @@ export default {
               this.showWsErr = true;
               this.wsErrMsg = "网络已断开，请检查网络后重新打开页面";
               console.log('navigator',navigator)
-              let http = 'wss://socket.sgjyun.com?token=' 
+              let http = 'wss://socket.sgjyun.com?token='
               // let http = 'ws://socket.szjkhd.com?token=' //测试
               let token = localStorage.getItem("token")
               this.$store.state.user.websocket = new ReconnectingWebSocket(
@@ -351,7 +351,7 @@ export default {
             this.websocket.send("1");
           }, 30000);
         }
-        
+
       }).catch(error => {
           // window.location.href = error.response.data.redirect;
         });
@@ -375,7 +375,7 @@ export default {
       })
     }
   },
-  
+
   created() {
     this.getConnect()
     getOrgs().then(response => {

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -194,8 +194,8 @@
       </el-form-item>
 
 
-      <el-button style="margin-left:10px;" type="primary" @click="check11" v-if="form.id_card_no.length > 0">查普通门诊待遇</el-button>
-      <el-button style="margin-left:10px;" type="primary" @click="check14" v-if="form.id_card_no.length > 0">查门诊大病待遇</el-button>
+      <el-button style="margin-left:10px;" type="primary" @click="check11" >查普通门诊待遇</el-button>
+      <el-button style="margin-left:10px;" type="primary" @click="check14" >查门诊大病待遇</el-button>
 
     </el-form>
 
@@ -208,11 +208,13 @@
 </template>
 
 <script>
+
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import axios from 'axios'
   import { PostSearch } from '@/api/patient'
 
   import { getDictionaryDataConfig } from '@/utils/data'
+  import cryptoJs from 'crypto-js'
 
   export default {
 
@@ -405,6 +407,9 @@
     },
     methods: {
       check11(){
+
+
+
         if(this.form.social_type == 0 || this.form.social_type == ''){
           this.$message.error("社保类型不能为空")
           return

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -163,8 +163,8 @@
                 </el-select>
             </el-form-item>
 
-          <el-button style="margin-left:10px;" type="primary" @click="check11" v-if="form.id_card_no.length > 0">查普通门诊待遇</el-button>
-          <el-button style="margin-left:10px;" type="primary" @click="check14" v-if="form.id_card_no.length > 0">查门诊大病待遇</el-button>
+          <el-button style="margin-left:10px;" type="primary" @click="check11" >查普通门诊待遇</el-button>
+          <el-button style="margin-left:10px;" type="primary" @click="check14" >查门诊大病待遇</el-button>
 
         </el-form>
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -525,6 +525,7 @@
   import ChargeMonthPrescriptionTable from './components/chargeMonthPrescriptionTable'
   import NewStatementPrintTwo from './newStatementPrintTwo'
   import RegisterDialog9504 from './components/registerDialog9504'
+  import cryptoJs from 'crypto-js'
 
   const moment = require('moment')
   export default {
@@ -1018,9 +1019,13 @@
         }
       },
       confirm(forms) {
+        var param =  "_api_access_key="+"1781ce9fb73a478289326c16ba8bf2c4"+"&_api_name="+"hssServives"+"&_api_timestamp="+ Date.now()+"&_api_version="+"1.0.0";
+        var signature = cryptoJs.enc.Base64.stringify(cryptoJs.HmacSHA1(param, "b5DPOGjc08DAAMJ8FP31pwwNHKo="));
         forms['record_time'] = this.record_date
         forms['admin_user_id'] = this.$store.getters.xt_user.user.id
         forms['org_id'] = this.$store.getters.xt_user.org_id
+        forms['key'] = signature
+
 
         this.loadingone = true
         var that = this