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

src/xt_pages/data/components/addProject.vue

@@ -367,6 +367,10 @@ export default {
             }
           })
        }
+    },
+    created(){
+       var statistics =   getDictionaryDataConfig('system','statistics_category')
+       console.log("#333333333",statistics)
     }
 }
 </script>

src/xt_pages/data/components/editInspection.vue

@@ -64,7 +64,7 @@
             <el-form>
                 <el-table :data="tableData" border  style="100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row ref="tab">
                     <el-table-column align="center" prop="name" label="分类" width="120">
-                        <template slot-scope="scope">{{getId(scope.row.cost_classify)}}</template>
+                        <template slot-scope="scope">{{getId(scope.row.statistical_classification)}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="组套明细" width="120">
                         <template slot-scope="scope">{{scope.row.project_name}}</template>
@@ -190,7 +190,7 @@ export default {
                        }
                    }
                  }
-                 console.log("数据222222",list)
+                
                  var strArr = []
                  for(let i=0;i<arr.length;i++){
                    for(let j=0;j<list.length;j++){
@@ -199,6 +199,7 @@ export default {
                       }
                    }
                  }
+                 console.log("数据222222",strArr)
                  this.tableData = strArr
                
                
@@ -260,8 +261,10 @@ export default {
           })   
         },
         getId(id){
+          console.log("id",id)
           var name = ""
           var statistics_category =  getDictionaryDataConfig('system','statistics_category') 
+          console.log("statics",statistics_category)
           for(let i=0;i<statistics_category.length;i++){
              if(id == statistics_category[i].id){
                  name = statistics_category[i].name

src/xt_pages/device/airDisinfect.vue

@@ -68,7 +68,7 @@
                    <span v-if="scope.row.modifications == 2">撤消</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="180">
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
@@ -304,7 +304,7 @@
           class:"",
           disinfection_methods:"",
           disinfection_fluid:"",
-          sort:"",
+          sort:"1",
           creator:"",
           detection_time:"",
           detection_result:"",

src/xt_pages/device/objectTableDisinfect.vue

@@ -68,7 +68,7 @@
                    <span v-if="scope.row.modifications == 2">撤消</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="180">
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
@@ -304,7 +304,7 @@
           class:"",
           disinfection_methods:"",
           disinfection_fluid:"",
-          sort:"",
+          sort:"1",
           creator:"",
           detection_time:"",
           detection_result:"",

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

@@ -393,11 +393,7 @@
           </el-col>
           
 
-          <el-col :span="24">
-            <el-form-item label="备注： ">
-              <el-input type="textarea" v-model="assessmentBeforeDislysis.remark" :rows="5"></el-input>
-            </el-form-item>
-          </el-col>
+          
 
           <el-col :span="8">
             <el-form-item label="透析期间： " v-if="isShow('透析期间')">
@@ -545,9 +541,14 @@
               <el-input v-model="assessmentBeforeDislysis.edema" @focus="showInnerDialog('16')"></el-input>
             </el-form-item>
           </el-col>
+          
 
          
-
+          <el-col :span="24">
+            <el-form-item label="备注： ">
+              <el-input type="textarea" v-model="assessmentBeforeDislysis.remark" :rows="5"></el-input>
+            </el-form-item>
+          </el-col>
          
       
         </el-row>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue

@@ -1058,10 +1058,8 @@
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
-              <span v-if="doctorForm.url !== ''">
-                <img class="es-img" :src="doctorForm.url" />
-              </span>
+              <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
+              <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
             </span>
             核对护士
             <span style="display: inline-block;width:100px;text-align: left;">

src/xt_pages/management/components/QualityForm.vue

@@ -407,10 +407,11 @@
               effect="dark"
               content="删除"
               placement="top"
+           
             >
               <el-button
                 size="mini"
-                type="primary"
+                type="danger"
                 icon="el-icon-delete"
                 @click="DeleteDialystates(scope.row.id, scope.$index)"
               ></el-button>
@@ -625,7 +626,7 @@
             >
               <el-button
                 size="mini"
-                type="primary"
+                type="danger"
                 icon="el-icon-delete"
                 @click="DeleteIons(scope.row.id, scope.$index)"
               ></el-button>
@@ -795,7 +796,7 @@
             >
               <el-button
                 size="mini"
-                type="primary"
+                type="danger"
                 icon="el-icon-delete"
                 @click="DeleteOxygenates(scope.row.id, scope.$index)"
               ></el-button>
@@ -965,7 +966,7 @@
             >
               <el-button
                 size="mini"
-                type="primary"
+                type="danger"
                 icon="el-icon-delete"
                 @click="DeleteHadWater(scope.row.id, scope.$index)"
               ></el-button>
@@ -1135,7 +1136,7 @@
             >
               <el-button
                 size="mini"
-                type="primary"
+                type="danger"
                 icon="el-icon-delete"
                 @click="DeleteWater(scope.row.id, scope.$index)"
               ></el-button>
@@ -1306,7 +1307,7 @@
             >
               <el-button
                 size="mini"
-                type="primary"
+                type="danger"
                 icon="el-icon-delete"
                 @click="DeleteDevicePh(scope.row.id, scope.$index)"
               ></el-button>
@@ -1409,7 +1410,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="出报告日期:">
+            <el-form-item label="出报告日期:" required prop="reporting_date">
               <el-date-picker
                 v-model="form.reporting_date"
                 prefix-icon="none"
@@ -1560,7 +1561,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="出报告日期:">
+            <el-form-item label="出报告日期:" required prop="reporting_dateb">
               <el-date-picker
                 v-model="diaForm.reporting_dateb"
                 prefix-icon="none"
@@ -1572,6 +1573,26 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="顺序号:" required prop="sort">
+               <el-input v-model="diaForm.sort" style="width:150px"></el-input>
+            </el-form-item>
+         </el-col>
+        </el-row>
+        <el-row>
+           <el-col :span="12">
+             <el-form-item label="检测合格:" required prop="pass_examination">
+               <el-radio v-model="diaForm.pass_examination" label="1">是</el-radio>
+               <el-radio v-model="diaForm.pass_examination" label="2">否</el-radio>
+             </el-form-item>
+          </el-col>
+         <el-col :span="12">
+           <el-form-item label="修改标志:" required prop="modifications">
+             <el-select style="width:150px"  v-model="diaForm.modifications">
+              <el-option v-for="(item,index) in modifications" :key="index" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -1657,7 +1678,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="出报告日期:">
+              <el-form-item label="出报告日期:" required prop="date_reportc">
                 <el-date-picker
                   v-model="ionForm.date_reportc"
                   prefix-icon="none"
@@ -1739,8 +1760,31 @@
                 ></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="顺序号:" required prop="sort">
+                <el-input
+                  style="width:100px"
+                  v-model="ionForm.sort"
+                ></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="12">
+              <el-form-item label="检测合格:" required prop="pass_examination">
+                <el-radio v-model="ionForm.pass_examination" label="1">是</el-radio>
+                <el-radio v-model="ionForm.pass_examination" label="2">否</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="修改标志:" required prop="modifications">
+                <el-select style="width:150px"  v-model="ionForm.modifications">
+                  <el-option v-for="(item,index) in modifications" :key="index" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+           <el-row>
             <el-col :span="24">
               <el-form-item label="备注:">
                 <el-input
@@ -1770,7 +1814,7 @@
       width="60%"
       center
     >
-      <el-form :model="diaForm" ref="diaForm" rules="diaRules">
+      <el-form :model="diaForm" ref="diaForm" rules="rulesOne">
         <el-row>
           <el-col :span="8">
             <el-form-item label="取样日期:">
@@ -1859,7 +1903,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="出报告日期:">
+            <el-form-item label="出报告日期:" required prop="reporting_dateb">
               <el-date-picker
                 v-model="diaForm.reporting_dateb"
                 prefix-icon="none"
@@ -1871,6 +1915,29 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
+           <el-col :span="8">
+              <el-form-item label="顺序号:" required prop="sort">
+                <el-input
+                  style="width:100px"
+                  v-model="diaForm.sort"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+        </el-row>
+         <el-row>
+            <el-col :span="12">
+               <el-form-item label="检测合格:" required prop="pass_examination">
+                  <el-radio v-model="diaForm.pass_examination" label="1">是</el-radio>
+                  <el-radio v-model="diaForm.pass_examination" label="2">否</el-radio>
+               </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item label="修改标志:" required prop="modifications">
+                 <el-select style="width:150px"  v-model="diaForm.modifications">
+                   <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                 </el-select>
+              </el-form-item>
+            </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -1887,7 +1954,7 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisibleTwo = false">取 消</el-button>
+        <el-button @click="dialogVisibleFour = false">取 消</el-button>
         <el-button type="primary" @click="UpdateOxygenates('diaForm')"
           >保存</el-button
         >
@@ -1992,7 +2059,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="出报告日期:">
+            <el-form-item label="出报告日期:" required prop="reporting_dateb">
               <el-date-picker
                 v-model="diaForm.reporting_dateb"
                 prefix-icon="none"
@@ -2004,6 +2071,29 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
+           <el-col :span="8">
+              <el-form-item label="顺序号:" required prop="sort">
+                <el-input
+                  style="width:100px"
+                  v-model="diaForm.sort"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+        </el-row>
+         <el-row>
+            <el-col :span="12">
+               <el-form-item label="检测合格:" required prop="pass_examination">
+                  <el-radio v-model="diaForm.pass_examination" label="1">是</el-radio>
+                  <el-radio v-model="diaForm.pass_examination" label="2">否</el-radio>
+               </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item label="修改标志:" required prop="modifications">
+                 <el-select style="width:150px"  v-model="diaForm.modifications">
+                   <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                 </el-select>
+              </el-form-item>
+            </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -2125,7 +2215,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="出报告日期:">
+            <el-form-item label="出报告日期:" required prop="reporting_dateb">
               <el-date-picker
                 v-model="diaForm.reporting_dateb"
                 prefix-icon="none"
@@ -2137,6 +2227,29 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
+           <el-col :span="8">
+              <el-form-item label="顺序号:" required prop="sort">
+                <el-input
+                  style="width:100px"
+                  v-model="diaForm.sort"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+        </el-row>
+         <el-row>
+            <el-col :span="12">
+               <el-form-item label="检测合格:" required prop="pass_examination">
+                  <el-radio v-model="diaForm.pass_examination" label="1">是</el-radio>
+                  <el-radio v-model="diaForm.pass_examination" label="2">否</el-radio>
+               </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item label="修改标志:" required prop="modifications">
+                 <el-select style="width:150px"  v-model="diaForm.modifications">
+                   <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                 </el-select>
+              </el-form-item>
+            </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -2258,7 +2371,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="出报告日期:">
+            <el-form-item label="出报告日期:" required prop="reporting_dateb">
               <el-date-picker
                 v-model="diaForm.reporting_dateb"
                 prefix-icon="none"
@@ -2270,6 +2383,29 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+              <el-form-item label="顺序号:" required prop="sort">
+                <el-input
+                  style="width:100px"
+                  v-model="diaForm.sort"
+                ></el-input>
+              </el-form-item>
+         </el-col>
+        </el-row>
+        <el-row>
+            <el-col :span="12">
+               <el-form-item label="检测合格:" required prop="pass_examination">
+                  <el-radio v-model="diaForm.pass_examination" label="1">是</el-radio>
+                  <el-radio v-model="diaForm.pass_examination" label="2">否</el-radio>
+               </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item label="修改标志:" required prop="modifications">
+                 <el-select style="width:150px"  v-model="diaForm.modifications">
+                   <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                 </el-select>
+              </el-form-item>
+            </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -2388,7 +2524,10 @@ export default {
         detection_unit: "",
         samplerb: "",
         reporting_dateb: "",
-        detection_resultb: ""
+        detection_resultb: "",
+        sort:"",
+        pass_examination:"",
+        modifications:""
       },
       sampling: [],
       samplingSpecimen: [
@@ -2409,15 +2548,35 @@ export default {
       ],
       rules: {
         detection_unit: [{ required: true, message: "请填写检测单位" }],
-        sampler: [{ required: true, message: "请填写取样者" }]
+        sampler: [{ required: true, message: "请填写取样者" }],
+        sort:[{required:true,message:"请输入顺序号"}],
+        reporting_date:[{required:true,message:"请选择出报告日期"}],
+        pass_examination:[{required:true,message:"请选择检测合格"}],
+        modifications:[{required:true,message:"请选择修改标志"}]
       },
       diaRules: {
         detection_unit: [{ required: true, message: "请填写检测单位" }],
-        samplerb: [{ required: true, message: "请填写取样者" }]
+        samplerb: [{ required: true, message: "请填写取样者" }],
+        sort:[{required:true,message:"请输入顺序号"}],
+        pass_examination:[{required:true,message:"请选择检测合格"}],
+        modifications:[{required:true,message:"请选择修改标志"}],
+        reporting_dateb:[{required:true,message:"请选择出报告日期"}],
+      },
+      rulesOne:{
+        detection_unit: [{ required: true, message: "请填写检测单位" }],
+        samplerb: [{ required: true, message: "请填写取样者" }],
+        sort:[{required:true,message:"请输入顺序号"}],
+        pass_examination:[{required:true,message:"请选择检测合格"}],
+        modifications:[{required:true,message:"请选择修改标志"}],
+        reporting_dateb:[{required:true,message:"请选择出报告日期"}],
       },
       ionrule: {
         detection_unit: [{ required: true, message: "请填写检测单位" }],
-        samplerc: [{ required: true, message: "请填写取样者" }]
+        samplerc: [{ required: true, message: "请填写取样者" }],
+        date_reportc:[{required:true,message:"请选择出报告日期"}],
+        sort:[{required:true,message:"请输入顺序号"}],
+        pass_examination:[{required:true,message:"请选择检测合格"}],
+        modifications:[{required:true,message:"请选择修改标志"}]
       },
       selectCulture: [],
       ionForm: {
@@ -2434,7 +2593,10 @@ export default {
         actual_ci: "",
         actual_hco: "",
         actual_mg: "",
-        actual_ph: ""
+        actual_ph: "",
+        sort:"",
+        pass_examination:"",
+        modifications:""
       },
      modifications:[
        {id:1,name:"正常"},
@@ -3074,13 +3236,16 @@ export default {
             dialysate.reporting_dateb
           );
           this.diaForm.detection_resultb = dialysate.detection_resultb;
+          this.diaForm.sort = dialysate.sort
+          this.diaForm.pass_examination = dialysate.pass_examination.toString()
+          this.diaForm.modifications = dialysate.modifications
         }
       });
     },
     UpdateDialyState(formName) {
       this.$refs[formName].validate(valid => {
         console.log("333333",this.diaForm)
-       
+        this.diaForm.pass_examination = parseInt(this.diaForm.pass_examination)
         if (valid) {
           UpdateDialyState(this.diaForm).then(response => {
             if (response.data.state === 1) {
@@ -3097,6 +3262,7 @@ export default {
 
     UpdateOxygenates(formName){
        this.$refs[formName].validate(valid=>{
+         this.diaForm.pass_examination = parseInt(this.diaForm.pass_examination)
          if(valid){
            UpdateOxygenates(this.diaForm).then(response=>{
               if(response.data.state == 1){
@@ -3112,6 +3278,7 @@ export default {
     },
     UpdateHadWater(formName){
        this.$refs[formName].validate(valid=>{
+         this.diaForm.pass_examination = parseInt(this.diaForm.pass_examination)
          if(valid){
            UpdateHadWater(this.diaForm).then(response=>{
               if(response.data.state == 1){
@@ -3128,6 +3295,7 @@ export default {
     updateWater(formName){
        this.$refs[formName].validate(valid=>{
          if(valid){
+           this.diaForm.pass_examination = parseInt(this.diaForm.pass_examination)
            updateWater(this.diaForm).then(response=>{
               if(response.data.state == 1){
                 var hadwater =  response.data.data.hadWater
@@ -3142,6 +3310,7 @@ export default {
     },
     updateDevicePh(formName){
        this.$refs[formName].validate(valid=>{
+         this.diaForm.pass_examination = parseInt(this.diaForm.pass_examination)
          if(valid){
            updateDevicePh(this.diaForm).then(response=>{
               if(response.data.state == 1){
@@ -3316,11 +3485,15 @@ export default {
           this.ionForm.actual_mg = ion.actual_mg;
           this.ionForm.actual_ph = ion.actual_ph;
           this.ionForm.remakes = ion.remakes;
+          this.ionForm.sort = ion.sort;
+          this.ionForm.pass_examination = ion.pass_examination.toString()
+          this.ionForm.modifications = ion.modifications
         }
       });
     },
     UpdateIon(formName) {
       this.$refs[formName].validate(valid => {
+        this.ionForm.pass_examination = parseInt(this.ionForm.pass_examination)
         if (valid) {
           UpdateIon(this.ionForm).then(response => {
             if (response.data.state === 1) {
@@ -3396,6 +3569,7 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var cultures = response.data.data.cultures;
+          
           for (let index = 0; index < cultures.length; index++) {
             if (cultures[index].specimen === 0) {
               cultures[index].specimen = "";
@@ -3437,7 +3611,9 @@ export default {
             }
           }
           this.tableData = cultures;
-          var dialysate = response.data.data.dialysate;
+
+          var dialyste = response.data.data.dialysate;
+          
           for (let index = 0; index < dialyste.length; index++) {
             if (dialyste[index].specimenb === 0) {
               dialyste[index].specimenb = "";
@@ -3478,15 +3654,184 @@ export default {
               dialyste[index].sampling_locationb = "反渗水末端取样口";
             }
           }
-          this.table = dialysate;
+          this.table = dialyste;
 
           var ions = response.data.data.ions;
-
+          console.log("ions",ions)
+          this.tableDatas = ions;
           var oxygenates =  response.data.data.oxygenates
+          for (let index = 0; index < oxygenates.length; index++) {
+            if (oxygenates[index].specimenb === 0) {
+              oxygenates[index].specimenb = "";
+            }
+            if (oxygenates[index].specimenb === 1) {
+              oxygenates[index].specimenb = "透析液";
+            }
+            if (oxygenates[index].specimenb === 2) {
+              oxygenates[index].specimenb = "A浓缩液";
+            }
+            if (oxygenates[index].specimenb === 3) {
+              oxygenates[index].specimenb = "B浓缩液";
+            }
+            if (oxygenates[index].specimenb === 4) {
+              oxygenates[index].specimenb = "置换液";
+            }
+            if (oxygenates[index].specimenb === 5) {
+              oxygenates[index].specimenb = "透析用水";
+            }
+
+            if (oxygenates[index].sampling_locationb === 0) {
+              oxygenates[index].sampling_locationb = "";
+            }
+
+            if (oxygenates[index].sampling_locationb === 1) {
+              oxygenates[index].sampling_locationb = "透析液入口";
+            }
+            if (oxygenates[index].sampling_locationb === 2) {
+              oxygenates[index].sampling_locationb = "透析液取样口";
+            }
+            if (oxygenates[index].sampling_locationb === 3) {
+              oxygenates[index].sampling_locationb = "置换液出口";
+            }
+            if (oxygenates[index].sampling_locationb === 4) {
+              oxygenates[index].sampling_locationb = "透析机反渗水入口";
+            }
+            if (oxygenates[index].sampling_locationb === 5) {
+              oxygenates[index].sampling_locationb = "反渗水末端取样口";
+            }
+          } 
+          this.tableOne = oxygenates
+
           var hadwater = response.data.data.hadwater
+          for (let index = 0; index < hadwater.length; index++) {
+            if (hadwater[index].specimenb === 0) {
+              hadwater[index].specimenb = "";
+            }
+            if (hadwater[index].specimenb === 1) {
+              hadwater[index].specimenb = "透析液";
+            }
+            if (hadwater[index].specimenb === 2) {
+              hadwater[index].specimenb = "A浓缩液";
+            }
+            if (hadwater[index].specimenb === 3) {
+              hadwater[index].specimenb = "B浓缩液";
+            }
+            if (hadwater[index].specimenb === 4) {
+              hadwater[index].specimenb = "置换液";
+            }
+            if (hadwater[index].specimenb === 5) {
+              hadwater[index].specimenb = "透析用水";
+            }
+
+            if (hadwater[index].sampling_locationb === 0) {
+              hadwater[index].sampling_locationb = "";
+            }
+
+            if (hadwater[index].sampling_locationb === 1) {
+              hadwater[index].sampling_locationb = "透析液入口";
+            }
+            if (hadwater[index].sampling_locationb === 2) {
+              hadwater[index].sampling_locationb = "透析液取样口";
+            }
+            if (hadwater[index].sampling_locationb === 3) {
+              hadwater[index].sampling_locationb = "置换液出口";
+            }
+            if (hadwater[index].sampling_locationb === 4) {
+              hadwater[index].sampling_locationb = "透析机反渗水入口";
+            }
+            if (hadwater[index].sampling_locationb === 5) {
+              hadwater[index].sampling_locationb = "反渗水末端取样口";
+            }
+          } 
+          this.tableTwo = hadwater
           var water = response.data.data.water
+          
+          for (let index = 0; index < water.length; index++) {
+            if (water[index].specimenb === 0) {
+              water[index].specimenb = "";
+            }
+            if (water[index].specimenb === 1) {
+              water[index].specimenb = "透析液";
+            }
+            if (water[index].specimenb === 2) {
+              water[index].specimenb = "A浓缩液";
+            }
+            if (water[index].specimenb === 3) {
+              water[index].specimenb = "B浓缩液";
+            }
+            if (water[index].specimenb === 4) {
+              water[index].specimenb = "置换液";
+            }
+            if (water[index].specimenb === 5) {
+              water[index].specimenb = "透析用水";
+            }
+
+            if (water[index].sampling_locationb === 0) {
+              water[index].sampling_locationb = "";
+            }
+
+            if (water[index].sampling_locationb === 1) {
+              water[index].sampling_locationb = "透析液入口";
+            }
+            if (water[index].sampling_locationb === 2) {
+              water[index].sampling_locationb = "透析液取样口";
+            }
+            if (water[index].sampling_locationb === 3) {
+              water[index].sampling_locationb = "置换液出口";
+            }
+            if (water[index].sampling_locationb === 4) {
+              water[index].sampling_locationb = "透析机反渗水入口";
+            }
+            if (water[index].sampling_locationb === 5) {
+              water[index].sampling_locationb = "反渗水末端取样口";
+            }
+          } 
+
+          this.tableThree = water
+          
           var deviceph = response.data.data.deviceph
-          this.tableDatas = ions;
+                  
+          for (let index = 0; index < deviceph.length; index++) {
+            if (deviceph[index].specimenb === 0) {
+              deviceph[index].specimenb = "";
+            }
+            if (deviceph[index].specimenb === 1) {
+              deviceph[index].specimenb = "透析液";
+            }
+            if (deviceph[index].specimenb === 2) {
+              deviceph[index].specimenb = "A浓缩液";
+            }
+            if (deviceph[index].specimenb === 3) {
+              deviceph[index].specimenb = "B浓缩液";
+            }
+            if (deviceph[index].specimenb === 4) {
+              deviceph[index].specimenb = "置换液";
+            }
+            if (deviceph[index].specimenb === 5) {
+              deviceph[index].specimenb = "透析用水";
+            }
+
+            if (deviceph[index].sampling_locationb === 0) {
+              deviceph[index].sampling_locationb = "";
+            }
+
+            if (deviceph[index].sampling_locationb === 1) {
+              deviceph[index].sampling_locationb = "透析液入口";
+            }
+            if (deviceph[index].sampling_locationb === 2) {
+              deviceph[index].sampling_locationb = "透析液取样口";
+            }
+            if (deviceph[index].sampling_locationb === 3) {
+              deviceph[index].sampling_locationb = "置换液出口";
+            }
+            if (deviceph[index].sampling_locationb === 4) {
+              deviceph[index].sampling_locationb = "透析机反渗水入口";
+            }
+            if (deviceph[index].sampling_locationb === 5) {
+              deviceph[index].sampling_locationb = "反渗水末端取样口";
+            }
+          } 
+          this.tableFour = deviceph
         }
       });
     },
@@ -3536,6 +3881,9 @@ export default {
             dialysate.reporting_dateb
           );
           this.diaForm.detection_resultb = dialysate.detection_resultb;
+          this.diaForm.sort = dialysate.sort
+          this.diaForm.pass_examination = dialysate.pass_examination.toString()
+          this.diaForm.modifications = dialysate.modifications
          }
       })
       
@@ -3586,6 +3934,9 @@ export default {
             dialysate.reporting_dateb
           );
           this.diaForm.detection_resultb = dialysate.detection_resultb;
+          this.diaForm.sort = dialysate.sort
+          this.diaForm.pass_examination = dialysate.pass_examination.toString()
+          this.diaForm.modifications = dialysate.modifications
          }
       })
     },
@@ -3635,6 +3986,10 @@ export default {
             dialysate.reporting_dateb
           );
           this.diaForm.detection_resultb = dialysate.detection_resultb;
+
+          this.diaForm.sort = dialysate.sort
+          this.diaForm.pass_examination = parseInt(dialysate.pass_examination)
+          this.diaForm.modifications = dialysate.modifications
         }
       })
     },
@@ -3684,6 +4039,9 @@ export default {
             dialysate.reporting_dateb
           );
           this.diaForm.detection_resultb = dialysate.detection_resultb;
+          this.diaForm.sort = dialysate.sort
+          this.diaForm.pass_examination = dialysate.pass_examination.toString()
+          this.diaForm.modifications = dialysate.modifications
         }
       })
     }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -379,6 +379,9 @@
     },mounted(){
       this.getInitData()
     },
+    created(){
+      console.log("数据元",this.prescription)
+    }
   }
 </script>
 

src/xt_pages/user/inspectionInfectious.vue

@@ -6,112 +6,106 @@
       v-loading="pageLoading"
       element-loading-text="拼命加载中"
     >
-      <el-row :gutter="20">
-        <el-col :span="17" v-loading="itemLoading">
-          <div class="filter-container" style="float:right">
-            <el-button
-              size="small"
-              class="filter-item"
-              type="primary"
-              @click="openNew()"
-              icon="el-icon-circle-plus-outline"
-              :disabled="project ? false : true"
-              >新增</el-button
-            >
-            <el-button
-              size="small"
-              class="filter-item"
-              type="primary"
-              icon="el-icon-edit-outline"
-              @click="openEdit()"
-              :disabled="itemDate ? false : true"
-              >修改</el-button
-            >
-            <el-button
-              size="small"
-              class="filter-item"
-              type="danger"
-              icon="el-icon-delete"
-              @click="deleteInspection()"
-              :disabled="itemDate ? false : true"
-              >删除</el-button
-            >
-          </div>
-          <div class="filter-container">
-            <el-button class="filter-item" type="text" style="color:#000"
-              >{{ itemName }}
-              <span v-if="itemDate">（检查日期：{{ itemDate }}）</span></el-button>
-              <span style="color:red">次数:{{total}}</span>
-          </div>
-          <el-table
-            :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
-            }"
-            :row-style="{ color: '#303133' }"
-            :data="items"
-            border
-            style="width: 100%"
-            id="user-inspection-order"
+      <div class="filter-container" style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
+        <div>
+          {{ itemName }}
+          <span v-if="itemDate">（检查日期：{{ itemDate }}）</span>
+          <span>次数:{{total}}</span>
+        </div>
+        <div>
+          <el-button
+            size="small"
+            type="primary"
+            @click="openNew()"
+            icon="el-icon-circle-plus-outline"
+            :disabled="project ? false : true"
+            >新增</el-button
           >
-            <el-table-column
-              prop="item_name"
-              label="检验项目"
-              align="center"
-              min-width="180"
-            >
-              <template slot-scope="scope">
-                {{ scope.row.item_name }} {{ scope.row.item_name_addition }}
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              label="结果"
-              align="center"
-              min-width="80"
-            >
-              <template slot-scope="scope">
-                <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
-                <span v-else>{{ scope.row.value }}</span>
-                <span v-if="scope.row.range_type == 1">
-                  {{scope.row.value_direction}}
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="address"
-              label="参考值"
-              align="center"
-              min-width="120"
-            >
-              <template slot-scope="scope">
-                <span v-if="scope.row.range_type == 1"
-                  >{{ scope.row.range_min }}~{{ scope.row.range_max }}</span
-                >
-                <span v-else>{{ scope.row.range_value }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="unit"
-              label="单位"
-              align="center"
-              min-width="200"
-            >
-            </el-table-column>
-          </el-table>
-          <el-pagination
-            align="right"
-            @current-change="handleCurrentChangePage"
-            :current-page="queryParams.page"
-            :page-size="1"
-            background
-            style="margin-top:20px;"
-            layout="total, prev, pager, next, jumper"
-            :total="total"
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-edit-outline"
+            @click="openEdit()"
+            :disabled="itemDate ? false : true"
+            >修改</el-button
+          >
+          <el-button
+            size="small"
+            type="danger"
+            icon="el-icon-delete"
+            @click="deleteInspection()"
+            :disabled="itemDate ? false : true"
+            >删除</el-button
           >
-          </el-pagination>
-        </el-col>
-      </el-row>
+        </div>
+      </div>
+      <el-table
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        :row-style="{ color: '#303133' }"
+        :data="items"
+        border
+        style="width: 100%"
+        id="user-inspection-order"
+      >
+        <el-table-column
+          prop="item_name"
+          label="检验项目"
+          align="center"
+          min-width="180"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.item_name }} {{ scope.row.item_name_addition }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="结果"
+          align="center"
+          min-width="80"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
+            <span v-else>{{ scope.row.value }}</span>
+            <span v-if="scope.row.range_type == 1">
+              {{scope.row.value_direction}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="参考值"
+          align="center"
+          min-width="120"
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.range_type == 1"
+              >{{ scope.row.range_min }}~{{ scope.row.range_max }}</span
+            >
+            <span v-else>{{ scope.row.range_value }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="unit"
+          label="单位"
+          align="center"
+          min-width="200"
+        >
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        align="right"
+        @current-change="handleCurrentChangePage"
+        :current-page="queryParams.page"
+        :page-size="1"
+        background
+        style="margin-top:20px;"
+        layout="total, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
     </div>
 
     <el-dialog
@@ -616,7 +610,7 @@ export default {
       this.fetchPatientInspections(this.queryParams)
     },
     fetchPatientInspections(params) {
-        console.log("重复了吗",params)
+       
       this.items = []
       fetchPatientInspections(params)
         .then(response => {

src/xt_pages/user/vascularAccess.vue

@@ -37,12 +37,7 @@
             <span>{{ getTime(scope.row.first_start_time, "{y}-{m}-{d}")}}</span>
           </template>
       </el-table-column>
-      <el-table-column prop="date" label="默认到处方" align="center" width="100">
-          <template slot-scope="scope">
-             <span v-if="scope.row.user_status == 1">启用</span>
-             <span v-if="scope.row.user_status == 2">停用</span>
-          </template>
-      </el-table-column>
+     
        <el-table-column prop="date" label="停用日期" align="center" width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.stop_time>0">{{ getTime(scope.row.stop_time, "{y}-{m}-{d}")}}</span>