Merge branch '20201014_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201014_pc_vue_new_branch

src/api/advice.js

@@ -43,6 +43,7 @@ export function EditDoctorAdvice(patient, id, advice, mode) {
 }
 
 export function ExecDoctorAdvice(patient, id, time, mode) {
+
   var params = {
     id: id,
     patient: patient,
@@ -440,8 +441,8 @@ export function ExecGroupAdvice(groupno, time, mode) {
       time +
       "&mode=" +
       mode,
-    method: "Post",
-    headers: {
+      method: "Post",
+      headers: {
       Permission: 2
     }
   });

src/api/drug/drug.js

@@ -6,4 +6,214 @@ export function getCurrentPatient(params){
       methods:"get",
       params:params  
    })
+}
+
+export function getAllDrugName(params){
+   return request({
+     url:"/api/drug/getalldrugname",
+     methods:"get",
+     params:params
+   })
+}
+
+
+export function saveDrugName(params){
+  return request({
+     url:"/api/drug/savedrugname",
+     methods:"get",
+     params:params
+  })
+}
+
+export function getdrugNameList(params){ 
+  return request({
+     url:"/api/drug/getdrugnamelist",
+     methods:"get",
+     params:params
+  })
+}
+
+export function getRulleName(params){
+  return request({
+     url:"/api/drug/getrullename",
+     methods:"get",
+     params:params 
+   })
+}
+
+export function getUnitByBaseId(params){
+  return request({
+     url:"/api/drug/getunitbybaseid",
+     methods:"get",
+     params:params  
+  })
+}
+
+export function saveRulleName(params){
+  return request({
+     url:"/api/drug/saverullename",
+     methods:"get",
+     params:params
+  })
+}
+
+export function EditRullerName(params){
+   return request({
+     url:"/api/drug/editrullername",
+     methods:"get",
+     params:params
+   })
+}
+
+
+export function updatedRulleName(params){
+  
+  return request({
+    url:"/api/drug/updatedrullername",
+    methods:"get",
+    params:params
+  })
+}
+
+export function getAllDrugNameList(params){
+  
+  return request({
+     url:"/api/drug/getalldrugnamelist",
+     methods:"Get",
+     params:params
+  })
+}
+
+export function getRullListByDrugName(params){
+  
+   return request({
+       url:"/api/drug/getrulllistbydrugname",
+       methods:"Get",
+       params:params
+    })
+}
+
+export function SaveSelfMedicines(data){
+   
+   return request({
+      url:"/api/drug/saveselfmedicines",
+      method:"post",
+      data:data
+   })
+}
+
+export function getCurrentOrgAllStaff(params){
+   return request({
+      url:"/api/drug/getcurrentorgallstaff",
+      methods:"get",
+      params:params
+   })
+}
+
+
+export function saveStock(data,startime,adminuserid,patientid){
+  
+   return request({
+      url:"/api/drug/savestock?start_time="+startime+"&admin_user_id="+adminuserid+"&patient_id="+patientid,
+      method:"post",
+      data:data
+   })
+
+}
+
+export function saveOutStock(data,startime,adminuserid,patientid){
+   return request({
+      url:"/api/drug/saveoutstock?start_time="+startime+"&admin_user_id="+adminuserid+"&patient_id="+patientid,
+      method:"post",
+      data:data
+   })
+}
+
+export function DeleteDrugById(params){
+  
+   return request({
+      url:"/api/drug/deletedrugbyid",
+      method:"get",
+      params:params
+   })
+}
+
+export function saveRadio(params){
+  
+   return request({
+      url:"/api/drug/saveradio",
+      method:"get",
+      params:params
+   })
+}
+
+export function DeleteDrugStand(id,params){
+   
+   return request({
+      url:"/api/drug/deletedrugstand?id="+id,
+      method:"get",
+      params:params
+   })
+}
+
+export function getStockList(params){
+   
+   return request({
+      url:"/api/drug/getstocklist",
+      method:"get",
+      params:params
+   })
+}
+
+export function DeleteDrugName(params){
+  
+   return request({
+      url:"/api/drug/deletedrugname",
+      method:"get",
+      params:params
+   })
+}
+
+export function getDrugDetail(params){
+   return request({
+      url:"/api/drug/getdrugdetail",
+      method:"get",
+      params:params
+   })
+}
+
+export function getAllPatientStockList(params){
+   
+   return request({
+      url:"/api/drug/getallpatientstocklist",
+      method:"get",
+      params:params
+   })
+}
+
+export function getDrugDataByPatientId(params){
+  
+   return request({
+      url:"/api/drug/getdrugdatabypatientid",
+      method:"get",
+      params:params
+   })
+}
+
+export function getSelfMedicalList(params){
+   
+   return request({
+       url:"/api/drug/getselfmedicallist",
+       methods:"get",
+       params:params
+   })
+}
+
+export function getDrugDescByDrugName(params){
+
+   return request({
+      url:"/api/drug/getdrugdescbydrugname",
+      methods:"get",
+      params:params
+   })
 }

src/api/manage.js

@@ -97,7 +97,7 @@ export function getAllEquimentName(params) {
 }
 
 export function savePlan(data, id) {
-  console.log('data', data)
+  console.log('data====', data)
   return request({
     url: '/api/management/saveplan?id=' + id,
     method: 'Post',

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -98,10 +98,7 @@
         ></el-table-column>
         <el-table-column label="药品规格" align="center">
           <template slot-scope="scope">
-                <span v-if="scope.row.advice_desc"
-                >{{ scope.row.advice_desc
-                  }}{{ scope.row.drug_spec_unit }}</span
-                >
+             <span v-if="scope.row.advice_desc">{{ scope.row.advice_desc}}{{ scope.row.drug_spec_unit }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -111,10 +108,7 @@
           align="center"
         >
           <template slot-scope="scope">
-                <span v-if="scope.row.prescribing_number != 0"
-                >{{ scope.row.prescribing_number
-                  }}{{ scope.row.prescribing_number_unit }}</span
-                >
+             <span v-if="scope.row.prescribing_number != 0">{{ scope.row.prescribing_number}}{{ scope.row.prescribing_number_unit }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -124,10 +118,7 @@
           align="center"
         >
           <template slot-scope="scope">
-                <span v-if="scope.row.single_dose != 0"
-                >{{ scope.row.single_dose
-                  }}{{ scope.row.single_dose_unit }}</span
-                >
+              <span v-if="scope.row.single_dose != 0">{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -137,9 +128,7 @@
           align="center"
         >
           <template slot-scope="scope">
-                <span v-if="scope.row.parent_row == 0">{{
-                  scope.row.delivery_way
-                }}</span>
+            <span v-if="scope.row.parent_row == 0">{{scope.row.delivery_way}}</span>
           </template>
         </el-table-column>
 
@@ -150,9 +139,7 @@
           align="center"
         >
           <template slot-scope="scope">
-                <span v-if="scope.row.parent_row == 0">{{
-                  scope.row.execution_frequency
-                }}</span>
+             <span v-if="scope.row.parent_row == 0">{{scope.row.execution_frequency}}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -1216,13 +1203,13 @@
         this.exceLoading = true
         let mode = '6'
 
-        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode)
-          .then(response => {
+        ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.exceLoading = false
               return false
             } else {
+
               this.$notify({
                 title: '成功',
                 message: '执行医嘱成功',
@@ -2172,7 +2159,7 @@
       }
       ,
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-        console.log('columnIndex', columnIndex)
+        // console.log('columnIndex', columnIndex)
         if (columnIndex === 0) {
           if (rowIndex % 2 === 0) {
             return {

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -184,9 +184,7 @@
                 align="center"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.parent_row == 0">{{
-                    scope.row.execution_frequency
-                  }}</span>
+                  <span v-if="scope.row.parent_row == 0">{{scope.row.execution_frequency}}</span>
                 </template>
               </el-table-column>
 
@@ -259,10 +257,7 @@
             ></el-table-column>
             <el-table-column label="药品规格" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.advice_desc"
-                  >{{ scope.row.advice_desc
-                  }}{{ scope.row.drug_spec_unit }}</span
-                >
+                <span v-if="scope.row.advice_desc">{{ scope.row.advice_desc}}{{ scope.row.drug_spec_unit }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -272,10 +267,7 @@
               align="center"
             >
               <template slot-scope="scope">
-                <span v-if="scope.row.prescribing_number != 0"
-                  >{{ scope.row.prescribing_number
-                  }}{{ scope.row.prescribing_number_unit }}</span
-                >
+                <span v-if="scope.row.prescribing_number != 0">{{ scope.row.prescribing_number}}{{ scope.row.prescribing_number_unit }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -285,10 +277,7 @@
               align="center"
             >
               <template slot-scope="scope">
-                <span v-if="scope.row.single_dose != 0"
-                  >{{ scope.row.single_dose
-                  }}{{ scope.row.single_dose_unit }}</span
-                >
+                <span v-if="scope.row.single_dose != 0">{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -298,9 +287,7 @@
               align="center"
             >
               <template slot-scope="scope">
-                <span v-if="scope.row.parent_row == 0">{{
-                  scope.row.delivery_way
-                }}</span>
+                <span v-if="scope.row.parent_row == 0">{{scope.row.delivery_way}}</span>
               </template>
             </el-table-column>
 
@@ -383,28 +370,65 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-              <el-input v-model="nameForm.advice_name"></el-input>
+              <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
+               <el-select
+                v-model="nameForm.advice_name"
+                filterable
+                clearable
+                allow-create
+                :disabled="isChild"
+                placeholder="请选择(输入可搜索)"
+                style="width:200px"
+                @change="changeDrugName"
+              >
+                <el-option
+                  v-for="item in medicals"
+                  :key="item.id"
+                  :label="item.drug_name"
+                  :value="item.drug_name"
+                ></el-option>
+              </el-select>
             </el-form-item>
+
+            
           </el-col>
 
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="13">
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
             <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
             <!--</el-form-item>-->
             <el-form-item label="药品规格 :" prop="advice_desc">
-              <el-col :span="8">
-                <el-input v-model="nameForm.advice_desc"></el-input>
+              <el-col :span="10">
+                <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
+                 <el-select
+                  v-model="nameForm.advice_desc"
+                  filterable
+                  clearable
+                  allow-create
+                  :disabled="isChild"
+                  placeholder="请选择(输入可搜索)"
+                  style="width:150px"
+                >
+                  <el-option
+                    v-for="item in drugSpec"
+                    :key="item.id"
+                    :label="item.drug_spec"
+                    :value="item.drug_spec"
+                  ></el-option>
+                 </el-select>
+
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
-              <el-col :span="14">
+              <el-col :span="10">
                 <el-select
                   v-model="nameForm.drug_spec_unit"
                   filterable
                   clearable
                   allow-create
                   placeholder="选择"
+                  style="width:120px"
                 >
                   <el-option
                     v-for="item in unitsOption"
@@ -416,7 +440,7 @@
               </el-col>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="9">
             <el-form-item label="开药数量 :" prop="prescribing_number">
               <el-col :span="8">
                 <el-input v-model="nameForm.prescribing_number"></el-input>
@@ -543,6 +567,7 @@ import {
   StopDoctorAdvice
 } from "@/api/advice";
 
+import {getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
 export default {
   name: "AddGroupAdvice",
   data() {
@@ -608,7 +633,9 @@ export default {
       },
       selectedTemp: { id: 0, name: "", org_id: 0, list: [], rows: [] },
       selectedTemplate: [],
-      allSelectedTemplate: []
+      allSelectedTemplate: [],
+      medicals:[],
+      drugSpec:[],
     };
   },
   props: {
@@ -677,7 +704,8 @@ export default {
           }
           submitForm.adviceNames = adviceNames;
           let mode = "1";
-
+          
+        
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -799,61 +827,36 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
+      //截取自备药名称
+      var arr = this.nameForm.advice_name.split("(自备药)")
+      this.nameForm.advice_name = arr[0]
+
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (_this.nameForm.isEdit) {
             var ale = _this.groupForm.adviceNames.length;
+            console.log("进来诶呦")
             if (_this.isChild) {
               for (let index = 0; index < ale; index++) {
-                if (
-                  _this.groupSelectRow.parent_row ==
-                  _this.groupForm.adviceNames[index].row_key
-                ) {
+                if (_this.groupSelectRow.parent_row ==_this.groupForm.adviceNames[index].row_key) {
                   var cle = _this.groupForm.adviceNames[index].children.length;
+              
                   var children = _this.groupForm.adviceNames[index].children;
                   for (let j = 0; j < ale; j++) {
                     if (_this.groupSelectRow.row_key == children[j].row_key) {
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].advice_name = _this.nameForm.advice_name;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].advice_desc = _this.nameForm.advice_desc;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].single_dose = "" + _this.nameForm.single_dose;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].single_dose_unit = _this.nameForm.single_dose_unit;
-                      _this.groupForm.adviceNames[index].children[j].drug_spec =
-                        "" + _this.nameForm.drug_spec;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].drug_spec_unit = _this.nameForm.drug_spec_unit;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].prescribing_number =
-                        "" + _this.nameForm.prescribing_number;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].prescribing_number_unit =
-                        _this.nameForm.prescribing_number_unit;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].delivery_way = _this.nameForm.delivery_way;
-                      _this.groupForm.adviceNames[index].children[
-                        j
-                      ].execution_frequency =
-                        _this.nameForm.execution_frequency;
-
-                      _this.groupForm.adviceNames[index].children[j].remark =
-                        _this.nameForm.remark;
-
-                      _this.$set(
-                        _this.groupForm.adviceNames[index].children,
-                        j,
-                        _this.groupForm.adviceNames[index].children[j]
+                      _this.groupForm.adviceNames[index].children[j].advice_name = _this.nameForm.advice_name;
+                      _this.groupForm.adviceNames[index].children[j].advice_desc = _this.nameForm.advice_desc;
+                      _this.groupForm.adviceNames[index].children[j].single_dose = "" + _this.nameForm.single_dose;
+                      _this.groupForm.adviceNames[index].children[j].single_dose_unit = _this.nameForm.single_dose_unit;
+                      _this.groupForm.adviceNames[index].children[j].drug_spec = "" + _this.nameForm.drug_spec;
+                      _this.groupForm.adviceNames[index].children[j].drug_spec_unit = _this.nameForm.drug_spec_unit;
+                      _this.groupForm.adviceNames[index].children[j].prescribing_number ="" + _this.nameForm.prescribing_number;
+                      _this.groupForm.adviceNames[index].children[j].prescribing_number_unit = _this.nameForm.prescribing_number_unit;
+                      _this.groupForm.adviceNames[index].children[j].delivery_way = _this.nameForm.delivery_way;
+                      _this.groupForm.adviceNames[index].children[j].execution_frequency =_this.nameForm.execution_frequency;
+                      _this.groupForm.adviceNames[index].children[j].remark =_this.nameForm.remark;
+                      _this.$set(_this.groupForm.adviceNames[index].children,j,_this.groupForm.adviceNames[index].children[j]
                       );
                       break;
                     }
@@ -862,32 +865,18 @@ export default {
               }
             } else {
               for (let index = 0; index < ale; index++) {
-                if (
-                  _this.groupSelectRow.row_key ==
-                  _this.groupForm.adviceNames[index].row_key
-                ) {
-                  _this.groupForm.adviceNames[index].advice_name =
-                    _this.nameForm.advice_name;
-                  _this.groupForm.adviceNames[index].advice_desc =
-                    _this.nameForm.advice_desc;
-                  _this.groupForm.adviceNames[index].single_dose =
-                    "" + _this.nameForm.single_dose;
-                  _this.groupForm.adviceNames[index].single_dose_unit =
-                    _this.nameForm.single_dose_unit;
-                  _this.groupForm.adviceNames[index].drug_spec =
-                    "" + _this.nameForm.drug_spec;
-                  _this.groupForm.adviceNames[index].drug_spec_unit =
-                    _this.nameForm.drug_spec_unit;
-                  _this.groupForm.adviceNames[index].prescribing_number =
-                    "" + _this.nameForm.prescribing_number;
-                  _this.groupForm.adviceNames[index].prescribing_number_unit =
-                    _this.nameForm.prescribing_number_unit;
-                  _this.groupForm.adviceNames[index].delivery_way =
-                    _this.nameForm.delivery_way;
-                  _this.groupForm.adviceNames[index].execution_frequency =
-                    _this.nameForm.execution_frequency;
-                  _this.groupForm.adviceNames[index].remark =
-                    _this.nameForm.remark;
+                if ( _this.groupSelectRow.row_key ==_this.groupForm.adviceNames[index].row_key) {
+                  _this.groupForm.adviceNames[index].advice_name =_this.nameForm.advice_name;
+                  _this.groupForm.adviceNames[index].advice_desc =_this.nameForm.advice_desc;
+                  _this.groupForm.adviceNames[index].single_dose ="" + _this.nameForm.single_dose;
+                  _this.groupForm.adviceNames[index].single_dose_unit =_this.nameForm.single_dose_unit;
+                  _this.groupForm.adviceNames[index].drug_spec = "" + _this.nameForm.drug_spec;
+                  _this.groupForm.adviceNames[index].drug_spec_unit =_this.nameForm.drug_spec_unit;
+                  _this.groupForm.adviceNames[index].prescribing_number ="" + _this.nameForm.prescribing_number;
+                  _this.groupForm.adviceNames[index].prescribing_number_unit =_this.nameForm.prescribing_number_unit;
+                  _this.groupForm.adviceNames[index].delivery_way =_this.nameForm.delivery_way;
+                  _this.groupForm.adviceNames[index].execution_frequency =_this.nameForm.execution_frequency;
+                  _this.groupForm.adviceNames[index].remark =_this.nameForm.remark;
 
                   _this.$set(
                     _this.groupForm.adviceNames,
@@ -905,18 +894,9 @@ export default {
 
               var ale = _this.groupForm.adviceNames.length;
               for (let index = 0; index < ale; index++) {
-                if (
-                  _this.nameForm.parent_row ==
-                  _this.groupForm.adviceNames[index].row_key
-                ) {
-                  _this.groupForm.adviceNames[index].children.push(
-                    _this.nameForm
-                  );
-                  _this.$set(
-                    _this.groupForm.adviceNames,
-                    index,
-                    _this.groupForm.adviceNames[index]
-                  );
+                if (_this.nameForm.parent_row ==_this.groupForm.adviceNames[index].row_key) {
+                  _this.groupForm.adviceNames[index].children.push(_this.nameForm);
+                  _this.$set(_this.groupForm.adviceNames,index,_this.groupForm.adviceNames[index]);
                   break;
                 }
               }
@@ -929,7 +909,6 @@ export default {
           _this.nameFormVisible = false;
         }
       });
-      console.log(_this.groupForm.adviceNames);
     },
 
     openGroupChild() {
@@ -945,7 +924,7 @@ export default {
         return;
       }
       this.nameForm = {
-        advice_name: "",
+        advice_name:"",
         advice_desc: "",
         single_dose: "",
         single_dose_unit: "",
@@ -1039,7 +1018,7 @@ export default {
     selectAdvice(selection, row) {
       // this.selectedTemplate = [];
 
-      console.log(selection);
+      // console.log(selection);
 
       var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id]
         .DoctorAdviceTemplate;
@@ -1057,7 +1036,7 @@ export default {
         }
       }
 
-      console.log(adviceArray);
+      // console.log(adviceArray);
 
       if (row.children.length > 0) {
         for (const index in row.children) {
@@ -1155,11 +1134,8 @@ export default {
               .DoctorAdviceTemplate[index].single_dose_unit,
             drug_spec:
               "" +
-              this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                .drug_spec,
-            drug_spec_unit: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
-              index
-            ].drug_spec_unit,
+              this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec,
+            drug_spec_unit: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec_unit,
             prescribing_number:
               "" +
               this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
@@ -1530,12 +1506,49 @@ export default {
           adviceTemplate.DoctorAdviceTemplate[index].selection = false;
         }
       }
+    },
+
+    //
+    getSelfMedicalList(){
+        const params = {
+          patient_id:this.$route.query.patient_id
+        }
+      getSelfMedicalList(params).then(response=>{
+          if(response.data.state == 1){
+            var medicalList =  response.data.data.medicalList
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
+            }
+            this.medicals = medicalList
+          }
+      })
+    },
+    changeDrugName(name){
+       console.log("name",name)
+      var arr = name.split("(自备药)");
+        const params = {
+          drug_name:arr[0],
+          patient_id:this.$route.query.patient_id
+        }
+        console.log("params",params)
+      getDrugDescByDrugName(params).then(response=>{
+          if(response.data.state == 1){
+             var drugspec = response.data.data.drugspec
+             console.log("drugspec",drugspec)
+             this.drugSpec = drugspec
+          }
+      })
+    
     }
   },
   watch: {
     "selectedTemp.list": function() {
       this.calcselectedTemp();
     }
+  },
+  created(){
+    //获取自备药
+    this.getSelfMedicalList()
   }
 };
 </script>

src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue

@@ -1,62 +1,57 @@
 <template>
     <el-dialog
-        :title="formTitle"
+        :title="title"
         width="900px"
         :visible.sync="visible"
         :before-close="_close"
     >
         <div style="display:flex;width:100%;">
             <div style="width:200px;">
-                <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+              <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" 
+                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
+                 ref="monthlyPlanTable" @current-change="handleCurrentChange" >
                     <el-table-column align="center" prop="name" label="药品名称">
-                        <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                        <template slot-scope="scope">
+                           {{scope.row.drug_name}}
+                         </template>
                     </el-table-column>
                 </el-table>
             </div>
             <div style="flex:1;padding-left:10px;">
-                <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                <el-table :data="tableDatatwo" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+                 highlight-current-row  @selection-change="handleSelectionChange">
                     <el-table-column type="selection" align="center" width="55"></el-table-column>
                     <el-table-column align="center" prop="name" label="规格名称">
-                        <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                        <template slot-scope="scope">{{scope.row.drug_spec}}</template>
                     </el-table-column>
                 </el-table>
             </div>
         </div>
         <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取 消</el-button>
-            <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+            <el-button type="primary" @click="SaveSelfMedicines()">保 存</el-button>
         </div>
     </el-dialog>         
 </template>
 
 <script>
+import { getAllDrugNameList,getRullListByDrugName,SaveSelfMedicines } from "@/api/drug/drug"
 export default {
     data(){
         return{
             visible:false,
             formTitle:'',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄',
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄',
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }]
+            tableData: [],
+            patient_name:"",
+            title:"",
+            currentRow:"",
+            tableDatatwo:[],
+            patient_id:0,
+            medicineData:[]
         }
     },
     methods:{
         _close: function(done) {
-            // this.clear()
             done()
         },
         clear: function() {
@@ -64,20 +59,70 @@ export default {
             this.form.name = "";
             this.form.intro = "";
         },
-        show(id) {
-            // this.clear()
-            this.visible = true
-            if(id == 0){
-                this.formTitle = '新增'
-            }else{
-                this.formTitle = '编辑'
+        show(name,id) {
+           this.patient_id = id
+           this.patient_name = name
+           this.title = "添加自备药"+"("+name+")"
+           this.visible = true
+           this.$nextTick(() => {
+            if( this.tableData.length > 0){
+                this.$refs.monthlyPlanTable.setCurrentRow(this.tableData[0])
             }
-        },
+          });
+         },
         hide() {
-            // this.clear()
-            this.visible = false
+           this.visible = false
+        },
+
+        getAllDrugNameList(){
+           getAllDrugNameList().then(response=>{
+             if(response.data.state == 1){
+               var rullername =  response.data.data.rullerName
+               this.tableData = rullername
+             }
+           }) 
+        },
+        handleCurrentChange(val){
+           console.log("val===",val)
+           this.currentRow = val
+           this.getRullListByDrugName(val.drug_name)
+        },
+        getRullListByDrugName(drugname){
+            const params = {
+              drug_name:drugname,
+            }
+           getRullListByDrugName(params).then(response=>{
+              if(response.data.state ==  1){
+                var drugName =  response.data.data.drugName
+                console.log("drugname",drugName)
+                this.tableDatatwo = drugName
+              }
+           })
+        },
+        handleSelectionChange(val){
+           this.medicineData = val
         },
-    }
+
+        SaveSelfMedicines(){
+          const params = {
+             patient_id:this.patient_id,
+             medicineData:this.medicineData
+          }
+         SaveSelfMedicines(params).then(response=>{
+             if(response.data.state == 1){
+                var msg = response.data.data.msg
+                this.$message.success("保存成功")
+                this.visible = false
+             }else {
+                this.$message.error("药品名称规格已存在")
+             }
+           })   
+        }
+    },
+  created(){
+       //获取所有药品名称
+      this.getAllDrugNameList()
+  },
 }
 </script>
 

src/xt_pages/stock/selfPreparedMedicine/components/medicineDetail.vue

@@ -6,7 +6,8 @@
         :before-close="_close"
     >
         <div style="margin-bottom:10px;">
-            <el-select v-model="value" placeholder="请选择">
+            <el-select v-model="type" placeholder="请选择"
+            @change="changOption">
                 <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -26,7 +27,7 @@
                 value-format="yyyy-MM-dd">
             </el-date-picker>
                 <el-date-picker
-                v-model="start_time"
+                v-model="end_time"
                 prefix-icon="el-icon-date"
                 :editable="false"
                 style="width: 196px;margin-right:10px;"
@@ -39,67 +40,71 @@
         </div>
         <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
             <el-table-column align="center" prop="name" label="日期">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                <template slot-scope="scope">
+                    {{getTimes(scope.row.storck_time)}}
+                </template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="操作类型">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                <template slot-scope="scope">
+                   <span v-if="scope.row.opration_type == 1">入库</span>
+                   <span v-if="scope.row.opration_type == 2">出库</span>
+              </template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="数量">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                <template slot-scope="scope">
+                   <span v-if="scope.row.opration_type == 1">{{scope.row.store_number}}</span>
+                   <span v-if="scope.row.opration_type == 2">{{scope.row.outstore_number}}</span>
+                </template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="操作人">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                <template slot-scope="scope">
+                    {{getName(scope.row.admin_user_id)}}
+               </template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="出库方式">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                <template slot-scope="scope">
+                  <span v-if="scope.row.opration_type == 1 && scope.row.storage_mode == 1">手动入库</span>
+                  <span v-if="scope.row.opration_type == 2 && scope.row.exit_mode == 1">手动出库</span>
+                  <span v-if="scope.row.opration_type == 2 && scope.row.exit_mode == 2">自动出库</span>
+               </template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="备注">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                <template slot-scope="scope">
+                    {{scope.row.remarks}}
+                </template>
             </el-table-column>
         </el-table>
     </el-dialog>         
 </template>
 
 <script>
+const moment = require('moment')
+import { uParseTime } from "@/utils/tools";
+import { getDrugDetail,getCurrentOrgAllStaff } from "@/api/drug/drug"
 export default {
     data(){
         return{
             visible:false,
             formTitle:'',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄',
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄',
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }],
+            tableData: [],
             options: [{
-            value: '选项1',
-            label: '黄金糕'
+            value: 1,
+            label: '全部'
             }, {
-            value: '选项2',
-            label: '双皮奶'
+            value: 2,
+            label: '入库'
             }, {
-            value: '选项3',
-            label: '蚵仔煎'
-            }, {
-            value: '选项4',
-            label: '龙须面'
-            }, {
-            value: '选项5',
-            label: '北京烤鸭'
+            value: 3,
+            label: '出库'
             }],
-            value: ''
+            value: '',
+            drug_name:"",
+            drug_spec:"",
+            patient_id:"",
+            type:1,
+            start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            staffList:[]
         }
     },
     methods:{
@@ -112,19 +117,80 @@ export default {
             this.form.name = "";
             this.form.intro = "";
         },
-        show(id) {
-            // this.clear()
-            this.visible = true
-            if(id == 0){
-                this.formTitle = '新增'
-            }else{
-                this.formTitle = '编辑'
-            }
+        show(name,drugspec,patientid) {
+          this.formTitle = "明细("+name+")" 
+          this.drug_name = name
+          this.drug_spec = drugspec
+          this.patient_id = patientid
+          this.visible = true
+          this.getDrugDetail()
         },
         hide() {
             // this.clear()
             this.visible = false
         },
+        changOption(){
+          this.getDrugDetail()
+        },
+        getDrugDetail(){
+            const params = {
+                drug_name:this.drug_name,
+                drug_spec:this.drug_spec,
+                patient_id:this.patient_id,
+                start_time:this.start_time,
+                end_time:this.end_time
+             }
+           getDrugDetail(params).then(response=>{
+              if(response.data.state == 1){
+                var stockDetail =  response.data.data.stockDetail
+                for(let i=0;i<stockDetail.length;i++){
+                    stockDetail[i].opration_type = 1
+                }
+                var outStockDetail = response.data.data.outStockDetail
+                for(let j=0;j<outStockDetail.length;j++){
+                   outStockDetail[j].opration_type = 2
+                }
+                if(this.type == 1){
+                   stockDetail.push(...outStockDetail)
+                   this.tableData = stockDetail
+                }
+                
+                if(this.type == 2){
+                   this.tableData = stockDetail
+                }
+                if(this.type == 3){
+                  this.tableData = outStockDetail
+                }
+              }
+          })
+        },
+
+         getCurrentOrgAllStaff(){
+           getCurrentOrgAllStaff().then(response=>{
+              if(response.data.state == 1){
+               var staff = response.data.data.staff
+               this.staffList = staff
+             }
+           })  
+        },
+
+        getName(adminUserId){
+          var user_name = ""
+          for(let i=0;i<this.staffList.length;i++){
+             if(this.staffList[i].admin_user_id == adminUserId){
+                user_name = this.staffList[i].user_name
+             }
+          }
+          return user_name
+        },
+
+       getTimes(time) {
+        return uParseTime(time, "{y}-{m}-{d}");
+      },
+    },
+
+    created(){
+      this.getCurrentOrgAllStaff() 
     }
 }
 </script>

src/xt_pages/stock/selfPreparedMedicine/components/warehouseOut.vue

@@ -17,76 +17,54 @@
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
             ></el-date-picker>
-            <el-select v-model="value" placeholder="请选择">
+            <el-select v-model="admin_user_id" placeholder="请选择">
                 <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                v-for="item in staffTable"
+                :key="item.admin_user_id"
+                :label="item.user_name"
+                :value="item.admin_user_id">
                 </el-option>
             </el-select>
         </div>
         <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
             <el-table-column align="center" prop="name" label="药品名称">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                <template slot-scope="scope">{{scope.row.drug_name}}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="规格名称">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+                <template slot-scope="scope">{{scope.row.drug_name}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="入库数量">
+            <el-table-column align="center" prop="name" label="出库数量">
                 <template slot-scope="scope">
-                    <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    <el-input v-model="scope.row.outstore_number" placeholder="请输入内容"></el-input>
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="备注">
                 <template slot-scope="scope">
-                    <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    <el-input v-model="scope.row.remarks" placeholder="请输入内容"></el-input>
                 </template>
             </el-table-column>
         </el-table>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary" @click="saveOutStock">保 存</el-button>
+        </div>
     </el-dialog>         
 </template>
 
 <script>
+const moment = require('moment')
+import { getCurrentOrgAllStaff,getAllDrugNameList,saveOutStock,getDrugDataByPatientId  }  from '@/api/drug/drug'
 export default {
     data(){
         return{
             visible:false,
             formTitle:'',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄',
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄',
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }],
-            options: [{
-            value: '选项1',
-            label: '黄金糕'
-            }, {
-            value: '选项2',
-            label: '双皮奶'
-            }, {
-            value: '选项3',
-            label: '蚵仔煎'
-            }, {
-            value: '选项4',
-            label: '龙须面'
-            }, {
-            value: '选项5',
-            label: '北京烤鸭'
-            }],
-            value: ''
+            tableData: [],
+            value: '',
+            start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            staffTable:[],
+            admin_user_id:this.$store.getters.xt_user.user.id,
+            patient_id:""
         }
     },
     methods:{
@@ -99,19 +77,79 @@ export default {
             this.form.name = "";
             this.form.intro = "";
         },
-        show(id) {
-            // this.clear()
-            this.visible = true
-            if(id == 0){
-                this.formTitle = '新增'
-            }else{
-                this.formTitle = '编辑'
-            }
+        show(name,id) {
+          this.patient_id = id
+          this.formTitle = "自备药出库("+name+")"
+          this.visible = true
+          //根据患者ID 获取该患者的自备药
+          this.getDrugDataByPatientId()
         },
         hide() {
             // this.clear()
             this.visible = false
         },
+        getCurrentOrgAllStaff(){
+           getCurrentOrgAllStaff().then(response=>{
+              if(response.data.state == 1){
+               var staff = response.data.data.staff
+               this.staffTable = staff
+             }
+           })  
+        },
+
+        //  getAllDrugNameList(){
+        //   getAllDrugNameList().then(response=>{
+        //      if(response.data.state == 1){
+        //        var rullername =  response.data.data.rullerName
+        //        for(let i=0;i<rullername.length;i++){
+        //           rullername[i].outstore_number = ""
+        //           rullername[i].remarks = ""
+        //        }
+        //        this.tableData = rullername
+        //      }
+        //   })
+        // },
+       
+        saveOutStock(){
+            const params = {
+               outStocks:this.tableData,
+            }
+            console.log("outStocks",params)
+            if(this.admin_user_id ==''){
+              this.$message.error("请选择出库人")
+              return
+            }
+          saveOutStock(params,this.start_time,this.admin_user_id,this.patient_id).then(response=>{
+              if(response.data.state == 1){
+                 var msg = response.data.data.msg
+                 console.log("msg",msg)
+                 this.visible = false
+              }
+          })
+        },
+
+        getDrugDataByPatientId(){
+           const params = {
+              patient_id:this.patient_id
+           }
+           console.log("params",params)
+          getDrugDataByPatientId(params).then(response=>{
+             if(response.data.state == 1){
+               var medicalList = response.data.data.medicalList
+                for(let i=0;i<medicalList.length;i++){
+                  medicalList[i].store_number = ""
+                  medicalList[i].remarks = ""
+                }
+                this.tableData = medicalList
+             }
+          })  
+        }
+    },
+    created(){
+       //获取当前机构的所有人员
+       this.getCurrentOrgAllStaff() 
+
+    //    this.getAllDrugNameList()
     }
 }
 </script>

src/xt_pages/stock/selfPreparedMedicine/components/warehousing.vue

@@ -17,76 +17,55 @@
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
             ></el-date-picker>
-            <el-select v-model="value" placeholder="请选择">
+            <el-select v-model="admin_user_id" placeholder="请选择">
                 <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                v-for="item in staffTable"
+                :key="item.admin_user_id"
+                :label="item.user_name"
+                :value="item.admin_user_id">
                 </el-option>
             </el-select>
         </div>
         <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" prop="name" label="药品名称">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+            <el-table-column align="center" label="药品名称">
+                <template slot-scope="scope">{{scope.row.drug_name}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="规格名称">
-                <!-- <template slot-scope="scope">{{scope.row.dialysis_no}}</template> -->
+            <el-table-column align="center" label="规格名称">
+                <template slot-scope="scope">{{scope.row.drug_spec}}</template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="入库数量">
+            <el-table-column align="center" label="入库数量">
                 <template slot-scope="scope">
-                    <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    <el-input v-model="scope.row.store_number" placeholder="请输入内容"></el-input>
                 </template>
             </el-table-column>
-            <el-table-column align="center" prop="name" label="备注">
+            <el-table-column align="center" label="备注">
                 <template slot-scope="scope">
-                    <el-input v-model="input" placeholder="请输入内容"></el-input>
+                    <el-input v-model="scope.row.remarks" placeholder="请输入内容"></el-input>
                 </template>
             </el-table-column>
         </el-table>
+         <div slot="footer" class="dialog-footer">
+            <el-button @click="hide">取 消</el-button>
+            <el-button type="primary" @click="saveStock">保 存</el-button>
+        </div>
     </el-dialog>         
 </template>
 
 <script>
+const moment = require('moment')
+import {getCurrentOrgAllStaff,getAllDrugNameList,saveStock,getDrugDataByPatientId} from "@/api/drug/drug"
 export default {
     data(){
         return{
             visible:false,
             formTitle:'',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄',
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄',
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }],
-            options: [{
-            value: '选项1',
-            label: '黄金糕'
-            }, {
-            value: '选项2',
-            label: '双皮奶'
-            }, {
-            value: '选项3',
-            label: '蚵仔煎'
-            }, {
-            value: '选项4',
-            label: '龙须面'
-            }, {
-            value: '选项5',
-            label: '北京烤鸭'
-            }],
-            value: ''
+            tableData: [],
+            staffTable: [],
+            value: '',
+            start_time: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            admin_user_id:this.$store.getters.xt_user.user.id,
+            patient_name:"",
+            patient_id:""
         }
     },
     methods:{
@@ -99,19 +78,78 @@ export default {
             this.form.name = "";
             this.form.intro = "";
         },
-        show(id) {
-            // this.clear()
+        show(name,id) {
+            this.patient_id = id
+            this.formTitle = "自备药入库("+name+")"
             this.visible = true
-            if(id == 0){
-                this.formTitle = '新增'
-            }else{
-                this.formTitle = '编辑'
-            }
+           //根据患者ID 获取该患者的自备药
+            this.getDrugDataByPatientId()
         },
         hide() {
-            // this.clear()
-            this.visible = false
+           this.visible = false
+        },
+        getCurrentOrgAllStaff(){
+          getCurrentOrgAllStaff().then(response=>{
+             if(response.data.state == 1){
+               var staff = response.data.data.staff
+               this.staffTable = staff
+             }
+          })   
         },
+        // getAllDrugNameList(){
+        //   getAllDrugNameList().then(response=>{
+        //      if(response.data.state == 1){
+        //        var rullername =  response.data.data.rullerName
+        //        for(let i=0;i<rullername.length;i++){
+        //           rullername[i].store_number = ""
+        //           rullername[i].remarks = ""
+        //        }
+        //        this.tableData = rullername
+        //      }
+        //   })
+        // },
+        saveStock(){
+            const params ={
+               stocks:this.tableData
+            }
+            if(this.admin_user_id ==''){
+              this.$message.error("请选择入库人")
+              return
+            }
+           console.log("params",params)
+       
+          saveStock(params,this.start_time,this.admin_user_id,this.patient_id).then(response=>{
+              if(response.data.state == 1){
+                 var msg = response.data.data.msg
+                 this.$message.success("保存成功")
+                 this.visible = false
+              }
+          })
+        },
+
+        getDrugDataByPatientId(){
+           const params = {
+              patient_id:this.patient_id
+           }
+           console.log("params",params)
+          getDrugDataByPatientId(params).then(response=>{
+             if(response.data.state == 1){
+               var medicalList = response.data.data.medicalList
+                for(let i=0;i<medicalList.length;i++){
+                  medicalList[i].outstore_number = ""
+                  medicalList[i].remarks = ""
+                }
+                this.tableData = medicalList
+             }
+          })  
+        }
+    },
+    created(){
+      //获取当前机构的所有人员
+      this.getCurrentOrgAllStaff() 
+       //获取药品名称规格
+      // this.getAllDrugNameList()
+      
     }
 }
 </script>

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -24,22 +24,24 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                @change="changeStartime"
                 ></el-date-picker>
-                <el-select v-model="value" placeholder="请选择">
+                <!-- <el-select v-model="value" placeholder="请选择">
                     <el-option
                     v-for="item in options"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value">
                     </el-option>
-                </el-select>
+                </el-select> -->
                 <el-input style="width: 180px;margin:0 10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
                 <el-button class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
             </div>
             <el-container>
                 <div style="width:160px;">
                     <div class="tablesTitle">患者列表</div>
-                    <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                    <el-table :data="tablePatient" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
+                    @current-change="handleCurrentChange"  ref="monthlyPlanTable">
                         <el-table-column align="center" prop="dialysis_no" label="透析号" width="70">
                             <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
                         </el-table-column>
@@ -59,36 +61,36 @@
                     </div>
                     <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
                         <el-table-column align="center" prop="dialysis_no" label="药品名称" width="120">
-                            <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+                            <template slot-scope="scope">{{scope.row.drug_name}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="规格名称">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                            <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="dialysis_no" label="单位" width="60">
-                            <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+                            <template slot-scope="scope">{{scope.row.min_unit}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="自备数量" width="90">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                            <template slot-scope="scope">{{ scope.row.Total }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="已使用" width="90">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                            <template slot-scope="scope">{{getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="剩余" width="90">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                            <template slot-scope="scope">{{scope.row.Total - getCount(scope.row.patient_id,scope.row.drug_name,scope.row.drug_spec)}}</template>
                         </el-table-column>
-                        <el-table-column align="center" prop="name" label="停用" width="90">
+                        <!-- <el-table-column align="center" prop="name" label="停用" width="90">
                             <template slot-scope="scope">
                                 <el-switch v-model="value1">
                                 </el-switch>
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column align="center" prop="name" label="备注">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                            <template slot-scope="scope">{{ scope.row.remarks }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="操作" width="180">
                             <template slot-scope="scope">
-                                <el-button size="mini" type="primary" @click="toDetail">明细</el-button>
-                                <el-button size="mini" type="danger">删除</el-button>
+                                <el-button size="mini" type="primary" @click="toDetail(scope.row.drug_name,scope.row.drug_spec,scope.row.patient_id)">明细</el-button>
+                                <el-button size="mini" type="danger" @click="DeleteDrugName(scope.row.drug_name,scope.row.patient_id)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -106,7 +108,7 @@
             <el-radio v-model="radio" label="2">不开启</el-radio>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                <el-button type="primary" @click="saveRadio">确 定</el-button>
             </span>
         </el-dialog>
         <add-medicine ref="addMedicine"></add-medicine>
@@ -123,7 +125,8 @@ import addMedicine from "./components/addMedicine"
 import medicineDetail from "./components/medicineDetail"
 import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
-import {getCurrentPatient} from "@/api/drug/drug"
+const moment = require('moment')
+import { getCurrentPatient,saveRadio,getStockList,DeleteDrugName } from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb,
@@ -139,66 +142,157 @@ export default {
                 { path: false, name: "自备药管理" },
                 { path: false, name: "自备药管理" },
             ],
-            options: [{
-            value: '选项1',
-            label: '黄金糕'
-            }, {
-            value: '选项2',
-            label: '双皮奶'
-            }, {
-            value: '选项3',
-            label: '蚵仔煎'
-            }, {
-            value: '选项4',
-            label: '龙须面'
-            }, {
-            value: '选项5',
-            label: '北京烤鸭'
-            }],
+            // options: [{
+            // value: '1',
+            // label: '上午'
+            // }, {
+            // value: '2',
+            // label: '下午'
+            // }, {
+            // value: '3',
+            // label: '晚上'
+            // }],
             value: '',
-            tableData:[
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-            ],
+            tableData:[],
             dialogVisible:false,
-            radio:'1'
+            radio:'2',
+            tablePatient:[],
+            disableBtton:false,
+            currentRow: null,
+            patient_name:"",
+            patient_id:"",
+            start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            search_input:"",
+            patient_id:0,
+            outStocklist:[]
         }
     },
     methods:{
         setting(){
             this.dialogVisible = true
         },
+        handleCurrentChange(val){
+          this.currentRow = val
+          this.patient_name = val.name
+          this.patient_id = val.id
+          if(val.name !=""){
+            this.disableBtton = true
+          }
+           
+          this.getlist()
+        },
+        changeStartime(){
+           this.getlist()
+        },
+        handleClose(){
+          this.dialogVisible = false
+        },
         openForm(index){
             if(index == 1){
-                this.$refs.addMedicine.show();
+              if(this.disableBtton == true){
+                 this.$refs.addMedicine.show(this.patient_name,this.patient_id);
+              }
+              if(this.disableBtton == false){
+                 this.$message.error("请选择患者!")
+              }          
             }else if(index == 2){
-                this.$refs.warehousing.show();
+                this.$refs.warehousing.show(this.patient_name,this.patient_id);
             }else if(index == 3){
-                this.$refs.warehouseOut.show();
+                this.$refs.warehouseOut.show(this.patient_name,this.patient_id);
             }
             
         },
-        toDetail(){
-            this.$refs.medicineDetail.show();
+        toDetail(drugname,drugspec,patientid){
+            console.log("drugname",drugname)
+            console.log("drugspec",drugspec)
+            console.log("patientid",patientid)
+            this.$refs.medicineDetail.show(drugname,drugspec,patientid);
         },
 
         getCurrentPatient(){
-          getCurrentPatient().then(response=>{
+         getCurrentPatient().then(response=>{
+            if(response.data.state == 1){
+              this.tablePatient = response.data.data.patient
+            } 
+          })
+        },
+        searchAction(){
+          this.getlist()
+        },
+        saveRadio(){
+          const params = {
+            radio:this.radio
+          }
+         saveRadio(params).then(response=>{
+            if(response.data.state == 1){
+              var drugset = response.data.data.drugSet
+              console.log("drugset",drugset)
+              this.$message.success("保存成功")
+              this.dialogVisible = false
+            } 
+          }) 
+        },
+        getlist(){
+            const params = {
+               id:this.patient_id,
+               start_time:this.start_time,
+               keyword:this.search_input,
+            }
+          getStockList(params).then(response=>{
+             if(response.data.state == 1){
+                var stocklist =  response.data.data.stocklist
+                var outstocklist = response.data.data.outStocklist
+                this.outStocklist = outstocklist
+                this.tableData = stocklist
 
+              }
+          })  
+        },
+        DeleteDrugName(name,patientid){
+            this.$confirm('确认删除吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+         })
+          .then(() => {
+              const params = {
+                drugname:name,
+                patientid:patientid
+              }
+            DeleteDrugName(params).then(response => {
+              if (response.data.state == 1) {
+                  var msg = response.data.data.msg
+                  this.tableData.splice(index, 1);
+                  this.$message.success("删除成功")
+              } else {
+                  this.$message.error("药品已经出库不能删除")
+              }
+            })
+          })
+          .catch(() => {
           })
+        },
+        getCount(patientid,drugname,drugspec){
+            var total = 0
+           for(let i=0;i<this.outStocklist.length;i++){
+              if(patientid == this.outStocklist[i].patient_id && drugname == this.outStocklist[i].drug_name && drugspec == this.outStocklist[i].drug_spec){
+                  total = this.outStocklist[i].Count
+              }
+           }
+           return total
         }
     },
     created(){
       //获取当前机构下的所有患者
       this.getCurrentPatient()
+    },
+    watch: {
+     tablePatient: function() {
+      this.$nextTick(function() {
+        this.$refs.monthlyPlanTable.setCurrentRow(this.tablePatient[0])
+      })
     }
+  },
 }
 </script>
 

src/xt_pages/stock/selfPreparedMedicine/info.vue

@@ -17,18 +17,22 @@
                 <div style="width:250px;">
                     <div style="display:flex;justify-content: space-between;align-items: center;">
                         <div class="tablesTitle">药品名称</div>
-                        <el-button type="primary">新增</el-button>
+                        <el-button type="primary" @click="addDrug">新增</el-button>
                     </div>
-                    <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                        <el-table-column align="center" prop="dialysis_no" label="透析号" width="70">
-                            <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+                    <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                     highlight-current-row
+                      @current-change="handleCurrentChange"  ref="monthlyPlanTable">
+                        <el-table-column align="center" prop="dialysis_no" label="序号" width="70">
+                            <template slot-scope="scope">
+                               {{scope.$index+1}} 
+                            </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="name" label="姓名" width="90">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                        <el-table-column align="center" prop="name" label="名称" width="90">
+                            <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="操作" width="80">
                             <template slot-scope="scope">
-                                <el-button size="mini" type="danger">删除</el-button>
+                                <el-button size="mini" type="danger" @click="DeleteDrugById(scope.row.id,scope.row.drug_name)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -37,35 +41,43 @@
                     <div style="display:flex;justify-content: space-between;align-items: center;">
                         <div class="tablesTitle">药品规格</div>
                         <div>
-                            <el-button type="primary">新增</el-button>
+                            <el-button type="primary" @click="addRule">新增</el-button>
                         </div>
                     </div>
-                    <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                    <el-table :data="rullerList" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
                         <el-table-column align="center" prop="dialysis_no" label="序号" width="60">
-                            <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+                            <template slot-scope="scope">{{scope.$index+1}}</template>
                         </el-table-column>
-                        <el-table-column align="center" prop="name" label="规格名称">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                        <el-table-column align="center" prop="rull_name" label="规格名称">
+                            <template slot-scope="scope">
+                              {{ scope.row.drug_spec }}
+                            </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="dialysis_no" label="单位" width="80">
-                            <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+                        <el-table-column align="center" prop="unit" label="单位" width="80">
+                            <template slot-scope="scope">
+                              {{scope.row.min_unit}}
+                            </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="name" label="价格" width="80">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                        <el-table-column align="center" prop="price" label="价格" width="80">
+                            <template slot-scope="scope">
+                              {{ scope.row.price }}
+                            </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="name" label="库存警戒" width="90">
-                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                        <el-table-column align="center" prop="drug_stock_limit" label="库存警戒" width="90">
+                            <template slot-scope="scope">
+                              {{ scope.row.drug_stock_limit }}
+                            </template>
                         </el-table-column>
-                        <el-table-column align="center" prop="name" label="停用" width="90">
+                        <!-- <el-table-column align="center" prop="name" label="停用" width="90">
                             <template slot-scope="scope">
                                 <el-switch v-model="value1">
                                 </el-switch>
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column align="center" prop="name" label="操作" width="180">
                             <template slot-scope="scope">
-                                <el-button size="mini" type="primary" @click="toDetail">编辑</el-button>
-                                <el-button size="mini" type="danger">删除</el-button>
+                                <el-button size="mini" type="primary" @click="toDetail(scope.row.id)">编辑</el-button>
+                                <el-button size="mini" type="danger" @click="DeleteDrugStand(scope.row.id,scope.$index)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -86,6 +98,133 @@
                 <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
             </span>
         </el-dialog>
+       
+
+
+        <el-dialog
+        title="新增药品名称"
+        :visible.sync="drugDialogVisible"
+        width="50%"
+        :before-close="drughandleClose">
+        <span>
+           <el-form style="width:100%">
+              <el-row :span="24">
+                <el-col :span="24">
+                    <el-form-item label="药品名称:">
+                        <el-select v-model="drug_name" filterable placeholder="请选择">
+                            <el-option
+                            v-for="item in drugName"
+                            :key="item.id"
+                            :label="item.drug_name"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                 </el-col>
+             </el-row> 
+          </el-form> 
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="drugDialogVisible = false">取 消</el-button>
+            <el-button  @click="saveDrugName">保 存</el-button>
+            <el-button type="primary" @click="saveDrugNameTwo">保 存 并 继 续 新 增</el-button>
+        </span>
+        </el-dialog>
+        
+        
+        <el-dialog
+        title="新增药品规格"
+        :visible.sync="ruleDialogVisible"
+        width="75%"
+        :before-close="rullerhandleClose">
+        <span>
+           <el-form style="width:100%" :model="form">
+              <el-row :span="24">
+                <el-col :span="6">
+                    <el-form-item label="规格名称:">
+                       <el-select v-model="form.drug_name_id" filterable placeholder="请选择"
+                       style="width:150px"
+                        @change="changeRuleName">
+                            <el-option
+                            v-for="item in ruleName"
+                            :key="item.id"
+                            :label="item.drug_spec"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                 </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="单位:">
+                       <el-input v-model="form.unit" style="width:150px"></el-input>
+                    </el-form-item>
+                 </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="价格:">
+                       <el-input v-model="form.price" style="width:150px"></el-input>
+                    </el-form-item>
+                 </el-col>
+                 <el-col :span="6">
+                    <el-form-item label="库存警戒:">
+                       <el-input v-model="form.drug_stock_limit" style="width:150px"></el-input>
+                    </el-form-item>
+                 </el-col>
+             </el-row> 
+          </el-form> 
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="ruleDialogVisible = false">取 消</el-button>
+            <el-button  @click="saveRulleName">保 存</el-button>
+            <el-button type="primary" @click="saveRulleNameTwo">保 存 并 继 续 新 增</el-button>
+        </span>
+        </el-dialog>
+
+
+        <el-dialog
+        title="编辑药品规格"
+        :visible.sync="editRuleDialogVisible"
+        width="75%"
+        :before-close="EditRullerhandleClose">
+        <span>
+           <el-form style="width:100%" :model="form">
+              <el-row :span="24">
+                <el-col :span="6">
+                    <el-form-item label="规格名称:">
+                        <el-select v-model="editform.drug_name_id" filterable placeholder="请选择"
+                        @change="changeRuleNameTwo">
+                            <el-option
+                            v-for="item in ruleName"
+                            :key="item.id"
+                            :label="item.drug_spec"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                 </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="单位:">
+                       <el-input v-model="form.unit"></el-input>
+                    </el-form-item>
+                 </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="价格:">
+                       <el-input v-model="form.price"></el-input>
+                    </el-form-item>
+                 </el-col>
+                 <el-col :span="6">
+                    <el-form-item label="库存警戒:">
+                       <el-input v-model="form.drug_stock_limit"></el-input>
+                    </el-form-item>
+                 </el-col>
+             </el-row> 
+          </el-form> 
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="editRuleDialogVisible = false">取 消</el-button>
+            <el-button  @click="updatedRulleName">保 存</el-button>
+        </span>
+        </el-dialog>
+
         <add-medicine ref="addMedicine"></add-medicine>
         <medicine-detail ref="medicineDetail"></medicine-detail>
         <warehousing ref="warehousing"></warehousing>
@@ -100,13 +239,14 @@ import addMedicine from "./components/addMedicine"
 import medicineDetail from "./components/medicineDetail"
 import warehousing from "./components/warehousing"
 import warehouseOut from "./components/warehouseOut"
+import { getAllDrugName,saveDrugName,getdrugNameList,getRulleName,getUnitByBaseId,saveRulleName,EditRullerName,updatedRulleName,DeleteDrugById,DeleteDrugStand }  from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb,
         addMedicine,
         medicineDetail,
         warehousing,
-        warehouseOut
+        warehouseOut,
     },
     data(){
         return{
@@ -132,19 +272,29 @@ export default {
             label: '北京烤鸭'
             }],
             value: '',
-            tableData:[
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-                {dialysis_no:123,name:'张三'},
-            ],
+            tableData:[],
             dialogVisible:false,
-            radio:'1'
+            radio:'1',
+            drugDialogVisible:false,
+            options:[],
+            drugName:[],
+            drug_name:"",
+            ruleDialogVisible:false,
+            ruleName:[],
+            rule_name:"",
+            name:"",
+            form:{
+              id:"",
+              drug_name_id:"",
+              unit:"", 
+              price:"",
+              drug_stock_limit:""
+            },
+            editform:{
+              drug_name_id:"",
+            },
+            rullerList:[],
+            editRuleDialogVisible:false,
         }
     },
     methods:{
@@ -161,10 +311,298 @@ export default {
             }
             
         },
-        toDetail(){
-            this.$refs.medicineDetail.show();
-        }
+        toDetail(id){
+          this.editRuleDialogVisible = true
+           const params = {
+             id:id
+           }
+          EditRullerName(params).then(response=>{
+            if(response.data.state == 1){
+              var rullerdetail =  response.data.data.rullerDetail
+              this.form.id = rullerdetail.id
+              this.editform.drug_name_id = rullerdetail.drug_spec
+              this.form.unit = rullerdetail.min_unit
+              this.form.price = rullerdetail.price
+              this.form.drug_stock_limit = rullerdetail.drug_stock_limit
+            }
+          })
+        },
+        addDrug(){
+          this.drugDialogVisible = true
+        },
+      
+       //获取所有药品名称
+        getAllDrugName(){
+          getAllDrugName().then(response=>{
+             if(response.data.state == 1){
+               var drugName  = response.data.data.drugName
+               this.drugName = drugName
+
+             }
+          })  
+        },
+        handleCurrentChange(val){
+          //获取药品规格名称
+          this.getRulleName(val.drug_name)
+
+        },
+       handleClose(){
+         this.dialogVisible = false
+       },
+       drughandleClose(){
+         this.drugDialogVisible = false
+       },
+       rullerhandleClose(){
+         this.ruleDialogVisible = false
+       },
+       EditRullerhandleClose(){
+         this.editRuleDialogVisible = false
+       },
+       saveDrugName(){
+           var name = ""
+           for(let i=0;i<this.drugName.length;i++){
+             if(this.drugName[i].id == this.drug_name){
+                name = this.drugName[i].drug_name
+             }
+           }
+           const params = {
+              drug_name:name,
+           }
+         saveDrugName(params).then(response=>{
+            if(response.data.state == 1){
+              var drugname =  response.data.data.drugName
+              this.getdrugNameList()
+              this.$message.success("保存成功")
+              this.drugDialogVisible = false
+            }else{
+              this.$message.error("药品名称已存在!")
+            }
+         })   
+       },
+       saveDrugNameTwo(){
+           var name = ""
+           for(let i=0;i<this.drugName.length;i++){
+             if(this.drugName[i].id == this.drug_name){
+                name = this.drugName[i].drug_name
+             }
+           }
+           const params = {
+              drug_name:name,
+           }
+         saveDrugName(params).then(response=>{
+            if(response.data.state == 1){
+              var drugname =  response.data.data.drugName
+              this.$message.success("保存成功")
+              this.getdrugNameList()
+            }else{
+              this.$message.error("药品名称已存在!")
+            }
+         })     
+       },
+       //获取所有药品
+       getdrugNameList(){
+         getdrugNameList().then(response=>{
+           if(response.data.state == 1){
+              var list =  response.data.data.list
+              this.tableData = list
+            }
+         })    
+       },
+
+       addRule(){
+          this.ruleDialogVisible = true   
+       },
+
+
+      //获取药品库的规格名称
+       getRulleName(name){
+          const params = {
+             name:name
+          }
+         getRulleName(params).then(response=>{
+            if(response.data.state == 1){
+              var rulleName = response.data.data.rulleName
+              this.ruleName = rulleName
+             
+              var rullerlist =  response.data.data.rullerList
+             
+              this.rullerList  = rullerlist
+            }
+         }) 
+       },
+       changeRuleName(id){
+         this.form.drug_name_id = id
+         this.getUnitByBaseId(id)
+       },
+       changeRuleNameTwo(id){
+         this.editform.drug_name_id = id
+         this.getUnitByBaseId(id)
+       },
+       getUnitByBaseId(id){
+           const params = {
+             id:id
+           }
+         getUnitByBaseId(params).then(response=>{
+            if(response.data.state == 1){
+              var baseList =  response.data.data.baseList
+              this.form.unit = baseList.min_unit
+              this.form.drug_stock_limit = baseList.drug_stock_limit,
+              this.form.price = baseList.retail_price
+              
+            }
+         })
+       },
+       saveRulleName(){
+           if(this.form.drug_name_id == ""){
+              this.$message.error("请选择药品规格")
+              return
+           }
+           var drug_spec = ""
+           var drug_name = ""
+           for(let i=0;i<this.ruleName.length;i++){
+              if(this.ruleName[i].id == this.form.drug_name_id){   
+                drug_spec = this.ruleName[i].drug_spec
+                drug_name = this.ruleName[i].drug_name
+              }
+           }
+           const params = {
+             drug_spec:drug_spec,
+             drug_name_id:this.form.drug_name_id,
+             unit:this.form.unit,
+             price:this.form.price,
+             drug_stock_limit:this.form.drug_stock_limit, 
+             drug_name:drug_name
+           }
+         saveRulleName(params).then(response=>{
+            if(response.data.state == 1){
+              var standName =  response.data.data.RullerName
+              this.$message.success("保存成功")
+              this.getRulleName(standName.drug_name)
+              this.ruleDialogVisible = false
+            }
+         })  
+       },
+
+       saveRulleNameTwo(){
+          if(this.form.drug_name_id == ""){
+              this.$message.error("请选择药品规格")
+              return
+           }
+           var drug_spec = ""
+           var drug_name = ""
+           for(let i=0;i<this.ruleName.length;i++){
+              if(this.ruleName[i].id == this.form.drug_name_id){   
+                drug_spec = this.ruleName[i].drug_spec
+                drug_name = this.ruleName[i].drug_name
+              }
+           }
+           const params = {
+             drug_spec:drug_spec,
+             drug_name_id:this.form.drug_name_id,
+             unit:this.form.unit,
+             price:this.form.price,
+             drug_stock_limit:this.form.drug_stock_limit, 
+             drug_name:drug_name
+           }
+         saveRulleName(params).then(response=>{
+            if(response.data.state == 1){
+              var RullerName =  response.data.data.RullerName
+              this.getRulleName(RullerName.drug_name)
+              this.$message.success("保存成功")
+            }
+         })    
+       },
+
+       updatedRulleName(){
+           var drug_spec = ""
+           var drug_name = ""
+           for(let i=0;i<this.ruleName.length;i++){
+              if(this.ruleName[i].id == this.editform.drug_name_id){   
+                drug_spec = this.ruleName[i].drug_spec
+                drug_name = this.ruleName[i].drug_name
+              }
+           }
+
+           const params = {
+             id:this.form.id,
+             drug_name_id:this.editform.drug_name_id,
+             drug_spec:drug_spec,
+             unit:this.form.unit,
+             price:this.form.price,
+             drug_stock_limit:this.form.drug_stock_limit, 
+             drug_name:drug_name
+           }
+           console.log("params999",params)
+         updatedRulleName(params).then(response=>{
+            if(response.data.state == 1){
+               var rullername = response.data.data.RullerName
+               this.$message.success("保存成功")
+               this.getRulleName(rullername.drug_name)
+               this.editRuleDialogVisible = false
+            }
+         })
+       },
+
+       DeleteDrugById(id,drugname){
+         this.$confirm('确认删除吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        })
+          .then(() => {
+              const params ={
+                id:id,
+                drug_name:drugname
+              }
+            DeleteDrugById(params).then(response => {
+              if (response.data.state == 1) {
+                  var msg = response.data.data.msg
+                  this.$message.success("删除成功",msg)
+              } else {
+                  this.$message.error("该药品名称下有药品规格，不能删除")
+              }
+            })
+          })
+          .catch(() => {
+          })
+       },
+
+       DeleteDrugStand(id,index){
+          this.$confirm('确认删除吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        })
+          .then(() => {
+            DeleteDrugStand(id,index).then(response => {
+              if (response.data.state == 1) {
+                  var msg = response.data.data.msg
+                  this.rullerList.splice(index, 1);
+                  this.$message.success("删除成功")
+              } else {
+                  this.$message.error("删除失败")
+              }
+            })
+          })
+          .catch(() => {
+          })
+       }
+    },
+    created(){
+       //获取药品库所有药品名称
+       this.getAllDrugName()
+
+       this.getdrugNameList()
+      
+     
+    },
+    watch: {
+     tableData: function() {
+      this.$nextTick(function() {
+        this.$refs.monthlyPlanTable.setCurrentRow(this.tableData[0])
+      })
     }
+  },
 }
 </script>
 

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -5,7 +5,8 @@
             <div>
                 <el-button
                     size="small"
-                    @click="setting"
+                    :loading="downloadLoading"
+                    @click="exportList"
                     class="filter-item"
                     type="primary"
                     >导出
@@ -31,9 +32,10 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                @change="changeStartime"
                 ></el-date-picker>
                 <el-date-picker
-                v-model="start_time"
+                v-model="end_time"
                 prefix-icon="el-icon-date"
                 :editable="false"
                 style="width: 196px;margin-right:10px;"
@@ -42,21 +44,24 @@
                 align="right"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
+                @change="changeEndtime"
                 ></el-date-picker>
-                <el-select v-model="value" placeholder="请选择" style="margin-right:10px;">
+                <el-select v-model="drug_name" placeholder="请选择" style="margin-right:10px;"
+                 @change="changeDrugName">
                     <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
+                    v-for="item in drugName"
+                    :key="item.id"
+                    :label="item.drug_name"
+                    :value="item.id">
                     </el-option>
                 </el-select>
-                <el-select v-model="value" placeholder="请选择">
+                <el-select v-model="drug_spec" placeholder="请选择"
+                @change="changeRullName">
                     <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
+                    v-for="item in rulleName"
+                    :key="item.id"
+                    :label="item.drug_spec"
+                    :value="item.id">
                     </el-option>
                 </el-select>
                 <el-input style="width: 180px;margin:0 10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
@@ -64,31 +69,31 @@
             </div>
             <el-table :data="tableData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
                 <el-table-column align="center" label="序号" width="60">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.$index +1 }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="透析号" width="80">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.dialysis_no }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="姓名" width="80">
                     <template slot-scope="scope">{{ scope.row.name }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="药品名称">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="规格名称">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="单位" width="80">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.min_unit }}</template>
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="自卑量" width="80">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                <el-table-column align="center" prop="name" label="自备量" width="80">
+                    <template slot-scope="scope">{{ scope.row.store_number }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="已使用" width="80">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.Count }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="剩余" width="80">
-                    <template slot-scope="scope">{{ scope.row.name }}</template>
+                    <template slot-scope="scope">{{ scope.row.store_number - scope.row.Count }}</template>
                 </el-table-column>
             </el-table>
         </div>
@@ -97,6 +102,9 @@
 
 <script>
 import BreadCrumb from "../../components/bread-crumb";
+import { parseTime } from '@/utils'
+import { getAllDrugName,getRulleName,getAllPatientStockList } from "@/api/drug/drug"
+const moment = require('moment')
 export default {
     components:{
         BreadCrumb
@@ -108,29 +116,136 @@ export default {
                 { path: false, name: "自备药管理" },
                 { path: false, name: "自备药查询" },
             ],
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }]
+            tableData: [],
+            downloadLoading: false,
+            search_input:"",
+            options:[],
+            value:"",
+            // start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            // end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            start_time:"",
+            end_time:"",
+            drug_name:"",
+            drug_spec:"",
+            drugName:[],
+            rulleName:[]
         }
     },
     methods:{
         toPrint(){
-            this.$router.push({path: '/stock/selfPreparedMedicineQueryPrint'})
+          this.$router.push({path: '/stock/selfPreparedMedicineQueryPrint?start_time='+this.start_time+"&end_time="+this.end_time+"&drug_name="+this.drug_name+"&drug_spec="+this.drug_spec+"&keyword="+this.search_input})
+        },
+        exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = ['序号', '透析号', '姓名','药品名称','规格名称','单位','自备量','已使用','剩余']
+         const filterVal = ['index', 'dialysis_no', 'name','drug_name','drug_spec','min_unit','Total','Count','margin']
+         for(let i=0;i<this.tableData.length;i++){
+            this.tableData[i].margin = this.tableData[i].Total - this.tableData[i].Count
+         }
+         const data = this.formatJson(filterVal, this.tableData)
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '自备药查询'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+
+      changeStartime(){
+        this.getlist()
+      },
+      changeEndtime(){
+        this.getlist()
+      },
+
+      getAllDrugName(){
+        getAllDrugName().then(response=>{
+          if(response.data.state == 1){
+             var drugName =  response.data.data.drugName
+             console.log("drugName",drugName)
+             this.drugName = drugName
+
+             this.getlist()
+          }
+        })
+      },
+      getRulleName(name){
+          const params = {
+             name:name
+          }
+        getRulleName(params).then(response=>{
+           if(response.data.state == 1){
+             var rulleName = response.data.data.rulleName
+             console.log("rulleName",rulleName)
+             this.rulleName = rulleName
+           }
+        })  
+      },
+      searchAction(){
+        this.getlist()
+      },
+      changeDrugName(id){
+        var drug_name = ""
+        for(let i=0;i<this.drugName.length;i++){
+           if(id == this.drugName[i].id){
+             drug_name = this.drugName[i].drug_name
+           }
+        }
+        this.drug_name = drug_name
+        this.getRulleName(drug_name)
+        this.getlist()
+      },
+      changeRullName(id){
+        var drug_desc = ""
+        for(let i=0;i<this.rulleName.length;i++){
+           if(id == this.rulleName[i].id){
+             drug_desc = this.rulleName[i].drug_desc
+           }
         }
+        this.drug_desc = drug_desc
+        this.getlist()
+      },
+      getlist(){
+          const params = {
+            start_time:this.start_time,
+            end_time:this.end_time,
+            drug_name:this.drug_name,
+            drug_spec:this.drug_spec,
+            search_input:this.search_input
+          }
+          console.log("params====",params)
+        getAllPatientStockList(params).then(response=>{
+            if(response.data.state == 1){
+              var stocklist = response.data.data.stocklist
+              for(let i=0;i<stocklist.length;i++){
+                 stocklist[i].index = i+1
+                 stocklist[i].Count = 0
+              }
+              var outStockList =  response.data.data.outStockList
+              for(let i=0;i<stocklist.length;i++){
+                for(let j=0;j<outStockList.length;j++){
+                   if(stocklist[i].patient_id == outStockList[j].patient_id &&stocklist[i].drug_name == outStockList[j].drug_name && stocklist[i].drug_spec == outStockList[j].drug_spec){
+                       stocklist[i].Count = outStockList[j].Count
+                   }
+                }
+              }
+              console.log("stocklist3333",stocklist)
+              this.tableData = stocklist
+            }
+        })   
+      }
+    },
+    created(){
+      //获取所有药品名称
+      this.getAllDrugName()
+
+
+
+      
     }
 }
 </script>

src/xt_pages/stock/selfPreparedMedicine/queryPrint.vue

@@ -12,10 +12,10 @@
             <div id="print_content">
                 <div class="print_main_content">
                     <div class="order_title_panl">
-                        <span class="main_title">{{ $store.getters.xt_user.org.org_name }}医护排班表</span>
+                        <span class="main_title">自备药查询表</span>
                     </div>
                     <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
-                      打印时间：
+                      打印时间：{{time_now}}
                     </div>
                     <div class="table_panel">
                         <table class="table">
@@ -33,16 +33,16 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr v-for='(item,index) in 8' :key="index">
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
-                                    <td>张三</td>
+                                <tr v-for='(item,index) in tableData' :key="index">
+                                    <td>{{index+1}}</td>
+                                    <td>{{item.dialysis_no}}</td>
+                                    <td>{{item.name}}</td>
+                                    <td>{{item.drug_name}}</td>
+                                    <td>{{item.drug_spec}}</td>
+                                    <td>{{item.min_unit}}</td>
+                                    <td>{{item.store_number}}</td>
+                                    <td>{{item.Count}}</td>
+                                    <td>{{item.store_number - item.Count}}</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -55,8 +55,9 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getAllPatientStockList } from '@/api/drug/drug'
 import print from 'print-js'
-import { getDoctorList,getScheduleByDoctorId } from '@/api/doctorSchedule'
+const moment = require('moment')
 export default {
     components:{
         BreadCrumb
@@ -70,27 +71,16 @@ export default {
           ],
           start_time:"",
           end_time:"",
-
-          doctorlist:[],
+          drug_name:"",
+          drug_spec:"",
+          keyword:"",
           tableData:[],
-          arrZero:[],
-          arrOne:[],
-          arrTwo:[],
-          arrThree:[],
-          arrFour:[],
-          arrFive:[],
-          arrSix:[],
-          arrSeven:[],
-          typevalue:0,
-          
-          doctorTableData:[],
-          nurseTableData:[]
+          time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD")
         }
     },
     methods:{
       printAction: function() {
           const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
-
           printJS({
           printable: 'print_content',
           type: 'html',
@@ -99,467 +89,48 @@ export default {
           scanStyles: false
           })
       },
-      getDoctorList(){
-        getDoctorList().then(response=>{
-          var list =  response.data.data.list
-          this.doctorlist = list
-          this.getScheduleByDoctorId()
-
-          //
-          var doctorlist =  response.data.data.doctorlist
-          let arr = []
-          for(let i=0;i<doctorlist.length;i++){
-              if(doctorlist[i].sort == 0){
-                doctorlist[i].sort = ""
-              }
-          }
-          console.log('doctorlist',doctorlist)
-          this.doctorTableData = doctorlist
-          var nurselist = response.data.data.nurselist
-          for(let i=0;i<nurselist.length;i++){
-              if(nurselist[i].sort == 0){
-                  nurselist[i].sort = ""
-              }
+        getlist(){
+          const params = {
+            start_time:this.start_time,
+            end_time:this.end_time,
+            drug_name:this.drug_name,
+            drug_spec:this.drug_spec,
+            search_input:this.keyword
           }
-          this.nurseTableData = nurselist
-        })
-      },
-      //获取本周的所有排班列表
-      getScheduleByDoctorId(){
-        const params = {
-          start_time:this.start_time,
-          end_time:this.end_time,
-          doctor_id:this.typevalue,
-        }
-        console.log("parasm",params)
-        getScheduleByDoctorId(params).then(response=>{
-          if(response.data.state == 1){
-              var staffList = response.data.data.staffList
-              console.log("stafflist",staffList)
-
-              var sevenStr = ""
-              var oneStr = ""
-              var twoStr = ""
-              var threeStr = ""
-              var fourStr = ""
-              var fiveStr = ""
-              var sixStr = ""
-              for(let i=0;i<staffList.length;i++){
-              if(staffList[i].schedule_week == 0){
-                  staffList[i].class_index = 0
-                    var arr = []
-                  this.arrZero.push(staffList[i].class_name)
-                  for(let i=0;i<this.arrZero.length;i++){
-                      if(this.arrZero[i]!=''){
-                        arr.push(this.arrZero[i])
-                      }
-                  }
-                  var countedNames = arr.reduce(function (allNames, name) { 
-                      if (name in allNames) {
-                          allNames[name]++;
-                      }
-                      else {
-                          allNames[name] = 1;
-                      }
-                      return allNames;
-                  }, {});
-                  let objKey = Object.keys(countedNames)
-                  let objVal = Object.values(countedNames)
-                  var zeroStr = ''
-                  objKey.map((item,index) => {
-                  let objVal = Object.values(countedNames)
-                      zeroStr += item + objVal[index] + '\n'
-                  })
-                  sevenStr = zeroStr
-              }
-              if(staffList[i].schedule_week == 1){
-                  staffList[i].class_index = 1
-                  var arr = []
-                  this.arrOne.push(staffList[i].class_name)
-                  for(let i=0;i<this.arrOne.length;i++){
-                      if(this.arrOne[i]!=''){
-                        arr.push(this.arrOne[i])
-                      }
-                  }
-                  var countedNames = arr.reduce(function (allNames, name) { 
-                      if (name in allNames) {
-                          allNames[name]++;
-                      }
-                      else {
-                          allNames[name] = 1;
-                      }
-                      return allNames;
-                  }, {});
-                  let objKey = Object.keys(countedNames)
-                  let objVal = Object.values(countedNames)
-                  let strOne = ''
-                  objKey.map((item,index) => {
-                  let objVal = Object.values(countedNames)
-                      strOne += item + objVal[index] + '\n'
-                  })
-                  oneStr  = strOne
+        getAllPatientStockList(params).then(response=>{
+            if(response.data.state == 1){
+              var stocklist = response.data.data.stocklist
+              for(let i=0;i<stocklist.length;i++){
+                 stocklist[i].index = i+1
+                 stocklist[i].Count = 0
               }
-              if(staffList[i].schedule_week == 2){
-                  staffList[i].class_index = 2
-                    var arr = []
-                  this.arrTwo.push(staffList[i].class_name)
-                  for(let i=0;i<this.arrTwo.length;i++){
-                      if(this.arrTwo[i]!=''){
-                        arr.push(this.arrTwo[i])
-                      }
-                  }
-                  var countedNames = arr.reduce(function (allNames, name) { 
-                      if (name in allNames) {
-                          allNames[name]++;
-                      }
-                      else {
-                          allNames[name] = 1;
-                      }
-                      return allNames;
-                  }, {});
-                  let objKey = Object.keys(countedNames)
-                  let objVal = Object.values(countedNames)
-                  let strTwo = ''
-                  objKey.map((item,index) => {
-                  let objVal = Object.values(countedNames)
-                      strTwo += item + objVal[index] + '\n'
-                  })
-                    twoStr = strTwo
-              }
-              if(staffList[i].schedule_week == 3){
-                  staffList[i].class_index = 3
-                    var arr = []
-                  this.arrThree.push(staffList[i].class_name)
-                  for(let i=0;i<this.arrThree.length;i++){
-                      if(this.arrThree[i]!=''){
-                        arr.push(this.arrThree[i])
-                      }
-                  }
-                  var countedNames = arr.reduce(function (allNames, name) { 
-                      if (name in allNames) {
-                          allNames[name]++;
-                      }
-                      else {
-                          allNames[name] = 1;
-                      }
-                      return allNames;
-                  }, {});
-                  let objKey = Object.keys(countedNames)
-                  let objVal = Object.values(countedNames)
-                  let strThree = ''
-                  objKey.map((item,index) => {
-                  let objVal = Object.values(countedNames)
-                      strThree += item + objVal[index] + '\n'
-                  })
-                  threeStr = strThree
-              }
-              if(staffList[i].schedule_week == 4){
-                  staffList[i].class_index = 4
-                  var arr = []
-                  this.arrFour.push(staffList[i].class_name)
-                  for(let i=0;i<this.arrFour.length;i++){
-                      if(this.arrFour[i]!=''){
-                        arr.push(this.arrFour[i])
-                      }
-                  }
-                  var countedNames = arr.reduce(function (allNames, name) { 
-                      if (name in allNames) {
-                          allNames[name]++;
-                      }
-                      else {
-                          allNames[name] = 1;
-                      }
-                      return allNames;
-                  }, {});
-                  let objKey = Object.keys(countedNames)
-                  let objVal = Object.values(countedNames)
-                  let strFour = ''
-                  objKey.map((item,index) => {
-                  let objVal = Object.values(countedNames)
-                      strFour += item + objVal[index] + '\n'
-                  })
-                  fourStr = strFour
-              }
-              if(staffList[i].schedule_week == 5){
-                  staffList[i].class_index = 5
-
-                    var arr = []
-                  this.arrFive.push(staffList[i].class_name)
-                  for(let i=0;i<this.arrFive.length;i++){
-                      if(this.arrFive[i]!=''){
-                        arr.push(this.arrFive[i])
-                      }
-                  }
-                  var countedNames = arr.reduce(function (allNames, name) { 
-                      if (name in allNames) {
-                          allNames[name]++;
-                      }
-                      else {
-                          allNames[name] = 1;
-                      }
-                      return allNames;
-                  }, {});
-                  let objKey = Object.keys(countedNames)
-                  let objVal = Object.values(countedNames)
-                  let strFive = ''
-                  objKey.map((item,index) => {
-                  let objVal = Object.values(countedNames)
-                      strFive += item + objVal[index] + '\n'
-                  })
-                    fiveStr = strFive
-              }
-              if(staffList[i].schedule_week == 6){
-                  staffList[i].class_index = 6
-                    var arr = []
-                  this.arrSix.push(staffList[i].class_name)
-                  for(let i=0;i<this.arrSix.length;i++){
-                      if(this.arrSix[i]!=''){
-                        arr.push(this.arrSix[i])
-                      }
-                  }
-                  var countedNames = arr.reduce(function (allNames, name) { 
-                      if (name in allNames) {
-                          allNames[name]++;
-                      }
-                      else {
-                          allNames[name] = 1;
-                      }
-                      return allNames;
-                  }, {});
-                  let objKey = Object.keys(countedNames)
-                  let objVal = Object.values(countedNames)
-                  let strSix = ''
-                  objKey.map((item,index) => {
-                  let objVal = Object.values(countedNames)
-                      strSix += item + objVal[index] + '\n'
-                  })
-                  sixStr = strSix
-                }
-              }
-              let tempArr = [], newArr = []
-              for (let i = 0; i < staffList.length; i++) {
-                if (tempArr.indexOf(staffList[i].user_name) === -1) {
-                  newArr.push({
-                    user_name: staffList[i].user_name,
-                    admin_user_id:staffList[i].admin_user_id,
-                    user_type:staffList[i].doctor_type,
-                    is_sort:staffList[i].is_sort,
-                    sort:staffList[i].sort,
-                    list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}]
-                  })
-                  tempArr.push(staffList[i].user_name);
-                } else {
-                  for (let j = 0; j < newArr.length; j++) {
-                    if (newArr[j].user_name == staffList[i].user_name) {
-                      newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes})
-                    }
-                  }
-                }
-              }
-
-              let arr = [...newArr]
-              let newNurse = []
-              let newDoctor = []
-              arr.map(item => {
-                if(item.user_type == 2){
-                  newDoctor.push(item)
+              var outStockList =  response.data.data.outStockList
+              for(let i=0;i<stocklist.length;i++){
+                for(let j=0;j<outStockList.length;j++){
+                   if(stocklist[i].patient_id == outStockList[j].patient_id &&stocklist[i].drug_name == outStockList[j].drug_name && stocklist[i].drug_spec == outStockList[j].drug_spec){
+                       stocklist[i].Count = outStockList[j].Count
+                   }
                 }
-                if(item.user_type == 3){
-                  newNurse.push(item)
-                }
-              })
-
-              if(this.typevalue == 0){
-                //护士
-                newNurse.sort(this.compare('admin_user_id'))
-                let newNurseTableData = []
-                this.nurseTableData.map(item => {
-                    if(item.is_sort == 1){
-                        newNurseTableData.push(item)
-                    }
-                })
-                newNurseTableData.sort(this.compare('admin_user_id'))
-                newNurseTableData.map((item,index) => {
-                    if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
-                
-                    }else{
-                        newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
-                    }
-                })
-                newNurse.sort(this.compare('sort'))
-
-                //医生
-                newDoctor.sort(this.compare('admin_user_id'))
-                let newDoctorTableData = []
-                this.doctorTableData.map(item => {
-                    if(item.is_sort == 1){
-                        newDoctorTableData.push(item)
-                    }
-                })
-                newDoctorTableData.sort(this.compare('admin_user_id'))
-                newDoctorTableData.map((item,index) => {
-                    if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
-                
-                    }else{
-                        newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
-                    }
-                })
-                newDoctor.sort(this.compare('sort'))
-                
-                
-
-                let arr2 = []
-                arr2.push({class_name:oneStr,schedule_week:1})
-                arr2.push({class_name:twoStr,schedule_week:2})
-                arr2.push({class_name:threeStr,schedule_week:3})
-                arr2.push({class_name:fourStr,schedule_week:4})
-                arr2.push({class_name:fiveStr,schedule_week:5})
-                arr2.push({class_name:sixStr,schedule_week:6})
-                arr2.push({class_name:zeroStr,schedule_week:0})
-                var obj = {}
-                obj.admin_user_id = "1000000"
-                obj.user_name = "合计"
-                obj.user_type = 10
-                obj.list = arr2
-                arr.push(obj)
-
-                let data = []
-                data.push(...newNurse)
-                data.push(...newDoctor)
-                data.push(obj)
-                this.tableData = data
-              }
-              if(this.typevalue == 2){
-                newDoctor.sort(this.compare('admin_user_id'))
-                let newDoctorTableData = []
-                this.doctorTableData.map(item => {
-                    if(item.is_sort == 1){
-                        newDoctorTableData.push(item)
-                    }
-                })
-                newDoctorTableData.sort(this.compare('admin_user_id'))
-                newDoctorTableData.map((item,index) => {
-                    if (newDoctor[index] && item.admin_user_id == newDoctor[index].admin_user_id) {
-                
-                    }else{
-                        newDoctor.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
-                    }
-                })
-                newDoctor.sort(this.compare('sort'))
-                
-                let arr2 = []
-                arr2.push({class_name:oneStr,schedule_week:1})
-                arr2.push({class_name:twoStr,schedule_week:2})
-                arr2.push({class_name:threeStr,schedule_week:3})
-                arr2.push({class_name:fourStr,schedule_week:4})
-                arr2.push({class_name:fiveStr,schedule_week:5})
-                arr2.push({class_name:sixStr,schedule_week:6})
-                arr2.push({class_name:zeroStr,schedule_week:0})
-                var obj = {}
-                obj.admin_user_id = "1000000"
-                obj.user_name = "合计"
-                obj.user_type = 10
-                obj.list = arr2
-                newDoctor.push(obj)
-                this.tableData = newDoctor
-              }
-              if(this.typevalue == 3){
-                newNurse.sort(this.compare('admin_user_id'))
-                let newNurseTableData = []
-                this.nurseTableData.map(item => {
-                    if(item.is_sort == 1){
-                        newNurseTableData.push(item)
-                    }
-                })
-                newNurseTableData.sort(this.compare('admin_user_id'))
-                newNurseTableData.map((item,index) => {
-                    if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
-                
-                    }else{
-                        newNurse.splice(index, 0, {user_name: item.user_name, admin_user_id: item.admin_user_id, list: [],user_type:item.user_type,is_sort:item.is_sort,sort:item.sort})
-                    }
-                })
-                newNurse.sort(this.compare('sort'))
-                let arr2 = []
-                arr2.push({class_name:oneStr,schedule_week:1})
-                arr2.push({class_name:twoStr,schedule_week:2})
-                arr2.push({class_name:threeStr,schedule_week:3})
-                arr2.push({class_name:fourStr,schedule_week:4})
-                arr2.push({class_name:fiveStr,schedule_week:5})
-                arr2.push({class_name:sixStr,schedule_week:6})
-                arr2.push({class_name:zeroStr,schedule_week:0})
-                var obj = {}
-                obj.admin_user_id = "1000000"
-                obj.user_name = "合计"
-                obj.user_type = 10
-                obj.list = arr2
-                newNurse.push(obj)
-                this.tableData = newNurse
               }
+              console.log("stocklist99999",stocklist)
+              this.tableData = stocklist
             }
-        })
-      },
-      getClass(name,index){
-        if(name != undefined){
-          let newClass = '';
-          this.tableData.map(item => {
-            if(item.user_name == name){
-              if(item.list){
-                item.list.map(it => {
-                  if(it.schedule_week == index){
-                    newClass = it.class_name
-                  }
-                })
-              } 
-            }
-          })
-          if(newClass && newClass.indexOf("(") > -1){
-            let num = newClass.indexOf("(")
-            let a = newClass.slice(0, num) + '\n' + newClass.slice(num)
-            return a
-          }else if(newClass && newClass.indexOf("（") > -1) {
-            let num = newClass.indexOf("（")
-            let a = newClass.slice(0, num) + '\n' + newClass.slice(num)
-            return a
-          }else{
-            return newClass
-          }
-          
-        }
-      },
-      getNowFormatDate() {
-        var date = new Date();
-        var seperator1 = "-";
-        var year = date.getFullYear();
-        var month = date.getMonth() + 1;
-        var strDate = date.getDate();
-        if (month >= 1 && month <= 9) {
-            month = "0" + month;
-        }
-        if (strDate >= 0 && strDate <= 9) {
-            strDate = "0" + strDate;
-        }
-        var currentdate = year + seperator1 + month + seperator1 + strDate;
-        return currentdate;
-      },
-      compare(property){
-        return function(a,b){
-            var value1 = a[property];
-            var value2 = b[property];
-            return value2 - value1;
-        }
-      },
+        })   
+      }
     },
     created(){
-      var starttime =  this.$route.query.starttime
+      var starttime =  this.$route.query.start_time
       this.start_time = starttime
-      var endtime =  this.$route.query.endtime
+      var endtime =  this.$route.query.end_time
       this.end_time = endtime
-      this.weekArr = this.$route.query.weekArr.split(',')
-      this.typevalue = parseInt(this.$route.query.typeValue)
-      
-      //获取该机构所有医护人员
-      this.getDoctorList()
+      var drugname = this.$route.query.drug_name
+      this.drug_name = drugname
+      var drug_spec = this.$route.query.drug_spec
+      this.drug_spec = drug_spec
+      var keyword = this.$route.query.keyword
+      this.keyword = keyword
+
+      this.getlist()
     }
 }
 </script>

src/xt_pages/user/doctorAdvice.vue

@@ -934,7 +934,7 @@
       <el-dialog
         :title="nameFormTitle"
         :visible.sync="nameFormVisible"
-        width="700px"
+        width="800px"
       >
         <el-form
           ref="nameForm"
@@ -943,19 +943,53 @@
           label-width="90px"
         >
           <el-row>
-            <el-col :span="12">
+            <el-col :span="10">
               <el-form-item label="医嘱内容 :" required prop="advice_name">
-                <el-input v-model="nameForm.advice_name"></el-input>
+                <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
+
+                <el-select
+                v-model="nameForm.advice_name"
+                filterable
+                clearable
+                allow-create
+                :disabled="isChild"
+                placeholder="请选择(输入可搜索)"
+                style="width:200px"
+                @change="changeDrugName"
+              >
+                <el-option
+                  v-for="item in medicals"
+                  :key="item.id"
+                  :label="item.drug_name"
+                  :value="item.drug_name"
+                ></el-option>
+              </el-select>
               </el-form-item>
             </el-col>
 
-            <el-col :span="12">
+            <el-col :span="14">
               <el-form-item label="药品规格 :" prop="advice_desc">
-                <el-col :span="8">
-                  <el-input v-model="nameForm.advice_desc"></el-input>
+                <el-col :span="12">
+                  <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
+                    <el-select
+                      v-model="nameForm.advice_desc"
+                      filterable
+                      clearable
+                      allow-create
+                      :disabled="isChild"
+                      placeholder="请选择(输入可搜索)"
+                      style="width:190px"
+                  >
+                  <el-option
+                    v-for="item in drugSpec"
+                    :key="item.id"
+                    :label="item.drug_spec"
+                    :value="item.drug_spec"
+                  ></el-option>
+                 </el-select>  
                 </el-col>
                 <el-col class="line" :span="2">&nbsp;</el-col>
-                <el-col :span="14">
+                <el-col :span="6">
                   <el-select
                     v-model="nameForm.drug_spec_unit"
                     filterable
@@ -1942,7 +1976,7 @@ import { fetchPatient, PostRemind } from "@/api/patient";
 
 import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
-
+import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
 let rowIndex = 1;
 const rowKey = 0;
 
@@ -2146,16 +2180,18 @@ export default {
       temp: null,
       schedulStatus: 0,
       doctorAdvice: [],
-      dataAdvice: []
+      dataAdvice: [],
+      medicals:[],
+      patient_id:"",
+      drugSpec:[]
     };
   },
   methods: {
     clickuseradvicecell(row, column, cell, event) {
-      console.log("row1", row);
-      console.log("column", column);
+      // console.log("row1", row);
+      // console.log("column", column);
     },
     onTranPatient: function(tranPatient) {
-      console.log("tranPatient", tranPatient);
       this.currentPatient = tranPatient;
     },
     adviceNameShow({ row, column, rowIndex, columnIndex }) {
@@ -2686,7 +2722,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          console.log(row);
+          // console.log(row);
 
           let mode = "";
           if (row.advice_type == 3) {
@@ -2849,7 +2885,7 @@ export default {
 
       this.temp = row;
 
-      console.log(row);
+      // console.log(row);
       this.stopForm = {
         id: row.parent_id > 0 ? row.parent_id : row.id,
         stop_time: "",
@@ -2903,7 +2939,7 @@ export default {
         remark: groups[0].remark,
         groupno: groupno
       };
-      console.log(groups[0]);
+      // console.log(groups[0]);
 
       var childMap = {};
       for (const index in groups) {
@@ -2975,7 +3011,7 @@ export default {
         this.groupForm.adviceNames.push(item);
       }
 
-      console.log(this.groupForm);
+      // console.log(this.groupForm);
 
       this.$refs.editGroupForm.open();
     },
@@ -2992,7 +3028,7 @@ export default {
       //     this.$message.error("不能修改非本人添加的医嘱！");
       //     return false;
       // }
-      console.log(row);
+      // console.log(row);
       this.setAdviceForm(row);
       this.dialogFormVisible = true;
     },
@@ -3291,7 +3327,6 @@ export default {
           //console.log("数据是什么", this.adviceTableData);
           var advice = response.data.data.advices;
           var one = response.data.data.advicetwo;
-          console.log("advicetwo", one);
           let dataInfo = {};
           one.forEach((item, index) => {
             let { start_time } = item;
@@ -3324,10 +3359,10 @@ export default {
           this.childList = objarr;
           let arr = this.doctorAdvice;
           arr.push(...list.reverse());
-          console.log("arr", arr);
+          // console.log("arr", arr);
           this.doctorAdvice = arr;
           var total = response.data.data.total;
-          console.log("total", total);
+          // console.log("total", total);
           this.total = total;
           this.operators = response.data.data.operators;
           if (this.operators.length > 0) {
@@ -3399,7 +3434,7 @@ export default {
       this.multipleSelection = selection;
     },
     handleClick(val) {
-      console.log("val", val);
+      // console.log("val", val);
     },
     printThisInfo() {
       if (this.adviceType == 1) {
@@ -3516,7 +3551,7 @@ export default {
         }
       }
 
-      console.log(this.selectedTemp.list);
+      // console.log(this.selectedTemp.list);
     },
     spanselecttable({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 0) {
@@ -3667,7 +3702,7 @@ export default {
         for (const index in adviceTemplate.DoctorAdviceTemplate) {
           if (adviceTemplate.DoctorAdviceTemplate[index].selection) {
             thisRowKey++;
-            console.log(adviceTemplate.DoctorAdviceTemplate[index].id);
+            // console.log(adviceTemplate.DoctorAdviceTemplate[index].id);
             var item = {
               advice_name:
                 adviceTemplate.DoctorAdviceTemplate[index].advice_name,
@@ -3764,7 +3799,7 @@ export default {
           continue;
         }
         this.rowKey++;
-        console.log(this.allSelectedTemplate[index]);
+        // console.log(this.allSelectedTemplate[index]);
         var item = {
           template_id: this.allSelectedTemplate[index].template_id,
           advice_name: this.allSelectedTemplate[index].advice_name,
@@ -3824,7 +3859,7 @@ export default {
         this.groupForm.adviceNames.push(item);
       }
 
-      console.log(this.groupForm);
+      // console.log(this.groupForm);
 
       this.templateFormVisible = false;
       // 清除数据源的选中记录
@@ -3929,6 +3964,8 @@ export default {
       });
     },
     submitNameForm(formName) {
+      var arr = this.nameForm.advice_name.split("(自备药)")
+      this.nameForm.advice_name = arr[0]
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -4258,11 +4295,11 @@ export default {
       getPrintInfo({ ids: ids }).then(response => {
         if (response.data.state === 1) {
           var doctoradvice = response.data.data.doctoradvice;
-          console.log("doctoradvice", doctoradvice);
+          // console.log("doctoradvice", doctoradvice);
           this.dataAdvice = doctoradvice;
           if (this.adviceType === 3 || this.adviceType === 2) {
             this.lstableData = this.dataAdvice;
-            console.log("---", this.multipleSelection);
+            // console.log("---", this.multipleSelection);
           } else if (this.adviceType === 1) {
             this.cqtableData = doctoradvice;
           }
@@ -4282,13 +4319,13 @@ export default {
       getPatientSchedules(id).then(response => {
         if (response.data.state === 1) {
           var scheduls = response.data.data.scheduls;
-          console.log("scheduls", scheduls);
+          // console.log("scheduls", scheduls);
           this.schedulStatus = 1;
-          console.log("sch22", this.schedulStatus);
+          // console.log("sch22", this.schedulStatus);
         }
         if (response.data.state === 0) {
           this.schedulStatus = 2;
-          console.log("sch23", this.schedulStatus);
+          // console.log("sch23", this.schedulStatus);
         }
       });
     },
@@ -4305,6 +4342,34 @@ export default {
     handleSizeChange(limit) {
       this.listQuery.limit = limit;
       this.getList();
+    },
+
+    getSelfMedicalList(id){
+        const params = {
+          patient_id:id
+        }
+      getSelfMedicalList(params).then(response=>{
+         if(response.data.state == 1){
+            var medicalList =  response.data.data.medicalList
+            for(let i=0;i<medicalList.length;i++){
+               medicalList[i].drug_name = medicalList[i].drug_name+"(自备药)"
+            }
+            this.medicals = medicalList
+         }
+      })
+    },
+    changeDrugName(name){
+      var arr = name.split("(自备药)");
+        const params = {
+          drug_name:arr[0],
+          patient_id:this.$route.params && this.$route.params.id
+        }
+      getDrugDescByDrugName(params).then(response=>{
+          if(response.data.state == 1){
+             var drugspec = response.data.data.drugspec
+             this.drugSpec = drugspec
+          }
+      })
     }
   },
   watch: {
@@ -4336,7 +4401,6 @@ export default {
   },
   created() {
     const id = this.$route.params && this.$route.params.id;
-    console.log("病人id", id);
     this.patientID = parseInt(id);
     if (isNaN(this.patientID) || this.patientID <= 0) {
       this.$notify.error({
@@ -4387,6 +4451,9 @@ export default {
     this.unitsOption = getDataConfig("hemodialysis", "units");
     //查询该病人是否有排班记录
     this.getPatientSchedules(id);
+
+
+    this.getSelfMedicalList(id)
   }
 };
 </script>