ソースを参照

11月14日 库存扣减更新

XMLWAN 3 年 前
コミット
716ab75e65

+ 31 - 12
package-lock.json ファイルの表示

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

@@ -1508,17 +1508,18 @@
1508 1508
       },
1509 1509
       exportList(){
1510 1510
         import('@/vendor/Export2Excel').then(excel => {
1511
-         console.log("this.table",this.goodInfo.goodInfoData)
1511
+         console.log("this.table",this.goodInfo.goodInfoDialog.formValue.goodType)
1512 1512
          
1513 1513
          for(let i=0;i<this.goodInfo.goodInfoData.length;i++){
1514 1514
            for(let j=0;j<this.goodKindList.length;j++){
1515 1515
               if(this.goodInfo.goodInfoData[i].good_kind == this.goodKindList[j].value){
1516
-                 this.goodInfo.goodInfoData[i].good_kind_name = this.goodKindList[i].name
1516
+                 this.goodInfo.goodInfoData[i].good_kind_name = this.goodKindList[j].name
1517 1517
               }
1518 1518
            }
1519
-           for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType;z++){
1520
-              if(this.goodInfo.goodInfoDialog.formValue[z].id == this.goodInfo.goodInfoData[i].good_type_id){
1521
-                 this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue[z].name
1519
+           for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType.length;z++){
1520
+              if(this.goodInfo.goodInfoData[i].good_type_id == this.goodInfo.goodInfoDialog.formValue.goodType[z].id){
1521
+                
1522
+                 this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue.goodType[z].type_name
1522 1523
               }
1523 1524
            }
1524 1525
 
@@ -1540,7 +1541,8 @@
1540 1541
              } 
1541 1542
           }
1542 1543
          }
1543
-        
1544
+         console.log("hhhadhh233323232",this.goodInfo.goodInfoData)
1545
+       
1544 1546
          const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码']
1545 1547
          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'] 
1546 1548
          

+ 24 - 12
src/xt_pages/data/components/drugs.vue ファイルの表示

@@ -28,10 +28,10 @@
28 28
         </el-select>
29 29
 
30 30
 
31
-        <span style="color: #909399;font-size:14px;">备案 : &nbsp;</span>
32
-        <el-select v-model="is_record" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
31
+        <span style="color: #909399;font-size:14px;">是否停用 : &nbsp;</span>
32
+        <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeRecord">
33 33
           <el-option
34
-            v-for="item in options"
34
+            v-for="item in optionsOne"
35 35
             :key="item.value"
36 36
             :label="item.label"
37 37
             :value="item.value">
@@ -91,7 +91,6 @@
91 91
       </el-table-column>
92 92
       <el-table-column prop="date" label="单位&规格" align="center">
93 93
         <template slot-scope="scope">
94
-          <!-- <div>{{scope.row.drug_spec}}</div> -->
95 94
           <div>
96 95
             <span v-if="scope.row.min_unit != scope.row.dose_unit">{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;</span>{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
97 96
           </div>
@@ -103,11 +102,7 @@
103 102
           <div>{{scope.row.last_price}}</div>
104 103
         </template>
105 104
       </el-table-column>
106
-      <!-- <el-table-column label="零售价" width="100" align="center">
107
-        <template slot-scope="scope">
108
-          <div>{{scope.row.retail_price}}</div>
109
-        </template>
110
-      </el-table-column> -->
105
+     
111 106
       <el-table-column label="拆零零售价" width="100" align="center">
112 107
         <template slot-scope="scope">
113 108
           <div>{{scope.row.min_price}}</div>
@@ -138,12 +133,12 @@
138 133
           <div>{{getDealer(scope.row.dealer)}}</div>
139 134
         </template>
140 135
       </el-table-column>
141
-      <!-- <el-table-column prop="date" label="备案日期" align="center" width="100">
136
+       <el-table-column prop="date" label="备案日期" align="center" width="100">
142 137
         <template slot-scope="scope">
143 138
           <span>{{getTime(scope.row.record_date)}}</span>
144 139
         </template>
145 140
       </el-table-column>
146
-      <el-table-column prop="date" label="药品备注" align="center" width="100">
141
+     <!-- <el-table-column prop="date" label="药品备注" align="center" width="100">
147 142
         <template slot-scope="scope">
148 143
           <div>{{scope.row.drug_remark}}</div>
149 144
         </template>
@@ -404,6 +399,17 @@
404 399
             value: '2',
405 400
             label: '未备案'
406 401
           }],
402
+         optionsOne: [
403
+          {
404
+            value: '0',
405
+            label: '全部'
406
+          }, {
407
+            value: '1',
408
+            label: '是'
409
+          }, {
410
+            value: '2',
411
+            label: '否'
412
+          }],
407 413
         value: '',
408 414
 
409 415
         dealer:[],
@@ -1509,11 +1515,17 @@
1509 1515
                this.list[i].dealer_name = this.dealer[s].dealer_name
1510 1516
              }
1511 1517
            }
1518
+           for(let b=0;b<this.getDataConfig('hemodialysis','units').length;b++){
1519
+             if(this.list[i].drug_dose_unit == this.getDataConfig('hemodialysis','units')[b].id){
1520
+               this.list[i].drug_dose_unit_name = this.getDataConfig('hemodialysis','units')[b].name
1521
+
1522
+             }
1523
+           }
1512 1524
           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
1513 1525
          }
1514 1526
 
1515 1527
          const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码']
1516
-         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'] 
1528
+         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_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code'] 
1517 1529
          
1518 1530
          const data = this.formatJson(filterVal,this.list)
1519 1531
      

+ 1 - 1
src/xt_pages/hospitalStation/checkTemplate/printOne.vue ファイルの表示

@@ -147,7 +147,7 @@ export default {
147 147
                         if(it.type == 2){
148 148
                             if(it.project.cost_classify == 3){
149 149
                                 projectPrint.push(it)
150
-                                total += it.project.price
150
+                                total += (it.project.price*parseInt(it.project.count))
151 151
                             }
152 152
                         }
153 153
                   })

+ 2 - 1
src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue ファイルの表示

