新分支

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/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' : ''">