hah阿凡达

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -239,6 +239,7 @@
                 {{ scope.row.frequency }}
               </template>
             </el-table-column>
+            
             <el-table-column
               prop="name"
               label="天数"
@@ -342,10 +343,20 @@
                 {{ scope.row.frequency }}
               </template>
             </el-table-column>
+            <el-table-column
+              prop="name"
+              label="药品追溯码"
+              width="185"
+              align="center"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.DrugCode }}
+              </template>
+            </el-table-column>
             <el-table-column
               prop="name"
               label="天数"
-              width="160"
+              width="50"
               align="center"
             >
               <template slot-scope="scope">

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

@@ -2663,6 +2663,7 @@ mu
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = ((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(0))*1000
+              console.log("超滤梁----------------", this.dialysisPrescription.target_ultrafiltration)
               if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
                  this.dialysisPrescription.target_ultrafiltration = 0
              }
@@ -3280,7 +3281,7 @@ mu
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = ((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(0))*1000
-              
+              console.log("目标超滤----------------", this.dialysisPrescription.target_ultrafiltration)
               if(this.dialysisPrescription.target_ultrafiltration == "NaN"){
                  this.dialysisPrescription.target_ultrafiltration = 0
              }

src/xt_pages/user/lapsoSummary.vue

@@ -71,7 +71,7 @@
                     >
                  </el-button>
                </el-tooltip>
-                <!-- <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <el-tooltip class="item" effect="dark" content="删除" placement="top">
                    <el-button
                     size="small"
                     type="danger"
@@ -79,7 +79,7 @@
                     @click="handleDeleteAdviceTemplate(scope.row.id, scope.$index)"
                     >
                    </el-button>
-                </el-tooltip> -->
+                </el-tooltip>
              </template>
         </el-table-column>
         </el-table>
@@ -894,13 +894,27 @@
         })
       },
       handleDeleteAdviceTemplate(id,index){
-        deletePatientLapsoRrecord(id).then(response=>{
-            if(response.data.state==1){
-               var msg = response.data.data.msg
+
+        this.$confirm('确认删除吗?', '删除', {
+            confirmButtonText: '确 定',
+            cancelButtonText: '取 消',
+            type: 'warning'
+         }).then(() => {
+          deletePatientLapsoRrecord(id).then(response => {
+              if (response.data.state == 1) {
+                var msg = response.data.data.msg
                this.$message.success("保存成功")
                this.tableData.splice(index,1)
-            }
-        })
+              } 
+            })
+          })
+        // deletePatientLapsoRrecord(id).then(response=>{
+        //     if(response.data.state==1){
+        //        var msg = response.data.data.msg
+        //        this.$message.success("保存成功")
+        //        this.tableData.splice(index,1)
+        //     }
+        // })
       }
      
   

src/xt_pages/user/sickHistory.vue

@@ -388,6 +388,10 @@ export default {
         this.$message.error('请填写病程内容')
         return
       }
+      if(this.edit_sick_history_time == ""){
+        this.$message.error("请填写日期!")
+        return
+      }
       this.uploading_new_record = true
       let params = {
         id:this.edit_current_id,
@@ -437,6 +441,10 @@ export default {
         this.$message.error('请填写病程内容')
         return
       }
+      if(this.sick_history_time == ""){
+        this.$message.error("请填写日期!")
+        return
+      }
       this.uploading_new_record = true
       let params = {
         patient_id: this.patient_id,