@@ -142,12 +142,13 @@ export default {
142 142
             let projectPrint = []
143 143
             let total = 0
144 144
             this.advicePrint.map(item => {
145
+              console.log("imte233232323232323223",item.project)
145 146
               if(item.project.length > 0){
146 147
                   item.project.map(it => {
147 148
                         if(it.type == 2){
148 149
                             if(it.project.cost_classify == 3){
149 150
                                 projectPrint.push(it)
150
-                                total += it.project.price
151
+                                total += (it.project.price*parseInt(it.count))
151 152
                             }
152 153
                         }
153 154
                   })

+ 2 - 3
src/xt_pages/qcd/officesControlAnalysis/project.vue ファイルの表示

@@ -261,7 +261,7 @@ export default {
261 261
         var normdata = response.data.data.normdata
262 262
         newArr = normdata
263 263
         var bloodpressure = response.data.data.bloodPressure
264
-        // console.log("血压",bloodpressure)
264
+        
265 265
         for (let i = 0; i < bloodpressure.length; i++) {
266 266
           if (bloodpressure[i].inspection_major == 0 && bloodpressure[i].inspection_minor == -1 && bloodpressure[i].is_status == 0) {
267 267
             bloodpressure[i].item_name = '收缩压'
@@ -281,7 +281,6 @@ export default {
281 281
         var newarr = newArr.sort((a, b) => {
282 282
           return a.sort - b.sort
283 283
         })
284
-        //  console.log("newarr",newarr)
285 284
         for (let i = 0; i < newarr.length; i++) {
286 285
           this.mode_type = normdata[0].inspection_minor
287 286
         }
@@ -824,7 +823,7 @@ export default {
824 823
       }
825 824
       this.isLoading = true
826 825
 
827
-      // console.log("params",params)
826
+      console.log("params",params)
828 827
       getBloodPressureList(params).then(response => {
829 828
         if (response.data.state == 1) {
830 829
           this.isLoading = false

+ 3 - 3
src/xt_pages/stock/cancelStockOrderEdit.vue ファイルの表示

@@ -28,7 +28,7 @@
28 28
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
29 29
              max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
30 30
 
31
-          <el-table-column align="center" width="320">
31
+          <el-table-column align="center" width="200">
32 32
              <template slot="header" slot-scope="scope">
33 33
               <span>耗材名称</span>
34 34
             </template>
@@ -42,11 +42,11 @@
42 42
                     placeholder="请输入耗材名称"
43 43
                     @select="handleSelect"
44 44
                     @input="changeGoodName(scope.$index)"
45
-                    style="width:280px;"
45
+                    style="width:160px;"
46 46
                   >
47 47
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
48 48
                   <template slot-scope="{ item }">
49
-                    <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
49
+                    <div  style="widht:400px">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
50 50
                   </template>
51 51
                  </el-autocomplete>
52 52
             </template>

+ 3 - 48
src/xt_pages/stock/detail/stockInDetail.vue ファイルの表示

@@ -73,46 +73,6 @@
73 73
       </div>
74 74
     </div>
75 75
 
76
-    
77
-
78
-    <!-- <div class="cell clearfix">
79
-      <label class="title"><span class="name">单据类型</span> : </label>
80
-      <el-select
81
-        size="small"
82
-        v-model="order_type"
83
-        clearable
84
-        placeholder="单据类型"
85
-        @change="changeType"
86
-      >
87
-        <el-option
88
-          v-for="item in orderTypeArr"
89
-          :key="item.value"
90
-          :label="item.label"
91
-          :value="item.value"
92
-        >
93
-        </el-option>
94
-      </el-select>
95
-    </div> -->
96
-
97
-    <!-- <div class="cell clearfix">
98
-      <label class="title"><span class="name">其它</span> : </label>
99
-      <el-select
100
-        size="small"
101
-        v-model="manufacturer_id"
102
-        clearable
103
-        placeholder="厂商"
104
-        @change="changeManufacturer"
105
-      >
106
-        <el-option
107
-          v-for="item in manufacturer"
108
-          :key="item.id"
109
-          :label="item.manufacturer_name"
110
-          :value="item.id"
111
-        >
112
-        </el-option>
113
-      </el-select>
114
-    </div> -->
115
-
116 76
     <el-row :gutter="12" style="margin-top: 10px">
117 77
       <el-table
118 78
         :data="cancelStockDate"
@@ -151,12 +111,7 @@
151 111
           </template>
152 112
         </el-table-column>
153 113
 
154
-        <!-- <el-table-column label="单据类型" align="center">
155
-          <template slot-scope="scope">
156
-            {{ getTypeName(scope.row) }}
157
-          </template>
158
-        </el-table-column> -->
159
-
114
+    
160 115
         <el-table-column label="操作时间" align="center">
161 116
           <template slot-scope="scope">
162 117
             {{ getTime(scope.row.Warehousing.warehousing_time) }}
@@ -475,14 +430,14 @@ export default {
475 430
       this.multipleSelection = val;
476 431
     },
477 432
     handleSizeChange(val) {
433
+      console.log("val2332323223",val)
478 434
       this.limit = val;
479 435
       this.GetCancelStock();
480
-      // this.getPrintStockGood()
481 436
     },
482 437
     handleCurrentChange(val) {
438
+      console.log("888888",val)
483 439
       this.page = val;
484 440
       this.GetCancelStock();
485
-      // this.getPrintStockGood()
486 441
     },
487 442
     startTimeChange(val) {
488 443
 

+ 1 - 1
src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue ファイルの表示

@@ -549,7 +549,7 @@ export default {
549 549
       this.$refs["tableForm"].validate(valid => {
550 550
         if (valid) {
551 551
           const array = this.recordInfo.recordData;
552
-          console.log("列表23323232323232",array)
552
+         
553 553
           let total = 0;
554 554
           for (let i = 0; i < array.length; i++) {
555 555
 

+ 36 - 8
src/xt_pages/stock/drugs/drugQueryPrint.vue ファイルの表示

@@ -18,8 +18,8 @@
18 18
               <td style="line-height: 50px" width="100">药品类型</td>
19 19
               <td style="line-height: 50px" width="150">药品名称</td>
20 20
               <td style="line-height: 50px" width="150">规格型号&单位</td>
21
-              <td style="line-height: 50px" width="50">进货单价</td>
22
-              <td  style="line-height: 50px" width="50">厂家</td>
21
+              <td style="line-height: 50px" width="100">进货单价</td>
22
+              <td  style="line-height: 50px" width="200">厂家</td>
23 23
               <td style="line-height: 50px" width="80">入库数量</td>
24 24
               <td style="line-height: 50px" width="80">出库数量</td>
25 25
               <td style="line-height:50px" width="80">剩余库存量</td>    
@@ -46,12 +46,9 @@
46 46
                 <span> {{getManufacturerList(item.manufacturer)}}</span>
47 47
               </td>
48 48
               <td>
49
-                <span v-if="getWarehoseInfo(item.drug_warehouse_info)!=0">{{getWarehoseInfo(item.drug_warehouse_info)}}{{item.max_unit}}</span >
49
+                <span v-if="getWarehoseInfo(item.drug_warehouse_info)!=0">{{getWarehoseInfoOne(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)}}</span >
50 50
               </td>
51 51
               <td>
52
-                <!-- <span v-if="getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)!=0">
53
-                  {{getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)}}
54
-                </span> -->
55 52
                   {{getOutFlush(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number,item.drug_cancel_stock_info)}}
56 53
               </td>
57 54
               <td>
@@ -260,7 +257,11 @@
260 257
              console.log("list99999",list)
261 258
              for(let i=0;i<list.length;i++){
262 259
                for(let j=0;j<list[i].drug_warehouse_info.length;j++){
263
-                 list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
260
+                 if(list[i].max_unit == list[i].drug_warehouse_info[j].max_unit){
261
+                    list[i].drug_warehouse_info[j].stock_max_number = list[i].min_number * list[i].drug_warehouse_info[j].stock_max_number
262
+                    list[i].drug_warehouse_info[j].warehousing_count = list[i].min_number * list[i].drug_warehouse_info[j].warehousing_count
263
+                 } 
264
+                
264 265
                }
265 266
                for(let y=0;y<list[i].drug_warehouse_out.length;y++){
266 267
                   if(list[i].drug_warehouse_out[y].count_unit == list[i].max_unit){
@@ -441,6 +442,33 @@
441 442
        
442 443
         return total
443 444
       },
445
+      getWarehoseInfoOne(arr,max_unit,min_unit,min_number){
446
+        var total = 0
447
+        var max_str=  ""
448
+         var min_str = ""
449
+        if (arr.length > 0) {
450
+          for(let i=0;i<arr.length;i++){
451
+            total += parseInt(arr[i].warehousing_count)
452
+          }
453
+        }
454
+        if (total < min_number){
455
+          min_str = total + min_unit
456
+        }
457
+        if (total == 0) {
458
+          min_str = ""
459
+          max_str = ""
460
+        }
461
+        if (total >=min_number) {
462
+           if(parseInt(total/min_number)!=0){
463
+              max_str = parseInt(total/min_number) + max_unit
464
+           }
465
+           if(total%min_number!=0){
466
+              min_str = total%min_number + min_unit
467
+           }
468
+
469
+        }
470
+        return max_str + min_str
471
+      },
444 472
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
445 473
        
446 474
          var max_str=  ""
@@ -507,7 +535,7 @@
507 535
         var over_count = 0
508 536
         var cancel_count = 0
509 537
         for(let i=0;i<info.length;i++){
510
-           total += (info[i].warehousing_count * min_number)
538
+           total += info[i].warehousing_count 
511 539
         }
512 540
         
513 541
         for(let j=0;j<info.length;j++){

+ 6 - 1
src/xt_pages/stock/drugs/drugStockInOrder.vue ファイルの表示

@@ -197,7 +197,12 @@
197 197
         </el-table-column>
198 198
         <el-table-column label="入库数量" align="center">
199 199
           <template slot-scope="scope">
200
-            {{scope.row.warehousing_count}}{{scope.row.drug.max_unit}}
200
+            {{scope.row.warehousing_count}}{{scope.row.max_unit}}
201
+          </template>
202
+        </el-table-column>
203
+        <el-table-column label="包装零售价" align="center">
204
+          <template slot-scope="scope">
205
+            {{scope.row.retail_price}}
201 206
           </template>
202 207
         </el-table-column>
203 208
         <el-table-column label="进货价" align="center">

+ 42 - 8
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue ファイルの表示

@@ -28,7 +28,6 @@
28 28
                         style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
29 29
                         value-format="yyyy-MM-dd"></el-date-picker>
30 30
          <div class="titleOne">制单人:{{this.$store.getters.xt_user.user.user_name}}</div>
31
-         <!-- <div class="titleOne">当前进货价合计:</div> -->
32 31
       </div>
33 32
      
34 33
      
@@ -113,7 +112,7 @@
113 112
               </template>
114 113
          </el-table-column>
115 114
 
116
-         <el-table-column align="center" width="120">
115
+         <el-table-column align="center" width="200">
117 116
             <template slot="header" slot-scope="scope">
118 117
               <span>入库数量<span style="color: red">*</span></span>
119 118
             </template>
@@ -129,14 +128,43 @@
129 128
                   placeholder="请输入入库数量"
130 129
                   type="number"
131 130
                   v-model="scope.row.warehousing_count"
132
-                  style="width:80px"
131
+                  style="width:120px"
133 132
                 ></el-input>
134
-                 {{scope.row.max_unit}}
133
+                 <!-- {{scope.row.max_unit}} -->
134
+                  <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
135
+                    <el-option
136
+                      v-for="(option, index) in unitList"
137
+                      :key="index"
138
+                      :label="option.name"
139
+                      :value="option.name">
140
+                    </el-option>
141
+                  </el-select>
135 142
               </div>
136 143
               </el-form-item>
137 144
              
138 145
             </template>
139 146
           </el-table-column>
147
+
148
+          <el-table-column align="center" width="140">
149
+            <template slot="header" slot-scope="scope">
150
+              <span>包装零售价(元)<span style="color: red">*</span></span>
151
+            </template>
152
+            <template slot-scope="scope">
153
+              <el-form-item
154
+                :prop="'recordData.' + scope.$index + '.retail_price'"
155
+                :rules="tableRules.retail_price"
156
+                style="padding-top: 20px"
157
+              >
158
+                <el-input
159
+                  style="width:100px"
160
+                  placeholder="请输入包装零售价"
161
+                  type="number"
162
+                  v-model="scope.row.retail_price"
163
+                ></el-input>
164
+               
165
+              </el-form-item>
166
+            </template>
167
+          </el-table-column>
140 168
        
141 169
           <el-table-column align="center" width="120">
142 170
             <template slot="header" slot-scope="scope">
@@ -358,6 +386,9 @@
358 386
           expiry_date:[
359 387
            {required:true,message:'有效日期不能为空',trigger:'blur'}
360 388
           ],
389
+          retail_price:[
390
+            {required:true,message:'请输入包装零售价',trigger:'blur'}
391
+          ]
361 392
         },
362 393
         type: this.$route.query.type,
363 394
         total: '',
@@ -419,6 +450,7 @@
419 450
         showTwo:false,
420 451
         drugTypeList:[],
421 452
         totalPrice:0,
453
+        unitList:[],
422 454
       }
423 455
     },
424 456
     methods: {
@@ -691,7 +723,8 @@
691 723
              if(this.recordInfo.recordData[i].dealer == ""){
692 724
                 this.recordInfo.recordData[i].dealer = 0
693 725
              }
694
-               this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
726
+              this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
727
+              this.recordInfo.recordData[i].retail_price = this.recordInfo.recordData[i].retail_price.toString()
695 728
              if(this.recordInfo.recordData[i].dealer == ""){
696 729
                 this.recordInfo.recordData[i].dealer = 0
697 730
              }
@@ -711,7 +744,7 @@
711 744
               'stockIn': this.recordInfo.recordData
712 745
             }
713 746
             console.log("params2222222",params)
714
-            
747
+           
715 748
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
716 749
               if (response.data.state == 0) {
717 750
                 this.$message.error(response.data.msg)
@@ -813,6 +846,7 @@
813 846
         this.currentIndex = val
814 847
       },
815 848
       handleSelect(val){
849
+         console.log("val233232323223",val)
816 850
          for(let i=0;i<this.recordInfo.recordData.length;i++){
817 851
            if(i == this.currentIndex){
818 852
              this.recordInfo.recordData[i].drug_id  = val.id
@@ -820,6 +854,7 @@
820 854
              this.recordInfo.recordData[i].drug_type = val.drug_type
821 855
              this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
822 856
              this.recordInfo.recordData[i].last_price = val.last_price
857
+             this.recordInfo.recordData[i].retail_price = val.retail_price
823 858
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
824 859
              this.recordInfo.recordData[i].number =  val.number
825 860
              this.recordInfo.recordData[i].max_unit = val.max_unit
@@ -875,8 +910,7 @@
875 910
       this.GetConfigInfo()
876 911
       this.propForm.goodUnit = this.$store.getters.good_unit
877 912
       
878
-     
879
-    
913
+     this.unitList =  getDataConfig('hemodialysis','units')
880 914
     }
881 915
 
882 916
   }

+ 1 - 1
src/xt_pages/stock/drugs/drugStockInOrderDetail.vue ファイルの表示

@@ -37,7 +37,7 @@
37 37
 
38 38
       <div class="cell clearfix" style="margin-top: 10px">
39 39
         <el-button size="small" icon="el-icon-edit" @click="editRecord"
40
-          >编辑222</el-button
40
+          >编辑</el-button
41 41
         >
42 42
         <el-button size="small" icon="el-icon-delete" @click="deleteRecord"
43 43
           >删除</el-button

+ 60 - 74
src/xt_pages/stock/drugs/drugStockInOrderEdit.vue ファイルの表示

@@ -25,13 +25,7 @@
25 25
     </div>
26 26
 
27 27
     <div class="app-container">
28
-      <!--<stock-in-dialog-->
29
-        <!--ref="dialog"-->
30
-        <!--:propForm="propForm"-->
31
-        <!--:visibility="isVisibility"-->
32
-        <!--v-on:dialog-comfirm="comfirm"-->
33
-        <!--v-on:dialog-cancle="cancle"-->
34
-      <!--&gt;</stock-in-dialog>-->
28
+    
35 29
       <drugs-stock-dialog
36 30
         ref="dialog"
37 31
         :propForm="propForm"
@@ -58,45 +52,7 @@
58 52
         </el-date-picker>
59 53
       </div>
60 54
 
61
-      <!-- <div class="cell clearfix">
62
-        <label class="title"><span class="name">经销商</span> : </label>
63
-        <el-select
64
-          size="small"
65
-          v-model="form.dealer"
66
-          clearable
67
-          placeholder="请选择经销商"
68
-        >
69
-          <el-option
70
-            v-for="(option, index) in dealer"
71
-            :key="index"
72
-            :label="option.dealer_name"
73
-            :value="option.id"
74
-          >
75
-          </el-option>
76
-        </el-select>
77
-      </div>
78
-
79
-      <div class="cell clearfix">
80
-        <label class="title"><span class="name">厂商</span> : </label>
81
-
82
-        <el-select
83
-          size="small"
84
-          v-model="form.manufacturer"
85
-          clearable
86
-          placeholder="请选择厂商"
87
-        >
88
-          <el-option
89
-            v-for="(option, index) in manufacturer"
90
-            :key="index"
91
-            :label="option.manufacturer_name"
92
-            :value="option.id"
93
-          >
94
-          </el-option>
95
-        </el-select>
96
-      </div> -->
97
-
98
-
99
-
55
+      
100 56
    <!-- 编辑入库单详情 -->
101 57
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
102 58
         <el-table
@@ -109,13 +65,14 @@
109 65
           v-loading="listLoading"
110 66
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
111 67
         >
112
-          <el-table-column align="center" width="200">
68
+
69
+          <el-table-column align="center" width="200px">
113 70
             <template slot="header" slot-scope="scope">
114 71
               <span>药品名称<span style="color: red">*</span></span>
115 72
             </template>
116 73
 
117 74
             <template slot-scope="scope">
118
-              <el-form-item style="padding-top: 20px">
75
+              <el-form-item style="padding-top: 15px">
119 76
                  <el-autocomplete
120 77
                     class="checkSearch"
121 78
                     popper-class="my-autocomplete"
@@ -126,15 +83,17 @@
126 83
                     @select="handleSelect"
127 84
                     @input="changeDrugName(scope.$index)"
128 85
                     style="width:160px;"
86
+                    :disabled="drug_show"
129 87
                   >
130 88
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
131 89
                   <template slot-scope="{ item }">
132
-                    <div class="name">{{ item.drug_name + item.dose +  item.dose_unit +"*" +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
90
+                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + " "+item.manufacturer}}</div>
133 91
                   </template>
134 92
                  </el-autocomplete>
135 93
               </el-form-item>
136 94
             </template>
137 95
           </el-table-column>
96
+       
138 97
          <el-table-column align="center" width="140">
139 98
             <template slot="header" slot-scope="scope">
140 99
               <span>药品类型</span>
@@ -177,21 +136,9 @@
177 136
                 </el-form-item>
178 137
               </template>
179 138
          </el-table-column>
180
-          <!-- <el-table-column align="center" width="140">
181
-            <template slot="header" slot-scope="scope" >
182
-              <span>批号</span>
183
-              </template>
184
-                <template slot-scope="scope">
185
-                  <el-form-item style="padding-top: 20px">
186
-                    <el-input
187
-                      placeholder="请输入批号"
188
-                      v-model="scope.row.batch_number"
189
-                    ></el-input>
190
-                  </el-form-item>
191
-                </template>
192
-          </el-table-column> -->
139
+       
193 140
                    
194
-         <el-table-column align="center" width="120">
141
+         <el-table-column align="center" width="200">
195 142
             <template slot="header" slot-scope="scope">
196 143
               <span>入库数量<span style="color: red">*</span></span>
197 144
             </template>
@@ -209,11 +156,38 @@
209 156
                     v-model="scope.row.warehousing_count"
210 157
                     style="width:80px"
211 158
                   ></el-input>
212
-                  {{scope.row.max_unit}}
159
+                   <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
160
+                    <el-option
161
+                      v-for="(option, index) in unitList"
162
+                      :key="index"
163
+                      :label="option.name"
164
+                      :value="option.name">
165
+                    </el-option>
166
+                  </el-select>
213 167
                 </div>
214 168
               </el-form-item>
215 169
             </template>
216 170
           </el-table-column>
171
+          <el-table-column align="center" width="140">
172
+            <template slot="header" slot-scope="scope">
173
+              <span>包装零售价(元)<span style="color: red">*</span></span>
174
+            </template>
175
+            <template slot-scope="scope">
176
+              <el-form-item
177
+                :prop="'recordData.' + scope.$index + '.retail_price'"
178
+                :rules="tableRules.retail_price"
179
+                style="padding-top: 20px"
180
+              >
181
+                <el-input
182
+                  style="width:100px"
183
+                  placeholder="请输入包装零售价"
184
+                  type="number"
185
+                  v-model="scope.row.retail_price"
186
+                ></el-input>
187
+               
188
+              </el-form-item>
189
+            </template>
190
+          </el-table-column>
217 191
           <el-table-column width="120">
218 192
             <template slot="header" slot-scope="scope">
219 193
                 <span>进货单价(元)<span style="color: red">*</span></span>
@@ -374,8 +348,6 @@ import {
374 348
   GetAllConfig,
375 349
   GetAllDrugInfoByID,
376 350
   getDrugWarehouseInfoList,
377
-  modifyDrugWarehouseInfo,
378
-  deleteDrugWarehouseInfo,
379 351
   DeleteDrugWarehouseInfoItem,
380 352
   EditDrugWarehouse
381 353
 } from "@/api/drug/drug_stock";
@@ -429,6 +401,9 @@ export default {
429 401
         batch_number:[
430 402
           {required:true,message:'批号不能为空',trigger:'blur'}
431 403
         ],
404
+        retail_price:[
405
+         {required:true,message:'请输入包装零售价',trigger:'blur'}
406
+        ]
432 407
       },
433 408
 
434 409
       total: "",
@@ -460,6 +435,8 @@ export default {
460 435
       dealerList:[],
461 436
       org_id:0,
462 437
       listLoading:false,
438
+      unitList:[],
439
+      drug_show:false,
463 440
     };
464 441
   },
465 442
   methods: {
@@ -689,7 +666,9 @@ export default {
689 666
 
690 667
              this.recordInfo.recordData[i].last_price = this.recordInfo.recordData[i].last_price.toString()
691 668
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].last_price.toString()
692
-            
669
+
670
+             this.recordInfo.recordData[i].retail_price = this.recordInfo.recordData[i].retail_price.toString()
671
+          
693 672
             for(let j=0;j<this.manufacturerList.length;j++){
694 673
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
695 674
                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
@@ -707,7 +686,7 @@ export default {
707 686
             stockIn: this.recordInfo.recordData
708 687
           };
709 688
           console.log("params22222222222",params)
710
-         
689
+     
711 690
           EditDrugWarehouse(
712 691
             params,
713 692
             this.warehousing_time,
@@ -742,11 +721,11 @@ export default {
742 721
         } else {
743 722
        
744 723
           var manufacturerList = response.data.data.manufacturerList
745
-          console.log("000000000000",response.data.data.info)
746 724
           this.manufacturerList = manufacturerList
747 725
           var dealerList  = response.data.data.dealerList
748
-          console.log("供应商232322332322332232323",this.dealerList)
726
+        
749 727
           this.dealerList = dealerList
728
+          console.log("详情32332323232323232232323323232323232",response.data.data.info)
750 729
           for (let i = 0; i < response.data.data.info.length; i++) {
751 730
             response.data.data.info[i].product_date = this.getTime(
752 731
               response.data.data.info[i].product_date,
@@ -770,8 +749,10 @@ export default {
770 749
 
771 750
             response.data.data.info[i].last_price = response.data.data.info[i].price
772 751
 
773
-            response.data.data.info[i].max_unit = response.data.data.info[i].drug.max_unit
774
-            
752
+            response.data.data.info[i].max_unit = response.data.data.info[i].max_unit
753
+
754
+            response.data.data.info[i].min_unit  = response.data.data.info[i].min_unit
755
+
775 756
             response.data.data.info[i].drug_type = response.data.data.info[i].drug.drug_type
776 757
 
777 758
            if(response.data.data.info[i].manufacturer == 0){
@@ -807,8 +788,6 @@ export default {
807 788
             this.warehouse.warehousing_time,
808 789
             "{y}-{m}-{d}"
809 790
           );
810
-
811
-        
812 791
         }
813 792
       });
814 793
     },
@@ -872,6 +851,11 @@ export default {
872 851
              }else{
873 852
                this.recordInfo.recordData[i].last_price = val.last_price
874 853
              }
854
+             if(val.retail_price == 0){
855
+               this.recordInfo.recordData[i].retail_price = ""
856
+             }else{
857
+               this.recordInfo.recordData[i].retail_price = val.retail_price
858
+             }
875 859
            
876 860
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
877 861
              this.recordInfo.recordData[i].number = val.number
@@ -896,6 +880,7 @@ export default {
896 880
     this.propForm.goodUnit = this.$store.getters.good_unit;
897 881
     const order_id = this.$route.query.id;
898 882
     this.GetOrderDetail(order_id);
883
+    this.unitList =  getDataConfig('hemodialysis','units')
899 884
   }
900 885
 };
901 886
 </script>
@@ -931,4 +916,5 @@ export default {
931 916
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
932 917
   background: #6fb5fa;
933 918
 }
919
+
934 920
 </style>

+ 1 - 1
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue ファイルの表示

@@ -775,7 +775,7 @@ export default {
775 775
     this.GetConfigInfo();
776 776
     this.propForm.goodUnit = this.$store.getters.good_unit;
777 777
     this.unitList =  getDataConfig('hemodialysis','units')
778
-    console.log("单位",this.unitList)
778
+ 
779 779
   }
780 780
 };
781 781
 </script>

+ 35 - 4
src/xt_pages/stock/drugs/query.vue ファイルの表示

@@ -107,7 +107,9 @@
107 107
         </el-table-column>
108 108
         <el-table-column prop="drug_name" label="入库数量" align="center">
109 109
            <template slot-scope="scope">
110
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.min_unit}}</span>
110
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">
111
+              {{getWarehoseInfoOne(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
112
+            </span>
111 113
            </template>
112 114
         </el-table-column>
113 115
         <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showOne">
@@ -191,7 +193,7 @@ import { min } from 'moment'
191 193
     created() {
192 194
       var start_time =  window.sessionStorage.getItem('start_time')
193 195
       var end_time =  window.sessionStorage.getItem('end_time')
194
-      console.log("start_time",start_time,end_time)
196
+     
195 197
       if(start_time !=null){
196 198
         this.start_time = start_time
197 199
       }
@@ -278,7 +280,7 @@ import { min } from 'moment'
278 280
         getDrugStockList(params).then(response=>{
279 281
           if(response.data.state == 1){
280 282
              var list = response.data.data.list
281
-             console.log("list99999",list)
283
+           
282 284
              for(let i=0;i<list.length;i++){
283 285
                for(let j=0;j<list[i].drug_warehouse_info.length;j++){
284 286
                  if(list[i].max_unit == list[i].drug_warehouse_info[j].max_unit){
@@ -468,7 +470,7 @@ import { min } from 'moment'
468 470
            this.tableList[i].drug_type_name = this.getDrugType(this.tableList[i].drug_type)
469 471
            this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number+this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
470 472
            this.tableList[i].manufacturer_name = this.getManufacturerList(this.tableList[i].manufacturer)
471
-          this.tableList[i].inCount =  this.getWarehoseInfo(this.tableList[i].drug_warehouse_info)
473
+          this.tableList[i].inCount =  this.getWarehoseInfoOne(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
472 474
           if(this.end_time == 0){
473 475
             this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
474 476
             this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
@@ -720,6 +722,35 @@ import { min } from 'moment'
720 722
 
721 723
         return total
722 724
       },
725
+
726
+      getWarehoseInfoOne(arr,max_unit,min_unit,min_number){
727
+        var total = 0
728
+        var max_str=  ""
729
+         var min_str = ""
730
+        if (arr.length > 0) {
731
+          for(let i=0;i<arr.length;i++){
732
+            total += parseInt(arr[i].warehousing_count)
733
+          }
734
+        }
735
+        if (total < min_number){
736
+          min_str = total + min_unit
737
+        }
738
+        if (total == 0) {
739
+          min_str = ""
740
+          max_str = ""
741
+        }
742
+        if (total >=min_number) {
743
+           if(parseInt(total/min_number)!=0){
744
+              max_str = parseInt(total/min_number) + max_unit
745
+           }
746
+           if(total%min_number!=0){
747
+              min_str = total%min_number + min_unit
748
+           }
749
+
750
+        }
751
+        return max_str + min_str
752
+      },
753
+      
723 754
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
724 755
 
725 756
          var max_str=  ""

+ 3 - 43
src/xt_pages/stock/stockInOrderEdit.vue ファイルの表示

@@ -49,46 +49,6 @@
49 49
         >
50 50
         </el-date-picker>
51 51
       </div>
52
-
53
-      <!-- <div class="cell clearfix">
54
-        <label class="title"><span class="name">经销商</span> : </label>
55
-        <el-select
56
-          size="small"
57
-          v-model="form.dealer"
58
-          clearable
59
-          placeholder="请选择经销商"
60
-          style="width: 200px;"
61
-        >
62
-          <el-option
63
-            v-for="(option, index) in dealer"
64
-            :key="index"
65
-            :label="option.dealer_name"
66
-            :value="option.id"
67
-          >
68
-          </el-option>
69
-        </el-select>
70
-      </div> -->
71
-
72
-      <!-- <div class="cell clearfix">
73
-        <label class="title"><span class="name">厂商</span> : </label>
74
-
75
-        <el-select
76
-          size="small"
77
-          v-model="form.manufacturer"
78
-          clearable
79
-          placeholder="请选择厂商"
80
-          style="width: 200px;"
81
-        >
82
-          <el-option
83
-            v-for="(option, index) in manufacturer"
84
-            :key="index"
85
-            :label="option.manufacturer_name"
86
-            :value="option.id"
87
-          >
88
-          </el-option>
89
-        </el-select>
90
-      </div> -->
91
-
92 52
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
93 53
         <el-table
94 54
           id="oictable"
@@ -99,7 +59,7 @@
99 59
           max-height="450"
100 60
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
101 61
         > 
102
-         <el-table-column align="center" width="300">
62
+         <el-table-column align="center" width="200">
103 63
              <template slot="header" slot-scope="scope">
104 64
               <span>耗材名称</span>
105 65
             </template>
@@ -113,11 +73,11 @@
113 73
                     placeholder="请输入耗材名称"
114 74
                     @select="handleSelect"
115 75
                     @input="changeGoodName(scope.$index)"
116
-                    style="width:250px;"
76
+                    style="width:150px;"
117 77
                   >
118 78
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
119 79
                   <template slot-scope="{ item }">
120
-                    <div class="name">{{ item.good_name +" " + item.specification_name + "  "+ item.manufacturer}}</div>
80
+                    <div style="width:400px">{{ item.good_name +" " + item.specification_name + "  "+ item.manufacturer}}</div>
121 81
                   </template>
122 82
                  </el-autocomplete>
123 83
             </template>

+ 1 - 0
src/xt_pages/user/courseOfDisease.vue ファイルの表示

@@ -269,6 +269,7 @@
269 269
           if (resp.state == 1) {
270 270
             this.current_select_record = null
271 271
             this.records = resp.data.records
272
+            console.log("records232322332323232323223",this.records)
272 273
             this.doctors = resp.data.doctors
273 274
 
274 275
           } else {

+ 12 - 11
src/xt_pages/workforce/remind_print.vue ファイルの表示

@@ -90,18 +90,19 @@
90 90
                     (<span>{{main_collection.prescription.antioxidant_commodity_name}}</span>)
91 91
                   </span>
92 92
                 </td>
93
+              
93 94
                 <td :width="td_1_width" v-if="printObj.anticoagulant_zongliang == 1">
94
-                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
95
-                  <span v-if="main_collection.prescription.anticoagulant == 2">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
96
-                  <span v-if="main_collection.prescription.anticoagulant == 3">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
97
-                  <span v-if="main_collection.prescription.anticoagulant == 4">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
98
-                  <span v-if="main_collection.prescription.anticoagulant == 5">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'mg':''}}</span>
99
-                  <span v-if="main_collection.prescription.anticoagulant == 6">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
100
-                  <span v-if="main_collection.prescription.anticoagulant == 7">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
101
-                   <span v-if="main_collection.prescription.anticoagulant == 8">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
102
-                  <span v-if="main_collection.prescription.anticoagulant == 9">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
103
-                  <span v-if="main_collection.prescription.anticoagulant == 10">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
104
-                  <span v-if="main_collection.prescription.anticoagulant == 11">{{main_collection.prescription.anticoagulant_zongliang?main_collection.prescription.anticoagulant_zongliang+'iu':''}}</span>
95
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
96
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
97
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
98
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
99
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
100
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
101
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
102
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 8">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
103
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
104
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
105
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
105 106
                 </td>
106 107
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
107 108
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>

+ 181 - 110
src/xt_pages/workforce/scheduleTablePrintOne.vue ファイルの表示

@@ -45,130 +45,150 @@
45 45
                         <div>{{ item.Mon_M.patient }} </div>
46 46
                         <div v-if="item.Mon_M.mode_name != 'HD'">
47 47
                             {{ item.Mon_M.mode_name }}
48
-                     </div>
48
+                       </div>
49
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Mon_M.patient_id,item.Mon_M.mode_name)}}</div>
49 50
                     </span>
50 51
                 </td>
51 52
                 <td style="min-width:50px;">
52 53
                     <span v-if="item.Mon_A.patient_id">
53 54
                         <div>{{ item.Mon_A.patient }} </div>
54 55
                         <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
56
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Mon_A.patient_id,item.Mon_A.mode_name)}}</div>
55 57
                     </span>
56 58
                 </td>
57 59
                 <td style="min-width:50px;">
58 60
                     <span v-if="item.Mon_N.patient_id">
59 61
                         <div>{{ item.Mon_N.patient }}</div>
60 62
                         <div v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</div>
63
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Mon_N.patient_id,item.Mon_N.mode_name)}}</div>
61 64
                     </span>
62 65
                 </td>
63 66
                 <td style="min-width:50px;">
64 67
                     <span v-if="item.Tue_M.patient_id">
65 68
                         <div>{{ item.Tue_M.patient }}</div>
66 69
                         <div v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</div>
70
+                         <div v-if="item.zone_id>0">{{getDialyzer(item.Tue_M.patient_id,item.Tue_M.mode_name)}}</div>
67 71
                     </span>
68 72
                 </td>
69 73
                 <td style="min-width:50px;">
70 74
                     <span v-if="item.Tue_A.patient_id">
71 75
                         <div>{{ item.Tue_A.patient }}</div>
72 76
                         <div v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</div>
77
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Tue_A.patient_id,item.Tue_A.mode_name)}}</div>
78
+
73 79
                     </span>
74 80
                 </td>
75 81
                 <td style="min-width:50px;">
76 82
                     <span v-if="item.Tue_N.patient_id">
77 83
                         <div>{{ item.Tue_N.patient }}</div>
78 84
                         <div v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</div>
85
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Tue_N.patient_id,item.Tue_N.mode_name)}}</div>
79 86
                     </span>
80 87
                 </td>
81 88
                 <td style="min-width:50px;">
82 89
                     <span v-if="item.Wed_M.patient_id">
83 90
                         <div>{{ item.Wed_M.patient }}</div>
84 91
                         <div v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</div>
92
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Wed_M.patient_id,item.Wed_M.mode_name)}}</div>
85 93
                     </span>
86 94
                 </td>
87 95
                 <td style="min-width:50px;">
88 96
                     <span v-if="item.Wed_A.patient_id">
89 97
                         <div>{{ item.Wed_A.patient }}</div>
90 98
                         <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
99
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Wed_A.patient_id,item.Wed_A.mode_name)}}</div>
91 100
                     </span>
92 101
                 </td>
93
-                <td style="min-width:50px;"> 
102
+                <td style="min-width:50px;">
94 103
                     <span v-if="item.Wed_N.patient_id">
95 104
                         <div>{{ item.Wed_N.patient }}</div>
96 105
                         <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
106
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Wed_N.patient_id,item.Wed_N.mode_name)}}</div>
97 107
                     </span>
98 108
                 </td>
99 109
                 <td style="min-width:50px;">
100 110
                     <span v-if="item.Thurs_M.patient_id">
101 111
                         <div>{{ item.Thurs_M.patient }}</div>
102 112
                         <div v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</div>
113
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Thurs_M.patient_id,item.Thurs_M.mode_name)}}</div>
103 114
                     </span>
