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

@@ -364,6 +364,7 @@ export function editTeam(params, data) {
 }
 
 export function createdTemplate(params, data) {
+  console.log('param22222222', params)
   return request({
     url: '/api/hisprescriptiontemplate/create',
     method: 'post',
@@ -605,3 +606,40 @@ export function getHisDoctorAdviceInfo(id, params) {
   })
 }
 
+export function getHisHospitalPatientList(params) {
+  return request({
+    url: '/api/hospitalchargedetail/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getHisHospitalDetailList(params) {
+  return request({
+    url: '/api/hospitaldetail/list',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getHisHospitalDetailInfo(params) {
+  return request({
+    url: '/api/hospitaldetail/info',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+export function getMonthHisHospitalDetailInfo(params) {
+  return request({
+    url: '/api/monthhospitaldetail/get',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+

src/api/schedule.js

@@ -245,3 +245,11 @@ export function getPatientScheduleTemplate(params) {
     params: params
   })
 }
+
+export function getSolutionSchedule(params) {
+  return request({
+    url: '/api/schedule/getsolutionschedule',
+    method: 'Get',
+    params: params
+  })
+}

src/lang/zh.js

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

src/router/modules/hospitalCharges.js

@@ -42,6 +42,12 @@ export default {
       name: 'summary',
       meta: { title: 'summary', noCache: true }
     },
+    {
+      path: '/hospitalCharges/chargeDetailManagement',
+      component: () => import('@/xt_pages/hospitalStation/chargeDetailManagement'),
+      name: 'chargeDetailManagement',
+      meta: { title: 'chargeDetailManagement', noCache: true }
+    },
     // {
     //   path: '/outpatientCharges/incomeStatistics',
     //   component: () => import('@/xt_pages/outpatientCharges/incomeStatistics'),

src/router/modules/workforce.js

@@ -60,49 +60,60 @@ export default {
       noCache: true
     }
   },
-    {
-      path: '/schedule/remind/print',
-      component: () => import('@/xt_pages/workforce/remind_print'),
-      name: 'remind_print',
-      hidden: true,
-      is_menu: false,
-      meta: {
-        title: 'remind_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/schedule/remind/print/next',
-      component: () => import('@/xt_pages/workforce/next_remind_print'),
-      name: 'next_remind_print',
-      hidden: true,
-      is_menu: false,
-      meta: {
-        title: 'next_remind_print',
-        noCache: true
-      }
-    },
-    {
-      path: '/schedule/remind/print/setting',
-      component: () => import('@/xt_pages/workforce/remind_print_setting'),
-      name: 'remind_print_setting',
-      hidden: true,
-      is_menu: false,
-      meta: {
-        title: 'remind_print_setting',
-        noCache: true
-      }
-    },
-    {
-      path: '/scheduleTablePrint',
-      component: () => import('@/xt_pages/workforce/scheduleTablePrint'),
-      name: 'scheduleTablePrint',
-      hidden: true,
-      is_menu: false,
-      meta: {
-        title: 'scheduleTablePrint',
-        noCache: true
-      }
-    },
+  {
+    path: '/schedule/remind/print',
+    component: () => import('@/xt_pages/workforce/remind_print'),
+    name: 'remind_print',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'remind_print',
+      noCache: true
+    }
+  },
+  {
+    path: '/schedule/remind/print/next',
+    component: () => import('@/xt_pages/workforce/next_remind_print'),
+    name: 'next_remind_print',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'next_remind_print',
+      noCache: true
+    }
+  },
+  {
+    path: '/schedule/remind/print/setting',
+    component: () => import('@/xt_pages/workforce/remind_print_setting'),
+    name: 'remind_print_setting',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'remind_print_setting',
+      noCache: true
+    }
+  },
+  {
+    path: '/scheduleTablePrint',
+    component: () => import('@/xt_pages/workforce/scheduleTablePrint'),
+    name: 'scheduleTablePrint',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'scheduleTablePrint',
+      noCache: true
+    }
+  },
+  {
+    path: '/scheduleTablePrintOne',
+    component: () => import('@/xt_pages/workforce/scheduleTablePrintOne'),
+    name: 'scheduleTablePrintOne',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'scheduleTablePrintOne',
+      noCache: true
+    }
+  }
   ]
 }

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/data/components/consumables.vue

@@ -34,6 +34,15 @@
             :value="item.value">
           </el-option>
         </el-select>
+        <span style="color: #909399;font-size:14px;">耗材类型 : &nbsp;</span>
+        <el-select v-model="is_type" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeTypeList">
+          <el-option
+            v-for="(item,index) in goodTypeList"
+            :key="index"
+            :label="item.type_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
 
       </div>
       <div>
@@ -63,6 +72,14 @@
           size="small"
         >下载日志
         </el-button>
+        <!-- <el-button
+          style="margin-left:10px;"
+          @click="exportList()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >点击导出
+        </el-button> -->
       </div>
 
     <el-table
@@ -94,9 +111,9 @@
           {{ getGoodTypeByID(scope.row.good_type_id) }}
         </template>
       </el-table-column>
-      <el-table-column label="耗材编号" width="140" align="center">
+      <el-table-column label="注册编码" width="140" align="center">
         <template slot-scope="scope">
-          {{ scope.row.good_number }}
+          {{ scope.row.register_number }}
         </template>
       </el-table-column>
 
@@ -146,7 +163,7 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :page-sizes="[10, 50, 100]"
+      :page-sizes="[10, 50, 100,500,1000]"
       :page-size="10"
       background
       align="right"
@@ -316,7 +333,6 @@
               register_number:"",
             },
             isVisibility: false,
-
           }
         },
         selectDrug:[],
@@ -339,7 +355,10 @@
         dealers:[],
         exportLogVisible:false,
         logs: [],
-        goodKindList:[]
+        goodKindList:[],
+        goodTypeList:[{id:0,type_name:"全部"}],
+        is_type:0,
+        medicalInsuranceLevelList:[]
       }
     },
     methods: {
@@ -745,6 +764,7 @@
           is_charge: this.is_charge,
           is_mark:this.is_record,
           manufacturer:this.manufacturer,
+          is_type:this.is_type,
         };
 
         getGoodInfoList(params).then(response => {
@@ -790,7 +810,7 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-        console.log("val22222",val)
+        
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId;
@@ -858,9 +878,8 @@
       },
       goodInfoDialogCancle: function() {
         this.$refs.addConsumable.hide()
-      },getGoodTypeByID(id){
-        console.log( id)
-
+      },
+      getGoodTypeByID(id){
         let name = ""
         for(let i = 0;  i < this.goodInfo.goodInfoDialog.formValue.goodType.length;i++){
           if(this.goodInfo.goodInfoDialog.formValue.goodType[i].id == id){
@@ -883,9 +902,7 @@
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
               }
-              this.goodInfo.goodInfoDialog.formValue.goodType.push(
-                response.data.data.goodType[i]
-              )
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
             }
             if (this.goodInfo.goodInfoDialog.formValue.goodType.length <= 0) {
               this.$message.error('请先新增商品类型');
@@ -941,6 +958,11 @@
             this.$message.error(response.data.msg);
             return false
           } else {
+           
+            for(let i=0;i<response.data.data.goodType.length;i++){
+              this.goodTypeList.push(response.data.data.goodType[i])
+            }
+ 
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
@@ -1127,7 +1149,10 @@
         this.getList()
       },
       changeRecord(){
-         this.getList()
+        this.getList()
+      },
+      changeTypeList(){
+        this.getList()
       },
       handleSuccess({ results, header }) {
 
@@ -1473,14 +1498,66 @@
        getInitializtion().then(response=>{
          if(response.data.state == 1){
            var goodKindList = response.data.data.goodKindList;
-
+           
            this.goodKindList = goodKindList
-
-
+           var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
+           console.log("医保等级",medicalInsuranceLevelList)
+           this.medicalInsuranceLevelList = medicalInsuranceLevelList
          }
        })
-      }
+      },
+      exportList(){
+        import('@/vendor/Export2Excel').then(excel => {
+         console.log("this.table",this.goodInfo.goodInfoData)
+         
+         for(let i=0;i<this.goodInfo.goodInfoData.length;i++){
+           for(let j=0;j<this.goodKindList.length;j++){
+              if(this.goodInfo.goodInfoData[i].good_kind == this.goodKindList[j].value){
+                 this.goodInfo.goodInfoData[i].good_kind_name = this.goodKindList[i].name
+              }
+           }
+           for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType;z++){
+              if(this.goodInfo.goodInfoDialog.formValue[z].id == this.goodInfo.goodInfoData[i].good_type_id){
+                 this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue[z].name
+              }
+           }
 
+           for(let y=0;y<this.medicalInsuranceLevelList.length;y++){
+              if(this.goodInfo.goodInfoData[i].medical_insurance_level == this.medicalInsuranceLevelList[y].value){
+                 this.goodInfo.goodInfoData[i].medical_insurance_level_name = this.medicalInsuranceLevelList[y].name
+              }
+           }
+
+           for(let s=0;s<this.manufacturers.length;s++){
+             if(this.manufacturers[s].id == this.goodInfo.goodInfoData[i].manufacturer){
+                this.goodInfo.goodInfoData[i].manufacturer_name =  this.manufacturers[s].manufacturer_name
+             }
+           }
+          
+          for(let a=0;a<this.dealers.length;a++){
+             if(this.dealers[a].id == this.goodInfo.goodInfoData[i].dealer){
+                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name 
+             } 
+          }
+         }
+        
+         const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码']
+         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code'] 
+         
+         const data = this.formatJson(filterVal,this.goodInfo.goodInfoData)
+     
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材信息'
+         })
+          this.downloadLoading = false
+    
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
     },
     created() {
       this.getAllGoodType();

src/xt_pages/data/components/drugs.vue

@@ -65,6 +65,14 @@
           size="small"
         >下载日志
         </el-button>
+       <!-- <el-button
+          style="margin-left:10px;"
+          @click="exportList()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >点击导出
+        </el-button> -->
       </div>
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
@@ -99,6 +107,16 @@
         <template slot-scope="scope">
           <div>{{scope.row.retail_price}}</div>
         </template>
+      </el-table-column>
+      <el-table-column label="拆零价" width="100" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.min_price}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="包装价" width="100" align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.retail_price}}</div>
+        </template>
       </el-table-column>
        <el-table-column prop="date" label="国家编码" width="100" align="center">
         <template slot-scope="scope">
