Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/fallassement.js

@@ -1,3 +1,4 @@
+import request from '@/utils/request'
 export function getAllNurseList(params){
 
     return request({

src/xt_pages/user/evaluationtool/Fallassessment.vue

@@ -43,7 +43,7 @@
                       <td>
                         <div style="display: flex;flex-wrap: wrap;padding:4px 0 4px 8px;">
                           <span  v-for="item in jiwang" class="ttbwzz-type-a" @change="handleCheckedCitiesChange">
-                            <label><input type="checkbox" name="ball" :value="item.content" />&nbsp;{{ item.content }}</label>
+                            <label><input type="checkbox" name="ball" :value="item.content"  v-model="item.jiwang_check"/>&nbsp;{{ item.content }}</label>
                           </span>
                         </div>
                       </td>
@@ -53,7 +53,7 @@
                       <td>
                         <div style="display: flex;flex-wrap: wrap;padding:4px 0 4px 8px;">
                           <span v-for="item in yishizt" class="ttbwzz-type-a" @change="handleCheckedCitiesChange">
-                            <label><input type="checkbox" name="ball" :value="item.content" />&nbsp;{{ item.content }}</label>
+                            <label><input type="checkbox" name="ball" :value="item.content"  v-model="item.yishizt_check"/>&nbsp;{{ item.content }}</label>
                           </span>
                         </div>
                       </td>
@@ -63,7 +63,7 @@
                       <td>
                         <div style="display: flex;flex-wrap: wrap;padding:4px 0 4px 8px;">
                           <span v-for="item in ganguan" class="ttbwzz-type-a" @change="handleCheckedCitiesChange">
-                            <label><input type="checkbox" name="ball" :value="item.content" />&nbsp;{{ item.content }}</label>
+                            <label><input type="checkbox" name="ball" :value="item.content" v-model="item.ganguan_check"/>&nbsp;{{ item.content }}</label>
                           </span>
                         </div>
                       </td>
@@ -73,7 +73,7 @@
                       <td>
                         <div style="display: flex;flex-wrap: wrap;padding:4px 0 4px 8px;">
                           <span v-for="item in shentizk" class="ttbwzz-type-a" @change="handleCheckedCitiesChange">
-                            <label><input type="checkbox" name="ball" :value="item.content" />&nbsp;{{ item.content }}</label>
+                            <label><input type="checkbox" name="ball" :value="item.content" v-model="item.shentizk_check"/>&nbsp;{{ item.content }}</label>
                           </span>
                         </div>
                       </td>
@@ -83,7 +83,7 @@
                       <td>
                         <div style="display: flex;flex-wrap: wrap;padding:4px 0 4px 8px;">
                           <span v-for="item in syyaowu" class="ttbwzz-type-a" @change="handleCheckedCitiesChange">
-                            <label><input type="checkbox" name="ball" :value="item.content" />&nbsp;{{ item.content }}</label>
+                            <label><input type="checkbox" name="ball" :value="item.content"  v-model="item.syyaowu_check"/>&nbsp;{{ item.content }}</label>
                           </span>
                         </div>
                       </td>
@@ -93,7 +93,7 @@
                       <td>
                         <div class="jiange">
                           <span v-for="item in paixie" class="rightjiange" @change="handleCheckedCitiesChange">
-                            <label><input type="checkbox" name="ball" :value="item.content" />&nbsp;{{ item.content }}</label>
+                            <label><input type="checkbox" name="ball" :value="item.content" v-model="item.paixie_check" />&nbsp;{{ item.content }}</label>
                           </span>
                         </div>
 
@@ -104,7 +104,7 @@
                       <td>
                         <div class="jiange">
                           <span v-for="item in zilinl" class="rightjiange" @change="handleCheckedCitiesChange">
-                            <label><input type="checkbox" name="ball" :value="item.content" />&nbsp;{{ item.content }}</label>
+                            <label><input type="checkbox" name="ball" :value="item.content" v-model="item.zilinl_check"/>&nbsp;{{ item.content }}</label>
                           </span>
                         </div>
 
@@ -131,7 +131,7 @@
                       <td>
                         <div class="jiange">
                           <span v-for="item in xiaoguo" class="rightjiange">
-                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item.content }}</label>
+                            <label><input type="checkbox" name="ball" value="volleyball" v-model="item.xiaoguo_check" />&nbsp;{{ item.content }}</label>
                           </span>
                         </div>
                       </td>
@@ -143,26 +143,28 @@
                 <div>
                   <span>评估日期：</span>
                   <el-date-picker
-                    v-model="pingdate"
+                    v-model="record_date"
                     type="date"
                     placeholder="选择日期"
                     :clearable="false"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
                     style="width: 150px;">
                   </el-date-picker>
                 </div>
                 <div>
                   <span>护士：</span>
-                  <el-select v-model="Nurse" placeholder="请选择" style="width:120px;">
+                  <el-select v-model="admin_user_id" placeholder="请选择" style="width:120px;">
                     <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                      v-for="item in nurseList"
+                      :key="item.admin_user_id"
+                      :label="item.user_name"
+                      :value="item.admin_user_id"
                       >
                     </el-option>
                   </el-select>
                 </div>
-                <el-button type="primary" >确认</el-button>
+                <el-button type="primary" @click="toDialog">确认</el-button>
               </div>
             </div>
             <div style="width: 49%;">
@@ -416,14 +418,16 @@
                             <el-date-picker
                               v-model="pingdate"
                               type="date"
+                              format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd"
                               placeholder="选择日期"
                               :clearable="false"
-                              style="width: 120px;">
+                              style="width: 140px;">
                             </el-date-picker>
                           </div>
                           <div style="flex: 1;">
                             <span v-for="item in touxidiedao" style="margin-right:10px">
-                              <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item.content }}</label>
+                              <label><input type="checkbox" name="ball" value="volleyball"  v-model="item.touxidiedao_check"/>&nbsp{{ item.content }}</label>
                             </span>
                           </div>
                         </div>