104 115
                 </td>
105 116
                 <td style="min-width:50px;">
106 117
                     <span v-if="item.Thurs_A.patient_id">
107 118
                         <div>{{ item.Thurs_A.patient }}</div>
108 119
                         <div v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</div>
120
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Thurs_A.patient_id,item.Thurs_A.mode_name)}}</div>
109 121
                     </span>
110 122
                 </td>
111 123
                 <td style="min-width:50px;">
112 124
                     <span v-if="item.Thurs_N.patient_id">
113 125
                         <div>{{ item.Thurs_N.patient }}</div>
114 126
                         <div v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</div>
127
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Thurs_N.patient_id,item.Thurs_N.mode_name)}}</div>
115 128
                     </span>
116 129
                 </td>
117 130
                 <td style="min-width:50px;">
118 131
                     <span v-if="item.Fri_M.patient_id">
119 132
                         <div>{{ item.Fri_M.patient }}</div>
120 133
                         <div v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</div>
134
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Fri_M.patient_id,item.Fri_M.mode_name)}}</div>
121 135
                     </span>
122 136
                 </td>
123 137
                 <td style="min-width:50px;">
124 138
                     <span v-if="item.Fri_A.patient_id">
125 139
                         <div>{{ item.Fri_A.patient }}</div>
126 140
                         <div v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</div>
141
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Fri_A.patient_id,item.Fri_A.mode_name)}}</div>
127 142
                     </span>
128 143
                 </td>
129 144
                 <td style="min-width:50px;">
130 145
                     <span v-if="item.Fri_N.patient_id">
131 146
                         <div>{{ item.Fri_N.patient }}</div>
132
-                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
147
+                        <div v-if="item.Fri_N.mode_name != 'HD'">{{ item.Fri_N.mode_name }}</div>
148
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Fri_N.patient_id,item.Fri_N.mode_name)}}</div>
133 149
                     </span>
134 150
                 </td>
135 151
                 <td style="min-width:50px;">
136 152
                     <span v-if="item.Sat_M.patient_id">
137 153
                         <div>{{ item.Sat_M.patient }}</div>
138 154
                         <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
155
+                       <div v-if="item.zone_id>0">{{getDialyzer(item.Sat_M.patient_id,item.Sat_M.mode_name)}}</div>
139 156
                     </span>
140 157
                 </td>
141 158
                 <td style="min-width:50px;">
142 159
                     <span v-if="item.Sat_A.patient_id">
143 160
                         <div>{{ item.Sat_A.patient }}</div>
144 161
                         <div v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</div>
162
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sat_A.patient_id,item.Sat_A.mode_name)}}</div>
145 163
                     </span>