@@ -120,7 +138,7 @@
           <div>{{getDealer(scope.row.dealer)}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="备案日期" align="center" width="100">
+      <!-- <el-table-column prop="date" label="备案日期" align="center" width="100">
         <template slot-scope="scope">
           <span>{{getTime(scope.row.record_date)}}</span>
         </template>
@@ -129,7 +147,7 @@
         <template slot-scope="scope">
           <div>{{scope.row.drug_remark}}</div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="状态" width="60" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.drug_status.indexOf('停用') == -1 ? '启用':'停用' }}</div>
@@ -167,7 +185,7 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :page-sizes="[10, 50, 100]"
+      :page-sizes="[10, 50, 100,500,1000]"
       :page-size="10"
       background
       align="right"
@@ -221,7 +239,7 @@
   import selfPayment from './selfPayment'
   import maintain from './maintain'
   import addDrugs from './addDrugs'
-  import { GetAllManufacturer,postDrugInformation } from '@/api/stock'
+  import { GetAllManufacturer,postDrugInformation,getInitializtion } from '@/api/stock'
   import { getDataConfig,getDictionaryDataConfig } from "@/utils/data";
   import { uParseTime } from '@/utils/tools'
   import {
@@ -392,7 +410,15 @@
         selectDrug:[],
         dialogVisible:false,
         exportLogVisible:false,
-        logs:[]
+        logs:[],
+        drugTypeList:[],
+        drugCategoryList:[],
+        drugDosageFormList:[],
+        medicalInsuranceLevelList:[],
+        drugControlList:[],
+        drugClassifyList:[],
+        statisticsCategoryList:[],
+        pharmacologyCategoryList:[],
       }
     },
     methods: {
@@ -1451,13 +1477,96 @@
         return getDictionaryDataConfig(module,filed_name)
       },
 
+      exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         
+        
+         console.log("this.table",this.list)
+
+         for(let i=0;i<this.list.length;i++){
+          for(let j=0;j<this.drugCategoryList.length;j++){
+              if(this.list[i].drug_category == this.drugCategoryList[j].value){
+                 this.list[i].drug_category_name = this.drugCategoryList[j].name
+              }  
+          }
+           for(let z=0;z<this.drugDosageFormList.length;z++){
+              if(this.list[i].drug_dosage_form == this.drugDosageFormList[z].value){
+                this.list[i].drug_dosage_form_name = this.drugDosageFormList[z].name
+              }
+           }
+           for(let h=0;h<this.drugClassifyList.length;h++){
+              if(this.list[i].drug_classify == this.drugClassifyList[h].value){
+                 this.list[i].drug_classify_name = this.drugClassifyList[h].name
+              }
+           }
+           for(let y=0;y<this.manufacturers.length;y++){
+             if(this.list[i].manufacturer == this.manufacturers[y].id){
+                this.list[i].manufacturer_name = this.manufacturers[y].manufacturer_name
+             }
+           }
+           for(let s=0;s<this.dealer.length;s++){
+             if(this.list[i].dealer == this.dealer[s].id){
+               this.list[i].dealer_name = this.dealer[s].dealer_name
+             }
+           }
+          this.list[i].specification_name = this.list[i].dose + this.list[i].dose_unit + this.list[i].min_number + this.list[i].min_unit + "/"+this.list[i].max_unit
+         }
+
+         const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码']
+         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code'] 
+         
+         const data = this.formatJson(filterVal,this.list)
+     
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '药品信息'
+         })
+          this.downloadLoading = false
+    
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+      getInitializtion(){
+        getInitializtion().then(response=>{
+           if(response.data.state ==1){
+             var drugCategoryList =  response.data.data.drugCategoryList
+             console.log("药品类型",drugCategoryList)
+             this.drugCategoryList = drugCategoryList
+             var drugTypeList = response.data.data.drugTypeList
+
+              this.drugTypeList = drugTypeList
+             var drugDosageFormList =  response.data.data.drugDosageFormList
+             console.log("药品剂型",drugDosageFormList)
+             this.drugDosageFormList = drugDosageFormList
+             var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
+             console.log("医保登记",medicalInsuranceLevelList)
+             this.medicalInsuranceLevelList = medicalInsuranceLevelList
+             var drugControlList = response.data.data.drugControlList
+             console.log("开药控制",drugControlList)
+             this.drugControlList = drugControlList
+             var drugClassifyList = response.data.data.drugClassifyList
+             console.log("药物分类",drugClassifyList)
+             this.drugClassifyList = drugClassifyList
+             var statisticsCategoryList =  response.data.data.statisticsCategoryList
+             console.log("统计分类",statisticsCategoryList)
+             this.statisticsCategoryList = statisticsCategoryList
+             var pharmacologyCategoryList = response.data.data.pharmacologyCategoryList
+             console.log("药理分类",pharmacologyCategoryList)
+             this.pharmacologyCategoryList = pharmacologyCategoryList
+           }
+        })
+      },
+
     },
     created() {
 
       this.getList();
       this.getAllManufacturer();
       this.GetAllConfig()
-
+      this.getInitializtion()
     }
   }
 </script>

src/xt_pages/data/components/project.vue

@@ -61,6 +61,14 @@
           size="small"
         >下载日志
         </el-button>
+        <!-- <el-button
+          style="margin-left:10px;"
+          @click="exportList()"
+          class="filter-item"
+          type="primary"
+          size="small"
+        >点击导出
+        </el-button> -->
       </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"  @selection-change="handleSelectionChange">
             <el-table-column
@@ -892,6 +900,45 @@ export default {
       getDictionaryDataConfig(module, filed_name) {
           return getDictionaryDataConfig(module, filed_name)
       },
+      exportList(){
+        import('@/vendor/Export2Excel').then(excel => {
+        
+         for(let i=0;i<this.tableData.length;i++){
+           for(let j=0;j<this.getDictionaryDataConfig('system','cost_classify').length;j++){
+              if(this.tableData[i].cost_classify == this.getDictionaryDataConfig('system','cost_classify')[j].id){
+                 this.tableData[i].cost_classify_name = this.getDictionaryDataConfig('system','cost_classify')[j].name 
+              }
+           }
+           for(let y=0;y<this.getDictionaryDataConfig('system','medical_insurance_level').length;y++){
+              if(this.tableData[i].medical_coverage == this.getDictionaryDataConfig('system','medical_insurance_level')[y].id){
+                 this.tableData[i].medical_coverage_name = this.getDictionaryDataConfig('system','medical_insurance_level')[y].name 
+              }
+           }
+           for(let a=0;a<this.departMentList.length;a++){
+             if(this.tableData[i].executive_section == this.departMentList[a].id){
+                this.tableData[i].executive_section_name = this.departMentList[a].name
+             }
+           }
+         }
+          console.log("this.table",this.tableData)
+         const tHeader = ['项目名称','零价','单位','费用类别','执行科室','医保等级','国家编码','社保目录编码']
+         const filterVal = ['project_name', 'price','unit','cost_classify_name','executive_section_name','medical_coverage_name','medical_code','social_security_directory_code'] 
+         
+         const data = this.formatJson(filterVal,this.tableData)
+     
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '项目信息'
+         })
+          this.downloadLoading = false
+    
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+     
     },
     created(){
       this.getlist();

src/xt_pages/data/printTemplate/schedulePrint.vue

@@ -56,6 +56,30 @@
         <el-radio v-model="radio" label="2" @change="change">模版二</el-radio
         >
         </el-col>
+
+       <el-col
+        :span="6"
+        style="margin-left: 100px;margin-right: 100px;text-align: center"
+        >
+        <div
+            @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
+        >
+            <el-tooltip
+            class="item"
+            effect="dark"
+            content="点击查看大图"
+            placement="top-start"
+            :hide-after="2000"
+            >
+            <el-image
+                style="width: 200px; height: 200px"
+                :src="require('@/assets/home/222.jpg')"
+            ></el-image>
+            </el-tooltip>
+        </div>
+        <el-radio v-model="radio" label="3" @change="change">模版三</el-radio
+        >
+        </el-col>
     </el-row>
    
 

src/xt_pages/data/specialDictionary.vue

@@ -18,21 +18,18 @@
         <inspection v-if="activeName == 4"></inspection>
         </el-tab-pane>
         <el-tab-pane label="生产厂商" name="5">
-          <!--<manufacturer></manufacturer>-->
+         
           <manufacturer v-if="activeName == 5"></manufacturer>
         </el-tab-pane>
         <el-tab-pane label="经销商" name="6">
-          <!--<supplier></supplier>-->
+         
           <dealer v-if="activeName == 6"></dealer>
         </el-tab-pane>
         <el-tab-pane label="疾病类型" name="7">
-        <!--<manufacturer></manufacturer>-->
+       
         <diagnosis v-if="activeName == 7"></diagnosis>
       </el-tab-pane>
-        <!--<el-tab-pane label="医疗类别" name="8">-->
-          <!--&lt;!&ndash;<manufacturer></manufacturer>&ndash;&gt;-->
-          <!--<diagnosis></diagnosis>-->
-        <!--</el-tab-pane>-->
+      
         <el-tab-pane label="附加收费配置" name="8">
           <addtion v-if="activeName == 8"></addtion>
         </el-tab-pane>

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -66,7 +66,7 @@
                     <div class="inline_block" style="margin-left: 10px;">
                         透析次数：
                         <div class="under_line" style="width: 80px;text-align: center;">
-                            {{ record.patient.total_dialysis + record.patient.user_sys_before_count }}
+                            {{ record.Count + record.patient.user_sys_before_count }}
                         </div>
                     </div>
                 </div>
@@ -713,8 +713,8 @@ export default {
           this.org_template_info = resp.data.templateInfo
 
           this.records = this.records.concat(resp.data.schedules)
-
-
+          console.log("记录23323322332",this.records)
+ 
 
           for (const recordIndex in this.records) {
             var dlegh = 0

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -353,8 +353,36 @@
         <el-button type="primary" @click="changeSearchMode">{{
           search_mode == 1 ? "改为病人查询" : "改为日期查询"
         }}</el-button>
-
-        <!-- <el-button type="primary" :disabled="selecting_schs.length == 0" @click="batchPrintAction">打印</el-button> -->
+      </div>
+      <div class="cell clearfix"  v-show="search_mode == 2">
+         <label class="title">
+          <span class="name">日期查询</span>:
+        </label>
+        <el-date-picker
+          v-model="listQuery.start_time"
+          prefix-icon="el-icon-date"
+          @change="changeStartTime"
+          style="width: 250px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          :picker-options="pickerOptions1"
+          format="yyyy-MM-dd"
+          value-format="timestamp"
+        ></el-date-picker>
+        -
+        <el-date-picker
+          v-model="listQuery.end_time"
+          prefix-icon="el-icon-date"
+          @change="changeEndTime"
+          style="width: 250px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          :picker-options="pickerOptions1"
+          format="yyyy-MM-dd"
+          value-format="timestamp"
+        ></el-date-picker>
       </div>
       <div class="cell clearfix">
         <label class="title"> <span class="name">排班班次</span> : </label>
@@ -480,7 +508,7 @@
         align="right"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 20, 30, 50]"
+        :page-sizes="[10, 20, 30, 50,100]"
         :page-size="10"
         background
         style="margin-top:20px;"
@@ -602,10 +630,13 @@ export default {
         schedul_type: 0,
         partition_type: 0,
         schedul_time: "",
-        keywords: ""
+        keywords: "",
+        start_time:"",
+        end_time:"",
       },
       selecting_schs: [],
-      partitionArr: []
+      partitionArr: [],
+  
     };
   },
   created() {
@@ -696,6 +727,13 @@ export default {
       this.listQuery.schedul_time = this.time;
       this.getSchedualPatientList();
     },
+    changeStartTime(){
+      this.getSchedualPatientList()
+    },
+    changeEndTime(){
+      
+      this.getSchedualPatientList()
+    },
     getAllZone: function() {
       GetAllZone().then(response => {
         if (response.data.state == 0) {
@@ -714,9 +752,10 @@ export default {
       } else {
         this.listQuery.schedul_time = "";
       }
+      console.log("params332322332323232",this.listQuery)
       this.SchedualPatientsTableData = [];
       getSchedualPatient(this.listQuery).then(response => {
-        console.log("排班对于23333223323223232",response.data.data.schedule)
+      
         if (response.data.state == 0) {
           this.loading = false;
           this.$message.error(response.data.msg);
@@ -773,7 +812,7 @@ export default {
              
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
-              console.log("中国222222",this.SchedualPatientsTableData)
+             
             }
           }
         }

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -254,9 +254,13 @@
                   <div class="inline_block">
                       置换方式:
                       <div class="under_line" style="width: 100px;text-align: center;">
-                          <span v-if="prescription.displace_liqui_part == ''">/</span>
-                          <span v-if="prescription.displace_liqui_part == 1">前置换</span>
-                          <span v-if="prescription.displace_liqui_part == 2">后置换</span>
+                        <span v-if="prescription.mode_id == 1"></span>
+                        <span v-else>
+                           <span v-if="prescription.displace_liqui_part == ''">/</span>
+                           <span v-if="prescription.displace_liqui_part == 1">前置换</span>
+                           <span v-if="prescription.displace_liqui_part == 2">后置换</span>
+                        </span>
+                         
                       </div>
                   </div>
                   <div class="inline_block">

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1613,7 +1613,7 @@ export default {
             }
           }
 
-          total = total.toFixed(2)
+          total = total.toFixed(3)
         }
       }
       return total
@@ -1643,7 +1643,7 @@ export default {
           }
         }
       }
-      return total.toFixed(2)
+      return total.toFixed(3)
 
     },
     getCurTotal() {
@@ -1658,7 +1658,7 @@ export default {
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
           total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
         }
-        return total.toFixed(2)
+        return total.toFixed(3)
 
       }
     },
