导出

src/api/drug/drug_stock.js

@@ -1,11 +1,7 @@
 import request from '@/utils/request'
 
 export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
-  console.log("params----",params)
-  console.log("warehousintg",warehousing_time)
-  console.log("manufactureer_id",manufacturer_id)
-  console.log("dealer_id",dealer_id)
-  console.log("type",type)
+
   return request({
     url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
     method: 'post',

src/xt_pages/data/components/addDrugs.vue

@@ -208,11 +208,11 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="代理商 : " prop="agent">
+            <!-- <el-form-item label="代理商 : " prop="agent">
               <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
-            </el-form-item>
+            </el-form-item> -->
 
-          <!-- <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
+          <el-form-item label="经销商 : " prop="dealer" style="width:100%">
              
                <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
                   <el-option
@@ -222,7 +222,7 @@
                     :value="item.id">
                   </el-option>
               </el-select>
-           </el-form-item> -->
+           </el-form-item>
 
             <el-form-item label=""  style="display:none;">
               <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
@@ -446,7 +446,8 @@
           last_price: [{ required: true, message: '请填写上次进价',trigger: 'blur'  }],
           drug_classify: [{ required: true, message: '请选择药物分类',trigger: 'change'  }],
           drug_dose: [{ required: true, message: '请填写剂量',trigger: 'blur'  }],
-          manufacturer: [{ required: true, message: '请选择生产产商',trigger: 'change'  }]
+          manufacturer: [{ required: true, message: '请选择生产产商',trigger: 'change'  }],
+          dealer:[{required:true,message:'请选择经销商',trigger:'change'}]
         },
         page:1,
         limit:500,
@@ -598,7 +599,7 @@
         form['is_charge_use'] = this.form.is_charge_use
         form['drug_code'] = this.form.drug_code
         form['drug_classify'] = this.form.drug_classify
-
+        form['dealer'] = this.form.dealer
 
 
         return form

src/xt_pages/data/components/drugs.vue

@@ -332,6 +332,8 @@
           })
         } else if (val.id == 0) {
           //新增
+          console.log("vale222222",val)
+         
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)

src/xt_pages/home/index.vue

