新分支

src/xt_pages/Pharmacy/drugCode.vue

@@ -148,6 +148,7 @@
   import { getDictionaryDataConfig } from "@/utils/data";
   import { uParseTime } from '@/utils/tools'
   import { changeDrugCode } from "@/api/pharmacy";
+  
   import axios from 'axios'
   const moment = require('moment')
   export default {

src/xt_pages/drugSourceCode/drugChange.vue

@@ -92,11 +92,17 @@
       </el-table-column>
 
       <el-table-column  align="center" prop="name" label="追溯码">
-        <template slot-scope="scope">{{scope.row.drug_code}}</template>
+        <template slot-scope="scope">
+            <div @click="getDrugCode(scope.row.advice_id,scope.row.drug_code,scope.$index)"><el-input style="width: 100;" v-model="scope.row.drug_code"></el-input></div> 
+          </template>
+        <!-- <template slot-scope="scope">{{scope.row.drug_code}}</template> -->
       </el-table-column>
 
       <el-table-column align="center" prop="name" label="患者姓名">
-        <template slot-scope="scope">{{scope.row.p.name}}</template>
+        <template slot-scope="scope">
+          <!-- {{scope.row.p.name}} -->
+           {{ getPatientName(scope.row.patient_id) }}
+        </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" label="批号">
@@ -217,6 +223,26 @@
 
     </el-table>
 
+    <el-dialog
+        title="药品追溯码"
+        :visible.sync="dialogVisibleOne"
+         width="40%">
+       <span>
+        <el-input
+          @keyup.native="changeText"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+          :rows="10"
+        >
+        </el-input>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleOne = false">取 消</el-button>
+        <el-button type="primary" @click="saveTextArea()">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 
   <!-- </div> -->
@@ -228,6 +254,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { GetDrugChangeStock } from '../../api/new_stock/stock'
 import { getDictionaryDataConfig } from "@/utils/data";
 import { uParseTime } from '@/utils/tools'
+import { changeDrugCode } from "@/api/pharmacy";
 import axios from 'axios'
 const moment = require('moment')
 export default {
@@ -255,10 +282,48 @@ export default {
       changes: [
         { id: 1, name: '已变更' },
         { id: 2, name: '未变更' },
-      ]
+      ],
+      textarea:'',
+      dialogVisibleOne:false,
+      currentRow:{},
+      currentIndex:0,
+      patientList:[]
     }
   },
   methods: {
+     changeText(event){
+        // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
+        if (event.key === 'Enter') {
+            var textarea = ""
+            textarea += this.textarea + ","
+            this.textarea = textarea
+        }
+       },
+       getDrugCode(id,DrugCode,index){
+            this.id = id 
+            this.textarea = DrugCode
+            this.currentIndex = index
+            this.dialogVisibleOne = true
+      },
+      saveTextArea(){
+       var params = {
+        id:this.id,
+        data_source:1,
+        drug_code:this.textarea,
+       }
+       console.log("paramss",params)
+      changeDrugCode(params).then(response=>{
+         if(response.data.state == 1){
+            this.$message.success("保存成功!")
+            for(let i=0;i<this.tableData.length;i++){
+             if(this.currentIndex == i){
+                this.tableData[i].drug_code = this.textarea
+             }
+            }
+            this.dialogVisibleOne = false
+         }
+      })
+    },
     deleteStock(row){
       let ids  = row.id
       var that = this;
@@ -446,6 +511,7 @@ export default {
           return false
         } else {
           this.value = response.data.data.total
+          this.patientList =  response.data.data.patientList
           for(let i =0; i < response.data.data.info.length; i++){
             let obj = {
               id:response.data.data.info[i].id,
@@ -460,7 +526,10 @@ export default {
               is_sale:response.data.data.info[i].is_sale,
               pc_date:response.data.data.info[i].pc_date,
               is_bg:response.data.data.info[i].is_change,
-              unit:response.data.data.info[i].Unit
+              unit:response.data.data.info[i].Unit,
+              patient_id:response.data.data.info[i].patient_id,
+              drug_code:response.data.data.info[i].his_advice_info.drug_code,
+              advice_id:response.data.data.info[i].his_advice_info.id
             }
             this.tableData.push(obj)
           }
@@ -471,6 +540,17 @@ export default {
 
 
     },
+    getPatientName(id){
+      console.log("id=-=--------------",id)
+      console.log("patinetlist===========",this.patientList)
+      var name = ""
+      for(let i=0;i<this.patientList.length;i++){
+        if(id == this.patientList[i].id){
+          name = this.patientList[i].name
+        }
+      }
+      return name
+    }
   },
   created() {
     var drugTypeList = getDictionaryDataConfig("system", "drug_type");

src/xt_pages/drugSourceCode/drugCodeQuery.vue

@@ -148,6 +148,7 @@
   import { getDictionaryDataConfig } from "@/utils/data";
   import { uParseTime } from '@/utils/tools'
   import { changeDrugCode } from "@/api/pharmacy";
+  
   import axios from 'axios'
   const moment = require('moment')
   export default {

src/xt_pages/stock/selfPreparedMedicine/addWarehouseInfo.vue

@@ -149,7 +149,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column align="center" width="150">
+            <!-- <el-table-column align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
@@ -166,7 +166,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-  
+   -->
             <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">
                 <span>入库数量<span style="color: red">*</span></span>
@@ -211,7 +211,7 @@
             </el-table-column>
         
             
-            <el-table-column width="180" align="center">
+            <!-- <el-table-column width="180" align="center">
               <template slot="header" slot-scope="scope">
                 <span>有效日期<span style="color: red">*</span></span>
               </template>
@@ -232,7 +232,7 @@
                   ></el-date-picker>
                 </el-form-item>
               </template>
-            </el-table-column>
+            </el-table-column> -->
   
             <el-table-column label="生产日期" width="180" align="center">
               <template slot-scope="scope">

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -150,7 +150,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column align="center" width="150">
+            <!-- <el-table-column align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
@@ -166,7 +166,7 @@
                   ></el-input>
                 </el-form-item>
               </template>
-            </el-table-column>
+            </el-table-column> -->
   
             <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">

src/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo.vue

@@ -157,7 +157,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column align="center" width="150">
+            <!-- <el-table-column align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
@@ -173,7 +173,7 @@
                   ></el-input>
                 </el-form-item>
               </template>
-            </el-table-column>
+            </el-table-column> -->
   
             <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">
@@ -219,7 +219,7 @@
             </el-table-column>
         
             
-            <el-table-column width="180" align="center">
+            <!-- <el-table-column width="180" align="center">
               <template slot="header" slot-scope="scope">
                 <span>有效日期<span style="color: red">*</span></span>
               </template>
@@ -240,7 +240,7 @@
                   ></el-date-picker>
                 </el-form-item>
               </template>
-            </el-table-column>
+            </el-table-column> -->
   
             <el-table-column label="生产日期" width="180" align="center">
               <template slot-scope="scope">

src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue

@@ -159,7 +159,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column align="center" width="150">
+            <!-- <el-table-column align="center" width="150">
               <template slot="header" slot-scope="scope">
                 <span>批号<span style="color: red">*</span></span>
               </template>
@@ -176,7 +176,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-  
+   -->
             <el-table-column align="center" width="200">
               <template slot="header" slot-scope="scope">
                 <span>出库数量<span style="color: red">*</span></span>

src/xt_pages/stock/selfPreparedMedicine/newDrugQuery.vue

@@ -172,7 +172,7 @@
         this.getlist()
       },
       toClick(val){
-       
+        console.log("val0000000000000000",val)
          var manufacturer_name = ""
          var specification_name = ""
          for(let i=0;i<this.manufacturerList.length;i++){
@@ -224,6 +224,7 @@
                       child: [],
                       count:0,
                       patient_id:0,
+                      flush_count:item.flush_count,
                     }
                   }
                 })

src/xt_pages/stock/selfPreparedMedicine/selfDrugFlow.vue

@@ -112,24 +112,23 @@
   
        
         
-           <el-table-column prop="drug_name" label="有效期" align="center">
+           <!-- <el-table-column prop="drug_name" label="有效期" align="center">
              <template slot-scope="scope">
                 {{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}
               
              </template>
-          </el-table-column>
+          </el-table-column> -->
          
           <el-table-column prop="drug_name" label="使用人" align="center">
              <template slot-scope="scope">
                <span > {{getPatientName(scope.row.patient_id)}}</span>
              </template>
           </el-table-column>
-          <el-table-column prop="drug_name" label="剩余库存" align="center">
+          <!-- <el-table-column prop="drug_name" label="剩余库存" align="center" v-if="patient_id>0">
              <template slot-scope="scope">
-               <!-- <span > {{getDrugCount(scope.row.over_count,scope.row.BaseDrugLib.max_unit,scope.row.BaseDrugLib.min_unit,scope.row.BaseDrugLib.min_number)}}</span> -->
                  {{ scope.row.over_count }} {{ drug.min_unit }}
              </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="remark" label="备注" align="center">
              <template slot-scope="scope">
                <span > {{scope.row.remark}}</span>
@@ -221,10 +220,13 @@
         houseList:[],
         patientList:[],
         drug:{},
-        patients:[]
+        patients:[],
+        patient_id:0,
       }
     },
     created(){
+      this.patient_id = this.$route.query.patient_id
+      console.log("病人ID=----------------",this.patient_id)
       this.getlist()
     },
     methods:{

src/xt_pages/stock/selfPreparedMedicine/selfPatientDrugFlow.vue

@@ -112,23 +112,23 @@
   
        
         
-           <el-table-column prop="drug_name" label="有效期" align="center">
+           <!-- <el-table-column prop="drug_name" label="有效期" align="center">
              <template slot-scope="scope">
                 {{getTime(scope.row.expire_date,"{y}-{h}-{d}")}}
               
              </template>
-          </el-table-column>
+          </el-table-column> -->
          
           <el-table-column prop="drug_name" label="使用人" align="center">
              <template slot-scope="scope">
                <span > {{getPatientName(scope.row.patient_id)}}</span>
              </template>
           </el-table-column>
-          <!-- <el-table-column prop="drug_name" label="剩余库存" align="center">
+          <el-table-column prop="drug_name" label="剩余库存" align="center">
              <template slot-scope="scope">
                  {{ scope.row.over_count }} {{ drug.min_unit }}
              </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column prop="remark" label="备注" align="center">
              <template slot-scope="scope">
                <span > {{scope.row.remark}}</span>