8月4日

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -227,6 +227,11 @@
                 }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="国家编码" width="162" align="center">
+              <template slot-scope="scope">
+                <span>{{getDrugName(scope.row.DrugId)}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="备注" width="170" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Remarks ? scope.row.Remarks : "" }}</span>
@@ -319,6 +324,7 @@ export default {
       shift: 0, //班次
       fen: [],
       partition: 0, //分区
+      drugList:[],
     };
   },
   watch: {},
@@ -451,6 +457,7 @@ export default {
         if (res.data.state == 1) {
           this.waitmount = res.data.data.itotal;
           this.alreadmount = res.data.data.wtotal;
+          this.drugList = res.data.data.drug
         }
       });
       // console.log("2222222")
@@ -706,6 +713,16 @@ export default {
         })
         .catch(() => {});
     },
+    getDrugName(drug_id){
+    
+      var  medical_insurance_number = ""
+      for(let i=0;i<this.drugList.length;i++){
+       if(drug_id == this.drugList[i].id){
+        medical_insurance_number = this.drugList[i].medical_insurance_number
+       }
+      }
+      return medical_insurance_number
+    }
   },
 };
 </script>

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -1538,18 +1538,18 @@
       },
       created(){
         var  disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
-        console.log("disinfection_fluid",disinfection_fluid)
+      
         for(let i=0;i<disinfection_fluid.length;i++){
           this.disInfectionWaterList.push(disinfection_fluid[i])
         }
 
         var  disinfection_methods = getManageMentDataConfig('management', 'disinfection_methods')
-        console.log("disinfection_methods",disinfection_methods)
+       
         for(let i=0;i<disinfection_methods.length;i++){
           this.DisinfectionMode.push(disinfection_methods[i])
         }
         var  disinfection_offices = getManageMentDataConfig('management', 'disinfection_object')
-        console.log("disinfection_offices",disinfection_offices)
+        
         for(let i=0;i<disinfection_offices.length;i++){
           this.disinfectionOfficeList.push(disinfection_offices[i])
         }
@@ -2098,7 +2098,7 @@
            if(response.data.state==1){
              var objctSet = response.data.data.objctSet
              if(objctSet!=undefined){
-                this.art_way_one = objctSet.air_way.toString()
+                this.art_way_one = objctSet.air_way
              }
             
            }

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -173,6 +173,9 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="医师编码：">
+         <el-input v-model="form.doctor_number"></el-input>
+      </el-form-item>
       <el-form-item label="科室：" prop="department">
         <el-select v-model="form.department" placeholder="请选择">
           <el-option
@@ -387,7 +390,8 @@
           medical_expenses: '',
           cost: '',
           phone: '',
-          social_type: ''
+          social_type: '',
+          doctor_number:"",
         }
 
       }