146 164
                 </td>
147 165
                 <td style="min-width:50px;">
148 166
                     <span v-if="item.Sat_N.patient_id">
149 167
                         <div>{{ item.Sat_N.patient }}</div>
150 168
                         <div v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</div>
169
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sat_N.patient_id,item.Sat_N.mode_name)}}</div>
151 170
                     </span>
152 171
                 </td>
153 172
                 <td style="min-width:50px;">
154 173
                     <span v-if="item.Sun_M.patient_id">
155 174
                         <div>{{ item.Sun_M.patient }}</div>
156 175
                         <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>
176
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sun_M.patient_id,item.Sun_M.mode_name)}}</div>
158 177
                     </span>
159 178
                 </td>
160 179
                 <td style="min-width:50px;">
161 180
                     <span v-if="item.Sun_A.patient_id">
162 181
                         <div>{{ item.Sun_A.patient }}</div>
163 182
                         <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>
183
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sun_A.patient_id, item.Sun_A.mode_name)}}</div>
184
+
165 185
                     </span>
166 186
                 </td>
167 187
                 <td style="min-width:50px;">
168 188
                     <span v-if="item.Sun_N.patient_id">
169 189
                         <div>{{ item.Sun_N.patient }}</div>
170 190
                         <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>
191
+                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sun_N.patient_id,item.Sun_N.mode_name)}}</div>
172 192
                     </span>
