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/addInspection.vue

@@ -144,6 +144,7 @@ export default {
            tableData:[],
            projectList:[],
            tabList:[],
+           itemList:[]
         }
     },
     methods:{
@@ -179,6 +180,7 @@ export default {
                 console.log("arr",arr)
                 console.log("table",this.tableData)
                 var ids = arr.join(",")
+                var listIds = this.itemList.join(",")
                 var params = {
                  project_team:this.form.project_team,
                  price:this.form.price,
@@ -188,9 +190,9 @@ export default {
                  team_type:this.form.team_type,
                  remark:this.form.remark,
                  ids:ids,
+                 item_id:listIds
                }
-               console.log("params",params)
-             
+              
               saveProjectTeam(params).then(response=>{
                  if(response.data.state == 1){
                    var projectTeam = response.data.data.projectTeam
@@ -248,6 +250,7 @@ export default {
            })
         },
        addProjectList(){
+          
           for(let i=0;i<this.projectList.length;i++){
             if(this.form.project_detail == this.projectList[i].id){
                 this.projectList[i].number = this.form.number
@@ -265,6 +268,9 @@ export default {
           addProjectList(params).then(response=>{
              if(response.data.state == 1){
                var projectList = response.data.data.projectList
+               var item = response.data.data.item
+               console.log("item22222",item)
+               this.itemList.push(item.id)
                this.$message.success("保存成功")
                this.form.project_detail = ""
                this.form.number = ""

src/xt_pages/data/components/editInspection.vue

@@ -127,6 +127,7 @@ export default {
               remark:"",
               project_detail:"",
               number:"",
+              item_id:"",
             },
             options: [{
             value: 1,
@@ -144,7 +145,8 @@ export default {
               price: [{ required: true, message: '请填写价格', trigger: 'change' }],
               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
            },
-           tableData:[]
+           tableData:[],
+           item_id:[]
         }
     },
     methods:{
@@ -211,6 +213,7 @@ export default {
                  this.form.tube_color = projectTeamDetail.tube_color
                  this.form.team_type = projectTeamDetail.team_type
                  this.form.remark = projectTeamDetail.remark
+                 this.form.item_id = projectTeamDetail.item_id
                 //  console.log("project",projectTeamDetail)
               }
            }) 
@@ -223,6 +226,9 @@ export default {
                 }
              
                var ids = arr.join(",")
+               var item_id = this.form.item_id + "," + this.item_id.join(",") 
+               console.log("item_id",item_id)
+               
                if(valid){
                 var params = {
                     id:this.form.id,
@@ -234,6 +240,7 @@ export default {
                     team_type:this.form.team_type,
                     remark:this.form.remark,
                     ids:ids,
+                    item_id:item_id
                 }
                 // console.log("params",params)
                  updatedProjectTeam(params).then(response=>{
@@ -286,6 +293,8 @@ export default {
                projectList.number = parseInt(this.form.number)
                this.tableData.push(projectList)
                console.log("23333",this.tableData)
+               var item = response.data.data.item
+               this.item_id.push(item.id)
                this.$message.success("保存成功")
                this.form.project_detail = ""
                this.form.number = ""
@@ -294,6 +303,7 @@ export default {
           })
         },
         DeleteProject(id,index){
+
            this.$confirm("确认删除此项目吗?", "删除", {
             confirmButtonText: "确 定",
             cancelButtonText: "取 消",
@@ -302,6 +312,7 @@ export default {
           DeleteProject(id).then(response => {
             if (response.data.state == 1) {
                this.tableData.splice(index, 1);
+               
             } else {
              
             }

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

@@ -1033,13 +1033,13 @@
            if(this.double_check.pipeline_connection_desc.indexOf("静脉管路未卡入保护夹")!=-1){
              this.checkListThree.push("静脉管路未卡入保护夹")
            }
-           if(this.double_check.pipeline_connection_desc.indexOf("压力传感器夹未打开")){
+           if(this.double_check.pipeline_connection_desc.indexOf("压力传感器夹未打开")!=-1){
               this.checkListThree.push("压力传感器夹未打开")
            }
-           if(this.double_check.pipeline_connection_desc.indexOf("接口连接松动")){
+           if(this.double_check.pipeline_connection_desc.indexOf("接口连接松动")!=-1){
               this.checkListThree.push("接口连接松动")
            }
-           if(this.double_check.pipeline_connection_desc.indexOf("管路打折")){
+           if(this.double_check.pipeline_connection_desc.indexOf("管路打折")!=-1){
              this.checkListThree.push("管路打折")
            }
            console.log("hhh",this.checkListOne)

src/xt_pages/user/components/PatientForm.vue

@@ -316,7 +316,7 @@
 
               <el-col :span="24">
                 <el-form-item label="传染病 : " prop="contagions">
-                  <el-radio-group v-model="form.is_infectious">
+                  <el-radio-group v-model="form.is_infectious" @change="changeInfectious">
                     <el-radio :label="1">阴性</el-radio>
                     <el-radio :label="2">阳性</el-radio>
                   </el-radio-group>
@@ -366,7 +366,7 @@
               </el-col>
 
               <el-col :span="24">
-                <el-form-item label="传染病周期提醒: ">
+                <el-form-item label="传染病周期提醒:">
                   <el-radio-group
                     v-model="form.remind_cycle"
                     @change="changeCycle()"
@@ -1130,7 +1130,8 @@ const defaultForm = {
   pulse: "",
   respiratory: "",
   sbp: "",
-  dbp: ""
+  dbp: "",
+  showOne:true,
 };
 
 export default {
@@ -1800,6 +1801,15 @@ export default {
           return;
         }
       }
+    },
+    changeInfectious(val){
+      
+      if(val == 1){
+         this.showOne = false
+      }
+      if(val == 2){
+        this.showOne = true
+      }
     }
 
     // fetchAllDoctorAndNurse() {

src/xt_pages/user/patients.vue

@@ -1489,6 +1489,9 @@
         this.GetRemindPatientList();
       },
       getTime(val) {
+        if(val < 0){
+          return ""
+        }
         if(val == ""){
          return ""
         }else {