forked from integrated_whb/integrated_whb_vue
				
			BUG 优化
							parent
							
								
									143c0e5c96
								
							
						
					
					
						commit
						629e17a48f
					
				|  | @ -21,7 +21,7 @@ | ||||||
|           </el-form-item> |           </el-form-item> | ||||||
|         </el-col> |         </el-col> | ||||||
|         <el-col :span="6"> |         <el-col :span="6"> | ||||||
|           <el-form-item label="车辆颜色" prop="VEHICLE_COLOR"> |           <el-form-item label="车牌颜色" prop="VEHICLE_COLOR"> | ||||||
|             <el-select v-model="form.VEHICLE_COLOR"> |             <el-select v-model="form.VEHICLE_COLOR"> | ||||||
|               <el-option |               <el-option | ||||||
|                 v-for="item in getVehicleColorList" |                 v-for="item in getVehicleColorList" | ||||||
|  |  | ||||||
|  | @ -17,7 +17,7 @@ | ||||||
|           </el-form-item> |           </el-form-item> | ||||||
|         </el-col> |         </el-col> | ||||||
|         <el-col :span="6"> |         <el-col :span="6"> | ||||||
|           <el-form-item label="车辆颜色" prop="VEHICLE_COLOR"> |           <el-form-item label="车牌颜色" prop="VEHICLE_COLOR"> | ||||||
|             <el-select v-model="form.VEHICLE_COLOR"> |             <el-select v-model="form.VEHICLE_COLOR"> | ||||||
|               <el-option |               <el-option | ||||||
|                 v-for="item in getVehicleColorList" |                 v-for="item in getVehicleColorList" | ||||||
|  |  | ||||||
|  | @ -16,7 +16,7 @@ | ||||||
|             </el-form-item> |             </el-form-item> | ||||||
|           </el-col> |           </el-col> | ||||||
|           <el-col :span="6"> |           <el-col :span="6"> | ||||||
|             <el-form-item label="车辆颜色" prop="VEHICLE_COLOR"> |             <el-form-item label="车牌颜色" prop="VEHICLE_COLOR"> | ||||||
|               <el-select v-model="searchForm.VEHICLE_COLOR" clearable> |               <el-select v-model="searchForm.VEHICLE_COLOR" clearable> | ||||||
|                 <el-option |                 <el-option | ||||||
|                   v-for="item in troubleshootingCycleList" |                   v-for="item in troubleshootingCycleList" | ||||||
|  | @ -104,7 +104,7 @@ | ||||||
|         </el-table-column> |         </el-table-column> | ||||||
|         <el-table-column prop="GOODSSELFNUMBER" label="编号" /> |         <el-table-column prop="GOODSSELFNUMBER" label="编号" /> | ||||||
|         <el-table-column prop="PLATE_NUMBER" label="车牌号" /> |         <el-table-column prop="PLATE_NUMBER" label="车牌号" /> | ||||||
|         <el-table-column prop="VEHICLE_COLOR" label="车辆颜色" /> |         <el-table-column prop="VEHICLE_COLOR" label="车牌颜色" /> | ||||||
|         <el-table-column prop="FRAMES_NUMBER" label="车架号" width="140" /> |         <el-table-column prop="FRAMES_NUMBER" label="车架号" width="140" /> | ||||||
|         <el-table-column prop="CONTACT" label="联系人" /> |         <el-table-column prop="CONTACT" label="联系人" /> | ||||||
|         <el-table-column |         <el-table-column | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ | ||||||
|         <el-descriptions-item label="车牌号"> |         <el-descriptions-item label="车牌号"> | ||||||
|           {{ info.PLATE_NUMBER }} |           {{ info.PLATE_NUMBER }} | ||||||
|         </el-descriptions-item> |         </el-descriptions-item> | ||||||
|         <el-descriptions-item label="车辆颜色"> |         <el-descriptions-item label="车牌颜色"> | ||||||
|           {{ info.VEHICLE_COLOR }} |           {{ info.VEHICLE_COLOR }} | ||||||
|         </el-descriptions-item> |         </el-descriptions-item> | ||||||
|         <el-descriptions-item label="车架号"> |         <el-descriptions-item label="车架号"> | ||||||
|  |  | ||||||
|  | @ -756,15 +756,9 @@ const rules = { | ||||||
|   ], |   ], | ||||||
|   NATION: [{ required: true, message: "民族不能为空", trigger: "change" }], |   NATION: [{ required: true, message: "民族不能为空", trigger: "change" }], | ||||||
|   SEX: [{ required: true, message: "性别不能为空", trigger: "change" }], |   SEX: [{ required: true, message: "性别不能为空", trigger: "change" }], | ||||||
|   POLITICAL_OUTLOOK: [ |  | ||||||
|     { required: true, message: "政治面貌不能为空", trigger: "change" }, |  | ||||||
|   ], |  | ||||||
|   DATE_OF_BIRTH: [ |   DATE_OF_BIRTH: [ | ||||||
|     { required: true, message: "请选择出生年月", trigger: "change" }, |     { required: true, message: "请选择出生年月", trigger: "change" }, | ||||||
|   ], |   ], | ||||||
|   DEGREE_OF_EDUCATION: [ |  | ||||||
|     { required: true, message: "文化程度不能为空", trigger: "change" }, |  | ||||||
|   ], |  | ||||||
|   PERSONNEL_TYPE: [ |   PERSONNEL_TYPE: [ | ||||||
|     { required: true, message: "人员类型不能为空", trigger: "change" }, |     { required: true, message: "人员类型不能为空", trigger: "change" }, | ||||||
|   ], |   ], | ||||||
|  | @ -772,14 +766,9 @@ const rules = { | ||||||
|   ENTRY_DATE: [ |   ENTRY_DATE: [ | ||||||
|     { required: true, message: "请选择入职日期", trigger: "change" }, |     { required: true, message: "请选择入职日期", trigger: "change" }, | ||||||
|   ], |   ], | ||||||
|   WORKING_DATE: [ |  | ||||||
|     { required: true, message: "请选择参加工作日期", trigger: "change" }, |  | ||||||
|   ], |  | ||||||
|   INCUMBENCY: [ |   INCUMBENCY: [ | ||||||
|     { required: true, message: "在职情况不能为空", trigger: "change" }, |     { required: true, message: "在职情况不能为空", trigger: "change" }, | ||||||
|   ], |   ], | ||||||
|   TITLE: [{ required: true, message: "职称不能为空", trigger: "change" }], |  | ||||||
|   DUTIES: [{ required: true, message: "职务不能为空", trigger: "change" }], |  | ||||||
|   SHIFTDUTYONE: [{ required: true, message: "请选择排班", trigger: "change" }], |   SHIFTDUTYONE: [{ required: true, message: "请选择排班", trigger: "change" }], | ||||||
|   SHIFTDUTYTWO: [{ required: true, message: "请选择排班", trigger: "change" }], |   SHIFTDUTYTWO: [{ required: true, message: "请选择排班", trigger: "change" }], | ||||||
|   periodStr: [ |   periodStr: [ | ||||||
|  |  | ||||||
|  | @ -38,6 +38,8 @@ | ||||||
|             <el-input |             <el-input | ||||||
|               v-model="form.WATCH_PHONE" |               v-model="form.WATCH_PHONE" | ||||||
|               placeholder="请输入值班人电话" |               placeholder="请输入值班人电话" | ||||||
|  |               maxlength="11" | ||||||
|  |               show-word-limit | ||||||
|             /> |             /> | ||||||
|           </el-form-item> |           </el-form-item> | ||||||
|         </el-col> |         </el-col> | ||||||
|  |  | ||||||
|  | @ -107,8 +107,8 @@ | ||||||
| 
 | 
 | ||||||
| <script setup> | <script setup> | ||||||
| import { | import { | ||||||
|   layoutFnGetNotificationsClassification, |  | ||||||
|   addSecurityNotice, |   addSecurityNotice, | ||||||
|  |   layoutFnGetMicrosoftSecurityEstate | ||||||
| } from "@/request/safety_production_related.js"; | } from "@/request/safety_production_related.js"; | ||||||
| import { reactive, ref } from "vue"; | import { reactive, ref } from "vue"; | ||||||
| import LayoutUpload from "@/components/upload/index.vue"; | import LayoutUpload from "@/components/upload/index.vue"; | ||||||
|  | @ -134,7 +134,9 @@ const rules = { | ||||||
|   ], |   ], | ||||||
| }; | }; | ||||||
| const relatedClassificationTempList = | const relatedClassificationTempList = | ||||||
|   await layoutFnGetNotificationsClassification(); |   await layoutFnGetMicrosoftSecurityEstate(); | ||||||
|  | 
 | ||||||
|  | console.log(relatedClassificationTempList); | ||||||
| 
 | 
 | ||||||
| const router = useRouter(); | const router = useRouter(); | ||||||
| const data = reactive({ | const data = reactive({ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue