src/main.js

@@ -82,7 +82,7 @@ import Tinymce from '@/components/tinymce/index.vue';
 Vue.component('tinymce', Tinymce);
 import '@/assets/icons';
 import request from '@/utils/request'; // 实现 form generator 使用自己定义的 axios request 对象
-console.log(request);
+// console.log(request);
 Vue.prototype.$axios = request;
 import '@/styles/index.scss';
 

src/views/quality/base/qualityInspectionBoxBtn/index.vue

@@ -1,120 +1,243 @@
 <template>
 	<div class="app-container">
-
 		<!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+		<SearchBar
-      <el-form-item>
+			:formConfigs="searchBarFormConfig"
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+			ref="search-bar"
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+			@headBtnClick="handleSearchBarBtnClick" />
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['base:quality-inspection-box-btn:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:quality-inspection-box-btn:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
 		<!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
+		<base-table
-      <el-table-column label="ID" align="center" prop="id" />
+			:table-props="tableProps"
-      <el-table-column label="该按钮绑定的检测内容id" align="center" prop="inspectionDetId" />
+			:page="queryParams.pageNo"
-      <el-table-column label="检测内容（设备推送消息时，可能无对应id，只填这个字段）" align="center" prop="inspectionDetContent" />
+			:limit="queryParams.pageSize"
-      <el-table-column label="按钮盒所在产线id" align="center" prop="productionId" />
+			:table-data="list"
-      <el-table-column label="按钮盒所在工段id" align="center" prop="sectionId" />
+			@emit-fun="handleEmitFun">
-      <el-table-column label="按钮盒模式" align="center" prop="model" />
+			<method-btn
-      <el-table-column label="按钮值" align="center" prop="keyValue" />
+				v-if="tableBtn.length"
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+				slot="handleBtn"
-        <template v-slot="scope">
+				label="操作"
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+				fixed="right"
-        </template>
+				:method-list="tableBtn"
-      </el-table-column>
+				@clickBtn="handleTableBtnClick" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+		</base-table>
-        <template v-slot="scope">
+
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:quality-inspection-box-btn:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:quality-inspection-box-btn:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
 		<!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
 
 		<!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
+		<base-dialog
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+			:dialogTitle="title"
-        <el-form-item label="该按钮绑定的检测内容id" prop="inspectionDetId">
+			:dialogVisible="open"
-          <el-input v-model="form.inspectionDetId" placeholder="请输入该按钮绑定的检测内容id" />
+			width="50%"
-        </el-form-item>
+			@close="cancel"
-        <el-form-item label="检测内容（设备推送消息时，可能无对应id，只填这个字段）" prop="inspectionDetContent">
+			@cancel="cancel"
-          <el-input v-model="form.inspectionDetContent" type="textarea" placeholder="请输入内容" />
+			@confirm="submitForm">
-        </el-form-item>
+			<DialogForm
-        <el-form-item label="按钮盒所在产线id" prop="productionId">
+				v-if="open"
-          <el-input v-model="form.productionId" placeholder="请输入按钮盒所在产线id" />
+				ref="form"
-        </el-form-item>
+				:dataForm="form"
-        <el-form-item label="按钮盒所在工段id" prop="sectionId">
+				:rows="[
-          <el-input v-model="form.sectionId" placeholder="请输入按钮盒所在工段id" />
+					[
-        </el-form-item>
+						{
-        <el-form-item label="按钮盒模式" prop="model">
+							select: true,
-          <el-input v-model="form.model" placeholder="请输入按钮盒模式" />
+							label: '产线',
-        </el-form-item>
+							url: '/base/production-line/listAll',
-        <el-form-item label="按钮值" prop="keyValue">
+							prop: 'productionId',
-          <el-input v-model="form.keyValue" placeholder="请输入按钮值" />
+							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-        </el-form-item>
+							bind: {
-      </el-form>
+								filterable: true,
-      <div slot="footer" class="dialog-footer">
+							},
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+						},
-        <el-button @click="cancel">取 消</el-button>
+					],
-      </div>
+					[
-    </el-dialog>
+						{
+							select: true,
+							label: '工段',
+							url: '/base/workshop-section/listAll',
+							prop: 'sectionId',
+							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						},
+						// {
+						// 	select: true,
+						//   url: '', //
+						// 	label: '检测内容',
+						// 	prop: 'inspectionDetContent',
+						// 	rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						// },
+					],
+					[
+						{
+							input: true,
+							label: '按钮盒识别码',
+							prop: 'buttonId',
+							rules: [
+								{
+									type: 'number',
+									message: '请输入数字',
+									trigger: 'blur',
+									transform: (val) => Number(val),
+								},
+							],
+						},
+					],
+					[{ input: true, label: '按钮盒模式', prop: 'model' }],
+					[
+						{
+							input: true,
+							label: '按钮值',
+							prop: 'keyValue',
+							rules: [
+								{
+									type: 'number',
+									message: '请输入100以内的数字',
+									trigger: 'blur',
+									transform: (val) => Number(val) <= 100 && Number(val),
+								},
+							],
+							bind: { type: 'number', min: 0, max: 100 },
+						},
+					],
+					[
+						{
+							textarea: true,
+							label: '检测内容',
+							prop: 'inspectionDetContent',
+							rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+						},
+					],
+				]" />
+		</base-dialog>
 	</div>
 </template>
 
 <script>