@@ -1683,7 +1683,7 @@ export default {
         }
       }
 
-      return total.toFixed(2)
+      return total.toFixed(3)
     }, getMonthTotal() {
       var total = 0
       for (let i = 0; i < this.month_prescriptions.length; i++) {
@@ -1705,7 +1705,7 @@ export default {
         }
       }
 
-      return total.toFixed(2)
+      return total.toFixed(3)
     },
     createFilter(queryString) {
       return (restaurant) => {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -95,7 +95,7 @@
 
             <!--                        <el-button v-loading="loadingtwo"-->
             <!--                                   v-if="(this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0)"-->
-            <!--                    c               size="small"-->
+            <!--                                   size="small"-->
             <!--                                   @click="open(30)"-->
             <!--                                   type="primary">上传费用明细-->
             <!--                        </el-button>-->
@@ -106,23 +106,23 @@
 <!--            </el-button>-->
 
 
-<!--            <el-button v-loading="loadingtwo"-->
-<!--                       v-if="(( this.activeName != 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0))"-->
-<!--                       size="small"-->
-<!--                       @click="open(8)"-->
-<!--                       type="primary">上传费用明细-->
-<!--            </el-button>-->
+            <el-button v-loading="loadingtwo"
+                       v-if="(( this.activeName != 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0 && this.order.id == 0))"
+                       size="small"
+                       @click="open(8)"
+                       type="primary">上传费用明细
+            </el-button>
 
             <!--<el-button size="small" @click="open(1)" type="primary">打印</el-button>-->
             <el-button v-loading="loadingone" size="small"
-                       v-if="(this.activeName == 'first' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type != 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
 
                        @click="open(2)"
                        type="primary">出院
             </el-button>
 
             <el-button v-loading="loadingone" size="small"
-                       v-if="(this.activeName == 'first' &&this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type == 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
 
                        @click="open(2)"
                        type="primary">出院
@@ -137,27 +137,27 @@
             </el-button>
 
             <el-button v-loading="loadingtwo"
-                       v-if="(this.activeName == 'first' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
+                       v-if="(this.activeName == 'third' &&this.hisPatientInfo.balance_accounts_type == 2 && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1  && this.order.order_status != 2)"
                        size="small"
                        @click="open(3)"
                        type="primary">收费
             </el-button>
 
             <el-button size="small" @click="open(4)" type="primary"
-                       v-if="this.activeName == 'first' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
+                       v-if="this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
               退费
             </el-button>
-            <el-button v-if="this.activeName == 'first' &&this.order.order_status == 2" size="small" @click="open(5)"
+            <el-button v-if="this.activeName == 'third' &&this.order.order_status == 2" size="small" @click="open(5)"
                        type="primary"
             >结算单
             </el-button>
 
-<!--            <el-button-->
-<!--                v-if="( this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"-->
+            <el-button
+                v-if="( this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
 
-<!--                size="small" @click="open(9)" type="primary"-->
-<!--            >撤销明细-->
-<!--            </el-button>-->
+                size="small" @click="open(9)" type="primary"
+            >撤销明细
+            </el-button>
 
             <!--                        <el-button-->
             <!--                                v-if="(this.activeName != 'third' && this.hisPatientInfo.balance_accounts_type != 2  && this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"-->
@@ -167,13 +167,13 @@
             <!--                        </el-button>-->
 
             <el-button
-                v-if="(this.activeName == 'first' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1)"
+                v-if="(this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 1)"
                 size="small" @click="open(6)" type="primary"
             >撤销出院
             </el-button>
 
             <el-button
-                v-if="(this.activeName == 'first' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+                v-if="(this.activeName == 'third' &&this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
                 size="small" @click="open(7)" type="primary"
             >撤销入院
             </el-button>
@@ -189,184 +189,185 @@
 
         <div class="mainCenter" v-loading="loading">
           <el-tabs class="settlementTabs" v-model="activeName" @tab-click="handleClick">
-<!--            <el-tab-pane label="日结" name="first">-->
-<!--              <div style="display:flex;height:100%;">-->
-<!--                <div class="centerLeft">-->
-<!--                  <div class="tabsBox">-->
-<!--                    &lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
-<!--                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"-->
-<!--                             @tab-click="tabclickEvent">-->
-<!--                      <el-tab-pane-->
-<!--                          v-for="(item, index) in prescriptions"-->
-<!--                          :key="index"-->
-<!--                          :label="item.name"-->
-<!--                          :name="item.name"-->
-<!--                      >-->
-<!--                      </el-tab-pane>-->
-
-<!--                      &lt;!&ndash;<div class="RP">&ndash;&gt;-->
-<!--                      &lt;!&ndash;Rp&ndash;&gt;-->
-<!--                      &lt;!&ndash;<el-date-picker&ndash;&gt;-->
-<!--                      &lt;!&ndash;v-model="record_date"&ndash;&gt;-->
-<!--                      &lt;!&ndash;type="date"&ndash;&gt;-->
-<!--                      &lt;!&ndash;:clearable="false"&ndash;&gt;-->
-<!--                      &lt;!&ndash;@change="changeDate"&ndash;&gt;-->
-<!--                      &lt;!&ndash;format="yyyy-MM-dd"&ndash;&gt;-->
-<!--                      &lt;!&ndash;value-format="yyyy-MM-dd"&ndash;&gt;-->
-<!--                      &lt;!&ndash;placeholder="选择日期">&ndash;&gt;-->
-<!--                      &lt;!&ndash;</el-date-picker>&ndash;&gt;-->
-<!--                      &lt;!&ndash;</div>&ndash;&gt;-->
-<!--                      &lt;!&ndash;<charge-prescription-table ref="prescription_tables"&ndash;&gt;-->
-<!--                      &lt;!&ndash;:prescription="curPrescriptions"></charge-prescription-table>&ndash;&gt;-->
-<!--                      &lt;!&ndash;<charge-prescription-table ref="prescription_tables" :prescription="curPrescriptions"></charge-prescription-table>&ndash;&gt;-->
-<!--                      <charge-prescription-table ref="prescription_tables"-->
-<!--                                                 :manufacturers="manufacturers"-->
-<!--                                                 :prescription="curPrescriptions"></charge-prescription-table>-->
-
-<!--                    </el-tabs>-->
-
-<!--                  </div>-->
-<!--                  <div class="costBox">-->
-<!--                    <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>-->
-<!--                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>-->
-<!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
-<!--                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--                <div class="centerRight">-->
-<!--                  <p class="centerRightTitle">人员信息</p>-->
-<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
-<!--                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>-->
-<!--                    <span style="font-size:14px;">日期:{{ record_date }}</span>-->
-<!--                  </div>-->
-<!--                  <ul class="basicUl">-->
-<!--                    <li style="width:50%;">姓名：{{ patientInfo.name }}</li>-->
-<!--                    <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>-->
-<!--                    <li style="width:50%;">年龄：{{ patientInfo.age }}</li>-->
-<!--                    <li style="width:50%;">电话：{{ patientInfo.phone }}</li>-->
-
-<!--                    &lt;!&ndash;<span>过敏病史:</span>&ndash;&gt;-->
-<!--                    &lt;!&ndash;<el-autocomplete&ndash;&gt;-->
-<!--                    &lt;!&ndash;style="width:100%;"&ndash;&gt;-->
-<!--                    &lt;!&ndash;class="inline-input"&ndash;&gt;-->
-<!--                    &lt;!&ndash;v-model="sick_history"&ndash;&gt;-->
-<!--                    &lt;!&ndash;:fetch-suggestions="querySearch2"&ndash;&gt;-->
-<!--                    &lt;!&ndash;placeholder="请输入内容"&ndash;&gt;-->
-<!--                    &lt;!&ndash;&gt;</el-autocomplete>&ndash;&gt;-->
-<!--                    &lt;!&ndash;<li style="width:100%;">地址：{{patientInfo.home_address}}</li>&ndash;&gt;-->
-<!--                    &lt;!&ndash;<li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>&ndash;&gt;-->
-<!--                  </ul>-->
-<!--                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>-->
-<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
-<!--                    <span style="font-size:14px;">住院编号:{{ hisPatientInfo.number }}</span>-->
-<!--                  </div>-->
-<!--                  <ul class="basicUl">-->
-<!--                    <li style="width:50%;">医生：{{ info.doctor }}</li>-->
-<!--                    <li style="width:50%;">科室：{{ info.departments }}</li>-->
-<!--                    <li style="width:100%;">总费用：{{ getTotal() }}</li>-->
-
-<!--                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>-->
-<!--                    <li style="width:100%;">是否有传染病：</li>-->
-<!--                    <li style="width:100%;">血压：</li>-->
-<!--                  </ul>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </el-tab-pane>-->
-<!--            <el-tab-pane label="月结" name="second">-->
-<!--              <div style="display:flex;height:100%;">-->
-<!--                <div class="centerLeft">-->
-<!--                  <div class="tabsBox">-->
-<!--                    &lt;!&ndash; <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> &ndash;&gt;-->
-<!--                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"-->
-<!--                             @tab-click="tabclickEventTwo">-->
-
-<!--                      <el-tab-pane-->
-<!--                          v-for="(item, index) in month_prescriptions"-->
-<!--                          :key="index"-->
-<!--                          :label="item.name"-->
-<!--                          :name="item.name">-->
-<!--                      </el-tab-pane>-->
-
-<!--                      <div class="RP">-->
-<!--                        Rp-->
-<!--                        <el-date-picker-->
-<!--                            v-model="other_start_time"-->
-<!--                            prefix-icon="el-icon-date"-->
-<!--                            @change="changeTime"-->
-<!--                            :editable="false"-->
-<!--                            style="width: 150px;"-->
-<!--                            type="date"-->
-<!--                            :picker-options="pickerOptions"-->
-<!--                            placeholder="选择开始时间"-->
-<!--                            align="right"-->
-<!--                            format="yyyy-MM-dd"-->
-<!--                            value-format="yyyy-MM-dd">-->
-<!--                        </el-date-picker>-->
-<!--                        <span class>-</span>-->
-<!--                        <el-date-picker-->
-<!--                            v-model="other_end_time"-->
-<!--                            prefix-icon="el-icon-date"-->
-<!--                            @change="changeEndTime"-->
-<!--                            :editable="false"-->
-<!--                            style="width: 150px;"-->
-<!--                            type="date"-->
-<!--                            placeholder="选择结束时间"-->
-<!--                            align="right"-->
-<!--                            format="yyyy-MM-dd"-->
-<!--                            value-format="yyyy-MM-dd">-->
-<!--                        </el-date-picker>-->
-<!--                      </div>-->
-<!--                      &lt;!&ndash;<prescription-table :preTableData='preTableData'></prescription-table>&ndash;&gt;-->
-<!--                      &lt;!&ndash;<month-prescription-table ref="prescription_tables"&ndash;&gt;-->
-<!--                      &lt;!&ndash;:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>&ndash;&gt;-->
-<!--                      <charge-month-prescription-table-->
-<!--                          :prescription="curMonthPrescriptions"></charge-month-prescription-table>-->
-
-<!--                    </el-tabs>-->
-
-<!--                  </div>-->
-<!--                  <div class="costBox">-->
-<!--                    <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>-->
-<!--                    &lt;!&ndash;<span>{{ state }}</span>&ndash;&gt;-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--                <div class="centerRight">-->
-<!--                  <p class="centerRightTitle">人员信息</p>-->
-<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
-<!--                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>-->
-<!--                    <span style="font-size:14px;">日期:{{ record_date }}</span>-->
-<!--                  </div>-->
-
-<!--                  <ul class="basicUl">-->
-<!--                    <li style="width:50%;">姓名：{{ patientInfo.name }}</li>-->
-<!--                    <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>-->
-<!--                    <li style="width:50%;">年龄：{{ patientInfo.age }}</li>-->
-<!--                    <li style="width:50%;">电话：{{ patientInfo.phone }}</li>-->
-<!--                    <li style="width:100%;">过敏史及其他病史：{{ info.sick_history }}</li>-->
-
-<!--                  </ul>-->
-<!--                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>-->
-<!--                  <div style="display:flex;justify-content: space-between;line-height:30px;">-->
-<!--                    <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number }}</span>-->
-<!--                  </div>-->
-<!--                  <ul class="basicUl">-->
-<!--                    <li style="width:50%;">医生：{{ info.doctor }}</li>-->
-<!--                    <li style="width:50%;">科室：{{ getDepartment(info.departments) }}</li>-->
-<!--                    <li style="width:100%;" v-if="activeName == 'first'">总费用：{{ getTotal() }}</li>-->
-<!--                    <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}-->
-<!--                    </li>-->
-
-<!--                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>-->
-<!--                    &lt;!&ndash;<li style="width:100%;">是否有传染病：</li>&ndash;&gt;-->
-<!--                    &lt;!&ndash;<li style="width:100%;">血压：</li>&ndash;&gt;-->
-<!--                  </ul>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </el-tab-pane>-->
-            <el-tab-pane label="结算" name="first">
+            <el-tab-pane label="日结" name="first">
+              <div style="display:flex;height:100%;">
+                <div class="centerLeft">
+                  <div class="tabsBox">
+                    <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
+                             @tab-click="tabclickEvent">
+                      <el-tab-pane
+                          v-for="(item, index) in prescriptions"
+                          :key="index"
+                          :label="item.name"
+                          :name="item.name"
+                      >
+                      </el-tab-pane>
+
+                      <!--<div class="RP">-->
+                      <!--Rp-->
+                      <!--<el-date-picker-->
+                      <!--v-model="record_date"-->
+                      <!--type="date"-->
+                      <!--:clearable="false"-->
+                      <!--@change="changeDate"-->
+                      <!--format="yyyy-MM-dd"-->
+                      <!--value-format="yyyy-MM-dd"-->
+                      <!--placeholder="选择日期">-->
+                      <!--</el-date-picker>-->
+                      <!--</div>-->
+                      <!--<charge-prescription-table ref="prescription_tables"-->
+                      <!--:prescription="curPrescriptions"></charge-prescription-table>-->
+                      <!--<charge-prescription-table ref="prescription_tables" :prescription="curPrescriptions"></charge-prescription-table>-->
+                      <charge-prescription-table ref="prescription_tables"
+                                                 :manufacturers="manufacturers"
+                                                 :prescription="curPrescriptions"></charge-prescription-table>
+
+                    </el-tabs>
+
+                  </div>
+                  <div class="costBox">
+                    <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
+                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>
+                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>
+                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>
+                  </div>
+                </div>
+                <div class="centerRight">
+                  <p class="centerRightTitle">人员信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>
+                    <span style="font-size:14px;">日期:{{ record_date }}</span>
+                  </div>
+                  <ul class="basicUl">
+                    <li style="width:50%;">姓名：{{ patientInfo.name }}</li>
+                    <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>
+                    <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
+                    <li style="width:50%;">电话：{{ patientInfo.phone }}</li>
+
+                    <!--<span>过敏病史:</span>-->
+                    <!--<el-autocomplete-->
+                    <!--style="width:100%;"-->
+                    <!--class="inline-input"-->
+                    <!--v-model="sick_history"-->
+                    <!--:fetch-suggestions="querySearch2"-->
+                    <!--placeholder="请输入内容"-->
+                    <!--&gt;</el-autocomplete>-->
+                    <!--<li style="width:100%;">地址：{{patientInfo.home_address}}</li>-->
+                    <!--<li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>-->
+                  </ul>
+                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">住院编号:{{ hisPatientInfo.number }}</span>
+                  </div>
+                  <ul class="basicUl">
+                    <li style="width:50%;">医生：{{ info.doctor }}</li>
+                    <li style="width:50%;">科室：{{ info.departments }}</li>
+                    <li style="width:100%;">总费用：{{ getTotal() }}</li>
+
+                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>
+                    <li style="width:100%;">是否有传染病：</li>
+                    <li style="width:100%;">血压：</li>
+                  </ul>
+                </div>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="月结" name="second">
               <div style="display:flex;height:100%;">
                 <div class="centerLeft">
                   <div class="tabsBox">
