XMLWAN 4 vuotta sitten
vanhempi
commit
3db3a46fdf

+ 8 - 2
src/xt_pages/data/components/addInspection.vue Näytä tiedosto

@@ -144,6 +144,7 @@ export default {
144 144
            tableData:[],
145 145
            projectList:[],
146 146
            tabList:[],
147
+           itemList:[]
147 148
         }
148 149
     },
149 150
     methods:{
@@ -179,6 +180,7 @@ export default {
179 180
                 console.log("arr",arr)
180 181
                 console.log("table",this.tableData)
181 182
                 var ids = arr.join(",")
183
+                var listIds = this.itemList.join(",")
182 184
                 var params = {
183 185
                  project_team:this.form.project_team,
184 186
                  price:this.form.price,
@@ -188,9 +190,9 @@ export default {
188 190
                  team_type:this.form.team_type,
189 191
                  remark:this.form.remark,
190 192
                  ids:ids,
193
+                 item_id:listIds
191 194
                }
192
-               console.log("params",params)
193
-             
195
+              
194 196
               saveProjectTeam(params).then(response=>{
195 197
                  if(response.data.state == 1){
196 198
                    var projectTeam = response.data.data.projectTeam
@@ -248,6 +250,7 @@ export default {
248 250
            })
249 251
         },
250 252
        addProjectList(){
253
+          
251 254
           for(let i=0;i<this.projectList.length;i++){
252 255
             if(this.form.project_detail == this.projectList[i].id){
253 256
                 this.projectList[i].number = this.form.number
@@ -265,6 +268,9 @@ export default {
265 268
           addProjectList(params).then(response=>{
266 269
              if(response.data.state == 1){
267 270
                var projectList = response.data.data.projectList
271
+               var item = response.data.data.item
272
+               console.log("item22222",item)
273
+               this.itemList.push(item.id)
268 274
                this.$message.success("保存成功")
269 275
                this.form.project_detail = ""
270 276
                this.form.number = ""

+ 12 - 1
src/xt_pages/data/components/editInspection.vue Näytä tiedosto

@@ -127,6 +127,7 @@ export default {
127 127
               remark:"",
128 128
               project_detail:"",
129 129
               number:"",
130
+              item_id:"",
130 131
             },
131 132
             options: [{
132 133
             value: 1,
@@ -144,7 +145,8 @@ export default {
144 145
               price: [{ required: true, message: '请填写价格', trigger: 'change' }],
145 146
               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
146 147
            },
147
-           tableData:[]
148
+           tableData:[],
149
+           item_id:[]
148 150
         }
149 151
     },
150 152
     methods:{
@@ -211,6 +213,7 @@ export default {
211 213
                  this.form.tube_color = projectTeamDetail.tube_color
212 214
                  this.form.team_type = projectTeamDetail.team_type
213 215
                  this.form.remark = projectTeamDetail.remark
216
+                 this.form.item_id = projectTeamDetail.item_id
214 217
                 //  console.log("project",projectTeamDetail)
215 218
               }
216 219
            }) 
@@ -223,6 +226,9 @@ export default {
223 226
                 }
224 227
              
225 228
                var ids = arr.join(",")
229
+               var item_id = this.form.item_id + "," + this.item_id.join(",") 
230
+               console.log("item_id",item_id)
231
+               return
226 232
                if(valid){
227 233
                 var params = {
228 234
                     id:this.form.id,
@@ -234,6 +240,7 @@ export default {
234 240
                     team_type:this.form.team_type,
235 241
                     remark:this.form.remark,
236 242
                     ids:ids,
243
+                    item_id:item_id
237 244
                 }
238 245
                 // console.log("params",params)
239 246
                  updatedProjectTeam(params).then(response=>{
@@ -286,6 +293,8 @@ export default {
286 293
                projectList.number = parseInt(this.form.number)
287 294
                this.tableData.push(projectList)
288 295
                console.log("23333",this.tableData)
296
+               var item = response.data.data.item
297
+               this.item_id.push(item.id)
289 298
                this.$message.success("保存成功")
290 299
                this.form.project_detail = ""
291 300
                this.form.number = ""
@@ -294,6 +303,7 @@ export default {
294 303
           })
295 304
         },
296 305
         DeleteProject(id,index){
306
+
297 307
            this.$confirm("确认删除此项目吗?", "删除", {
298 308
             confirmButtonText: "确 定",
299 309
             cancelButtonText: "取 消",
@@ -302,6 +312,7 @@ export default {
302 312
           DeleteProject(id).then(response => {
303 313
             if (response.data.state == 1) {
304 314
                this.tableData.splice(index, 1);
315
+               
305 316
             } else {
306 317
              
307 318
             }

+ 13 - 3
src/xt_pages/user/components/PatientForm.vue Näytä tiedosto

@@ -316,7 +316,7 @@
316 316
 
317 317
               <el-col :span="24">
318 318
                 <el-form-item label="传染病 : " prop="contagions">
319
-                  <el-radio-group v-model="form.is_infectious">
319
+                  <el-radio-group v-model="form.is_infectious" @change="changeInfectious">
320 320
                     <el-radio :label="1">阴性</el-radio>
321 321
                     <el-radio :label="2">阳性</el-radio>
322 322
                   </el-radio-group>
@@ -366,7 +366,7 @@
366 366
               </el-col>
367 367
 
368 368
               <el-col :span="24">
369
-                <el-form-item label="传染病周期提醒: ">
369
+                <el-form-item label="传染病周期提醒:">
370 370
                   <el-radio-group
371 371
                     v-model="form.remind_cycle"
372 372
                     @change="changeCycle()"
@@ -1130,7 +1130,8 @@ const defaultForm = {
1130 1130
   pulse: "",
1131 1131
   respiratory: "",
1132 1132
   sbp: "",
1133
-  dbp: ""
1133
+  dbp: "",
1134
+  showOne:true,
1134 1135
 };
1135 1136
 
1136 1137
 export default {
@@ -1800,6 +1801,15 @@ export default {
1800 1801
           return;
1801 1802
         }
1802 1803
       }
1804
+    },
1805
+    changeInfectious(val){
1806
+      
1807
+      if(val == 1){
1808
+         this.showOne = false
1809
+      }
1810
+      if(val == 2){
1811
+        this.showOne = true
1812
+      }
1803 1813
     }
1804 1814
 
1805 1815
     // fetchAllDoctorAndNurse() {