-import { createQualityInspectionBoxBtn, updateQualityInspectionBoxBtn, deleteQualityInspectionBoxBtn, getQualityInspectionBoxBtn, getQualityInspectionBoxBtnPage, exportQualityInspectionBoxBtnExcel } from "@/api/base/qualityInspectionBoxBtn";
+import {
+	createQualityInspectionBoxBtn,
+	updateQualityInspectionBoxBtn,
+	deleteQualityInspectionBoxBtn,
+	getQualityInspectionBoxBtn,
+	getQualityInspectionBoxBtnPage,
+	exportQualityInspectionBoxBtnExcel,
+} from '@/api/base/qualityInspectionBoxBtn';
+import basicPageMixin from '../../mixin/basicPageMixin';
+import moment from 'moment';
 
 export default {
-  name: "QualityInspectionBoxBtn",
+	name: 'QualityInspectionBoxBtn',
-  components: {
+	mixins: [basicPageMixin],
-  },
+	components: {},
 	data() {
 		return {
-      // 遮罩层
+			searchBarFormConfig: [
-      loading: true,
+				{
-      // 导出遮罩层
+					type: 'input',
-      exportLoading: false,
+					label: '检查内容',
-      // 显示搜索条件
+					placeholder: '请输入检查内容',
-      showSearch: true,
+					param: 'inspectionDetContent',
-      // 总条数
+				},
-      total: 0,
+				{
-      // 安灯按钮16键对应列表
+					type: 'button',
-      list: [],
+					btnName: '查询',
-      // 弹出层标题
+					name: 'search',
-      title: "",
+					color: 'primary',
-      // 是否显示弹出层
+				},
-      open: false,
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:quality-inspection-box-btn:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+			],
+			tableBtn: [
+				this.$auth.hasPermi('base:quality-inspection-box-btn:update')
+					? {
+							type: 'edit',
+							btnName: '修改',
+					  }
+					: undefined,
+				this.$auth.hasPermi('base:quality-inspection-box-btn:delete')
+					? {
+							type: 'delete',
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{
+					width: 128,
+					prop: 'productionName',
+					label: '产线',
+					align: 'center',
+				},
+				{
+					width: 128,
+					prop: 'sectionName',
+					label: '工段',
+					align: 'center',
+				},
+				{
+					width: 128,
+					prop: 'inspectionDetContent',
+					label: '检测内容',
+					align: 'center',
+				},
+				{
+					width: 160,
+					prop: 'buttonId',
+					label: '按钮盒识别码',
+					align: 'center',
+				},
+				// {
+				// 	width: 256,
+				// 	prop: 'productionId',
+				// 	label: '按钮盒所在产线ID',
+				// 	align: 'center',
+				// },
+				// {
+				// 	width: 256,
+				// 	prop: 'sectionId',
+				// 	label: '按钮盒所在工段ID',
+				// 	align: 'center',
+				// },
+				{ width: 90, prop: 'keyValue', label: '按钮值', align: 'center' },
+				{ width: 128, prop: 'model', label: '按钮盒模式', align: 'center' },
+			],
 			// 查询参数
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
 				inspectionDetContent: null,
 			},
-      // 表单参数
+			// 搜索框需要的 keys, 与上面 queryParams 的除 pageNo, pageSize 之外的 key 一一对应
-      form: {},
+			searchBarKeys: ['inspectionDetContent'],
-      // 表单校验
+			form: {
-      rules: {
+				id: undefined,
-        productionId: [{ required: true, message: "按钮盒所在产线id不能为空", trigger: "blur" }],
+				inspectionDetId: undefined,
-        sectionId: [{ required: true, message: "按钮盒所在工段id不能为空", trigger: "blur" }],
+				inspectionDetContent: undefined,
-      }
+				productionId: undefined,
+				sectionId: undefined,
+				model: undefined,
+				keyValue: undefined,
+			},
 		};
 	},
 	created() {
@@ -125,17 +248,12 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-      getQualityInspectionBoxBtnPage(this.queryParams).then(response => {
+			getQualityInspectionBoxBtnPage(this.queryParams).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
 			});
 		},
-    /** 取消按钮 */
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
 		/** 表单重置 */
 		reset() {
 			this.form = {
@@ -147,52 +265,42 @@ export default {
 				model: undefined,
 				keyValue: undefined,
 			};
-      this.resetForm("form");
+			this.resetForm('form');
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
 			this.open = true;
-      this.title = "添加安灯按钮16键对应";
+			this.title = '添加安灯按钮16键对应';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
 			const id = row.id;
-      getQualityInspectionBoxBtn(id).then(response => {
+			getQualityInspectionBoxBtn(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-        this.title = "修改安灯按钮16键对应";
+				this.title = '修改安灯按钮16键对应';
 			});
 		},
 		/** 提交按钮 */
 		submitForm() {
-      this.$refs["form"].validate(valid => {
+			this.$refs['form'].validate((valid) => {
 				if (!valid) {
 					return;
 				}
 				// 修改的提交
 				if (this.form.id != null) {
-          updateQualityInspectionBoxBtn(this.form).then(response => {
+					updateQualityInspectionBoxBtn(this.form).then((response) => {
-            this.$modal.msgSuccess("修改成功");
+						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
 					});
 					return;
 				}
 				// 添加的提交
-        createQualityInspectionBoxBtn(this.form).then(response => {
+				createQualityInspectionBoxBtn(this.form).then((response) => {
-          this.$modal.msgSuccess("新增成功");
+					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();
 				});
@@ -201,12 +309,16 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const id = row.id;
-      this.$modal.confirm('是否确认删除安灯按钮16键对应编号为"' + id + '"的数据项?').then(function() {
+			this.$modal
+				.confirm('是否确认删除安灯按钮16键对应编号为"' + id + '"的数据项?')
+				.then(function () {
 					return deleteQualityInspectionBoxBtn(id);
-        }).then(() => {
+				})
+				.then(() => {
 					this.getList();
-          this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-        }).catch(() => {});
+				})
+				.catch(() => {});
 		},
 		/** 导出按钮操作 */
 		handleExport() {
@@ -214,14 +326,18 @@ export default {
 			let params = { ...this.queryParams };
 			params.pageNo = undefined;
 			params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有安灯按钮16键对应数据项?').then(() => {
+			this.$modal
+				.confirm('是否确认导出所有安灯按钮16键对应数据项?')
+				.then(() => {
 					this.exportLoading = true;
 					return exportQualityInspectionBoxBtnExcel(params);
-        }).then(response => {
+				})
+				.then((response) => {
 					this.$download.excel(response, '安灯按钮16键对应.xls');
 					this.exportLoading = false;
-        }).catch(() => {});
+				})
-    }
+				.catch(() => {});
-  }
+		},
+	},
 };
 </script>

src/views/quality/components/dialogForm.vue

@@ -20,6 +20,13 @@
 						@change="$emit('update', form)"
 						:placeholder="`请输入${col.label}`"
 						v-bind="col.bind" />
+					<el-input
+						v-if="col.textarea"
+						type="textarea"
+						v-model="form[col.prop]"
+						@change="$emit('update', form)"
+						:placeholder="`请输入${col.label}`"
+						v-bind="col.bind" />
 					<el-select
 						v-if="col.select"
 						v-model="form[col.prop]"
@@ -142,10 +149,14 @@ export default {
 					}
 				});
 			});
-			// this.formLoading = false;
+			if (!promiseList.length) this.formLoading = false;
 		},
 	},
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.el-select {
+	width: 100%;
+}
+</style>