Browse Source

11月14日 库存扣减更新

XMLWAN 3 years ago
parent
commit
b18f2a2f4a

+ 6 - 0
src/xt_pages/role/admin.vue View File

@@ -44,6 +44,12 @@
44 44
           min-width="160"
45 45
           align="center"
46 46
         ></el-table-column>
47
+        <el-table-column
48
+          label="医保医师编码"
49
+          prop="doctor_number"
50
+          min-width="160"
51
+          align="center"
52
+        ></el-table-column>
47 53
         <el-table-column
48 54
           label="最后登录IP"
49 55
           prop="ip"

+ 8 - 9
src/xt_pages/role/components/AdminInfoForm.vue View File

@@ -68,6 +68,13 @@
68 68
       </el-form-item>
69 69
     </el-col>
70 70
    </el-row>
71
+   <el-row :span="24">
72
+      <el-col :span="8">
73
+       <el-form-item label="医保医师编码:">
74
+        <el-input v-model="form.doctor_number"></el-input>
75
+       </el-form-item>
76
+    </el-col>
77
+   </el-row>
71 78
   
72 79
   <div v-show="show">
73 80
    <el-row :span="24">
@@ -343,12 +350,7 @@
343 350
 
344 351
 
345 352
   <el-row :gutter="24">
346
-    <el-col :span="8">
347
-       <el-form-item label="医保医师编码:">
348
-         
349
-        <el-input v-model="form.doctor_number"></el-input>
350
-       </el-form-item>
351
-    </el-col>
353
+   
352 354
      <el-col :span="8">
353 355
        <el-form-item label="门诊大病类别:" label-width="130px">
354 356
             <el-select v-model="form.outpatient_illnessCategory" placeholder="门诊大病类别">
@@ -1063,8 +1065,6 @@
1063 1065
         })
1064 1066
       },
1065 1067
       changeRole(arr){
1066
-        console.log("arr",arr)
1067
-        console.log("roles",this.roles)
1068 1068
         var varName = []
1069 1069
         for(let i=0;i<this.roles.length;i++){
1070 1070
           for(let j=0;j<arr.length;j++){
@@ -1073,7 +1073,6 @@
1073 1073
              }
1074 1074
           }
1075 1075
         }
1076
-        console.log("33333",varName)
1077 1076
         this.form.role_type = 1
1078 1077
         var ids = varName.join(";")
1079 1078
         console.log("valee22222",ids)

+ 6 - 0
src/xt_pages/stock/cancelStockOrder.vue View File

@@ -186,6 +186,12 @@
186 186
             </template>
187 187
           </el-table-column>
188 188
 
189
+           <el-table-column label="国家编码" align="center">
190
+            <template slot-scope="scope">
191
+              {{scope.row.GoodInfo.social_security_directory_code}}
192
+            </template>
193
+          </el-table-column>
194
+
189 195
           <el-table-column label="退库数量" align="center">
190 196
             <template slot-scope="scope">
191 197
               {{ scope.row.count}}{{scope.row.GoodInfo.packing_unit}}

+ 5 - 1
src/xt_pages/stock/drugs/cancelDrugStockOrder.vue View File