173 193
                 </td>
174 194
                 <td>{{item.total}}</td>
@@ -215,7 +235,7 @@ export default {
215 235
     created(){
216 236
         this.getAllZones()
217 237
         this.modeOptions = this.$store.getters.treatment_mode;
218
-        this.partition_id = this.$route.query.partition_id   
238
+        this.partition_id = this.$route.query.partition_id
219 239
         this.getSolutionSchedule()
220 240
     },
221 241
     methods:{
@@ -228,7 +248,7 @@ export default {
228 248
                 }
229 249
                 this.zones.push(...zones)
230 250
                 var strArr =  this.zoneIdList.join(",")
231
-                
251
+
232 252
                 this.strArr = strArr
233 253
                 this.getWeekPanels()
234 254
                 //统计患者排班数量
@@ -277,147 +297,168 @@ export default {
277 297
                                 mode_id: 0,
278 298
                                 mode_name: '',
279 299
                                 patient_id: 0,
280
-                                patient: ''
300
+                                patient: '',
301
+                                type:1
281 302
                             },
282 303
                             Mon_A: {
283 304
                                 schedule_id: 0,
284 305
                                 mode_id: 0,
285 306
                                 mode_name: '',
286 307
                                 patient_id: 0,
287
-                                patient: ''
308
+                                patient: '',
309
+                                type:1
288 310
                             },
289 311
                             Mon_N: {
290 312
                                 schedule_id: 0,
291 313
                                 mode_id: 0,
292 314
                                 mode_name: '',
293 315
                                 patient_id: 0,
294
-                                patient: ''
316
+                                patient: '',
317
+                                type:1
295 318
                             },
296 319
                             Tue_M: {
297 320
                                 schedule_id: 0,
298 321
                                 mode_id: 0,
299 322
                                 mode_name: '',
300 323
                                 patient_id: 0,
301
-                                patient: ''
324
+                                patient: '',
325
+                                type:1
302 326
                             },
303 327
                             Tue_A: {
304 328
                                 schedule_id: 0,
305 329
                                 mode_id: 0,
306 330
                                 mode_name: '',
307 331
                                 patient_id: 0,
308
-                                patient: ''
332
+                                patient: '',
333
+                                type:1
309 334
                             },
310 335
                             Tue_N: {
311 336
                                 schedule_id: 0,
312 337
                                 mode_id: 0,
313 338
                                 mode_name: '',
314 339
                                 patient_id: 0,
315
-                                patient: ''
340
+                                patient: '',
341
+                                type:1
316 342
                             },
317 343
                             Wed_M: {
318 344
                                 schedule_id: 0,
319 345
                                 mode_id: 0,
320 346
                                 mode_name: '',
321 347
                                 patient_id: 0,
322
-                                patient: ''
348
+                                patient: '',
349
+                                type:1
323 350
                             },
324 351
                             Wed_A: {
325 352
                                 schedule_id: 0,
326 353
                                 mode_id: 0,
327 354
                                 mode_name: '',
328 355
                                 patient_id: 0,
329
-                                patient: ''
356
+                                patient: '',
357
+                                type:1
330 358
                             },
331 359
                             Wed_N: {
332 360
                                 schedule_id: 0,
333 361
                                 mode_id: 0,
334 362
                                 mode_name: '',
335 363
                                 patient_id: 0,
336
-                                patient: ''
364
+                                patient: '',
365
+                                type:1
337 366
                             },
338 367
                             Thurs_M: {
339 368
                                 schedule_id: 0,
340 369
                                 mode_id: 0,
341 370
                                 mode_name: '',
342 371
                                 patient_id: 0,
343
-                                patient: ''
372
+                                patient: '',
373
+                                type:1
344 374
                             },
345 375
                             Thurs_A: {
346 376
                                 schedule_id: 0,
347 377
                                 mode_id: 0,
348 378
                                 mode_name: '',
349 379
                                 patient_id: 0,
350
-                                patient: ''
380
+                                patient: '',
381
+                                type:1
351 382
                             },
352 383
                             Thurs_N: {
353 384
                                 schedule_id: 0,
354 385
                                 mode_id: 0,
355 386
                                 mode_name: '',
356 387
                                 patient_id: 0,
357
-                                patient: ''
388
+                                patient: '',
389
+                                type:1
358 390
                             },
359 391
                             Fri_M: {
360 392
                                 schedule_id: 0,
361 393
                                 mode_id: 0,
362 394
                                 mode_name: '',
363 395
                                 patient_id: 0,
364
-                                patient: ''
396
+                                patient: '',
397
+                                type:1
365 398
                             },
366 399
                             Fri_A: {
367 400
                                 schedule_id: 0,
368 401
                                 mode_id: 0,
369 402
                                 mode_name: '',
370 403
                                 patient_id: 0,
371
-                                patient: ''
404
+                                patient: '',
405
+                                type:1
372 406
                             },
373 407
                             Fri_N: {
374 408
                                 schedule_id: 0,
375 409
                                 mode_id: 0,
376 410
                                 mode_name: '',
377 411
                                 patient_id: 0,
378
-                                patient: ''
412
+                                patient: '',
413
+                                type:1
379 414
                             },
380 415
                             Sat_M: {
381 416
                                 schedule_id: 0,
382 417
                                 mode_id: 0,
383 418
                                 mode_name: '',
384 419
                                 patient_id: 0,
385
-                                patient: ''
420
+                                patient: '',
421
+                                type:1
386 422
                             },
387 423
                             Sat_A: {
388 424
                                 schedule_id: 0,
389 425
                                 mode_id: 0,
390 426
                                 mode_name: '',
391 427
                                 patient_id: 0,
392
-                                patient: ''
428
+                                patient: '',
429
+                                type:1
393 430
                             },
394 431
                             Sat_N: {
395 432
                                 schedule_id: 0,
396 433
                                 mode_id: 0,
397 434
                                 mode_name: '',
398 435
                                 patient_id: 0,
399
-                                patient: ''
436
+                                patient: '',
437
+                                type:1
400 438
                             },
401 439
                             Sun_A: {
402 440
                                 schedule_id: 0,
403 441
                                 mode_id: 0,
404 442
                                 mode_name: '',
405 443
                                 patient_id: 0,
406
-                                patient: ''
444
+                                patient: '',
445
+                                type:1
407 446
                             },
408 447
                             Sun_N: {
409 448
                                 schedule_id: 0,
410 449
                                 mode_id: 0,
411 450
                                 mode_name: '',
412 451
                                 patient_id: 0,
413
-                                patient: ''
452
+                                patient: '',
453
+                                type:1
414 454
                             },
415 455
                             Sun_M: {
416 456
                                 schedule_id: 0,
417 457
                                 mode_id: 0,
418 458
                                 mode_name: '',
419 459
                                 patient_id: 0,
420
-                                patient: ''
460
+                                patient: '',
461
+                                type:1
421 462
                             },
422 463
                             total: 0
423 464
                             }
@@ -465,135 +506,156 @@ export default {
465 506
                     var theSchedules = response.data.data.schdules;
466 507
                     var that = this;
467 508
                     that.scheduleZone.forEach(function(zone, index) {
468
-                        
509
+
469 510
                         that.scheduleZone[index].Mon_M = {
470 511
                             mode_id: 0,
471 512
                             mode_name: "",
472 513
                             patient_id: 0,
473
-                            patient: ""
514
+                            patient: "",
515
+                            type:1
474 516
                         };
475 517
                         that.scheduleZone[index].Mon_A = {
476 518
                             mode_id: 0,
477 519
                             mode_name: "",
478 520
                             patient_id: 0,
479
-                            patient: ""
521
+                            patient: "",
522
+                            type:1
480 523
                         };
481 524
                         that.scheduleZone[index].Mon_N = {
482 525
                             mode_id: 0,
483 526
                             mode_name: "",
484 527
                             patient_id: 0,
485
-                            patient: ""
528
+                            patient: "",
529
+                            type:1
486 530
                         };
487 531
                         that.scheduleZone[index].Tue_M = {
488 532
                             mode_id: 0,
489 533
                             mode_name: "",
490 534
                             patient_id: 0,
491
-                            patient: ""
535
+                            patient: "",
536
+                            type:1
492 537
                         };
493 538
                         that.scheduleZone[index].Tue_A = {
494 539
                             mode_id: 0,
495 540
                             mode_name: "",
496 541
                             patient_id: 0,
497
-                            patient: ""
542
+                            patient: "",
543
+                            type:1
498 544
                         };
499 545
                         that.scheduleZone[index].Tue_N = {
500 546
                             mode_id: 0,
501 547
                             mode_name: "",
502 548
                             patient_id: 0,
503
-                            patient: ""
549
+                            patient: "",
550
+                            type:1
504 551
                         };
505 552
                         that.scheduleZone[index].Wed_M = {
506 553
                             mode_id: 0,
507 554
                             mode_name: "",
508 555
                             patient_id: 0,
509
-                            patient: ""
556
+                            patient: "",
557
+                            type:1
510 558
                         };
511 559
                         that.scheduleZone[index].Wed_A = {
512 560
                             mode_id: 0,
513 561
                             mode_name: "",
514 562
                             patient_id: 0,
515
-                            patient: ""
563
+                            patient: "",
564
+                            type:1
516 565
                         };
517 566
                         that.scheduleZone[index].Wed_N = {
518 567
                             mode_id: 0,
519 568
                             mode_name: "",
520 569
                             patient_id: 0,
521
-                            patient: ""
570
+                            patient: "",
571
+                            type:1
522 572
                         };
523 573
                         that.scheduleZone[index].Thurs_M = {
524 574
                             mode_id: 0,
525 575
                             mode_name: "",
526 576
                             patient_id: 0,
527
-                            patient: ""
577
+                            patient: "",
578
+                            type:1
528 579
                         };
529 580
                         that.scheduleZone[index].Thurs_A = {
530 581
                             mode_id: 0,
531 582
                             mode_name: "",
532 583
                             patient_id: 0,
533
-                            patient: ""
584
+                            patient: "",
585
+                            type:1
534 586
                         };
535 587
                         that.scheduleZone[index].Thurs_N = {
536 588
                             mode_id: 0,
537 589
                             mode_name: "",
538 590
                             patient_id: 0,
539
-                            patient: ""
591
+                            patient: "",
592
+                            type:1
540 593
                         };
541 594
                         that.scheduleZone[index].Fri_M = {
542 595
                             mode_id: 0,
543 596
                             mode_name: "",
544 597
                             patient_id: 0,
545
-                            patient: ""
598
+                            patient: "",
599
+                            type:1
546 600
                         };
547 601
                         that.scheduleZone[index].Fri_A = {
548 602
                             mode_id: 0,
549 603
                             mode_name: "",
550 604
                             patient_id: 0,
551
-                            patient: ""
605
+                            patient: "",
606
+                            type:1
552 607
                         };
553 608
                         that.scheduleZone[index].Fri_N = {
554 609
                             mode_id: 0,
555 610
                             mode_name: "",
556 611
                             patient_id: 0,
557
-                            patient: ""
612
+                            patient: "",
613
+                            type:1
558 614
                         };
559 615
                         that.scheduleZone[index].Sat_M = {
560 616
                             mode_id: 0,
561 617
                             mode_name: "",
562 618
                             patient_id: 0,
563
-                            patient: ""
619
+                            patient: "",
620
+                            type:1
564 621
                         };
565 622
                         that.scheduleZone[index].Sat_A = {
566 623
                             mode_id: 0,
567 624
                             mode_name: "",
568 625
                             patient_id: 0,
569
-                            patient: ""
626
+                            patient: "",
627
+                            type:1
570 628
                         };
571 629
                         that.scheduleZone[index].Sat_N = {
572 630
                             mode_id: 0,
573 631
                             mode_name: "",
574 632
                             patient_id: 0,
575
-                            patient: ""
633
+                            patient: "",
634
+                            type:1
576 635
                         };
577 636
                         that.scheduleZone[index].Sun_A = {
578 637
                             mode_id: 0,
579 638
                             mode_name: "",
580 639
                             patient_id: 0,
581
-                            patient: ""
640
+                            patient: "",
641
+                            type:1
582 642
                         };
583 643
                         that.scheduleZone[index].Sun_N = {
584 644
                             mode_id: 0,
585 645
                             mode_name: "",
586 646
                             patient_id: 0,
587
-                            patient: ""
647
+                            patient: "",
648
+                            type:1
588 649
                         };
589 650
                         that.scheduleZone[index].Sun_M = {
590 651
                             mode_id: 0,
591 652
                             mode_name: "",
592 653
                             patient_id: 0,
593
-                            patient: ""
654
+                            patient: "",
655
+                            type:1
594 656
                         };
595 657
                         that.scheduleZone[index].total = 0;
596
-                        
658
+
597 659
                         if (response.data.data.schdules.length > 0) {
598 660
                             theSchedules.forEach(function(schedule, sindex) {
599 661
 
@@ -614,77 +676,73 @@ export default {
614 676
                                         patient_id: schedule.patient_id,
615 677
                                         patient: schedule.patient,
616 678
                                         patient_contagions: schedule.patient_contagions,
617
-                                        mode_name:
618
-                                            typeof that.modeOptions[schedule.mode_id] ===
619
-                                            "undefined"
620
-                                            ? ""
621
-                                            : that.modeOptions[schedule.mode_id].name
679
+                                        mode_name:typeof that.modeOptions[schedule.mode_id] ==="undefined"? "": that.modeOptions[schedule.mode_id].name
622 680
                                         };
623 681
                                         that.scheduleZone[index].total += 1;
624
-                                        
682
+
625 683
                                     }
626
-                                    
684
+
627 685
                                 }
628
-                                
686
+
629 687
                             });
630 688
                         }
631
-                       
689
+
632 690
                     });