+                    <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
+                    <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
+                             @tab-click="tabclickEventTwo">
+
+                      <el-tab-pane
+                          v-for="(item, index) in month_prescriptions"
+                          :key="index"
+                          :label="item.name"
+                          :name="item.name">
+                      </el-tab-pane>
+
+                      <div class="RP">
+                        Rp
+                        <el-date-picker
+                            v-model="other_start_time"
+                            prefix-icon="el-icon-date"
+                            @change="changeTime"
+                            :editable="false"
+                            style="width: 150px;"
+                            type="date"
+                            :picker-options="pickerOptions"
+                            placeholder="选择开始时间"
+                            align="right"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                        <span class>-</span>
+                        <el-date-picker
+                            v-model="other_end_time"
+                            prefix-icon="el-icon-date"
+                            @change="changeEndTime"
+                            :editable="false"
+                            style="width: 150px;"
+                            type="date"
+                            placeholder="选择结束时间"
+                            align="right"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd">
+                        </el-date-picker>
+                      </div>
+                      <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
+                      <!--<month-prescription-table ref="prescription_tables"-->
+                      <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
+                      <charge-month-prescription-table
+                          :prescription="curMonthPrescriptions"></charge-month-prescription-table>
+
+                    </el-tabs>
+
+                  </div>
+                  <div class="costBox">
+                    <span>当前处方总费用：<span style="color:red;">{{ month_total }}元</span></span>
+                    <!--<span>{{ state }}</span>-->
+                  </div>
+                </div>
+                <div class="centerRight">
+                  <p class="centerRightTitle">人员信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">人员编码:{{ patientInfo.dialysis_no }}</span>
+                    <span style="font-size:14px;">日期:{{ record_date }}</span>
+                  </div>
+
+                  <ul class="basicUl">
+                    <li style="width:50%;">姓名：{{ patientInfo.name }}</li>
+                    <li style="width:50%;">性别：{{ patientInfo.gender == 1 ? '男' : '女' }}</li>
+                    <li style="width:50%;">年龄：{{ patientInfo.age }}</li>
+                    <li style="width:50%;">电话：{{ patientInfo.phone }}</li>
+                    <li style="width:100%;">过敏史及其他病史：{{ info.sick_history }}</li>
+
+                  </ul>
+                  <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>
+                  <div style="display:flex;justify-content: space-between;line-height:30px;">
+                    <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number }}</span>
+                  </div>
+                  <ul class="basicUl">
+                    <li style="width:50%;">医生：{{ info.doctor }}</li>
+                    <li style="width:50%;">科室：{{ getDepartment(info.departments) }}</li>
+                    <li style="width:100%;" v-if="activeName == 'first'">总费用：{{ getTotal() }}</li>
+                    <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}
+                    </li>
+
+                    <li style="width:100%;">判断结果：{{ info.diagnosis }}</li>
+                    <!--<li style="width:100%;">是否有传染病：</li>-->
+                    <!--<li style="width:100%;">血压：</li>-->
+                  </ul>
+                </div>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="结算" name="third">
+              <div style="display:flex;height:100%;">
+                <div class="centerLeft">
+                  <div class="tabsBox">
+                    <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
                     <el-tabs class="preTabs" v-model="editSettletableTabsValue" type="border-card"
                              @tab-click="tabclickEventThree">
 