@@ -182,7 +182,11 @@
182 182
                 {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
183 183
               </template>
184 184
             </el-table-column>
185
-          
185
+            <el-table-column label="国家编码" align="center">
186
+              <template slot-scope="scope">
187
+                {{ scope.row.BaseDrugLib.medical_insurance_number}}
188
+              </template>
189
+            </el-table-column>
186 190
             <el-table-column label="退库数量" align="center">
187 191
               <template slot-scope="scope">
188 192
                 {{ scope.row.count}}

+ 4 - 1
src/xt_pages/stock/drugs/drugQueryPrint.vue View File

@@ -18,6 +18,7 @@
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="150">国家编码</td>
21 22
               <td style="line-height: 50px" width="100">进货单价</td>
22 23
               <td  style="line-height: 50px" width="200">厂家</td>
23 24
               <td style="line-height: 50px" width="80">入库数量</td>
@@ -38,7 +39,9 @@
38 39
               <td style="line-height: 50px">
39 40
                    <span> {{item.dose + item.dose_unit +"*"+item.min_number+item.min_unit+"/"+item.max_unit}}</span>
40 41
               </td>
41
-             
42
+             <td style="line-height: 50px">
43
+                  <span>{{item.medical_insurance_number }}</span>
44
+              </td>
42 45
               <td style="line-height: 50px">
43 46
                   <span>{{item.last_price }}</span>
44 47
               </td>

+ 5 - 0
src/xt_pages/stock/drugs/drugStockInOrder.vue View File

@@ -189,6 +189,11 @@
189 189
           <template slot-scope="scope">
190 190
             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
191 191
           </template>
192
+        </el-table-column>
193
+          <el-table-column label="国家编码" align="center">
194
+          <template slot-scope="scope">
195
+            {{scope.row.drug.medical_insurance_number}}
196
+          </template>
192 197
         </el-table-column>
193 198
         <el-table-column label="批号" align="center">
194 199
           <template slot-scope="scope">

+ 5 - 1
src/xt_pages/stock/drugs/drugStockOutOrder.vue View File

@@ -211,7 +211,11 @@
211 211
               {{scope.row.dose}}&nbsp;{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
212 212
             </template>
213 213
           </el-table-column>
214
-         
214
+          <el-table-column label="国家编码" align="center">
215
+            <template slot-scope="scope">
216
+              {{scope.row.medical_insurance_number}}
217
+            </template>
218
+          </el-table-column>
215 219
           <el-table-column label="出库数量" align="center">
216 220
             <template slot-scope="scope">
217 221
               <!-- <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span> -->

+ 7 - 2
src/xt_pages/stock/drugs/query.vue View File

@@ -94,6 +94,11 @@
94 94
            <template slot-scope="scope">
95 95
              {{scope.row.dose + scope.row.dose_unit +"*"+scope.row.min_number+scope.row.min_unit+"/"+scope.row.max_unit}}
96 96
            </template>
97
+        </el-table-column>
98
+        <el-table-column prop="drug_name" label="国家编码" align="center">
99
+           <template slot-scope="scope">
100
+             {{scope.row.medical_insurance_number}}
101
+           </template>
97 102
         </el-table-column>
98 103
          <el-table-column prop="drug_name" label="进货单价" align="center">
99 104
            <template slot-scope="scope">
@@ -482,8 +487,8 @@ import { min } from 'moment'
482 487
           }   
483 488
          }