@@ -201,7 +201,8 @@ export default {
       }
     },
     jump(id) {
-      this.$router.push({ path: "patients/inspection?id=" + id });
+      // this.$router.push({ path: "patients/inspection?id=" + id });
+      this.$router.push({path:"/patients/patients/"+id+"/inspectionInfectious"})
     },
     handleSizeChange(val) {},
     handleCurrentChange(val) {

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -337,7 +337,7 @@ export default {
     //  this.start_time = agoDay
     //  console.log("333333332222",this.start_time)
     this.GetWarehouse();
-    this.GetConfigInfo();
+    // this.GetConfigInfo();
     this.fetchAllAdminUsers();
   },
   data() {
@@ -485,6 +485,7 @@ export default {
         console.log(response);
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
+          console.log("制单人2222222",this.adminUserOptions)
           var alen = this.adminUserOptions.length;
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -567,6 +567,7 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         }
+        console.log("2222",this.form.dealer)
         GetAllDrugInfoByID(params).then(response => {
           
             if (response.data.state == 0) {
@@ -581,12 +582,12 @@
                 this.$message.error('该厂商或经销商没有药品信息')
                 return
               }
-              this.$refs.dialog.show()
               for (let i = 0; i < response.data.data.drugs.length; i++) {
                 this.propForm.goods.push(
                   response.data.data.drugs[i]
                 );
               }
+              this.$refs.dialog.show()
               const obj = {};
               this.propForm.goods = this.propForm.goods.reduce(
                 (cur, next) => {
@@ -595,6 +596,7 @@
                 },
                 []
               ); // 设置cur默认类型为数组，并且初始值为空的数组
+              
             }
 
             for (let i = 0; i < this.propForm.goods.length; i++) {
@@ -678,7 +680,8 @@
 
       }, 
       changeDealer(val) {
-
+        this.form.dealer = val;
+        this.propForm.goods= []
       },
       getDataConfig(module, filed_name){
         return getDataConfig(module, filed_name)

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -576,7 +576,10 @@ export default {
       this.propForm.manufacturer = val;
     },
     changeDealer(val) {
+      this.propForm.goods = []
       this.propForm.dealer = val;
+      this.form.dealer = val
+     
     },
     getDataConfig(module, filed_name){
      return getDataConfig(module, filed_name)

src/xt_pages/user/vascularAccess.vue

@@ -55,6 +55,33 @@
            <span v-if="scope.row.stop_time>0&&(scope.row.stop_time - scope.row.start_time)/86400 != 0">{{(scope.row.stop_time - scope.row.start_time)/86400}}</span>
           </template>
       </el-table-column>
+       
+      <el-table-column prop="date" label="导管感染转归" align="center" width="120">
+          <template slot-scope="scope">
+             <span v-if="scope.row.ci_type == 1">拔管</span>
+             <span v-if="scope.row.ci_type == 2">治愈</span>
+             <span v-if="scope.row.ci_type == 3">死亡</span>
+             <span v-if="scope.row.ci_type == 4">放弃</span>
+             <span v-if="scope.row.ci_type == 9">其它</span>
+          </template>
+      </el-table-column>
+       
+       <el-table-column prop="date" label="血培养检查结果" align="center" width="120">
+          <template slot-scope="scope">
+             <span v-if="scope.row.blood_cultupe == 0">阴性</span>
+             <span v-if="scope.row.blood_cultupe == 1">阳性</span>
+             <span v-if="scope.row.blood_cultupe == 9">未查</span>
+          </template>
+      </el-table-column>
+      
+     <el-table-column prop="date" label="患者导管转归类型" align="center" width="120">
+          <template slot-scope="scope">
+             <span v-if="scope.row.sequelae_type == 1">局部感染</span>
+             <span v-if="scope.row.sequelae_type == 2">静脉炎</span>
+             <span v-if="scope.row.sequelae_type == 3">导管细菌定植</span>
+             <span v-if="scope.row.sequelae_type == 4">导管相关血型感染</span>
+          </template>
+      </el-table-column>
        <el-table-column prop="date" label="备注" align="center" width="180">
           <template slot-scope="scope">
              <span>{{scope.row.remark}}</span>
@@ -187,6 +214,44 @@
                </el-form-item>
             </el-col>
          </el-row>
+         <el-row v-show="showOne">
+            <el-col :span="8">
+               <el-form-item label="导管感染转归:">
+                  <el-select v-model="form.ci_type" placeholder="请选择" style="width:150px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsTwo"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="血培养检查结果:">
+                  <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:150px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsThree"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+            <el-col :span="8">
+               <el-form-item label="患者导管转归类型:">
+                  <el-select v-model="form.sequelae_type" placeholder="请选择" style="width:150px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsOne"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+             </el-col>
+         </el-row>
          <el-row v-show="show">
             <el-col :span="8">
                <el-form-item label="停用日期:">
@@ -320,6 +385,44 @@
                   </el-select>
                </el-form-item>
             </el-col>
+         </el-row>
+           <el-row v-show="showOne">
+            <el-col :span="8">
+               <el-form-item label="导管感染转归:">
+                  <el-select v-model="form.ci_type" placeholder="请选择" style="width:150px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsTwo"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+             </el-col>
+             <el-col :span="8">
+               <el-form-item label="血培养检查结果:">
+                  <el-select v-model="form.blood_cultupe" placeholder="请选择" style="width:150px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsThree"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+            <el-col :span="8">
+               <el-form-item label="患者导管转归类型:">
+                  <el-select v-model="form.sequelae_type" placeholder="请选择" style="width:150px" @change="changeStatus">
+                     <el-option
+                           v-for="item in optionsOne"
+                           :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+             </el-col>
          </el-row>
          <el-row v-show="show">
             <el-col :span="8">
@@ -411,7 +514,10 @@
          user_status:1,
          remark:"",
          stop_time:"",
-         other_vascular:""
+         other_vascular:"",
+         ci_type:"",//导管感染转归
+         blood_cultupe:"", //血培养检查结果
+         sequelae_type:"",//患者导管转归类型
         },
         options:[
          {id:1,name:"启用"},
@@ -421,6 +527,7 @@
           {id:1,name:"流入-动脉"},
           {id:2,name:"流出-静脉"},
         ],
+
         blood_access_part_opera:[],
         blood_access_part:[],
         show:false,
@@ -435,6 +542,28 @@
         },
         new_blood_access_part_opera:[],
         new_blood_access_part:[],
+       // 导管感染类型
+        optionsOne:[
+           {id:1,name:"局部感染"},
+           {id:2,name:"静脉炎"},
+           {id:3,name:"导管细菌定植"},
+           {id:4,name:"导管相关血型感染"},
+        ],
+      //   导管转归类型
+        optionsTwo:[
+           {id:1,name:"拔管"},
+           {id:2,name:"治愈"},
+           {id:3,name:"死亡"},
+           {id:4,name:"放弃"},
+           {id:9,name:"其它"},
+        ],
+      //  血培养检查结果
+        optionsThree:[
+           {id:0,name:"阴性"},
+           {id:1,name:"阳性"},
+           {id:9,name:"未查"}
+        ],
+        showOne:false
       }
     },
     methods: {
@@ -497,8 +626,12 @@
                 remark:this.form.remark,
                 stop_time:this.form.stop_time,
                 other_vascular:this.form.other_vascular,
+                ci_type:this.form.ci_type,
+                blood_cultupe:this.form.blood_cultupe,
+                sequelae_type:this.form.sequelae_type,
               }
               console.log("params",params)
+            
              saveVasularAccess(params).then(response=>{
                 if(response.data.state == 1){
                    var access =  response.data.data.access
@@ -576,6 +709,7 @@
               }
 
               if(accessDetail.access_project == "2"){
+               this.showOne = true
                for(let i=0;i<this.new_blood_access_part_opera.length;i++){ 
                   if(this.new_blood_access_part_opera[i].field_type == 2){
                      arrOne.push(this.new_blood_access_part_opera[i])  
@@ -620,6 +754,9 @@
  
              this.form.user_status = accessDetail.user_status
              this.form.other_vascular = accessDetail.other_vascular
+             this.form.ci_type = accessDetail.ci_type
+             this.form.blood_cultupe = accessDetail.blood_cultupe
+             this.form.sequelae_type = accessDetail.sequelae_type
              if(accessDetail.user_status == 1){
                this.show = false
              }
@@ -693,9 +830,12 @@
                 remark:this.form.remark,
                 stop_time:this.form.stop_time,
                 patient_id:this.patientID,
-                other_vascular:this.form.other_vascular
+                other_vascular:this.form.other_vascular,
+                ci_type:this.form.ci_type,
+                blood_cultupe:this.form.blood_cultupe,
+                sequelae_type:this.form.sequelae_type
               }
-              console.log("编辑",params)
+            
               updatedVasularAccess(params).then(response=>{
                 if(response.data.state == 1){
                   var access =  response.data.data.access
@@ -800,11 +940,13 @@
         if(val == 1){
            this.blood_access_part_opera = arr
            this.blood_access_part = arrTwo
+           this.showOne = false
           
         }
         if(val == 2){
           this.blood_access_part_opera = arrOne
           this.blood_access_part = arrThree
+          this.showOne = true
         }
         
         console.log("arr",arr)