633
-                    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":""}]
634
-                     
635
-                     
691
+                    var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1",type:0},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1",type:0},"jihao_id":"","total":"","zone_id":"","zone_type":""}]
692
+
693
+
636 694
                      for(let i=0;i<newArr.length;i++){
637 695
                        for(let j=0;j<this.scheduleCountList.length;j++){
638 696
                             newArr[i].cut = this.total
639 697
                          //礼拜一上午
640 698
                           if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 1){
641
-                            
699
+
642 700
                               newArr[i].Mon_M.patient = this.scheduleCountList[j].Count
643
-                          } 
701
+                          }
644 702
                         //礼拜一下午
645 703
                          if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 2){
646
-                           
704
+
647 705
                               newArr[i].Mon_A.patient = this.scheduleCountList[j].Count
648
-                          } 
706
+                          }
649 707
 
650 708
                          //礼拜一晚上
651 709
                          if(this.scheduleCountList[j].schedule_week == 1 && this.scheduleCountList[j].schedule_type == 3){
652
-                            
710
+
653 711
                               newArr[i].Mon_N.patient = this.scheduleCountList[j].Count
654
-                          } 
655
-                         
712
+                          }
713
+
656 714
                         //礼拜二上午
657 715
                          if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 1){
658
-                            
716
+
659 717
                               newArr[i].Tue_M.patient = this.scheduleCountList[j].Count
660
-                          } 
718
+                          }
661 719
                          //礼拜二下午