484 489
          import('@/vendor/Export2Excel').then(excel => {
485
-         const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
486
-         const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
490
+         const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','国家编码','进货单价','厂家','入库数量','出库数量','剩余库存量']
491
+         const filterVal = ['index', 'drug_type_name', 'drug_name','unit','medical_insurance_number','last_price','manufacturer_name','inCount','outCount','overplusCount']
487 492
 
488 493
 
489 494
          const data = this.formatJson(filterVal, this.tableList)

+ 1 - 1
src/xt_pages/stock/inventory.vue View File

@@ -100,7 +100,7 @@
100 100
           v-model="form.drug_name"
101 101
           :fetch-suggestions="querySearchAsync"
102 102
           :trigger-on-focus="true"
103
-          placeholder="请输入药品名称"
103
+          placeholder="请输入耗材名称"
104 104
           @select="handleSelect"
105 105
           style="width:300px;"
106 106
           v-show="showTableOne"

+ 10 - 0
src/xt_pages/stock/stockInOrder.vue View File

@@ -193,6 +193,11 @@
193 193
             {{ scope.row.GoodInfo.specification_name}} / {{scope.row.GoodInfo.packing_unit}}
194 194
           </template>
195 195
         </el-table-column>
196
+        <el-table-column label="国家编码" align="center">
197
+          <template slot-scope="scope">
198
+            {{ scope.row.GoodInfo.social_security_directory_code}}
199
+          </template>
200
+        </el-table-column>
196 201
         <el-table-column label="批号" align="center">
197 202
           <template slot-scope="scope">
198 203
             {{ scope.row.number}}
@@ -202,6 +207,11 @@
202 207
           <template slot-scope="scope">
203 208
             {{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}}
204 209
           </template>
210
+        </el-table-column>
211
+         <el-table-column label="零售价" align="center">
212
+          <template slot-scope="scope">
213
+            {{ scope.row.packing_price}}
214
+          </template>
205 215
         </el-table-column>
206 216
         <el-table-column label="进货价" align="center">
207 217
           <template slot-scope="scope">

+ 28 - 0
src/xt_pages/stock/stockInOrderAdd.vue View File

@@ -107,7 +107,21 @@
107 107
             
108 108
             </template>
109 109
           </el-table-column>
110
+        
111
+          <el-table-column align="center" width="120">
112
+            <template slot="header" slot-scope="scope">
113
+              <span>零售价<span style="color: red">*</span></span>
114
+            </template>
115
+            <template slot-scope="scope">
116
+            
117
+              <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
118
+                            style="padding-top: 20px">
119
+                <el-input placeholder="请输入单价" type="number" v-model="scope.row.packing_price"></el-input>
120
+              </el-form-item>
110 121
 
122
+
123
+            </template>
124
+          </el-table-column>
111 125
           <el-table-column align="center" width="120">
112 126
             <template slot="header" slot-scope="scope">
113 127
               <span>进货单价<span style="color: red">*</span></span>
@@ -285,6 +299,9 @@
285 299
           price: [
286 300
             { required: true, message: '单价不能为空', trigger: 'blur' }
287 301
           ],
302
+          packing_price: [
303
+            { required: true, message: '零售价不能为空', trigger: 'blur' }
304
+          ],
288 305
           warehousing_count: [
289 306
             { required: true, message: '数量不能为空', trigge: 'blur' }
290 307
           ],
@@ -511,6 +528,7 @@
511 528
         tempObj['specification_name'] = ''
512 529
         tempObj['name'] = ''
513 530
         tempObj['license_number'] = ""
531
+        tempObj["packing_price"] = ""
514 532
         this.recordInfo.recordData.push(tempObj)
515 533
       }, handleDelete: function(index, row) {
516 534
         if (this.recordInfo.recordData.length <= 1) {
@@ -652,6 +670,7 @@
652 670
                 return
653 671
               }
654 672
               array[i].price = array[i].price.toString()
673
+              array[i].packing_price = array[i].packing_price.toString()
655 674
             }
656 675
 
657 676
             if(this.recordInfo.recordData.length <= 0){
@@ -755,6 +774,7 @@
755 774
         this.currentIndex = val
756 775
       },
757 776
       handleSelect(val){
777
+         console.log("val3232232323",val)
758 778
          for(let i=0;i<this.recordInfo.recordData.length;i++){
759 779
            if(this.currentIndex == i){
760 780
               this.recordInfo.recordData[i].good_type_id = val.id
@@ -764,11 +784,18 @@
764 784
               this.recordInfo.recordData[i].number =  val.number
765 785
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
766 786
               this.recordInfo.recordData[i].remark = val.remark
787
+           
767 788
               if(val.buy_price == 0){
768 789
                this.recordInfo.recordData[i].price = ""
769 790
               }else{
770 791
                 this.recordInfo.recordData[i].price = val.buy_price
771 792
               }
793
+
794
+              if(val.packing_price == 0){
795
+               this.recordInfo.recordData[i].packing_price = ""
796
+              }else{
797
+                this.recordInfo.recordData[i].packing_price = val.packing_price
798
+              }
772 799
               
773 800
               this.recordInfo.recordData[i].specification_name = val.specification_name
774 801
               this.recordInfo.recordData[i].good_id = val.id
@@ -811,6 +838,7 @@
811 838
       tempObj['specification_name'] = ''
812 839
       tempObj['name'] = ''
813 840
       tempObj['license_number'] = ''
841
+      tempObj['packing_price']= ''
814 842
       this.recordInfo.recordData.push(tempObj)
815 843
       this.GetConfigInfo()
816 844
       this.propForm.goodUnit = this.$store.getters.good_unit

+ 19 - 1
src/xt_pages/stock/stockInOrderEdit.vue View File

@@ -122,10 +122,23 @@
122 122
               </el-form-item>
123 123
             </template>
124 124
           </el-table-column>
125
+          <el-table-column align="center" width="120">
126
+            <template slot="header" slot-scope="scope">
127
+              <span>零售价<span style="color: red">*</span></span>
128
+            </template>
129
+            <template slot-scope="scope">
130
+            
131
+              <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
132
+                            style="padding-top: 20px">
133
+                <el-input placeholder="请输入单价" type="number" v-model="scope.row.packing_price"></el-input>
134
+              </el-form-item>
135
+
125 136
 
137
+            </template>
138
+          </el-table-column>
126 139
           <el-table-column align="center" width="120">
127 140
             <template slot="header" slot-scope="scope">
128
-              <span>单价<span style="color: red">*</span></span>
141
+              <span>进货价<span style="color: red">*</span></span>
129 142
             </template>
130 143
             <template slot-scope="scope">
131 144
               <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
@@ -340,6 +353,9 @@ export default {
340 353
       },
341 354
       tableRules: {
342 355
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
356
+        packing_price: [
357
+          { required: true, message: '零售价不能为空', trigger: 'blur' }
358
+        ],
343 359
         warehousing_count: [
344 360
           { required: true, message: "数量不能为空", trigge: "blur" }
345 361
         ],
@@ -482,6 +498,7 @@ export default {
482 498
       tempObj["dealer"] = "";
483 499
       tempObj["manufacturer"] = "";
484 500
       tempObj["license_number"] = ""
501
+      tempObj["packing_price"] = ""
485 502
       this.recordInfo.recordData.push(tempObj);
486 503
     },
487 504
     handleDelete: function(index, row) {
@@ -608,6 +625,7 @@ export default {
608 625
          
609 626
           for(let i=0;i<this.recordInfo.recordData.length;i++){
610 627
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
628
+             this.recordInfo.recordData[i].packing_price = this.recordInfo.recordData[i].packing_price.toString()
611 629
              if(this.recordInfo.recordData[i].dealer == ""){
612 630
                 this.recordInfo.recordData[i].dealer = 0
613 631
              }

+ 6 - 0
src/xt_pages/stock/stockOutOrder.vue View File

@@ -191,6 +191,12 @@
191 191
               {{ scope.row.specification_name}} / {{scope.row.packing_unit}}
192 192
             </template>
193 193
           </el-table-column>
194
+
195
+          <el-table-column label="国家编码" align="center">
196
+            <template slot-scope="scope">
197
+              {{ scope.row.social_security_directory_code}}
198
+            </template>
199
+          </el-table-column>
194 200
          
195 201
           <el-table-column label="出库数量" align="center">
196 202
             <template slot-scope="scope">

+ 2 - 0
src/xt_pages/stock/stockPrint.vue View File

@@ -27,6 +27,7 @@
27 27
                                     <td width="80">耗材类型</td>
28 28
                                     <td width="80">耗材名称</td>
29 29
                                     <td width="80">规格&单位</td>
30
+                                    <td width="80">国家编码</td>
30 31
                                     <td width="80">进货单价</td>
31 32
                                     <td width="80">生产商</td>
32 33
                                     <td width="80">入库数量</td>
@@ -39,6 +40,7 @@
39 40
                                    <td>{{getGoodType(item.good_type_id)}}</td>
40 41
                                    <td>{{item.good_name }}</td>
41 42
                                    <td><span>{{item.specification_name }} / {{item.packing_unit}}</span></td>
43
+                                   <td>{{item.social_security_directory_code}}</td>
42 44
                                    <td>{{item.buy_price}}</td>
43 45
                                    <td>{{getManufacture(item.manufacturer)}}</td>
44 46
                                    <td>

+ 7 - 2
src/xt_pages/stock/stockQuery.vue View File

@@ -91,6 +91,11 @@
91 91
               <span>{{ scope.row.specification_name }} / {{scope.row.packing_unit}}</span>
92 92
             </template>
93 93
          </el-table-column>
94
+         <el-table-column label="国家编码" align="center">
95
+            <template slot-scope="scope">
96
+              <span>{{ scope.row.social_security_directory_code}}</span>
97
+            </template>
98
+         </el-table-column>
94 99
         <el-table-column label="进货单价" align="center">
95 100
           <template slot-scope="scope">
96 101
              {{scope.row.buy_price}}
@@ -353,8 +358,8 @@ export default {
353 358
     exportList(){
354 359
          import('@/vendor/Export2Excel').then(excel => {
355 360
 
356
-         const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
357
-         const filterVal = ['type_name', 'good_name', 'unit','buy_price','prodect_name','inCount','outCount','overplus']
361
+         const tHeader = ['耗材类型', '耗材名称', '规格&单位','国家编码','进货单价','生产商','入库数量','出库数量','库存剩余量']
362
+         const filterVal = ['type_name', 'good_name', 'unit','social_security_directory_code','buy_price','prodect_name','inCount','outCount','overplus']
358 363
 
359 364
 
360 365
          for(let i=0;i<this.tableList.length;i++){

+ 49 - 3
src/xt_pages/workforce/components/tableData.vue View File

@@ -86,8 +86,37 @@
86 86
           </template>
87 87
         </el-table-column>
88 88
         <el-table-column label="操作" align="center" width="300">
89
+          
90
+           <template slot-scope="scope">
91
+            <span v-if="now_time>scope.row.schedule_date">
92
+              <el-button
93
+                size="mini"
94
+                type="primary"
95
+                :disable="true"
96
+              >
97
+                取消排班
98
+              </el-button>
99
+              <el-button
100
+                size="mini"
101
+                type="primary"
102
+                :disable="true"
103
+              >
104
+                调整机号
105
+              </el-button>
106
+              <el-button
107
+                size="mini"
108
+                type="primary"
109
+              :disable="true"
110
+              >
111
+                调整模式
112
+              </el-button>
113
+           </span>
114
+          </template>
115
+         
116
+         
89 117
           <template slot-scope="scope">
90
-            <el-button
118
+            <span v-if="now_time <=scope.row.schedule_date">
119
+              <el-button
91 120
               size="mini"
92 121
               type="primary"
93 122
               @click="CancelSchedule(scope.row.id)"
@@ -108,6 +137,8 @@
108 137
             >
109 138
               调整模式
110 139
             </el-button>
140
+            </span>
141
+           
111 142
           </template>
112 143
         </el-table-column>
113 144
       </el-table>
@@ -774,7 +805,8 @@ export default {
774 805
       },
775 806
       zoneIdList:[],
776 807
       strArr:"",
777
-      patient_id_hover:0
808
+      patient_id_hover:0,
809
+      now_time:"",
778 810
     };
779 811
   },
780 812
 
@@ -2307,7 +2339,21 @@ export default {
2307 2339
   //    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
2308 2340
   // },
2309 2341
   created() {
2310
-    
2342
+    var date = new Date()
2343
+    this.time = date
2344
+    var year = date.getFullYear()
2345
+    var month = date.getMonth() + 1
2346
+    if (month < 10) {
2347
+      month = "0" + month
2348
+    }
2349
+    var day = date.getDate()
2350
+    if (day < 10) {
2351
+      day = "0" + day
2352
+    }
2353
+    var nowDate = year + "-" + month + "-" + day
2354
+    var date = new Date(nowDate + " 00:00:00")
2355
+    console.log("date23232323232323",date.getTime()/1000) 
2356
+    this.now_time = date.getTime()/1000
2311 2357
     this.getAllZones()
2312 2358
  
2313 2359
     this.changeScheduleType(1)