src/views/equipment/base/inspection/Confirm/add-or-updata.vue

@@ -6,15 +6,25 @@
  * @Description:
 -->
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" :before-close="beforeClose"
+	<el-drawer
-    class="drawer" size="60%">
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="true"
+		:before-close="beforeClose"
+		class="drawer"
+		size="60%">
 		<small-title slot="title" :no-padding="true">
 			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
 		</small-title>
 		<div class="content">
 			<div class="visual-part">
-        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+				<el-form
-          label-width="100px" label-position="top">
+					:model="dataForm"
+					:rules="dataRule"
+					ref="dataForm"
+					@keyup.enter.native="dataFormSubmit()"
+					label-width="100px"
+					label-position="top">
 					<el-row :gutter="20">
 						<el-col :span="8">
 							<el-form-item label="巡检单名称" prop="name">
@@ -23,17 +33,34 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="部门" prop="departmentId">
-                <el-select v-model="dataForm.departmentId" :disabled="isdetail" :placeholder="`请选择部门`"
+								<el-select
+									v-model="dataForm.departmentId"
+									:disabled="isdetail"
+									:placeholder="`请选择部门`"
 									style="width: 100%">
-                  <el-option v-for="opt in departmentOptions" :key="opt.id" :label="opt.name" :value="opt.id" />
+									<el-option
+										v-for="opt in departmentOptions"
+										:key="opt.id"
+										:label="opt.name"
+										:value="opt.id" />
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="班次" prop="groupClass">
-                <el-select v-model="dataForm.groupClass" filterable clearable multiple :disabled="isdetail"
+								<el-select
-                  style="width: 100%" placeholder="请选择班次">
+									v-model="dataForm.groupClass"
-                  <el-option v-for="d in groupOptions" :key="d.id" :label="d.label" :value="d.label" />
+									filterable
+									clearable
+									multiple
+									:disabled="isdetail"
+									style="width: 100%"
+									placeholder="请选择班次">
+									<el-option
+										v-for="d in groupOptions"
+										:key="d.id"
+										:label="d.label"
+										:value="d.label" />
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -41,18 +68,31 @@
 					<el-row :gutter="20">
 						<el-col :span="8">
 							<el-form-item label="巡检人" prop="checkPerson">
-                <!-- <el-input v-model="dataForm.checkPerson" :disabled="isdetail" placeholder="请输入巡检人" /> -->
+								<el-select
-
+									v-model="dataForm.checkPerson"
-                <el-select v-model="dataForm.checkPerson" :placeholder="`请选择巡检人`" multiple clearable
+									:placeholder="`请选择巡检人`"
-                  :disabled="isdetail" filterable style="width: 100%">
+									multiple
-                  <el-option v-for="opt in inspectorOptions" :key="opt.value" :label="opt.label" :value="opt.label" />
+									clearable
+									:disabled="isdetail"
+									filterable
+									style="width: 100%">
+									<el-option
+										v-for="opt in inspectorOptions"
+										:key="opt.value"
+										:label="opt.label"
+										:value="opt.label" />
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="实际巡检时间" prop="actualCheckTime">
-                <el-date-picker v-model="dataForm.actualCheckTime" type="datetime" :disabled="isdetail"
+								<el-date-picker
-                  placeholder="请选择实际巡检时间" value-format="timestamp" style="width: 100%" />
+									v-model="dataForm.actualCheckTime"
+									type="datetime"
+									:disabled="isdetail"
+									placeholder="请选择实际巡检时间"
+									value-format="timestamp"
+									style="width: 100%" />
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -65,7 +105,10 @@
 				</small-title>
 
 				<div v-if="!isdetail" style="display: flex">
-          <SearchBar :formConfigs="searchBarFormConfig" ref="attr-search-bar" @headBtnClick="handleSearchBarBtnClick" />
+					<SearchBar
+						:formConfigs="searchBarFormConfig"
+						ref="attr-search-bar"
+						@headBtnClick="handleSearchBarBtnClick" />
 					<!-- <div class="action_btn"> -->
 					<el-button type="text" class="action_btn" @click="addNew()">
 						<span style="display: inline-block;">
@@ -75,13 +118,26 @@
 					</el-button>
 					<!-- </div> -->
 				</div>
-        <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+				<base-table
+					:table-props="tableProps"
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
 					:table-data="detList">
-          <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+					<method-btn
+						v-if="!isdetail"
+						slot="handleBtn"
+						:width="120"
+						label="操作"
+						:method-list="tableBtn"
 						@clickBtn="handleClick" />
 				</base-table>
-        <pagination v-show="listQuery.total > 0" :total="listQuery.total" :page.sync="listQuery.pageNo"
+				<pagination
-          :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
 			</div>
 
 		</div>
@@ -93,7 +149,11 @@
 			<el-button v-else type="primary" @click="dataFormSubmit()">保存</el-button>
 		</div>
 
-    <attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :order-id="dataForm.id" @refreshDataList="getList" />
+		<attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:order-id="dataForm.id"
+			@refreshDataList="getList" />
 	</el-drawer>
 </template>
 
@@ -245,15 +305,15 @@ export default {
 					}))
 				);
 			}
-			// const workerlist = await this.$axios('/base/core-worker/listAll');
+			const workerlist = await this.$axios('/base/core-worker/listAll');
-			// if (workerlist.code == 0) {
+			if (workerlist.code == 0) {
-			// 	inspectorList = inspectorList.concat(
+				inspectorList = inspectorList.concat(
-			// 		workerlist.data.map((item) => ({
+					workerlist.data.map((item) => ({
-			// 			label: item.name,
+						label: item.name,
-			// 			value: item.id,
+						value: item.id,
-			// 		}))
+					}))
-			// 	);
+				);
-			// }
+			}
 			this.inspectorOptions = inspectorList;
 			// const res1 = await groupClassesListAll();
 			// this.groupOptions = res1.data || [];

src/views/equipment/base/inspection/items/components/add-or-updata.vue

@@ -17,7 +17,7 @@
     <el-row :gutter="24">
       <el-col :span="24">
         <el-form-item label="默认巡检结果" prop="resultType">
-          <el-select v-model="dataForm.resultType" placeholder="请选择默认保养结果" @change="handleClear">
+          <el-select v-model="dataForm.resultType" placeholder="请选择默认保养结果">
             <el-option v-for="dict in resultList" :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
@@ -38,16 +38,13 @@
       </el-col>
     </el-row>
     <el-row v-else-if="dataForm.resultType === 2" :gutter="24">
-      <el-col :span="11">
+      <el-col :span="12">
         <el-form-item prop="minValue">
           <el-input oninput="value=value.replace(/[^\-\d.]/g, '')" v-model="dataForm.minValue" placeholder="请输入最小值" />
         </el-form-item>
       </el-col>
-      <el-col :span="4">
+      <el-col :span="12">
-        —————
+        <el-form-item prop="maxValue">
-      </el-col>
-      <el-col :span="9">
-        <el-form-item prop="maxValue" label-width="20">
           <el-input @change="handleChange" oninput="value=value.replace(/[^\-\d.]/g, '')" v-model="dataForm.maxValue"
             placeholder="请输入最大值" />
         </el-form-item>
@@ -117,11 +114,6 @@ export default {
 		console.log('我看看', this.dataForm)
 	},
 	methods: {
-    handleClear() {
-      this.dataForm.minValue = undefined
-      this.dataForm.maxValue = undefined
-      this.dataForm.maintainResult = undefined
-    },
 		async getDict() {
 			// 物料列表
       const res = await getList();