Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/drug/drug.js

@@ -800,4 +800,13 @@ export function deleteSelfWarehouseOut(id,params){
     method:"get",
     params:params
   })
+}
+
+export function getSelfDrugWarehouseOutById(id,params){
+  
+  return request({
+    url:"/api/drug/getselfdrugwarehouseoutbyid?id="+id,
+    method:"get",
+    params:params
+  })
 }

src/router/modules/selfPreparedMedicine.js

@@ -50,6 +50,14 @@ export default {
       hidden: true,
       is_menu: false,
     },
+    {
+      path: '/stock/selfwarehouse/out/edit',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/editWarehouseOut'),
+      name: 'SelfeditWarehouseOut',
+      meta: { title: '自备药编辑出库', noCache: true },
+      hidden: true,
+      is_menu: false,
+    },
     {
       path: '/stock/selfstockquery',
       component: () => import('@/xt_pages/stock/selfPreparedMedicine/stockquery'),

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

@@ -1270,6 +1270,13 @@ export default {
              ParamsQuery.weight_loss = (this.predialysis_evaluation.weight_before - this.form.weight_after).toFixed(1)
           }
 
+          if(ParamsQuery.additional_weight == 0){
+            if(this.additional_weight!=null){
+              ParamsQuery.additional_weight = this.predialysis_evaluation.additional_weight
+            }
+            
+          }
+
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -39,7 +39,7 @@
           <div>{{ scope.row.spec }}</div>
         </template>
       </el-table-column>
-      
+
       <el-table-column align="center" prop="name" width="80" label="单次用量">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
@@ -74,12 +74,21 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="80" label="执行状态">
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0">
+        <template slot-scope="scope">
+          <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
         </template>
       </el-table-column>
 
+
+
+
       <el-table-column align="center" prop="name" width="220" label="医保编码">
         <template slot-scope="scope">
           <div>{{ scope.row.code }}</div>
@@ -200,7 +209,7 @@
           >{{ scope.row.single_dose }}{{ scope.row.unit }}</template
         >
       </el-table-column>
-      
+
       <el-table-column
         align="center"
         prop="delivery_way"
@@ -235,24 +244,32 @@
           <div>{{ scope.row.total }} {{ scope.row.unit }}</div>
         </template>
       </el-table-column>
-      
+
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">{{ scope.row.price }}元</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="80" label="执行状态">
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id > 0 && schedule.id > 0">
         <template slot-scope="scope">
           <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
         </template>
       </el-table-column>
 
+      <el-table-column align="center" prop="name" width="80" label="执行状态" v-if="his_patient.id == 0 && schedule.id > 0">
+        <template slot-scope="scope">
+          <div>{{ scope.row.execution_state == 1 ? "已执行" : "未执行" }}</div>
+        </template>
+      </el-table-column>
+
+
+
       <el-table-column align="center" prop="name" width="220" label="医保编码">
         <template slot-scope="scope">
           <div>{{ scope.row.medical_code }}</div>
         </template>
       </el-table-column>
 
-      
+
 
       <el-table-column align="center" prop="name" width="60" label="金额">
         <template slot-scope="scope">
@@ -339,6 +356,8 @@ import { getDictionaryDataConfig } from "@/utils/data";
 export default {
   props: {
     prescription: Object,
+    his_patient: Object,
+    schedule: Object,
     manufacturers: Array,
   },
   data() {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -263,6 +263,8 @@
                           </el-tab-pane>
                             <prescription-table ref="prescription_tables"
                                               :prescription="items.curPrescriptions"
+                                                :schedule="schedule"
+                                                :his_patient="hisPatientInfo"
                                               :manufacturers="manufacturers"></prescription-table>
 
                         </el-tabs>
@@ -1202,6 +1204,7 @@ export default {
       }],
       tabIndex: 1,
       hisPatientInfo: {},
+      schedule:{},
       loadingtwo: false,
       patientTableData: [{}],
       patientInfo: { id: 0 },
@@ -1968,6 +1971,8 @@ export default {
           this.hisPatientInfo = response.data.data.his_info
           this.info = response.data.data.info
           this.order = response.data.data.order
+          this.schedule = response.data.data.sch
+
 
           this.addtions_charge = response.data.data.addtions_charge
 
@@ -2810,10 +2815,10 @@ export default {
             this.big_month_prescriptions[b].curMonthPrescriptions = temp
             this.big_month_prescriptions[b].month_total = this.getMonthTotalTwo(temp)
           }
-          
+
         }
       }
-     
+
     },
     tabclickEventThree(val) {
       for (let i = 0; i < this.big_prescriptions_two.length; i++) {
@@ -5333,8 +5338,8 @@ export default {
           for(let j in month_prescriptions[i].advices){
             const obj ={
               drug_id: month_prescriptions[i].advices[j].drug_id,
-              spec:month_prescriptions[i].advices[j].drug.dose + month_prescriptions[i].advices[j].drug.dose_unit + '*' + 
-              month_prescriptions[i].advices[j].drug.min_number + month_prescriptions[i].advices[j].drug.min_unit + '/' + 
+              spec:month_prescriptions[i].advices[j].drug.dose + month_prescriptions[i].advices[j].drug.dose_unit + '*' +
+              month_prescriptions[i].advices[j].drug.min_number + month_prescriptions[i].advices[j].drug.min_unit + '/' +
               month_prescriptions[i].advices[j].drug.max_unit
             }
             advices2.push(obj)
@@ -5552,8 +5557,8 @@ export default {
           }
         }
       }
-      
-        
+
+
       console.log('kkkkk',big_prescriptions[0].curMonthPrescriptions);
       if (this.big_month_prescriptions.length > 0) {
         this.editableTabsValue = this.big_month_prescriptions[0].curMonthPrescriptions.name
@@ -5785,6 +5790,7 @@ export default {
             this.hisPatientInfo = response.data.data.his_info
             this.info = response.data.data.info
             this.order = response.data.data.order
+            this.schedule = response.data.data.sch
             this.p_type = ''
             this.sick_type = ''
             this.diagnosis = []

src/xt_pages/stock/selfPreparedMedicine/warehouseOut.vue

@@ -467,7 +467,7 @@ export default {
     },
     clicks: function () {},
      handleWarehouse: function () {
-      this.$router.push({path:"/stock/selfwarehouse/info/add"})
+      this.$router.push({path:"/stock/selfwarehouse/out/add"})
     },
     handleSelectionChange: function (val) {
       this.multipleSelection = val;
@@ -511,7 +511,7 @@ export default {
 
     handleEdit: function (index, row) {
 
-      this.$router.push({path:"/stock/selfwarehouse/info/edit?id="+row.id+"&is_sys="+row.is_sys+"&is_check="+row.is_check})
+      this.$router.push({path:"/stock/selfwarehouse/out/edit?id="+row.id+"&is_sys="+row.is_sys+"&is_check="+row.is_check})
       
     },
     search(){
@@ -567,7 +567,7 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.tableData.splice(index, 1)
+              this.tableList.splice(index, 1)
 
             }
           })

src/xt_pages/user/components/PatientDetail.vue

@@ -281,8 +281,14 @@
                 </el-checkbox-group>
               </el-form-item>
              </el-col>
+
+             <el-col :span="8">
+              <el-form-item label="家庭住址 : " prop="homeAddress">
+                <el-input v-model="form.homeAddress" disabled style="width: 350px;"></el-input>
+              </el-form-item>
+            </el-col>
             
-             <el-col :span="6" :style="isEdit ? 'width:380px' : ''">
+             <el-col :span="8" :style="isEdit ? 'width:280px' : ''">
                 <el-form-item
                   label="打印日期:"
                   label-width="150px"
@@ -634,11 +640,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="家庭住址 : " prop="homeAddress">
-                <el-input v-model="form.homeAddress" disabled style="width: 350px;"></el-input>
-              </el-form-item>
-            </el-col>
+           
 
             <div v-show="!generic_info_fold">
               <el-col :span="8">

src/xt_pages/user/components/PatientForm.vue

@@ -333,7 +333,13 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="6" :style="isEdit ? 'width:380px' : ''">
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item label="家庭住址 : " prop="homeAddress"  class="is-required">
+                  <el-input v-model="form.homeAddress" style="width: 280px;"></el-input>
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8" :style="isEdit ? 'width:280px' : ''">
                 <el-form-item
                   label="打印日期:"
                   label-width="150px"
@@ -676,11 +682,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                <el-form-item label="家庭住址 : " prop="homeAddress"  class="is-required">
-                  <el-input v-model="form.homeAddress" style="width: 350px;"></el-input>
-                </el-form-item>
-              </el-col>
+            
 
               <div v-show="!generic_info_fold">
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">