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

@@ -171,10 +171,13 @@ export default {
         submitAction(formName){
            this.$refs[formName].validate((valid)=>{
                 var arr = []
+                var listId = []
                 for(let i=0;i<this.tableData.length;i++){
                     arr.push(this.tableData[i].id)
+                    
                 }
                 console.log("arr",arr)
+                console.log("table",this.tableData)
                 var ids = arr.join(",")
                 var params = {
                  project_team:this.form.project_team,
@@ -187,6 +190,7 @@ export default {
                  ids:ids,
                }
                console.log("params",params)
+             
               saveProjectTeam(params).then(response=>{
                  if(response.data.state == 1){
                    var projectTeam = response.data.data.projectTeam

src/xt_pages/data/components/editInspection.vue

@@ -255,7 +255,7 @@ export default {
                console.log('projectlist33333',projectList)
                this.projectList = projectList
                var hisprojectlist = response.data.data.hisprojectlist
-            //    console.log("hisprojectlist",hisprojectlist)
+             console.log("hisprojectlist",hisprojectlist)
             //    this.tableData = hisprojectlist
              }
           })   

src/xt_pages/device/airDisinfect.vue

@@ -108,7 +108,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="班次" label-width="110px" required prop="class">
-                    <el-select v-model="form.class" placeholder="请选择活动区域">
+                    <el-select v-model="form.class" placeholder="请选择消毒班次">
                         <el-option label="上午" value="1"></el-option>
                         <el-option label="下午" value="2"></el-option>
                         <el-option label="晚上" value="3"></el-option>
@@ -152,7 +152,7 @@
                 <el-form-item label="检测结果" label-width="110px">
                     <el-input v-model="form.detection_result"></el-input>
                 </el-form-item>
-                <el-form-item label="上传时间" label-width="110px">
+                <el-form-item label="上传时间" label-width="110px" required prop="upload_time">
                     <el-date-picker
                     value-format="yyyy-MM-dd"
                     v-model="form.upload_time"
@@ -199,7 +199,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="班次" label-width="110px" required prop="class">
-                    <el-select v-model="form.class" placeholder="请选择活动区域">
+                    <el-select v-model="form.class" placeholder="请选择消毒班次">
                         <el-option label="上午" value="1"></el-option>
                         <el-option label="下午" value="2"></el-option>
                         <el-option label="晚上" value="3"></el-option>
@@ -243,7 +243,7 @@
                 <el-form-item label="检测结果" label-width="110px">
                     <el-input v-model="form.detection_result"></el-input>
                 </el-form-item>
-                <el-form-item label="上传时间" label-width="110px">
+                <el-form-item label="上传时间" label-width="110px" required prop="upload_time">
                     <el-date-picker
                     value-format="yyyy-MM-dd"
                     v-model="form.upload_time"
@@ -320,13 +320,14 @@
         ],
        airRules: {
         start_time: [{ required: true, message: "请选择时间", trigger: "blur" }],
-        class:[{required:true,message:"请选择班次",trigger:"blur"}],
+        class:[{required:true,message:"请选择消毒班次",trigger:"blur"}],
         created_time:[{required:true,message:"请选择创建时间",trigger:"blur"}],
         sort:[{required:true,message:"请填写顺序号",trigger:"blur"}],
         detection_time:[{required:true,message:"请选择检测时间",trigger:"blur"}],
         check_out:[{required:true,message:"请选择检验合格",trigger:"blur"}],
         modifications:[{required:true,message:"请选择修改标志",trigger:"blur"}],
-        creator:[{required:true,message:"请选择创建人",trigger:"blur"}]
+        creator:[{required:true,message:"请选择创建人",trigger:"blur"}],
+        upload_time:[{required:true,message:"请选择上传时间",trigger:"blur"}]
        },
        limit:20,
        page:1,

src/xt_pages/device/objectTableDisinfect.vue

@@ -108,7 +108,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="班次" label-width="110px" required prop="class">
-                    <el-select v-model="form.class" placeholder="请选择活动区域">
+                    <el-select v-model="form.class" placeholder="请选择消毒班次">
                         <el-option label="上午" value="1"></el-option>
                         <el-option label="下午" value="2"></el-option>
                         <el-option label="晚上" value="3"></el-option>
@@ -152,7 +152,7 @@
                 <el-form-item label="检测结果" label-width="110px">
                     <el-input v-model="form.detection_result"></el-input>
                 </el-form-item>
-                <el-form-item label="上传时间" label-width="110px">
+                <el-form-item label="上传时间" label-width="110px" required prop="upload_time">
                     <el-date-picker
                     value-format="yyyy-MM-dd"
                     v-model="form.upload_time"
@@ -199,7 +199,7 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item label="班次" label-width="110px" required prop="class">
-                    <el-select v-model="form.class" placeholder="请选择活动区域">
+                    <el-select v-model="form.class" placeholder="请选择消毒班次">
                         <el-option label="上午" value="1"></el-option>
                         <el-option label="下午" value="2"></el-option>
                         <el-option label="晚上" value="3"></el-option>
@@ -243,7 +243,7 @@
                 <el-form-item label="检测结果" label-width="110px">
                     <el-input v-model="form.detection_result"></el-input>
                 </el-form-item>
-                <el-form-item label="上传时间" label-width="110px">
+                <el-form-item label="上传时间" label-width="110px" required prop="upload_time">
                     <el-date-picker
                     value-format="yyyy-MM-dd"
                     v-model="form.upload_time"
@@ -320,13 +320,14 @@
         ],
        airRules: {
         start_time: [{ required: true, message: "请选择时间", trigger: "blur" }],
-        class:[{required:true,message:"请选择班次",trigger:"blur"}],
+        class:[{required:true,message:"请选择消毒班次",trigger:"blur"}],
         created_time:[{required:true,message:"请选择创建时间",trigger:"blur"}],
         sort:[{required:true,message:"请填写顺序号",trigger:"blur"}],
         detection_time:[{required:true,message:"请选择检测时间",trigger:"blur"}],
         check_out:[{required:true,message:"请选择检验合格",trigger:"blur"}],
         modifications:[{required:true,message:"请选择修改标志",trigger:"blur"}],
-        creator:[{required:true,message:"请选择创建人",trigger:"blur"}]
+        creator:[{required:true,message:"请选择创建人",trigger:"blur"}],
+        upload_time:[{required:true,message:"请选择报告日期",trigger:"blur"}]
        },
        limit:20,
        page:1,

src/xt_pages/management/home.vue

@@ -1442,13 +1442,13 @@
                              </el-row>
 
                              <el-row>
-                               <el-col :span="12">
+                               <el-col :span="8">
                                   <el-form-item label="检测合格:" required prop="pass_examination">
                                     <el-radio v-model="qualityForm.pass_examination" label="1">是</el-radio>
                                     <el-radio v-model="qualityForm.pass_examination" label="2">否</el-radio>
                                   </el-form-item>
                                </el-col>
-                               <el-col :span="12">
+                               <el-col :span="8">
                                   <el-form-item label="修改标志:" required prop="modifications">
                                     <el-select style="width:150px"  v-model="qualityForm.modifications">
                                        <el-option v-for="(item,index) in modifications" :key="index" :label="item.name" :value="item.id"></el-option>
@@ -1567,13 +1567,13 @@
                                 </el-col>
                               </el-row>
                               <el-row>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="检测合格:" required prop="pass_examination">
                                         <el-radio v-model="qualityFormTwo.pass_examination" label="1">是</el-radio>
                                         <el-radio v-model="qualityFormTwo.pass_examination" label="2">否</el-radio>
                                       </el-form-item>
                                   </el-col>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="修改标志:" required prop="modifications">
                                         <el-select style="width:150px"  v-model="qualityFormTwo.modifications">
                                           <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -1694,13 +1694,13 @@
                                 </el-col>
                               </el-row>
                               <el-row>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="检测合格:" required prop="pass_examination">
                                         <el-radio v-model="qualityFormFour.pass_examination" label="1">是</el-radio>
                                         <el-radio v-model="qualityFormFour.pass_examination" label="2">否</el-radio>
                                       </el-form-item>
                                   </el-col>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="修改标志:" required prop="modifications">
                                         <el-select style="width:150px"  v-model="qualityFormFour.modifications">
                                           <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -1820,13 +1820,13 @@
                                 </el-col>
                               </el-row>
                               <el-row>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="检测合格:" required prop="pass_examination">
                                         <el-radio v-model="qualityFormFive.pass_examination" label="1">是</el-radio>
                                         <el-radio v-model="qualityFormFive.pass_examination" label="2">否</el-radio>
                                       </el-form-item>
                                   </el-col>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="修改标志:" required prop="modifications">
                                         <el-select style="width:150px"  v-model="qualityFormFive.modifications">
                                           <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -1947,13 +1947,13 @@
                                 </el-col>
                               </el-row>
                               <el-row>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="检测合格:" required prop="pass_examination">
                                         <el-radio v-model="qualityFormSix.pass_examination" label="1">是</el-radio>
                                         <el-radio v-model="qualityFormSix.pass_examination" label="2">否</el-radio>
                                       </el-form-item>
                                   </el-col>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="修改标志:" required prop="modifications">
                                         <el-select style="width:150px"  v-model="qualityFormSix.modifications">
                                           <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -2073,13 +2073,13 @@
                                 </el-col>
                               </el-row>
                               <el-row>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="检测合格:" required prop="pass_examination">
                                         <el-radio v-model="qualityFormSeven.pass_examination" label="1">是</el-radio>
                                         <el-radio v-model="qualityFormSeven.pass_examination" label="2">否</el-radio>
                                       </el-form-item>
                                   </el-col>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="修改标志:" required prop="modifications">
                                         <el-select style="width:150px"  v-model="qualityFormSeven.modifications">
                                           <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -2234,13 +2234,13 @@
                                 <div></div>
                               </el-row>
                                <el-row>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="检测合格:" required prop="pass_examination">
                                         <el-radio v-model="qualityFormThree.pass_examination" label="1">是</el-radio>
                                         <el-radio v-model="qualityFormThree.pass_examination" label="2">否</el-radio>
                                       </el-form-item>
                                   </el-col>
-                                  <el-col :span="12">
+                                  <el-col :span="8">
                                       <el-form-item label="修改标志:" required prop="modifications">
                                         <el-select style="width:150px"  v-model="qualityFormThree.modifications">
                                           <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
@@ -4630,8 +4630,6 @@ export default {
               this.qualityForm.concentrate_noa = '',
               this.qualityForm.concentrate_nob = '',
               this.qualityForm.sampling_locationa = '',
-              this.qualityForm.sampler = ''
-              this.qualityForm.reporting_date = ''
               this.qualityForm.detection_result = ''
               this.$refs.mychild.getAllQulityInfo()
             }else{
@@ -4683,8 +4681,6 @@ export default {
                 this.qualityFormTwo.concentrate_noc = ''
                 this.qualityFormTwo.concentrateb_nod = ''
                 this.qualityFormTwo.sampling_locationb = ''
-                this.qualityFormTwo.samplerb = ''
-                this.qualityFormTwo.reporting_dateb = ''
                 this.qualityFormTwo.detection_resultb = ''
                
               
@@ -4716,10 +4712,8 @@ export default {
                 var ion = response.data.data.ion
                 this.$message.success('保存成功')
                 this.$refs.mychild.getAllQulityInfo()
-                this.qualityFormThree.samplerc = ''
                 this.qualityFormThree.concentrate_nof = ''
                 this.qualityFormThree.concentrate_nog = ''
-                this.qualityFormThree.date_reportc = ''
                 this.qualityFormThree.actual_na = ''
                 this.qualityFormThree.actual_pna = ''
                 this.qualityFormThree.actual_k = ''
@@ -5104,8 +5098,7 @@ export default {
                 this.qualityFormFour.concentrate_noc = ''
                 this.qualityFormFour.concentrateb_nod = ''
                 this.qualityFormFour.sampling_locationb = ''
-                this.qualityFormFour.samplerb = ''
-                this.qualityFormFour.reporting_dateb = ''
+             
                 this.qualityFormFour.detection_resultb = ''
                 
               
@@ -5149,8 +5142,6 @@ export default {
                 this.qualityFormFive.concentrate_noc = ''
                 this.qualityFormFive.concentrateb_nod = ''
                 this.qualityFormFive.sampling_locationb = ''
-                this.qualityFormFive.samplerb = ''
-                this.qualityFormFive.reporting_dateb = ''
                 this.qualityFormFive.detection_resultb = ''
                
               
@@ -5194,8 +5185,6 @@ export default {
                 this.qualityFormSix.concentrate_noc = ''
                 this.qualityFormSix.concentrateb_nod = ''
                 this.qualityFormSix.sampling_locationb = ''
-                this.qualityFormSix.samplerb = ''
-                this.qualityFormSix.reporting_dateb = ''
                 this.qualityFormSix.detection_resultb = ''
              
               
@@ -5241,8 +5230,6 @@ export default {
                 this.qualityFormSeven.concentrate_noc = ''
                 this.qualityFormSeven.concentrateb_nod = ''
                 this.qualityFormSeven.sampling_locationb = ''
-                this.qualityFormSeven.samplerb = ''
-                this.qualityFormSeven.reporting_dateb = ''
                 this.qualityFormSeven.detection_resultb = ''
               
               

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -319,7 +319,7 @@
             </el-tabs>
           </div>
           <div style="height:100%;" v-show="showTwo">
-            <el-tabs class="rightTabs" v-model="activeName">
+            <el-tabs class="rightTabs" v-model="activeName" >
               <el-tab-pane label="项目列表" name="1">
                 <div style="margin-bottom:5px;">
                   <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
@@ -433,7 +433,7 @@
   import selectTemplate from './selectTemplate'
   import saveTemplate from './saveTemplate'
   import additionalCharges from './additionalCharges'
-  import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById } from '@/api/project/project'
+  import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById,getAllProjectList } from '@/api/project/project'
   import { uParseTime } from '@/utils/tools'
   import NextOrLastPrescription from './nextOrLastPrescription'
   import CallPrescription from './callPrescription'
@@ -572,7 +572,8 @@
               return time.getTime() <= new Date(beginDateVal).getTime()
             }
           }
-        }
+        },
+        hisList:[]
 
       }
     },
@@ -1655,6 +1656,7 @@
             this.prescription_id = this.prescriptions[i].id
             this.$emit('event1', this.prescription_id)
             this.curPrescriptions = this.prescriptions[i]
+
             this.teamList = []
             this.curDrugs = []
             this.$refs.multipleTable.clearSelection()
@@ -1697,6 +1699,7 @@
 
       },
       setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data) {
+     
         this.curMonthPrescriptions = {}
         this.curPrescriptions = {}
 
@@ -2226,7 +2229,10 @@
       selectDrugs(selection, row) {
         this.curDrugs = selection
       },
+    
       comfirm() {
+        console.log("222222222222",this.curPrescriptions)
+   
         if (this.dayorMonth == 'month') {
           this.$message.error('月结状态下，无法添加药品或者项目')
           return
@@ -2361,7 +2367,20 @@
               this.curStatus = 1
             }
 
+           if(this.activeName == 2){
+             
+              for(let i = 0; i<temp2.length;i++){
+               for(let j=0;j<this.hisList.length;j++){
+                   if(temp2[i].id == this.hisList[j].project_id){
+                      temp2[i].total =  this.hisList[j].number
+                   }
+               }
+              }
+            }
+          
+
             if (temp2.length > 0) {
+              console.log("temp2222222222",temp2)
               for (let b = 0; b < temp2.length; b++) {
                 let obj = {
                   id: 0,
@@ -2429,11 +2448,13 @@
         getAllProjectTeam().then(response => {
           if (response.data.state == 1) {
             var team = response.data.data.team
+            console.log("team2222",team) 
             this.tabPrjectTeam = team
           }
         })
       },
       selectTeam(row) {
+        console.log("row",row)
         var arr = []
         for (let i = 0; i < row.length; i++) {
           arr.push(row[i].project_id)
@@ -2484,6 +2505,15 @@
 
         }
 
+      },
+      getAllProjectList(){
+        getAllProjectList().then(response=>{
+          if(response.data.state == 1){
+            var hisprojectlist = response.data.data.hisprojectlist
+             console.log("hisprojectlist",hisprojectlist)
+             this.hisList = hisprojectlist
+          }
+        })
       }
     }, mounted() {
       this.request_record_date = this.record_date
@@ -2492,10 +2522,12 @@
       this.getlist()
       //获取所以项目组套
       this.getAllProjectTeam()
+      
+      this.getAllProjectList()
       this.$nextTick(() => {
         this.multipleTableHeight = parseInt(this.$refs.rightTable.offsetHeight)
       })
-
+      
     },
     watch: {
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

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