@@ -559,6 +563,9 @@
         is_check_eighteen:false,
         is_check_nineteen:false,
         is_check_nineteen:false,
+        nurseList:[],
+        admin_user_id:"",
+        record_date:"",
       }
 
     },
@@ -606,8 +613,49 @@
         getAllNurseList().then(response=>{
            if(response.data.state ==1){
              var nurseList  = response.data.data.nurseList
+
+             this.nurseList =nurseList
            }
         })
+      },
+      toDialog(){
+         var is_age =0
+         if(this.age_check == false){
+             is_age = 2
+         } 
+         if(this.age_check == true){
+             is_age =1
+         }
+
+         var is_jiwang=0
+         if(this.jiwang_check == false){
+             is_jiwang =2
+         }
+         if(this.jiwang_check == true){
+            is_jiwang =1
+         }
+
+         var is_yishizt =0 
+         if(this.yishizt_check == false){
+            is_yishizt = 2
+         } 
+         if(this.yishizt_check == true){
+            is_yishizt = 1
+         }
+
+         var is_ganguan= 0
+         if(this.is_ganguan_check == false){
+            is_ganguan = 2
+         }
+         if(this.is_ganguan_check == true){
+            is_ganguan =1
+         }
+         var params = {
+
+         }
+        saveFllassessmentList().then(response=>{
+
+        })
       }
     }
   }

src/xt_pages/user/inspection.vue

@@ -791,19 +791,22 @@ export default {
          
        
         this.form.formItem = []
+        // console.log("hhhhhhhhhhhhh",this.project.inspection_reference)
+        // console.log("inspectionsMap",this.inspectionsMap)
         for (var index in this.project.inspection_reference) {
           if(this.org_id ==10278 || this.org_id ==10138 || this.org_id == 0){
             this.form.formItem.push({
-              id: this.project.inspection_reference[index].item_id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].item_id : 0,
+              id: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].id : 0,
               project_id: this.project.inspection_reference[index].project_id,
               project_name: this.project.inspection_reference[index].project_name,
               item_id: this.project.inspection_reference[index].id,
               item: this.project.inspection_reference[index].item,
               item_name: this.project.inspection_reference[index].item_name,
               range_type: this.project.inspection_reference[index].range_type,
-              value: this.project.inspection_reference[index].id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].id].inspect_value : '',
+              value: this.project.inspection_reference[index].item_id in this.inspectionsMap ? this.inspectionsMap[this.project.inspection_reference[index].item_id].inspect_value : '',
               select_options: this.project.inspection_reference[index].range_options.split(','),
-              unit: this.project.inspection_reference[index].unit
+              unit: this.project.inspection_reference[index].unit,
+              item_id:parseInt(this.project.inspection_reference[index].item_id) ,
             })
           }else{
             this.form.formItem.push({