@@ -526,7 +530,7 @@
       changeDoctor() {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.form.doctor) {
-            console.log(this.doctors[i].department_id)
+            this.form.doctor_number = this.doctors[i].doctor_number
             this.form.department = this.doctors[i].department_id
             if (this.form.department == 0) {
 

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -165,6 +165,10 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="医师编码：">
+         <el-input v-model="form.doctor_number"></el-input>
+      </el-form-item>
+
       <el-form-item label="科室：" prop="department" >
         <el-select v-model="form.department" placeholder="请选择">
           <el-option
@@ -629,6 +633,7 @@
           cost: '',
           phone: '',
           social_type: '',
+          doctor_number:"",
         }, IDCardTypes: [{
           value: 1,
           label: '社保卡'
@@ -903,7 +908,7 @@
       changeDoctor() {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.form.doctor) {
-            console.log(this.doctors[i].department_id)
+            this.form.doctor_number = this.doctors[i].doctor_number
             this.form.department = this.doctors[i].department_id
             if(this.form.department == 0){
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -105,6 +105,11 @@
                     </el-select>
                 </template>
             </el-table-column>
+            <el-table-column align="center" prop="remark" width="80" label="国家编码">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.drug.medical_insurance_number" placeholder=""></el-input>
+                </template>
+            </el-table-column>
             <el-table-column align="center" prop="remark" width="50" label="备注">
                 <template slot-scope="scope">
                     <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
@@ -183,6 +188,14 @@
 
                 </template>
             </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="国家编码">
+                <template slot-scope="scope" v-if="scope.row.type==3">
+                    <el-input v-model="scope.row.good_info.social_security_directory_code"></el-input>
+                </template>
+                <template slot-scope="scope" v-if="scope.row.type==2">
+                    <el-input v-model="scope.row.project.medical_code"></el-input>
+                </template>
+            </el-table-column>
             <el-table-column align="center" prop="name" width="50" label="备注">
                 <template slot-scope="scope">
                     <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
@@ -320,8 +333,10 @@
             return false
           } else {
             this.drugways = response.data.data.drugways
+
             this.efs = response.data.data.efs
             this.drugList = response.data.data.drugs
+           
           }
         })
 
@@ -683,7 +698,8 @@
     watch: {
       'prescription.advices': {
         handler(newVal, oldVal) {
-
+          console.log("检查我我我我",this.prescription.advices)
+          console.log("检查我我我我",this.prescription.project)
         },
         deep: true
       }

src/xt_pages/outpatientRegistration/index.vue

@@ -381,6 +381,9 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="医师编码：">
+                       <el-input v-model="form.doctor_number"></el-input>
+                    </el-form-item>
                     <el-form-item label="科室：" prop="department" :validate-event="is_Name">
                         <el-select v-model="form.department" placeholder="请选择">
                             <el-option
@@ -484,7 +487,8 @@
           total: '',
           phone: '',
           social_type: '',
-          id_card_type: 2
+          id_card_type: 2,
+          doctor_number:"",
 
         },
         medical_care: [
@@ -1515,17 +1519,20 @@
       ,
 
       changeDoctor(id) {
-
+        console.log("idwowowowo",id)
         for (let i = 0; i < this.doctorList.length; i++) {
           if (this.doctorList[i].admin_user_id == id) {
+            this.form.doctor_number = this.doctorList[i].doctor_number
             if (this.doctorList[i].department_id == 0) {
               this.form.department = this.departmentList[0].id
+              
             } else {
               this.form.department = this.doctorList[i].department_id
             }
 
           }
         }
+        console.log("this.form.doctor_number",this.form.doctor_number)
       },
       changeName(id) {
         this.form.sex = ''

src/xt_pages/stock/inventoryTransfer/Addtrans.vue

@@ -113,6 +113,14 @@
               </el-form-item>
             </template>
           </el-table-column>
+        <el-table-column align="center" width="100">
+          <template slot="header" slot-scope="scope">
+              国家编码
+            </template>
+           <template slot-scope="scope">
+              {{ scope.row.medical_insurance_number? scope.row.medical_insurance_number:"" }}
+           </template>
+        </el-table-column>
           <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
               <span>商品类型<span style="color: red">*</span></span>
@@ -520,11 +528,11 @@ export default {
           this.recordInfo.recordData[i].name = val.name;
           this.recordInfo.recordData[i].project_name = val.project_name;
           this.recordInfo.recordData[i].project_type = val.project_type;
-          this.recordInfo.recordData[i].second_specification_name =
-            val.second_specification_name;
+          this.recordInfo.recordData[i].second_specification_name =val.second_specification_name;
           this.recordInfo.recordData[i].second_total = val.second_total;
           this.recordInfo.recordData[i].sencond_unit = val.sencond_unit;
           this.recordInfo.recordData[i].min_price = val.min_price;
+          this.recordInfo.recordData[i].medical_insurance_number = val.medical_insurance_number
           if (val.count == NaN) {
             this.recordInfo.recordData[i].count = "";
           } else {
@@ -588,6 +596,7 @@ export default {
       tempObj["remake"] = "";
       tempObj["project_id"] = 0;
       tempObj["min_price"] = 0;
+      tempObj["medical_insurance_number"] =0
       this.recordInfo.recordData = []
       this.recordInfo.recordData.push(tempObj);
       if(this.storehouse_in_id == this.storehouse_out_id){
@@ -665,6 +674,7 @@ export default {
           drugList[i].count = "";
           drugList[i].remake = "";
           drugList[i].min_price = drugList[i].min_price;
+          drugList[i].medical_insurance_number = drugList[i].medical_insurance_number
           if (drugList[i].max_unit != drugList[i].min_unit) {
             drugList[i].unitList = [
               { id: 1, name: "" },
@@ -719,6 +729,7 @@ export default {
           goodList[i].sencond_unit = goodList[i].packing_unit;
           goodList[i].remake = "";
           goodList[i].min_price = goodList[i].retail_price;
+          goodList[i].medical_insurance_number = goodList[i].medical_insurance_number
           for (let j = 0; j < goodList[i].unitList.length; j++) {
             goodList[i].unitList[0].name = goodList[i].packing_unit;
           }
@@ -771,7 +782,8 @@ export default {
     tempObj["remake"] = "";
     tempObj["is_source"] = 0;
     tempObj["project_id"] = 0;
-    tempObj["min_price"] = 0;
+    tempObj["min_price"] = 0; 
+    tempObj["medical_insurance_number"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.getlist();
   },

src/xt_pages/stock/inventoryTransfer/transEdit.vue

@@ -132,6 +132,14 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column align="center" width="100">
+          <template slot="header" slot-scope="scope">
+              国家编码
+            </template>
+           <template slot-scope="scope">
+              {{ scope.row.medical_insurance_number? scope.row.medical_insurance_number:"" }}
+           </template>
+         </el-table-column>
           <el-table-column align="center" width="250">
             <template slot="header" slot-scope="scope">
               <span>规格<span style="color: red">*</span></span>
@@ -451,6 +459,7 @@ export default {
       tempObj["remake"] = "";
       tempObj["project_id"] = 0;
       tempObj["min_price"] = 0;
+      tempObj["medical_insurance_number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
 
@@ -687,7 +696,8 @@ export default {
             }
 
             drugList[i].sencond_unit = drugList[i].max_unit;
-            for (let j = 0; j < drugList[i].unitList.length; j++) {
+            drugList[i].medical_insurance_number  = drugList[i].medical_insurance_number
+              for (let j = 0; j < drugList[i].unitList.length; j++) {
               if (drugList[i].max_unit != drugList[i].min_unit) {
                 drugList[i].unitList[0].name = drugList[i].max_unit;
                 drugList[i].unitList[1].name = drugList[i].min_unit;
@@ -730,9 +740,11 @@ export default {
             goodList[i].sencond_unit = goodList[i].packing_unit;
             goodList[i].remake = "";
             goodList[i].min_price = goodList[i].retail_price;
+            goodList[i].medical_insurance_number = goodList[i].medical_insurance_number
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
+            
             this.tabList.push(goodList[i]);
           }
         }
@@ -847,6 +859,7 @@ export default {
       tempObj["remake"] = "";
       tempObj["project_id"] = 0;
       tempObj["min_price"] = 0;
+      tempObj["medical_insurance_number"] = ""
       if(this.storehouse_in_id == this.storehouse_out_id){
          this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
          this.storehouse_out_id = ""
@@ -925,6 +938,7 @@ export default {
           drugList[i].count = "";
           drugList[i].remake = "";
           drugList[i].min_price = drugList[i].min_price;
+          drugList[i].medical_insurance_number = drugList[i].medical_insurance_number
           if (drugList[i].max_unit != drugList[i].min_unit) {
             drugList[i].unitList = [
               { id: 1, name: "" },
@@ -979,6 +993,7 @@ export default {
           goodList[i].sencond_unit = goodList[i].packing_unit;
           goodList[i].remake = "";
           goodList[i].min_price = goodList[i].retail_price;
+          goodList[i].medical_insurance_number= goodList[i].medical_insurance_number
           for (let j = 0; j < goodList[i].unitList.length; j++) {
             goodList[i].unitList[0].name = goodList[i].packing_unit;
           }
@@ -1011,6 +1026,7 @@ export default {
     tempObj["is_source"] = 0;
     tempObj["project_id"] = 0;
     tempObj["min_price"] = 0;
+    tempObj["medical_insurance_number"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.getlist();
     this.getSencondOrderDetail();