@@ -379,16 +380,55 @@
                       <settle-prescription-table
                           :prescription="curSettlePrescriptions"
                       ></settle-prescription-table>
+
+                      <!--                                <charge-month-prescription-table-->
+                      <!--                                    :prescription="curMonthPrescriptions"></charge-month-prescription-table>-->
+
                     </el-tabs>
 
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ settle_total }}元</span></span>
+                    <!--<span>{{ state }}</span>-->
                   </div>
                 </div>
+                <!--                          <div class="centerRight">-->
+                <!--                            <p class="centerRightTitle">人员信息</p>-->
+                <!--                            <div style="display:flex;justify-content: space-between;line-height:30px;">-->
+                <!--                              <span style="font-size:14px;">人员编码:{{patientInfo.dialysis_no}}</span>-->
+                <!--                              <span style="font-size:14px;">日期:{{record_date}}</span>-->
+                <!--                            </div>-->
+
+                <!--                            <ul class="basicUl">-->
+                <!--                              <li style="width:50%;">姓名：{{patientInfo.name}}</li>-->
+                <!--                              <li style="width:50%;">性别：{{patientInfo.gender == 1 ? '男' : '女' }}</li>-->
+                <!--                              <li style="width:50%;">年龄：{{patientInfo.age }}</li>-->
+                <!--                              <li style="width:50%;">电话：{{patientInfo.phone}}</li>-->
+                <!--                              <li style="width:100%;">过敏史及其他病史：{{info.sick_history}}</li>-->
+
+                <!--                            </ul>-->
+                <!--                            <p class="centerRightTitle" style="padding-top: 10px;">诊断信息</p>-->
+                <!--                            <div style="display:flex;justify-content: space-between;line-height:30px;">-->
+                <!--                              <span style="font-size:14px;">门诊编号:{{ hisPatientInfo.number}}</span>-->
+                <!--                            </div>-->
+                <!--                            <ul class="basicUl">-->
+                <!--                              <li style="width:50%;">医生：{{ info.doctor }}</li>-->
+                <!--                              <li style="width:50%;">科室：{{ getDepartment(info.departments) }}</li>-->
+                <!--                              <li style="width:100%;" v-if="activeName == 'first'">总费用：{{ getTotal() }}</li>-->
+                <!--                              <li style="width:100%;" v-if="activeName == 'second'">总费用：{{ getTotalTwo() }}-->
+                <!--                              </li>-->
+
+                <!--                              <li style="width:100%;">判断结果：{{info.diagnosis}}</li>-->
+                <!--                              &lt;!&ndash;<li style="width:100%;">是否有传染病：</li>&ndash;&gt;-->
+                <!--                              &lt;!&ndash;<li style="width:100%;">血压：</li>&ndash;&gt;-->
+                <!--                            </ul>-->
+                <!--                          </div>-->
               </div>
             </el-tab-pane>
+
           </el-tabs>
+
+
         </div>
       </div>
     </div>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -192,6 +192,11 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+
+      <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>
 
     <span slot="footer" class="dialog-footer">