662 720
                          if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 2){
663
-                            
721
+
664 722
                               newArr[i].Tue_A.patient = this.scheduleCountList[j].Count
665
-                          } 
666
-                        
723
+                          }
724
+
667 725
                          //礼拜二晚上
668 726
                          if(this.scheduleCountList[j].schedule_week == 2 && this.scheduleCountList[j].schedule_type == 3){
669
-                            
727
+
670 728
                               newArr[i].Tue_N.patient = this.scheduleCountList[j].Count
671
-                          } 
729
+                          }
672 730
 
673 731
                          //礼拜三上午
674 732
                          if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
675
-                            
733
+
676 734
                               newArr[i].Wed_M.patient = this.scheduleCountList[j].Count
677
-                          } 
735
+                          }
678 736
 
679 737
                          //礼拜三下午
680 738
                          if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
681
-                            
739
+
682 740
                               newArr[i].Wed_A.patient = this.scheduleCountList[j].Count
683 741
                           }
684 742
 
685 743
                          //礼拜三晚上
686 744
                          if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 3){
687
-                            
745
+
688 746
                               newArr[i].Wed_N.patient = this.scheduleCountList[j].Count
689 747
                           }
690 748
 
@@ -692,76 +750,76 @@ export default {
692 750
 
693 751
                         //礼拜四上午
694 752
                          if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 1){
695
-                            
753
+
696 754
                               newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
697
-                          } 
755
+                          }
698 756
 
699 757
                          //礼拜四下午
700 758
                          if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 2){
701
-                            
759
+
702 760
                               newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
703 761
                           }
704 762
 
705 763
                          //礼拜四晚上
706 764
                          if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 3){
707
-                            
765
+
708 766
                               newArr[i].Thurs_N.patient = this.scheduleCountList[j].Count
709 767
                           }
710 768
 
711 769
 
712 770
                         //礼拜五上午
713 771
                          if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 1){
714
-                            
772
+
715 773
                               newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
716
-                          } 
774
+                          }
717 775
 
718 776
                          //礼拜五下午
719 777
                          if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 2){
720
-                            
778
+
721 779
                               newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
722 780
                           }
723 781
 
724 782
                          //礼拜五晚上
725 783
                          if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 3){
726
-                            
784
+
727 785
                               newArr[i].Fri_N.patient = this.scheduleCountList[j].Count
728 786
                           }
729 787
 
730 788
 
731 789
                         //礼拜六上午
732 790
                          if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 1){
733
-                            
791
+
734 792
                               newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
735
-                          } 
793
+                          }
736 794
 
737 795
                          //礼拜六下午
738 796
                          if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 2){
739
-                            
797
+
740 798
                               newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
741 799
                           }
742 800
 
743 801
                          //礼拜六晚上
744 802
                          if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 3){
745
-                            
803
+
746 804
                               newArr[i].Sat_N.patient = this.scheduleCountList[j].Count
747 805
                           }
748
-                         
806
+
749 807
 
750 808
                           //礼拜日上午
751 809
                          if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 1){
752
-                            
810
+
753 811
                               newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
754
-                          } 
812
+                          }
755 813
 
756 814
                          //礼拜日下午
757 815
                          if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 2){
758
-                            
816
+
759 817
                               newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
760 818
                           }
761 819
 
762 820
                          //礼拜日晚上
763 821
                          if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 3){
764
-                            
822
+
765 823
                               newArr[i].Sun_N.patient = this.scheduleCountList[j].Count
766 824
                           }
767 825
 
@@ -771,7 +829,7 @@ export default {
771 829
                     console.log("newArr222222222",newArr)
772 830
                     that.scheduleZone.push(...newArr)
773 831
                     console.log('总数据77777777777',that.scheduleZone)
774
-                    
832
+
775 833
                 } else {
776 834
                     this.$message.error("网络错误");
777 835
                     return false;
@@ -841,13 +899,13 @@ export default {
841 899
                if(response.data.state == 1){
842 900
                   var list = response.data.data.list
843 901
                   console.log("list22222",list)
844
-                  
902
+
845 903
                   this.scheduleCountList = list
846 904
                   var total = response.data.data.total
847 905
                   console.log("totalw222",total)
848 906
                   this.total = total
849 907
                }
850
-           }) 
908
+           })
851 909
         },
852 910
         getSolutionSchedule(){
853 911
           getSolutionSchedule().then(response=>{
@@ -942,28 +1000,41 @@ export default {
942 1000
                  if(solution[i].mode_id == 29){
943 1001
                     solution[i].mode_name = "PE"
944 1002
                  }
1003
+                 if(solution[i].solution!=undefined){
1004
+                    solution[i].dialysis_dialyszers = solution[i].solution.dialysis_dialyszers
1005
+                    solution[i].dialysis_irrigation = solution[i].solution.dialysis_irrigation
1006
+                    solution[i].dialyzer_perfusion_apparatus = solution[i].solution.dialyzer_perfusion_apparatus
1007
+                 }
1008
+
945 1009
                }
946 1010
                this.solutionList = solution
947
-             }  
948
-          })  
1011
+             }
1012
+          })
949 1013
         },
950 1014
         getDialyzer(patient_id,mode){
951 1015
           var diazers = ""
1016
+          var irrigation = ""
952 1017
           for(let i=0;i<this.solutionList.length;i++){
1018
+            if(patient_id == 0){
1019
+              return ""
1020
+            }  
953 1021
             if(patient_id == this.solutionList[i].patient_id && mode == this.solutionList[i].mode_name){
954 1022
                if(this.solutionList[i].dialyzer_perfusion_apparatus!=""){
955 1023
                  diazers = this.solutionList[i].dialyzer_perfusion_apparatus
1024
+                 irrigation = this.solutionList[i].dialysis_irrigation
956 1025
                }else{
957 1026
                  diazers = this.solutionList[i].dialysis_dialyszers
958
-                 if(this.solutionList[i].dialysis_dialyszers == ""){
959
-                    diazers = this.solutionList[i].dialysis_irrigation
960
-                 }
1027
+                 irrigation = this.solutionList[i].dialysis_irrigation
961 1028
                
962 1029
                }
963
-               
1030
+
964 1031
             }
965 1032
           }
966
-          return diazers
1033
+          if(irrigation!=""){
1034
+             return diazers + "/" + irrigation
1035
+          }else{
1036
+            return diazers 
1037
+          }
967 1038
         }
968 1039
     }
969 1040
 }
@@ -975,4 +1046,4 @@ td{
975 1046
     text-align: center;
976 1047
     padding: 5px;
977 1048
 }
978
-</style>
1049
+</style>