瀏覽代碼

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

csx 3 年之前
父節點
當前提交
fbb6d89539

+ 30 - 11
package-lock.json 查看文件

4757
         "ansi-regex": {
4757
         "ansi-regex": {
4758
           "version": "2.1.1",
4758
           "version": "2.1.1",
4759
           "bundled": true,
4759
           "bundled": true,
4760
-          "dev": true
4760
+          "dev": true,
4761
+          "optional": true
4761
         },
4762
         },
4762
         "aproba": {
4763
         "aproba": {
4763
           "version": "1.2.0",
4764
           "version": "1.2.0",
4780
         "balanced-match": {
4781
         "balanced-match": {
4781
           "version": "1.0.0",
4782
           "version": "1.0.0",
4782
           "bundled": true,
4783
           "bundled": true,
4783
-          "dev": true
4784
+          "dev": true,
4785
+          "optional": true
4784
         },
4786
         },
4785
         "brace-expansion": {
4787
         "brace-expansion": {
4786
           "version": "1.1.11",
4788
           "version": "1.1.11",
4787
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
4789
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
4788
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
4790
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
4789
           "dev": true,
4791
           "dev": true,
4792
+          "optional": true,
4790
           "requires": {
4793
           "requires": {
4791
             "balanced-match": "^1.0.0",
4794
             "balanced-match": "^1.0.0",
4792
             "concat-map": "0.0.1"
4795
             "concat-map": "0.0.1"
4802
         "code-point-at": {
4805
         "code-point-at": {
4803
           "version": "1.1.0",
4806
           "version": "1.1.0",
4804
           "bundled": true,
4807
           "bundled": true,
4805
-          "dev": true
4808
+          "dev": true,
4809
+          "optional": true
4806
         },
4810
         },
4807
         "concat-map": {
4811
         "concat-map": {
4808
           "version": "0.0.1",
4812
           "version": "0.0.1",
4809
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
4813
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
4810
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
4814
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
4811
-          "dev": true
4815
+          "dev": true,
4816
+          "optional": true
4812
         },
4817
         },
4813
         "console-control-strings": {
4818
         "console-control-strings": {
4814
           "version": "1.1.0",
4819
           "version": "1.1.0",
4815
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
4820
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
4816
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
4821
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
4817
-          "dev": true
4822
+          "dev": true,
4823
+          "optional": true
4818
         },
4824
         },
4819
         "core-util-is": {
4825
         "core-util-is": {
4820
           "version": "1.0.2",
4826
           "version": "1.0.2",
4944
         "inherits": {
4950
         "inherits": {
4945
           "version": "2.0.3",
4951
           "version": "2.0.3",
4946
           "bundled": true,
4952
           "bundled": true,
4947
-          "dev": true
4953
+          "dev": true,
4954
+          "optional": true
4948
         },
4955
         },
4949
         "ini": {
4956
         "ini": {
4950
           "version": "1.3.5",
4957
           "version": "1.3.5",
4958
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
4965
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
4959
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
4966
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
4960
           "dev": true,
4967
           "dev": true,
4968
+          "optional": true,
4961
           "requires": {
4969
           "requires": {
4962
             "number-is-nan": "^1.0.0"
4970
             "number-is-nan": "^1.0.0"
4963
           }
4971
           }
4974
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
4982
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
4975
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
4983
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
4976
           "dev": true,
4984
           "dev": true,
4985
+          "optional": true,
4977
           "requires": {
4986
           "requires": {
4978
             "brace-expansion": "^1.1.7"
4987
             "brace-expansion": "^1.1.7"
4979
           }
4988
           }
4981
         "minimist": {
4990
         "minimist": {
4982
           "version": "0.0.8",
4991
           "version": "0.0.8",
4983
           "bundled": true,
4992
           "bundled": true,
4984
-          "dev": true
4993
+          "dev": true,
4994
+          "optional": true
4985
         },
4995
         },
4986
         "minipass": {
4996
         "minipass": {
4987
           "version": "2.3.5",
4997
           "version": "2.3.5",
4988
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
4998
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
4989
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
4999
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
4990
           "dev": true,
5000
           "dev": true,
5001
+          "optional": true,
4991
           "requires": {
5002
           "requires": {
4992
             "safe-buffer": "^5.1.2",
5003
             "safe-buffer": "^5.1.2",
4993
             "yallist": "^3.0.0"
5004
             "yallist": "^3.0.0"
5008
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
5019
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
5009
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
5020
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
5010
           "dev": true,
5021
           "dev": true,
5022
+          "optional": true,
5011
           "requires": {
5023
           "requires": {
5012
             "minimist": "0.0.8"
5024
             "minimist": "0.0.8"
5013
           }
5025
           }
5095
         "number-is-nan": {
5107
         "number-is-nan": {
5096
           "version": "1.0.1",
5108
           "version": "1.0.1",
5097
           "bundled": true,
5109
           "bundled": true,
5098
-          "dev": true
5110
+          "dev": true,
5111
+          "optional": true
5099
         },
5112
         },
5100
         "object-assign": {
5113
         "object-assign": {
5101
           "version": "4.1.1",
5114
           "version": "4.1.1",
5109
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
5122
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
5110
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
5123
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
5111
           "dev": true,
5124
           "dev": true,
5125
+          "optional": true,
5112
           "requires": {
5126
           "requires": {
5113
             "wrappy": "1"
5127
             "wrappy": "1"
5114
           }
5128
           }
5203
         "safe-buffer": {
5217
         "safe-buffer": {
5204
           "version": "5.1.2",
5218
           "version": "5.1.2",
5205
           "bundled": true,
5219
           "bundled": true,
5206
-          "dev": true
5220
+          "dev": true,
5221
+          "optional": true
5207
         },
5222
         },
5208
         "safer-buffer": {
5223
         "safer-buffer": {
5209
           "version": "2.1.2",
5224
           "version": "2.1.2",
5245
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
5260
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
5246
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
5261
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
5247
           "dev": true,
5262
           "dev": true,
5263
+          "optional": true,
5248
           "requires": {
5264
           "requires": {
5249
             "code-point-at": "^1.0.0",
5265
             "code-point-at": "^1.0.0",
5250
             "is-fullwidth-code-point": "^1.0.0",
5266
             "is-fullwidth-code-point": "^1.0.0",
5266
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
5282
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
5267
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
5283
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
5268
           "dev": true,
5284
           "dev": true,
5285
+          "optional": true,
5269
           "requires": {
5286
           "requires": {
5270
             "ansi-regex": "^2.0.0"
5287
             "ansi-regex": "^2.0.0"
5271
           }
5288
           }
5313
         "wrappy": {
5330
         "wrappy": {
5314
           "version": "1.0.2",
5331
           "version": "1.0.2",
5315
           "bundled": true,
5332
           "bundled": true,
5316
-          "dev": true
5333
+          "dev": true,
5334
+          "optional": true
5317
         },
5335
         },
5318
         "yallist": {
5336
         "yallist": {
5319
           "version": "3.0.3",
5337
           "version": "3.0.3",
5320
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
5338
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
5321
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
5339
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
5322
-          "dev": true
5340
+          "dev": true,
5341
+          "optional": true
5323
         }
5342
         }
5324
       }
5343
       }
5325
     },
5344
     },

+ 8 - 8
src/views/layout/components/Navbar.vue 查看文件

125
       <div>
125
       <div>
126
         <!-- <i class="el-icon-question"></i>
126
         <!-- <i class="el-icon-question"></i>
127
         <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a> -->
127
         <a href="https://sso.kuyicloud.com/help" target="_blank">帮助中心</a> -->
128
-        <div class="fixedBox">
129
-          <div class="fixed-item" @mouseover="mouseOver" @mouseleave="leave">
130
-            <i class="el-icon-chat-line-round"></i>
131
-            <div class="fixed-text">联系客户经理</div>
128
+       <div class="fixedBox">
129
+         <div class="fixed-item" @mouseover="mouseOver" @mouseleave="leave">
130
+          <i class="el-icon-chat-line-round"></i>
131
+           <div class="fixed-text">联系客户经理</div>
132
             <div class="fixed-wrap" v-show="wrap1">
132
             <div class="fixed-wrap" v-show="wrap1">
133
               <div class="fixed-inner">
133
               <div class="fixed-inner">
134
                 <div class="fixed-inner-item">您的专属客户经理:{{ information.name }}</div>
134
                 <div class="fixed-inner-item">您的专属客户经理:{{ information.name }}</div>
135
-                <div class="fixed-inner-item">电话:{{ information.phone }}</div>
136
-                <div class="fixed-inner-item">微信:{{ information.wechat }}</div>
135
+                  <div class="fixed-inner-item">电话:{{ information.phone }}</div>
136
+               <div class="fixed-inner-item">微信:{{ information.wechat }}</div>
137
                 <div class="fixed-inner-item">QQ:{{ information.qqchat }}</div>
137
                 <div class="fixed-inner-item">QQ:{{ information.qqchat }}</div>
138
                 <div class="fixed-inner-item">邮箱:{{ information.email }}</div>
138
                 <div class="fixed-inner-item">邮箱:{{ information.email }}</div>
139
                 <div class="fixed-inner-triangle"></div>
139
                 <div class="fixed-inner-triangle"></div>
140
-              </div>
140
+             </div>
141
             </div>
141
             </div>
142
           </div>
142
           </div>
143
           <div class="fixed-item" @mouseover="mouseOver1" @mouseleave="leave1">
143
           <div class="fixed-item" @mouseover="mouseOver1" @mouseleave="leave1">
144
-            <i class="el-icon-full-screen"></i>
144
+           <i class="el-icon-full-screen"></i>
145
             <div class="fixed-text">微信联系</div>
145
             <div class="fixed-text">微信联系</div>
146
             <div class="fixed-wrap" v-show="wrap2">
146
             <div class="fixed-wrap" v-show="wrap2">
147
               <div class="fixed-inner">
147
               <div class="fixed-inner">

+ 2 - 2
src/xt_pages/data/components/consumables.vue 查看文件

72
           size="small"
72
           size="small"
73
         >下载日志
73
         >下载日志
74
         </el-button>
74
         </el-button>
75
-        <!-- <el-button
75
+        <el-button
76
           style="margin-left:10px;"
76
           style="margin-left:10px;"
77
           @click="exportList()"
77
           @click="exportList()"
78
           class="filter-item"
78
           class="filter-item"
79
           type="primary"
79
           type="primary"
80
           size="small"
80
           size="small"
81
         >点击导出
81
         >点击导出
82
-        </el-button> -->
82
+        </el-button>
83
       </div>
83
       </div>
84
 
84
 
85
     <el-table
85
     <el-table

+ 6 - 6
src/xt_pages/data/components/drugs.vue 查看文件

65
           size="small"
65
           size="small"
66
         >下载日志
66
         >下载日志
67
         </el-button>
67
         </el-button>
68
-       <!-- <el-button
68
+       <el-button
69
           style="margin-left:10px;"
69
           style="margin-left:10px;"
70
           @click="exportList()"
70
           @click="exportList()"
71
           class="filter-item"
71
           class="filter-item"
72
           type="primary"
72
           type="primary"
73
           size="small"
73
           size="small"
74
         >点击导出
74
         >点击导出
75
-        </el-button> -->
75
+        </el-button>
76
       </div>
76
       </div>
77
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
77
     <el-table :data="list" border style="width: 100%" :row-style="{ color: '#303133' }"
78
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
78
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}"
103
           <div>{{scope.row.last_price}}</div>
103
           <div>{{scope.row.last_price}}</div>
104
         </template>
104
         </template>
105
       </el-table-column>
105
       </el-table-column>
106
-      <el-table-column label="零售价" width="100" align="center">
106
+      <!-- <el-table-column label="零售价" width="100" align="center">
107
         <template slot-scope="scope">
107
         <template slot-scope="scope">
108
           <div>{{scope.row.retail_price}}</div>
108
           <div>{{scope.row.retail_price}}</div>
109
         </template>
109
         </template>
110
-      </el-table-column>
111
-      <el-table-column label="拆零价" width="100" align="center">
110
+      </el-table-column> -->
111
+      <el-table-column label="拆零零售价" width="100" align="center">
112
         <template slot-scope="scope">
112
         <template slot-scope="scope">
113
           <div>{{scope.row.min_price}}</div>
113
           <div>{{scope.row.min_price}}</div>
114
         </template>
114
         </template>
115
       </el-table-column>
115
       </el-table-column>
116
-      <el-table-column label="包装价" width="100" align="center">
116
+      <el-table-column label="包装零售价" width="100" align="center">
117
         <template slot-scope="scope">
117
         <template slot-scope="scope">
118
           <div>{{scope.row.retail_price}}</div>
118
           <div>{{scope.row.retail_price}}</div>
119
         </template>
119
         </template>

+ 3 - 3
src/xt_pages/data/components/project.vue 查看文件

61
           size="small"
61
           size="small"
62
         >下载日志
62
         >下载日志
63
         </el-button>
63
         </el-button>
64
-        <!-- <el-button
64
+        <el-button
65
           style="margin-left:10px;"
65
           style="margin-left:10px;"
66
           @click="exportList()"
66
           @click="exportList()"
67
           class="filter-item"
67
           class="filter-item"
68
           type="primary"
68
           type="primary"
69
           size="small"
69
           size="small"
70
         >点击导出
70
         >点击导出
71
-        </el-button> -->
71
+        </el-button>
72
       </div>
72
       </div>
73
         <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">
73
         <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">
74
             <el-table-column
74
             <el-table-column
137
          <el-pagination
137
          <el-pagination
138
             @size-change="handleSizeChange"
138
             @size-change="handleSizeChange"
139
             @current-change="handleCurrentChange"
139
             @current-change="handleCurrentChange"
140
-            :page-sizes="[10, 50, 100]"
140
+            :page-sizes="[10, 50, 100,500,1000]"
141
             :page-size="10"
141
             :page-size="10"
142
             background
142
             background
143
             align="right"
143
             align="right"

+ 1 - 3
src/xt_pages/data/printTemplate/schedulePrint.vue 查看文件

62
         style="margin-left: 100px;margin-right: 100px;text-align: center"
62
         style="margin-left: 100px;margin-right: 100px;text-align: center"
63
         >
63
         >
64
         <div
64
         <div
65
-            @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
65
+          @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
66
         >
66
         >
67
             <el-tooltip
67
             <el-tooltip
68
             class="item"
68
             class="item"
82
         </el-col>
82
         </el-col>
83
     </el-row>
83
     </el-row>
84
    
84
    
85
-
86
-
87
       <el-image-viewer
85
       <el-image-viewer
88
         v-if="showViewer"
86
         v-if="showViewer"
89
         :on-close="closeViewer"
87
         :on-close="closeViewer"

+ 1 - 1
src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue 查看文件

885
           console.log("为首务2322323",this.assessmentBeforeDislysis.period)
885
           console.log("为首务2322323",this.assessmentBeforeDislysis.period)
886
           this.assessmentBeforeDislysis.period = this.assessmentBeforeDislysis.period.toString()
886
           this.assessmentBeforeDislysis.period = this.assessmentBeforeDislysis.period.toString()
887
      
887
      
888
-          this.assessmentBeforeDislysis.dry_weight = this.predialysis_evaluation['dry_weight']
888
+          // this.assessmentBeforeDislysis.dry_weight = this.predialysis_evaluation['dry_weight']
889
           this.weight_adjust.weight = this.predialysis_evaluation['dry_weight']
889
           this.weight_adjust.weight = this.predialysis_evaluation['dry_weight']
890
         }
890
         }
891
 
891
 

+ 4 - 3
src/xt_pages/hospitalStation/components/deskPrescription.vue 查看文件

2225
               }
2225
               }
2226
             }
2226
             }
2227
             if (index == 1) {
2227
             if (index == 1) {
2228
-              console.log(this.prescriptions)
2229
-
2228
+              
2230
               // for (let i = 0; i < this.prescriptions.length; i++) {
2229
               // for (let i = 0; i < this.prescriptions.length; i++) {
2231
               //   for(let b = 0; b < this.prescriptions[i].advices.length; b++){
2230
               //   for(let b = 0; b < this.prescriptions[i].advices.length; b++){
2232
               //     if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
2231
               //     if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
2265
                 department: this.departmentValue,
2264
                 department: this.departmentValue,
2266
                 record_date: this.record_date,
2265
                 record_date: this.record_date,
2267
                 his_patient_id: this.hisPatientInfo.id,
2266
                 his_patient_id: this.hisPatientInfo.id,
2268
-                reg_type: this.register_type
2267
+                reg_type: this.register_type,
2269
               }
2268
               }
2270
 
2269
 
2271
               for (let i = 0; i < this.prescriptions.length; i++) {
2270
               for (let i = 0; i < this.prescriptions.length; i++) {
2300
                   this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
2299
                   this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
2301
                 }
2300
                 }
2302
               }
2301
               }
2302
+            
2303
               let data = {
2303
               let data = {
2304
                 'prescriptions': this.prescriptions
2304
                 'prescriptions': this.prescriptions
2305
               }
2305
               }
2319
               //   }
2319
               //   }
2320
               // })
2320
               // })
2321
               if (num == 0) {
2321
               if (num == 0) {
2322
+
2322
                 createHisPrescription(data, params).then(response => {
2323
                 createHisPrescription(data, params).then(response => {
2323
                   if (response.data.state == 1) {
2324
                   if (response.data.state == 1) {
2324
                     this.$emit('change', this.patientInfo.id)
2325
                     this.$emit('change', this.patientInfo.id)

+ 5 - 3
src/xt_pages/outpatientCharges/invoicePrint.vue 查看文件

13
     </template>
13
     </template>
14
     <div class="app-container" style="padding-top:40px;">
14
     <div class="app-container" style="padding-top:40px;">
15
         <div class='dialysisPage'>
15
         <div class='dialysisPage'>
16
-          <div v-if="org_id != 10106" >
16
+          <div v-if="org_id != 10106 && org_id != 10215" >
17
             <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
17
             <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
18
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
18
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
19
           </div>
19
           </div>
20
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
20
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
21
-            
21
+          <printFour v-if="org_id == 10215" :paramsObj="invoiceParams"></printFour>
22
         </div>
22
         </div>
23
     </div>
23
     </div>
24
   </div>
24
   </div>
28
 import printOne from './invoiceTemplate/printOne'
28
 import printOne from './invoiceTemplate/printOne'
29
 import printTwo from './invoiceTemplate/printTwo'
29
 import printTwo from './invoiceTemplate/printTwo'
30
 import printThree from './invoiceTemplate/printThree'
30
 import printThree from './invoiceTemplate/printThree'
31
+import printFour from './invoiceTemplate/printFour'
31
 export default {
32
 export default {
32
    name: "invoicePrint",
33
    name: "invoicePrint",
33
   components: {
34
   components: {
34
     printOne,
35
     printOne,
35
     printTwo,
36
     printTwo,
36
-    printThree
37
+    printThree,
38
+    printFour
37
   },
39
   },
38
   props:{
40
   props:{
39
     invoiceParams:Object
41
     invoiceParams:Object

+ 246 - 0
src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue 查看文件

1
+<template>
2
+    <div id='invoice-print'>
3
+        <div style="display:flex;">
4
+            <div style="position: absolute;top:50px;left:70px;">{{ list.order_number }}</div>
5
+            <!-- <div>{{ list.id_card_no }}</div> -->
6
+        </div>
7
+        <div style="display:flex;justify-content: space-between;">
8
+            <!-- <div>{{ list.department_name }}</div> -->
9
+            <div  style="position: absolute;top:50px;left:300px">{{ list.id_card_no }}</div>
10
+            <div></div>
11
+            <div  style="position: absolute;left:560px;top:50px;">
12
+                <span>{{ printDate.slice(0,4) }}</span>
13
+                <span>{{ printDate.slice(5,7) }}</span>
14
+                <span>{{ printDate.slice(8,11) }}</span>
15
+            </div>
16
+        </div>
17
+        <div style="display:flex;justify-content: space-between;">
18
+            <!-- <div>{{ list.department_name }}</div> -->
19
+            <div  style="position: absolute;top:70px;left:70px">门诊</div>
20
+            <div></div>
21
+            <div  style="position: absolute;top:70px;left:300px">{{ list.number }}</div>
22
+        </div>
23
+        <div style="display:flex;justify-content: space-between;">
24
+            <div style="position: absolute;top:90px;left:120px;"> {{ paramsObj.name }}</div>
25
+            <div style="position: absolute;top:90px;left:240px;">√</div>
26
+            <!-- <div>{{ list.pay_way }}</div> -->
27
+            <div style="position: absolute;top:70px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
28
+            <div style="position: absolute;top:70px;left:560px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
29
+        </div>
30
+        <div style="display:flex;justify-content: space-between;">
31
+            <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
32
+            <div style="position: absolute;top:110px;left:70px;">√</div>
33
+            <div style="position: absolute;top:110px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
34
+            <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money }}</div>
35
+            <div style="position: absolute;top:110px;left:580px;">现金</div>
36
+        </div>
37
+        <div style="display:flex;justify-content: space-between;">
38
+            <div style="position: absolute;top:160px;left:40px">西药</div>
39
+            <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
40
+            <div style="position: absolute;top:160px;left:180px">检查费</div>
41
+            <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
42
+            <div style="position: absolute;top:160px;left:340px">治疗费</div>
43
+            <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>
44
+            <div style="position: absolute;top:160px;left:500px">床位费</div>
45
+            <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>
46
+        </div>
47
+        <div style="display:flex;justify-content: space-between;">
48
+            <div style="position: absolute;top:190px;left:40px">中成药</div>
49
+            <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
50
+            <div style="position: absolute;top:190px;left:180px">化验费</div>
51
+            <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>
52
+            <div style="position: absolute;top:190px;left:340px">手术费</div>
53
+            <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>
54
+            <div style="position: absolute;top:190px;left:500px">其他费</div>
55
+            <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>
56
+        </div>
57
+        <div style="display:flex;justify-content: space-between;">
58
+            <div style="position: absolute;top:210px;left:40px"></div>
59
+            <div style="position: absolute;top:210px;left:110px"></div>
60
+            <div style="position: absolute;top:210px;left:180px"></div>
61
+            <div style="position: absolute;top:210px;left:260px"></div>
62
+            <div style="position: absolute;top:210px;left:340px">材料费</div>
63
+            <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>
64
+            <div style="position: absolute;top:210px;left:500px"></div>
65
+            <div style="position: absolute;top:210px;left:580px"></div>
66
+        </div>
67
+        <div style="display:flex;justify-content: space-between;">
68
+            <div style="position: absolute;top:230px;left:40px"></div>
69
+            <div style="position: absolute;top:230px;left:110px"></div>
70
+            <div style="position: absolute;top:230px;left:180px">补收</div>
71
+            <div style="position: absolute;top:230px;left:260px">{{ list.psn_cash_money }}</div>
72
+            <div style="position: absolute;top:230px;left:340px"></div>
73
+            <div style="position: absolute;top:230px;left:420px"></div>
74
+            <div style="position: absolute;top:230px;left:500px"></div>
75
+            <div style="position: absolute;top:230px;left:580px"></div>
76
+        </div>
77
+        <div>
78
+            <span>
79
+            <span  style="position: absolute;top:260px;left:180px">
80
+                <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
81
+                    {{ zhongwen.substring(0,1) }}
82
+                </span>
83
+                <span v-else>零</span>
84
+            </span>
85
+            <span  style="position: absolute;top:260px;left:220px">
86
+                <span v-if="zhongwen.indexOf('万') > -1">
87
+                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
88
+                </span>
89
+                <span v-else>零</span>
90
+            </span>
91
+            <span  style="position: absolute;top:260px;left:260px">
92
+                <span v-if="zhongwen.indexOf('仟') > -1">
93
+                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
94
+                </span>
95
+                <span v-else>零</span>
96
+            </span>
97
+            <span  style="position: absolute;top:260px;left:300px">
98
+                <span v-if="zhongwen.indexOf('佰') > -1">
99
+                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
100
+                </span>
101
+                <span v-else>零</span>
102
+            </span>
103
+            <span style="position: absolute;top:260px;left:340px">
104
+                <span v-if="zhongwen.indexOf('拾') > -1">
105
+                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
106
+                </span>
107
+                <span v-else>零</span>
108
+            </span>
109
+            <span  style="position: absolute;top:260px;left:380px">
110
+                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
111
+                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
112
+                </span>
113
+                <span v-else>零</span>
114
+            </span>
115
+            <span  style="position: absolute;top:260px;left:420px">
116
+                <span v-if="zhongwen.indexOf('角') > -1">
117
+                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
118
+                </span>
119
+                <span v-else>零</span>
120
+            </span>
121
+            <span  style="position: absolute;top:260px;left:460px">
122
+                <span v-if="zhongwen.indexOf('分') > -1">
123
+                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
124
+                </span>
125
+                <span v-else>零</span>
126
+            </span>
127
+            </span>
128
+            <span style="position: absolute;top:260px;left:540px">{{ totalPrice }}</span>
129
+        </div>
130
+        <!-- <div style="position: absolute;top:300px;left:460px">现金:{{ list.psn_cash_money }}</div> -->
131
+        <div>
132
+            <div style="position: absolute;top:340px;left:120px">{{ org_name }}</div>
133
+            <div style="position: absolute;top:340px;left:420px">高慧裕</div>
134
+        </div>
135
+    </div>
136
+</template>
137
+
138
+
139
+<script>
140
+import { getInvoice } from '@/api/project/project'
141
+export default {
142
+    props:{
143
+        paramsObj:Object
144
+    },
145
+    data(){
146
+        return{
147
+            list:{},
148
+            printDate:'',
149
+            zhongwen:'',
150
+            totalPrice:0.0,
151
+            org_id:'',
152
+            org_name:''
153
+        }
154
+    },
155
+    created(){
156
+        console.log('paramsObj',this.paramsObj)
157
+        let params = {
158
+            order_id: this.paramsObj.order_id,
159
+            patient_id: this.paramsObj.patient_id,
160
+            number: this.paramsObj.number,
161
+        }
162
+        this.getInvoice(params)
163
+        // var data = new Date();
164
+        // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
165
+        // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
166
+        // this.printDate = data.getFullYear() + "-" + month + "-" + date;
167
+        // this.smalltoBIG(982732.21)
168
+        this.org_id = this.$store.getters.xt_user.org_id
169
+        this.org_name = this.$store.getters.xt_user.org.org_name
170
+    },
171
+    methods:{
172
+        getInvoice(params){
173
+            getInvoice(params).then((res) => {
174
+                console.log('res',res)
175
+                this.list = res.data.data
176
+                this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
177
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
178
+                this.smalltoBIG(this.totalPrice)
179
+                var data = new Date(res.data.data.date * 1000);
180
+                var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
181
+                var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
182
+                this.printDate = data.getFullYear() + "-" + month + "-" + date;
183
+            })
184
+        },
185
+        smalltoBIG(n) {
186
+            // let fraction = ['角', '分'];
187
+            // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
188
+            // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
189
+            // let head = price < 0 ? '欠' : '';
190
+            // price = Math.abs(price);
191
+            // let upper = '';
192
+            // for (let i = 0; i < fraction.length; i++) {
193
+            // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
194
+            // }
195
+            // upper = upper || '整';
196
+            // price = Math.floor(price);
197
+            // for (let i = 0; i < unit[0].length && price > 0; i++) {
198
+            // let p = '';
199
+            // for (let j = 0; j < unit[1].length && price > 0; j++) {
200
+            //     p = digit[price % 10] + unit[1][j] + p;
201
+            //     price = Math.floor(price / 10);
202
+            // }
203
+            // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
204
+            // }
205
+            // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
206
+            // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
207
+            if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
208
+                return "数据非法";  //判断数据是否大于0
209
+            }
210
+
211
+            var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
212
+            n += "00";
213
+
214
+            var indexpoint = n.indexOf('.');  // 如果是小数,截取小数点前面的位数
215
+
216
+            if (indexpoint >= 0){
217
+
218
+                n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数,截取需要使用的unit单位
219
+            }
220
+
221
+            unit = unit.substr(unit.length - n.length);  // 若为整数,截取需要使用的unit单位
222
+            for (var i=0; i < n.length; i++){
223
+                str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
224
+            }
225
+
226
+            this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
227
+            console.log(this.zhongwen)
228
+        },
229
+
230
+    },
231
+    watch:{
232
+        paramsObj:{//深度监听,可监听到对象、数组的变化
233
+            handler(val, oldVal){
234
+                let params = {
235
+                    order_id: val.order_id,
236
+                    patient_id: val.patient_id,
237
+                    number: val.number,
238
+                }
239
+                this.getInvoice(params)
240
+
241
+            },
242
+            deep:true
243
+        }
244
+    }
245
+}
246
+</script>

+ 2 - 1
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue 查看文件

2261
                 department: this.departmentValue,
2261
                 department: this.departmentValue,
2262
                 record_date: this.record_date,
2262
                 record_date: this.record_date,
2263
                 his_patient_id: this.hisPatientInfo.id,
2263
                 his_patient_id: this.hisPatientInfo.id,
2264
-                reg_type: this.register_type
2264
+                reg_type: this.register_type,
2265
               }
2265
               }
2266
 
2266
 
2267
               for (let i = 0; i < this.prescriptions.length; i++) {
2267
               for (let i = 0; i < this.prescriptions.length; i++) {
2296
                   this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
2296
                   this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
2297
                 }
2297
                 }
2298
               }
2298
               }
2299
+            
2299
               let data = {
2300
               let data = {
2300
                 'prescriptions': this.prescriptions
2301
                 'prescriptions': this.prescriptions
2301
               }
2302
               }

+ 2 - 1
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue 查看文件

940
               department: this.departmentValue,
940
               department: this.departmentValue,
941
               record_date: this.record_date,
941
               record_date: this.record_date,
942
               his_patient_id: this.hisPatientInfo.id,
942
               his_patient_id: this.hisPatientInfo.id,
943
-              reg_type: this.register_type
943
+              reg_type: this.register_type,
944
             }
944
             }
945
 
945
 
946
             for (let i = 0; i < this.prescriptions.length; i++) {
946
             for (let i = 0; i < this.prescriptions.length; i++) {
981
                 this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
981
                 this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
982
               }
982
               }
983
             }
983
             }
984
+            
984
             let data = {
985
             let data = {
985
               'prescriptions': this.prescriptions
986
               'prescriptions': this.prescriptions
986
             }
987
             }

+ 7 - 3
src/xt_pages/stock/drugs/query.vue 查看文件

107
         </el-table-column>
107
         </el-table-column>
108
         <el-table-column prop="drug_name" label="入库数量" align="center">
108
         <el-table-column prop="drug_name" label="入库数量" align="center">
109
            <template slot-scope="scope">
109
            <template slot-scope="scope">
110
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
110
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.min_unit}}</span>
111
            </template>
111
            </template>
112
         </el-table-column>
112
         </el-table-column>
113
         <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showOne">
113
         <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showOne">
281
              console.log("list99999",list)
281
              console.log("list99999",list)
282
              for(let i=0;i<list.length;i++){
282
              for(let i=0;i<list.length;i++){
283
                for(let j=0;j<list[i].drug_warehouse_info.length;j++){
283
                for(let j=0;j<list[i].drug_warehouse_info.length;j++){
284
-                 list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
284
+                 if(list[i].max_unit == list[i].drug_warehouse_info[j].max_unit){
285
+                    list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
286
+                    list[i].drug_warehouse_info[j].warehousing_count = list[i].min_number * list[i].drug_warehouse_info[j].warehousing_count
287
+                 }
288
+                
285
                }
289
                }
286
                for(let y=0;y<list[i].drug_warehouse_out.length;y++){
290
                for(let y=0;y<list[i].drug_warehouse_out.length;y++){
287
                   if(list[i].drug_warehouse_out[y].count_unit == list[i].max_unit){
291
                   if(list[i].drug_warehouse_out[y].count_unit == list[i].max_unit){
832
         var over_count = 0
836
         var over_count = 0
833
         var cancel_count = 0
837
         var cancel_count = 0
834
         for(let i=0;i<info.length;i++){
838
         for(let i=0;i<info.length;i++){
835
-           total += (info[i].warehousing_count * min_number)
839
+           total += info[i].warehousing_count
836
         }
840
         }
837
         
841
         
838
         for(let j=0;j<info.length;j++){
842
         for(let j=0;j<info.length;j++){

+ 2 - 2
src/xt_pages/stock/stockPrint.vue 查看文件

45
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
45
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
46
                                    </td>
46
                                    </td>
47
                                    <td v-if="end_time == ''">
47
                                    <td v-if="end_time == ''">
48
-                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779">
48
+                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
49
                                         <span>
49
                                         <span>
50
                                           {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
50
                                           {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
51
                                         </span>
51
                                         </span>
58
                                    </td>
58
                                    </td>
59
                                   
59
                                   
60
                                    <td v-if="end_time == ''">
60
                                    <td v-if="end_time == ''">
61
-                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">
61
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
62
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
62
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
63
                                      </span>
63
                                      </span>
64
                                      <span v-else>
64
                                      <span v-else>

+ 4 - 4
src/xt_pages/stock/stockQuery.vue 查看文件

108
        </el-table-column>
108
        </el-table-column>
109
        <el-table-column label="出库数量" align="center" v-if="showOne">
109
        <el-table-column label="出库数量" align="center" v-if="showOne">
110
          <template slot-scope="scope">
110
          <template slot-scope="scope">
111
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164">
111
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id ==10290 ">
112
             <!-- <span>
112
             <!-- <span>
113
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
113
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
114
             </span> -->
114
             </span> -->
122
       
122
       
123
         <el-table-column label="剩余库存量" align="center" v-if="showThree">
123
         <el-table-column label="剩余库存量" align="center" v-if="showThree">
124
          <template slot-scope="scope">
124
          <template slot-scope="scope">
125
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164">
125
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id == 10290">
126
             {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
126
             {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
127
           </span>
127
           </span>
128
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
128
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
367
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
367
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
368
 
368
 
369
           if(this.end_time == ""){
369
           if(this.end_time == ""){
370
-            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 || this.org_id == 10191 || this.org_id == 9919  || this.org_id == 10265 || this.org_id ==10164){
370
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 || this.org_id == 10191 || this.org_id == 9919  || this.org_id == 10265 || this.org_id ==10164 || this.org_id == 10290){
371
               this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
371
               this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
372
             }else{
372
             }else{
373
               this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
373
               this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
374
             }
374
             }
375
             
375
             
376
-            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 || this.org_id == 10191 || this.org_id == 9919 || this.org_id == 10265 || this.org_id == 10164){
376
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 || this.org_id == 10191 || this.org_id == 9919 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10290){
377
                 this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
377
                 this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
378
             }else{
378
             }else{
379
               this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
379
               this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)

+ 113 - 3
src/xt_pages/workforce/scheduleTablePrintOne.vue 查看文件

153
                 <td style="min-width:50px;">
153
                 <td style="min-width:50px;">
154
                     <span v-if="item.Sun_M.patient_id">
154
                     <span v-if="item.Sun_M.patient_id">
155
                         <div>{{ item.Sun_M.patient }}</div>
155
                         <div>{{ item.Sun_M.patient }}</div>
156
-                        <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }} FX80</div>
156
+                        <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }} </div>
157
+                        <div>{{getDialyzer(item.Sun_M.patient_id,item.Sun_M.mode_name)}}</div>
157
                     </span>
158
                     </span>
158
                 </td>
159
                 </td>
159
                 <td style="min-width:50px;">
160
                 <td style="min-width:50px;">
160
                     <span v-if="item.Sun_A.patient_id">
161
                     <span v-if="item.Sun_A.patient_id">
161
                         <div>{{ item.Sun_A.patient }}</div>
162
                         <div>{{ item.Sun_A.patient }}</div>
162
-                        <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }} FX80</div>
163
+                        <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }} </div>
164
+                        <div>{{getDialyzer(item.Sun_A.patient_id, item.Sun_A.mode_name)}}</div>
163
                     </span>
165
                     </span>
164
                 </td>
166
                 </td>
165
                 <td style="min-width:50px;">
167
                 <td style="min-width:50px;">
166
                     <span v-if="item.Sun_N.patient_id">
168
                     <span v-if="item.Sun_N.patient_id">
167
                         <div>{{ item.Sun_N.patient }}</div>
169
                         <div>{{ item.Sun_N.patient }}</div>
168
-                        <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }} FX80</div>
170
+                        <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }} </div>
171
+                        <div>{{getDialyzer(item.Sun_N.patient_id,item.Sun_N.mode_name)}}</div>
169
                     </span>
172
                     </span>
170
                 </td>
173
                 </td>
171
                 <td>{{item.total}}</td>
174
                 <td>{{item.total}}</td>
851
              if(response.data.state ==1){
854
              if(response.data.state ==1){
852
                var solution = response.data.data.solution
855
                var solution = response.data.data.solution
853
                console.log("solution",solution)
856
                console.log("solution",solution)
857
+               for(let i=0;i<solution.length;i++){
858
+                 if(solution[i].mode_id == 1){
859
+                    solution[i].mode_name = "HD"
860
+                 }
861
+                 if(solution[i].mode_id == 2){
862
+                    solution[i].mode_name = "HDF"
863
+                 }
864
+                 if(solution[i].mode_id == 3){
865
+                    solution[i].mode_name = "HD+HP"
866
+                 }
867
+                 if(solution[i].mode_id == 4){
868
+                    solution[i].mode_name = "HP"
869
+                 }
870
+                 if(solution[i].mode_id == 5){
871
+                    solution[i].mode_name = "HF"
872
+                 }
873
+                 if(solution[i].mode_id == 6){
874
+                    solution[i].mode_name = "SCUF"
875
+                 }
876
+                 if(solution[i].mode_id == 7){
877
+                    solution[i].mode_name = "IUF"
878
+                 }
879
+                 if(solution[i].mode_id == 8){
880
+                    solution[i].mode_name = "HFHD"
881
+                 }
882
+                 if(solution[i].mode_id == 9){
883
+                    solution[i].mode_name = "HFHD+HP"
884
+                 }
885
+                 if(solution[i].mode_id == 10){
886
+                    solution[i].mode_name = "PHF"
887
+                 }
888
+                 if(solution[i].mode_id == 11){
889
+                    solution[i].mode_name = "HFR"
890
+                 }
891
+                 if(solution[i].mode_id == 12){
892
+                    solution[i].mode_name = "HDF+HP"
893
+                 }
894
+                 if(solution[i].mode_id == 13){
895
+                    solution[i].mode_name = "CRRT"
896
+                 }
897
+                 if(solution[i].mode_id == 14){
898
+                    solution[i].mode_name = "腹水回输"
899
+                 }
900
+                 if(solution[i].mode_id == 19){
901
+                    solution[i].mode_name = "IUF+HD"
902
+                 }
903
+                 if(solution[i].mode_id == 20){
904
+                    solution[i].mode_name = "UF"
905
+                 }
906
+                 if(solution[i].mode_id == 21){
907
+                    solution[i].mode_name = "HD+"
908
+                 }
909
+                 if(solution[i].mode_id == 18){
910
+                    solution[i].mode_name = "SCUF"
911
+                 }
912
+                 if(solution[i].mode_id == 19){
913
+                    solution[i].mode_name = "SCUF"
914
+                 }
915
+                 if(solution[i].mode_id == 20){
916
+                    solution[i].mode_name = "SCUF"
917
+                 }
918
+                 if(solution[i].mode_id == 21){
919
+                    solution[i].mode_name = "HD+"
920
+                 }
921
+                 if(solution[i].mode_id == 22){
922
+                    solution[i].mode_name = "血浆胆红素吸附+HDF"
923
+                 }
924
+                 if(solution[i].mode_id == 23){
925
+                    solution[i].mode_name = "血浆胆红素吸附"
926
+                 }
927
+                 if(solution[i].mode_id == 24){
928
+                    solution[i].mode_name = "I-HDF"
929
+                 }
930
+                 if(solution[i].mode_id == 25){
931
+                    solution[i].mode_name = "HD高通"
932
+                 }
933
+                 if(solution[i].mode_id == 26){
934
+                    solution[i].mode_name = "CVVH"
935
+                 }
936
+                 if(solution[i].mode_id == 27){
937
+                    solution[i].mode_name = "CVVH"
938
+                 }
939
+                 if(solution[i].mode_id == 28){
940
+                    solution[i].mode_name = "CVVHDF"
941
+                 }
942
+                 if(solution[i].mode_id == 29){
943
+                    solution[i].mode_name = "PE"
944
+                 }
945
+               }
854
                this.solutionList = solution
946
                this.solutionList = solution
855
              }  
947
              }  
856
           })  
948
           })  
949
+        },
950
+        getDialyzer(patient_id,mode){
951
+          var diazers = ""
952
+          for(let i=0;i<this.solutionList.length;i++){
953
+            if(patient_id == this.solutionList[i].patient_id && mode == this.solutionList[i].mode_name){
954
+               if(this.solutionList[i].dialyzer_perfusion_apparatus!=""){
955
+                 diazers = this.solutionList[i].dialyzer_perfusion_apparatus
956
+               }else{
957
+                 diazers = this.solutionList[i].dialysis_dialyszers
958
+                 if(this.solutionList[i].dialysis_dialyszers == ""){
959
+                    diazers = this.solutionList[i].dialysis_irrigation
960
+                 }
961
+               
962
+               }
963
+               
964
+            }
965
+          }
966
+          return diazers
857
         }
967
         }
858
     }
968
     }
859
 }
969
 }