@@ -203,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 {
 
@@ -399,6 +406,111 @@
       diagnoses: Array
     },
     methods: {
+      check11(){
+
+
+
+        if(this.form.social_type == 0 || this.form.social_type == ''){
+          this.$message.error("社保类型不能为空")
+          return
+        }
+        var that = this
+        let params={
+          id_card_no: this.form.id_card_no,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          med_type: 11,
+          insutype: this.form.social_type
+        }
+        axios.get('http://127.0.0.1:9532/api/treatment/check', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.loadingone = false
+              return false
+            } else {
+              that.loadingone = false
+              if (response.data.data.failed_code == -10) {
+                // that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+
+                }).catch(() => {
+                })
+              } else {
+                var result_desc = '';
+                result_desc = response.data.data.msg
+                that.$alert(result_desc, '结果', {
+                  confirmButtonText: '确定',
+                  callback: action => {
+                    this.dialogFormVisible = false
+                  }
+                });
+              }
+            }
+          })
+          .catch(function(error) {
+          })
+      },
+      check14(){
+        if(this.form.social_type == 0 || this.form.social_type == ''){
+          this.$message.error("社保类型不能为空")
+          return
+        }
+        var that = this
+        let params={
+          id_card_no: this.form.id_card_no,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          med_type: "14",
+          insutype: this.form.social_type
+        }
+        axios.get('http://127.0.0.1:9532/api/treatment/check', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.loadingone = false
+              return false
+            } else {
+              that.loadingone = false
+              if (response.data.data.failed_code == -10) {
+                // that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+
+                }).catch(() => {
+                })
+              } else {
+                var result_desc = '';
+                result_desc = response.data.data.msg
+                that.$alert(result_desc, '结果', {
+                  confirmButtonText: '确定',
+                  callback: action => {
+                    this.dialogFormVisible = false
+                  }
+                });
+              }
+            }
+          })
+          .catch(function(error) {
+
+          })
+
+      },
       changeDoctor() {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.form.doctor) {

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -1,174 +1,178 @@
 <template>
-    <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
-               :close-on-click-modal="isClose"
-               :close-on-press-escape="isClose">
-
-        <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
-            <el-form-item label="患者姓名：" prop="name" >
-                <el-autocomplete
-                        class="checkSearch"
-                        popper-class="my-autocomplete"
-                        v-model="form.name"
-                        :fetch-suggestions="querySearchAsync"
-                        :trigger-on-focus="false"
-                        placeholder="请输入病人名字"
-                        @select="handleSelect"
-                        style="width:160px;"
-                >
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
-                    <template slot-scope="{ item }">
-                        <div class="name">{{ item.name }}</div>
-                    </template>
-                </el-autocomplete>
-            </el-form-item>
-
-            <el-form-item label="性别：" prop="gender" >
-                <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="item in sex"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-
-
-            </el-form-item>
-
-            <!-- <el-form-item label="年龄：" prop="age" >
-                <el-input v-model="form.age"></el-input>
-            </el-form-item> -->
-
-
-            <el-form-item label="出生日期：" prop="birthday" >
-                <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
-                                value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="手机号码：" prop="phone">
-                <el-input v-model="form.phone"></el-input>
-            </el-form-item>
-
-
-            <!--<el-form-item label="医疗类别：" prop="medical_care">-->
-                <!--<el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">-->
-                    <!--<el-option-->
-                            <!--v-for="(item,index) in medical_care"-->
-                            <!--:key="index"-->
-                            <!--:label="item.label"-->
-                            <!--:value="item.value">-->
-                    <!--</el-option>-->
-                <!--</el-select>-->
-            <!--</el-form-item>-->
-
-
-            <el-form-item label="证件类型：" prop="certificates" >
-                <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="item in certificates"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="证件号码：" prop="id_card">
-                <el-input v-model="form.id_card"></el-input>
-            </el-form-item>
-
-
-
-
-            <el-form-item label="结算类型：">
-                <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="item in settlement"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-
-            <el-form-item label="社保类型：">
-                <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
-                    <el-option
-                            v-for="item in medicalCare"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-
-            <el-form-item label="读卡类型：" prop="id_card_type">
-                <el-select v-model="form.id_card_type" placeholder="请选择">
-                    <el-option
-                            v-for="item in IDCardTypes"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-
-            <el-form-item class="specialFormItem" label="医保卡号：">
-                <div style="display:flex;">
-                    <el-input v-model="form.medical_insurance_card"></el-input>
-                    <el-button style="margin-left:10px;" type="primary" @click="reading" v-loading="read_loading">读卡</el-button>
-
-                </div>
-            </el-form-item>
-
-            <el-form-item label="挂号类型：" prop="register" >
-                <el-select v-model="form.register" placeholder="请选择" style="width:100%;" @change="changeRegister">
-                    <el-option
-                            v-for="item in register"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="挂号费：">
-                <el-input readonly v-model="form.registration_fee"></el-input>
-            </el-form-item>
-            <el-form-item label="诊疗费：">
-                <el-input readonly v-model="form.medical_expenses"></el-input>
-            </el-form-item>
-
-            <el-form-item label="医生：" prop="doctor" >
-                <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
-                    <el-option
-                            v-for="(item,index) in doctors"
-                            :key="index"
-                            :label="item.user_name"
-                            :value="item.admin_user_id">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="科室：" prop="department" >
-                <el-select v-model="form.department" placeholder="请选择">
-                    <el-option
-                            v-for="(item,index) in departments"
-                            :key="index"
-                            :label="item.name"
-                            :value="item.id">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-        </el-form>
-
-        <span slot="footer" class="dialog-footer">
+  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
+             :close-on-click-modal="isClose"
+             :close-on-press-escape="isClose">
+
+    <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
+      <el-form-item label="患者姓名：" prop="name" >
+        <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="form.name"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="false"
+          placeholder="请输入病人名字"
+          @select="handleSelect"
+          style="width:160px;"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+        </el-autocomplete>
+      </el-form-item>
+
+      <el-form-item label="性别：" prop="gender" >
+        <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in sex"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+
+
+      </el-form-item>
+
+      <!-- <el-form-item label="年龄：" prop="age" >
+          <el-input v-model="form.age"></el-input>
+      </el-form-item> -->
+
+
+      <el-form-item label="出生日期：" prop="birthday" >
+        <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="手机号码：" prop="phone">
+        <el-input v-model="form.phone"></el-input>
+      </el-form-item>
+
+
+      <!--<el-form-item label="医疗类别：" prop="medical_care">-->
+      <!--<el-select v-model="form.medical_care"  placeholder="请选择" style="width:100%;">-->
+      <!--<el-option-->
+      <!--v-for="(item,index) in medical_care"-->
+      <!--:key="index"-->
+      <!--:label="item.label"-->
+      <!--:value="item.value">-->
+      <!--</el-option>-->
+      <!--</el-select>-->
+      <!--</el-form-item>-->
+
+
+      <el-form-item label="证件类型：" prop="certificates" >
+        <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in certificates"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="证件号码：" prop="id_card">
+        <el-input v-model="form.id_card"></el-input>
+      </el-form-item>
+
+
+
+
+      <el-form-item label="结算类型：">
+        <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in settlement"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item label="社保类型：">
+        <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in medicalCare"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item label="读卡类型：" prop="id_card_type">
+        <el-select v-model="form.id_card_type" placeholder="请选择">
+          <el-option
+            v-for="item in IDCardTypes"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item class="specialFormItem" label="医保卡号：">
+        <div style="display:flex;">
+          <el-input v-model="form.medical_insurance_card"></el-input>
+          <el-button style="margin-left:10px;" type="primary" @click="reading" v-loading="read_loading">读卡</el-button>
+
+        </div>
+      </el-form-item>
+
+      <el-form-item label="挂号类型：" prop="register" >
+        <el-select v-model="form.register" placeholder="请选择" style="width:100%;" @change="changeRegister">
+          <el-option
+            v-for="item in register"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="挂号费：">
+        <el-input readonly v-model="form.registration_fee"></el-input>
+      </el-form-item>
+      <el-form-item label="诊疗费：">
+        <el-input readonly v-model="form.medical_expenses"></el-input>
+      </el-form-item>
+
+      <el-form-item label="医生：" prop="doctor" >
+        <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
+          <el-option
+            v-for="(item,index) in doctors"
+            :key="index"
+            :label="item.user_name"
+            :value="item.admin_user_id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="科室：" prop="department" >
+        <el-select v-model="form.department" placeholder="请选择">
+          <el-option
+            v-for="(item,index) in departments"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <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>
+
+    <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>
     <el-button type="primary" @click="confirm('formValue')">挂 号</el-button>
   </span>
-    </el-dialog>
+  </el-dialog>
 
 </template>
 
@@ -377,6 +381,108 @@
       diagnoses: Array,
     },
     methods: {
+      check11(){
+        if(this.form.social_type == 0 || this.form.social_type == ''){
+          this.$message.error("社保类型不能为空")
+          return
+        }
+        var that = this
+        let params={
+          id_card_no: this.form.id_card_no,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          med_type: 11,
+          insutype: this.form.social_type
+        }
+        axios.get('http://127.0.0.1:9532/api/treatment/check', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.loadingone = false
+              return false
+            } else {
+              that.loadingone = false
+              if (response.data.data.failed_code == -10) {
+                // that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+
+                }).catch(() => {
+                })
+              } else {
+                var result_desc = '';
+                result_desc = response.data.data.msg
+                that.$alert(result_desc, '结果', {
+                  confirmButtonText: '确定',
+                  callback: action => {
+                    this.dialogFormVisible = false
+                  }
+                });
+              }
+            }
+          })
+          .catch(function(error) {
+          })
+      },
+      check14(){
+        if(this.form.social_type == 0 || this.form.social_type == ''){
+          this.$message.error("社保类型不能为空")
+          return
+        }
+        var that = this
+        let params={
+          id_card_no: this.form.id_card_no,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+          med_type: "14",
+          insutype: this.form.social_type
+        }
+        axios.get('http://127.0.0.1:9532/api/treatment/check', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+          .then(function(response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg)
+              that.loadingone = false
+              return false
+            } else {
+              that.loadingone = false
+              if (response.data.data.failed_code == -10) {
+                // that.$message.error(response.data.data.msg)
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+
+                }).catch(() => {
+                })
+              } else {
+                var result_desc = '';
+                result_desc = response.data.data.msg
+                that.$alert(result_desc, '结果', {
+                  confirmButtonText: '确定',
+                  callback: action => {
+                    this.dialogFormVisible = false
+                  }
+                });
+              }
+            }
+          })
+          .catch(function(error) {
+
+          })
+
+      },
       changeDoctor() {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.form.doctor) {
@@ -562,16 +668,16 @@
 </script>
 
 <style lang="scss" scoped>
-    .registerDialog {
+  .registerDialog {
 
-    .el-form {
-        display: flex;
-        flex-wrap: wrap;
-    }
+  .el-form {
+    display: flex;
+    flex-wrap: wrap;
+  }
 
-    .el-form-item {
-        width: 50%;
-    }
+  .el-form-item {
+    width: 50%;
+  }
 
-    }
+  }
 </style>

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

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -495,65 +495,65 @@
         }
       },
       changePrescribingNumber(scope) {
-         var max_number = 0 
-         if(scope.row.prescribing_number_unit == scope.row.drug.max_unit){
-            max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number 
-         }
-         if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-           max_number = parseInt(scope.row.prescribing_number)
-         }
-         console.log("修改的数量",max_number)
-         //查询该药品库存
-         if(this.drugList.length > 0){
-            var stock_number = 0
-            for(let i=0;i<this.drugList.length;i++){
-              if(scope.row.id == this.drugList[i].id){
-                 for(let j=0;j<this.drugList[i].stock_in.length;j++){
-                    stock_number += this.drugList[i].stock_in[j].stock_max_number * this.drugList[i].min_number + this.drugList[i].stock_in[j].stock_min_number
-                 }
-              }
-            }
-            console.log("库存数量",stock_number)
-         }
-        if(scope.row.advice_id > 0){
-          //获取该药品上一次出库的的数量
-          getHisDoctorAdviceInfo(scope.row.advice_id).then(response=>{
-            if(response.data.state == 1){
-               var out_count  = 0
-               var adviceList = response.data.data.advice
-               if(adviceList.prescribing_number_unit == adviceList.drug.max_number){
-                   out_count = adviceList.prescribing_number * adviceList.drug.min_number
-               }
-               if(adviceList.prescribing_number_unit == adviceList.drug.min_unit){
-                  out_count = adviceList.prescribing_number
-               }
+        //  var max_number = 0 
+        //  if(scope.row.prescribing_number_unit == scope.row.drug.max_unit){
+        //     max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number 
+        //  }
+        //  if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        //    max_number = parseInt(scope.row.prescribing_number)
+        //  }
+        //  console.log("修改的数量",max_number)
+        //  //查询该药品库存
+        //  if(this.drugList.length > 0){
+        //     var stock_number = 0
+        //     for(let i=0;i<this.drugList.length;i++){
+        //       if(scope.row.id == this.drugList[i].id){
+        //          for(let j=0;j<this.drugList[i].stock_in.length;j++){
+        //             stock_number += this.drugList[i].stock_in[j].stock_max_number * this.drugList[i].min_number + this.drugList[i].stock_in[j].stock_min_number
+        //          }
+        //       }
+        //     }
+        //     console.log("库存数量",stock_number)
+        //  }
+        // if(scope.row.advice_id > 0){
+        //   //获取该药品上一次出库的的数量
+        //   getHisDoctorAdviceInfo(scope.row.advice_id).then(response=>{
+        //     if(response.data.state == 1){
+        //        var out_count  = 0
+        //        var adviceList = response.data.data.advice
+        //        if(adviceList.prescribing_number_unit == adviceList.drug.max_number){
+        //            out_count = adviceList.prescribing_number * adviceList.drug.min_number
+        //        }
+        //        if(adviceList.prescribing_number_unit == adviceList.drug.min_unit){
+        //           out_count = adviceList.prescribing_number
+        //        }
                
-               //如果更改的数量大于修改之前的数量
-               if(max_number > out_count){
-                 if((max_number - out_count)>stock_number){
-                   this.$message.error(scope.row.drug_name + '库存不足')
-                 }
-               }
-            }
-          })
-        }
-
-        if(scope.row.advice_id == 0){
-           if(max_number > stock_number){
-            this.$message.error(scope.row.drug_name + '库存不足')
-           }
-        }
-        
+        //        //如果更改的数量大于修改之前的数量
+        //        if(max_number > out_count){
+        //          if((max_number - out_count)>stock_number){
+        //            this.$message.error(scope.row.drug_name + '库存不足')
+        //          }
+        //        }
+        //     }
+        //   })
+        // }
 
-        // if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-        //   if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
-        //     this.$message.error(scope.row.drug_name + '库存不足')
-        //   }
-        // } else {
-        //   if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+        // if(scope.row.advice_id == 0){
+        //    if(max_number > stock_number){
         //     this.$message.error(scope.row.drug_name + '库存不足')
-        //   }
+        //    }
         // }
+        
+
+        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+          if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        } else {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        }
       },
       getProjectSingleDose(scope) {
         this.prescription.project[scope.$index].total = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.number_days ? scope.row.number_days : 1)

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -180,8 +180,8 @@ export default {
       ],originType:0,
       originState: [
         { value: 0, label: '全部', source: 0},
-        { value: 1, label: '住院', source: 1},
-        { value: 2, label: '门诊', source: 2}
+        { value: 2, label: '住院', source: 2},
+        { value: 1, label: '门诊', source: 1}
       ],
       crumbs: [
         { path: false, name: '质控管理' },

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -48,7 +48,7 @@
 
 
             <el-form-item label="规格型号 : " prop="specification_name">
-              <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
+              <el-input v-model="form.specification_name" placeholder=""></el-input>
             </el-form-item>
             <el-form-item prop="packing_unit"  label="包装单位:">
               <el-select v-model="form.packing_unit" style="width:160px;" placeholder="包装单位" @change="changePackingUnit">

src/xt_pages/stock/cancelStockOrder.vue

@@ -198,11 +198,11 @@
             </template>
           </el-table-column>
 
-         <el-table-column label="批次" align="center">
+         <!-- <el-table-column label="批次" align="center">
             <template slot-scope="scope">
               {{ scope.row.number}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
          <el-table-column label="品名/注册证号(备案凭证号)" align="center">
             <template slot-scope="scope">

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -201,11 +201,11 @@
               </template> 
             </el-table-column>
 
-            <el-table-column label="批次" align="center">
+            <!-- <el-table-column label="批次" align="center">
               <template slot-scope="scope">
                 {{ scope.row.batch_number}}
               </template>
-            </el-table-column>
+            </el-table-column> -->
 
             <el-table-column label="品名/注册证号(备案凭证号)" align="center">
               <template slot-scope="scope">

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -118,11 +118,11 @@
             
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="批号" align="center">
+        <!-- <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
              <span>{{scope.row.batch_number}}</span>
            </template>
-        </el-table-column>
+        </el-table-column> -->
         <!-- <el-table-column prop="drug_name" label="生产商" align="center">
            <template slot-scope="scope">
              {{getManufacturer(scope.row.manufacturer)}}

src/xt_pages/stock/stockFlow.vue

@@ -98,11 +98,11 @@
          </template>
        </el-table-column> -->
 
-       <el-table-column label="批次" align="center">
+       <!-- <el-table-column label="批次" align="center">
          <template slot-scope="scope">
            <span>{{scope.row.number}}</span>
          </template>
-       </el-table-column>
+       </el-table-column> -->
 
     
         <el-table-column prop="drug_name" label="单价"  align="center">

src/xt_pages/workforce/appointment.vue

@@ -674,6 +674,9 @@
         if(this.templateObj.template_id == 2){
           this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
         }
+        if(this.templateObj.template_id == 3){
+          this.$router.push({path: '/scheduleTablePrintOne?partition_id='+this.partition_id+"&weekTime="+this.activeName})
+        }
        
       }, 
       isShow() {

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -42,13 +42,15 @@
                 <td style="min-width:50px;">{{ item.cut }}</td>
                 <td style="min-width:50px;">
                     <span v-if="item.Mon_M.patient_id">
-                        <div>{{ item.Mon_M.patient }}</div>
-                        <div v-if="item.Mon_M.mode_name != 'HD'">{{ item.Mon_M.mode_name }}</div>
+                        <div>{{ item.Mon_M.patient }} </div>
+                        <div v-if="item.Mon_M.mode_name != 'HD'">
+                            {{ item.Mon_M.mode_name }}
+                     </div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Mon_A.patient_id">
-                        <div>{{ item.Mon_A.patient }}</div>
+                        <div>{{ item.Mon_A.patient }} </div>
                         <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
                     </span>
                 </td>
@@ -209,9 +211,7 @@ export default {
     created(){
         this.getAllZones()
         this.modeOptions = this.$store.getters.treatment_mode;
-        this.partition_id = this.$route.query.partition_id
-       
-        
+        this.partition_id = this.$route.query.partition_id   
     },
     methods:{
          getAllZones(){

src/xt_pages/workforce/scheduleTablePrintOne.vue

@@ -0,0 +1,868 @@
+<template>
+    <div>
+        <el-button type="primary" @click="printAction">打印</el-button>
+        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
+            <tr>
+                <td rowspan="2">分区</td>
+                <td rowspan="2">机号</td>
+                <td colspan="3">周一({{ weekTitle[0] }})</td>
+                <td colspan="3">周二({{ weekTitle[1] }})</td>
+                <td colspan="3">周三({{ weekTitle[2] }})</td>
+                <td colspan="3">周四({{ weekTitle[3] }})</td>
+                <td colspan="3">周五({{ weekTitle[4] }})</td>
+                <td colspan="3">周六({{ weekTitle[5] }})</td>
+                <td colspan="3">周日({{ weekTitle[6] }})</td>
+                <td>总数</td>
+            </tr>
+            <tr>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+                <td>上午</td>
+                <td>下午</td>
+                <td>晚上</td>
+            </tr>
+            <tr v-for="(item,index) in scheduleZone" :key="index">
+                <td style="min-width:50px;">{{ item.area }}</td>
+                <td style="min-width:50px;">{{ item.cut }}</td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Mon_M.patient_id">
+                        <div>{{ item.Mon_M.patient }} </div>
+                        <div v-if="item.Mon_M.mode_name != 'HD'">
+                            {{ item.Mon_M.mode_name }}
+                     </div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Mon_A.patient_id">
+                        <div>{{ item.Mon_A.patient }} </div>
+                        <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Mon_N.patient_id">
+                        <div>{{ item.Mon_N.patient }}</div>
+                        <div v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Tue_M.patient_id">
+                        <div>{{ item.Tue_M.patient }}</div>
+                        <div v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Tue_A.patient_id">
+                        <div>{{ item.Tue_A.patient }}</div>
+                        <div v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Tue_N.patient_id">
+                        <div>{{ item.Tue_N.patient }}</div>
+                        <div v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Wed_M.patient_id">
+                        <div>{{ item.Wed_M.patient }}</div>
+                        <div v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Wed_A.patient_id">
+                        <div>{{ item.Wed_A.patient }}</div>
+                        <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;"> 
+                    <span v-if="item.Wed_N.patient_id">
+                        <div>{{ item.Wed_N.patient }}</div>
+                        <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Thurs_M.patient_id">
+                        <div>{{ item.Thurs_M.patient }}</div>
+                        <div v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Thurs_A.patient_id">
+                        <div>{{ item.Thurs_A.patient }}</div>
+                        <div v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Thurs_N.patient_id">
+                        <div>{{ item.Thurs_N.patient }}</div>
+                        <div v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Fri_M.patient_id">
+                        <div>{{ item.Fri_M.patient }}</div>
+                        <div v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Fri_A.patient_id">
+                        <div>{{ item.Fri_A.patient }}</div>
+                        <div v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Fri_N.patient_id">
+                        <div>{{ item.Fri_N.patient }}</div>
+                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sat_M.patient_id">
+                        <div>{{ item.Sat_M.patient }}</div>
+                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sat_A.patient_id">
+                        <div>{{ item.Sat_A.patient }}</div>
+                        <div v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sat_N.patient_id">
+                        <div>{{ item.Sat_N.patient }}</div>
+                        <div v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sun_M.patient_id">
+                        <div>{{ item.Sun_M.patient }}</div>
+                        <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }} FX80</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sun_A.patient_id">
+                        <div>{{ item.Sun_A.patient }}</div>
+                        <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }} FX80</div>
+                    </span>
+                </td>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sun_N.patient_id">
+                        <div>{{ item.Sun_N.patient }}</div>
+                        <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }} FX80</div>
+                    </span>
+                </td>
+                <td>{{item.total}}</td>
+            </tr>
+        </table>
+    </div>
+</template>
+
+
+
+<script>
+import {getSchedulesOne,getWeekPanelsOne,getPatientSheduleCount,getAllZones,getSolutionSchedule} from "@/api/schedule";
+import print from 'print-js'
+export default {
+    props:{
+        scheduleZoneProp: {
+            type: Array,
+            dafault: []
+        },
+    },
+    data(){
+        return{
+            schedule_type:'',
+            partition_id:'',
+            theType:2,
+            scheduleZone:[],
+            weekTitle:[],
+            scheduleZoneRow: [],
+            partitions: {},
+            theWeek: {
+              lastWeek: 0,
+              thisWeek: 0,
+              nextWeek: 0,
+              nextTwoWeek: 0
+           },
+           scheduleCountList:[],
+           total:0,
+           zones:[],
+           zoneIdList:[],
+           strArr:"",
+           solutionList:[]
+        }
+    },
+    created(){
+        this.getAllZones()
+        this.modeOptions = this.$store.getters.treatment_mode;
+        this.partition_id = this.$route.query.partition_id   
+        this.getSolutionSchedule()
+    },
+    methods:{
+         getAllZones(){
+           getAllZones().then(response=>{
+             if(response.data.state == 1){
+                var zones = response.data.data.zones
+               for(let i=0;i<zones.length;i++){
+                    this.zoneIdList.push(zones[i].id)
+                }
+                this.zones.push(...zones)
+                var strArr =  this.zoneIdList.join(",")
+                
+                this.strArr = strArr
+                this.getWeekPanels()
+                //统计患者排班数量
+                this.getPatientSheduleCount()
+            }
+          })
+        },
+        getWeekPanels() {
+             this.scheduleZone = []
+              var partionStr = this.partition_id
+              var arr = this.zoneIdList.join(',')
+               var str = ""
+                if(partionStr == 0){
+                    str = arr
+                }
+                if(partionStr != 0){
+                    str = partionStr
+                }
+            getWeekPanelsOne(1,str).then(response => {
+                if (response.data.state == 0) {
+                    return false
+                }
+                var partitions = response.data.data.partitions
+                console.log("分区",partitions)
+                this.theWeek.thisWeek = response.data.data.theWeek
+                this.theWeek.lastWeek = this.theWeek.thisWeek - 1
+                this.theWeek.nextWeek = this.theWeek.thisWeek + 1
+                this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
+                var that = this
+                if (partitions.length > 0) {
+                    partitions.forEach(function(partition) {
+                        if (partition.jihaos.length == 0) {
+                            return false
+                        }
+                        that.scheduleZoneRow.push(partition.jihaos.length)
+                        that.partitions[partition.id] = partition
+                        partition.jihaos.forEach(function(jihao) {
+                            var thisPa = {
+                            area: partition.name,
+                            zone_id: partition.id,
+                            zone_type: partition.type,
+                            cut: jihao.number,
+                            jihao_id: jihao.id,
+                            Mon_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Mon_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Mon_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Tue_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Tue_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Tue_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Wed_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Wed_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Wed_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Thurs_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Thurs_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Thurs_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Fri_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Fri_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Fri_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sat_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sat_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sat_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sun_A: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sun_N: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            Sun_M: {
+                                schedule_id: 0,
+                                mode_id: 0,
+                                mode_name: '',
+                                patient_id: 0,
+                                patient: ''
+                            },
+                            total: 0
+                            }
+                            that.scheduleZone.push(thisPa)
+
+                        })
+                    })
+                }
+                this.getSchedules()
+            })
+        },
+        getSchedules() {
+            var theType = 2;
+            if(this.$route.query.weekTime == "lastWeek"){
+               theType = 1
+            }
+           if(this.$route.query.weekTime == "thisWeek"){
+               theType = 2
+            }
+            if(this.$route.query.weekTime == "nextWeek"){
+               theType = 3
+            }
+           if(this.$route.query.weekTime == "nextTwoWeek"){
+               theType = 4
+            }
+            var partionStr = this.partition_id
+            var arr = this.zoneIdList.join(',')
+            var str = ""
+            if(partionStr == 0){
+                str = arr
+            }
+            if(partionStr != 0){
+                str = partionStr
+            }
+            const params = {
+                weekTime:theType,
+                patitionid:str,
+                schedule_type:this.schedule_type,
+            }
+            getSchedulesOne(params).then(response => {
+                if (response.data.state == 1) {
+                    this.weekTitle = response.data.data.weekTitle;
+                    this.weekDays = response.data.data.days;
+                    this.toDay = response.data.data.today;
+                    var theSchedules = response.data.data.schdules;
+                    var that = this;
+                    that.scheduleZone.forEach(function(zone, index) {
+                        
+                        that.scheduleZone[index].Mon_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Mon_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Mon_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Tue_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Tue_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Tue_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Wed_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Wed_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Wed_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Thurs_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Thurs_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Thurs_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Fri_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Fri_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Fri_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sat_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sat_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sat_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sun_A = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sun_N = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].Sun_M = {
+                            mode_id: 0,
+                            mode_name: "",
+                            patient_id: 0,
+                            patient: ""
+                        };
+                        that.scheduleZone[index].total = 0;
+                        
+                        if (response.data.data.schdules.length > 0) {
+                            theSchedules.forEach(function(schedule, sindex) {
+
+                                if (zone.jihao_id == schedule.bed_id) {
+                                    // if(zone.zone_id == schedule.partition_id && zone.jihao_id == schedule.bed_id) {
+                                    var weekPath = that.weekPath(
+                                        schedule.schedule_week,
+                                        schedule.schedule_type
+                                    );
+
+                                    if (weekPath.length == 2) {
+                                        // console.log(schedule);
+
+                                        var weekPathKey = weekPath[0] + "_" + weekPath[1];
+                                        that.scheduleZone[index][weekPathKey] = {
+                                        schedule_id: schedule.id,
+                                        mode_id: schedule.mode_id,
+                                        patient_id: schedule.patient_id,
+                                        patient: schedule.patient,
+                                        patient_contagions: schedule.patient_contagions,
+                                        mode_name:
+                                            typeof that.modeOptions[schedule.mode_id] ===
+                                            "undefined"
+                                            ? ""
+                                            : that.modeOptions[schedule.mode_id].name
+                                        };
+                                        that.scheduleZone[index].total += 1;
+                                        
+                                    }
+                                    
+                                }
+                                
+                            });
+                        }
+                       
+                    });
+                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1"},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"jihao_id":"","total":"","zone_id":"","zone_type":""}]
+                     
+                     
+                     for(let i=0;i<newArr.length;i++){
+                       for(let j=0;j<this.scheduleCountList.length;j++){
+                            newArr[i].cut = this.total
+                         //礼拜一上午
+                          if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Mon_M.patient = this.scheduleCountList[j].Count
+                          } 
+                        //礼拜一下午
+                         if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 2){
+                           
+                              newArr[i].Mon_A.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜一晚上
+                         if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 3){
+                            
+                              newArr[i].Mon_N.patient = this.scheduleCountList[j].Count
+                          } 
+                         
+                        //礼拜二上午
+                         if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Tue_M.patient = this.scheduleCountList[j].Count
+                          } 
+                         //礼拜二下午
+                         if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Tue_A.patient = this.scheduleCountList[j].Count
+                          } 
+                        
+                         //礼拜二晚上
+                         if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 3){
+                            
+                              newArr[i].Tue_N.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜三上午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Wed_M.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜三下午
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Wed_A.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜三晚上
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 3){
+                            
+                              newArr[i].Wed_N.patient = this.scheduleCountList[j].Count
+                          }
+
+
+
+                        //礼拜四上午
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜四下午
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜四晚上
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 3){
+                            
+                              newArr[i].Thurs_N.patient = this.scheduleCountList[j].Count
+                          }
+
+
+                        //礼拜五上午
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜五下午
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜五晚上
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 3){
+                            
+                              newArr[i].Fri_N.patient = this.scheduleCountList[j].Count
+                          }
+
+
+                        //礼拜六上午
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜六下午
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜六晚上
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 3){
+                            
+                              newArr[i].Sat_N.patient = this.scheduleCountList[j].Count
+                          }
+                         
+
+                          //礼拜日上午
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 1){
+                            
+                              newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
+                          } 
+
+                         //礼拜日下午
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 2){
+                            
+                              newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
+                          }
+
+                         //礼拜日晚上
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 3){
+                            
+                              newArr[i].Sun_N.patient = this.scheduleCountList[j].Count
+                          }
+
+
+                       }
+                     }
+                    console.log("newArr222222222",newArr)
+                    that.scheduleZone.push(...newArr)
+                    console.log('总数据77777777777',that.scheduleZone)
+                    
+                } else {
+                    this.$message.error("网络错误");
+                    return false;
+                }
+            });
+        },
+        weekPath(week, schedule_type) {
+            var weekArr = {
+                1: "Mon",
+                2: "Tue",
+                3: "Wed",
+                4: "Thurs",
+                5: "Fri",
+                6: "Sat",
+                7: "Sun"
+            };
+            var typeArr = { 1: "M", 2: "A", 3: "N" };
+            if (
+                typeof weekArr[week] === "undefined" ||
+                typeof typeArr[schedule_type] === "undefined"
+            ) {
+                return [];
+            }
+            return [weekArr[week], typeArr[schedule_type]];
+        },
+        printAction: function() {
+            const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
+
+            printJS({
+            printable: 'scheduleTable',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        getPatientSheduleCount(){
+            var theType = 2;
+            if(this.$route.query.weekTime == "lastWeek"){
+               theType = 1
+            }
+           if(this.$route.query.weekTime == "thisWeek"){
+               theType = 2
+            }
+            if(this.$route.query.weekTime == "nextWeek"){
+               theType = 3
+            }
+           if(this.$route.query.weekTime == "nextTwoWeek"){
+               theType = 4
+            }
+           var partionStr = this.partition_id
+           console.log("partionStr",partionStr)
+            var arr = this.zoneIdList.join(',')
+            var str = ""
+            if(partionStr == 0){
+                str = arr
+            }
+            if(partionStr != 0){
+                str = partionStr
+            }
+            var params = {
+             weekTime:theType,
+             partition_id:str,
+
+            }
+           getPatientSheduleCount(params).then(response=>{
+               if(response.data.state == 1){
+                  var list = response.data.data.list
+                  console.log("list22222",list)
+                  
+                  this.scheduleCountList = list
+                  var total = response.data.data.total
+                  console.log("totalw222",total)
+                  this.total = total
+               }
+           }) 
+        },
+        getSolutionSchedule(){
+          getSolutionSchedule().then(response=>{
+             if(response.data.state ==1){
+               var solution = response.data.data.solution
+               console.log("solution",solution)
+               this.solutionList = solution
+             }  
+          })  
+        }
+    }
+}
+</script>
+
+
+<style lang="scss">
+td{
+    text-align: center;
+    padding: 5px;
+}
+</style>