add 设备工段绑定，设备分组

src/components/DialogForm/index.vue

@@ -53,7 +53,12 @@
 						:action="col.url"
 						:on-success="handleUploadSuccess"
 						v-bind="col.bind">
-						<el-button size="small" type="primary" :disabled="col.bind?.disabled || false">点击上传</el-button>
+						<el-button
+							size="small"
+							type="primary"
+							:disabled="col.bind?.disabled || false">
+							点击上传
+						</el-button>
 						<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
 							{{ col.uploadTips || '只能上传jpg/png文件，大小不超过2MB' }}
 						</div>
@@ -157,7 +162,7 @@ export default {
 			return response.data;
 		},
 		async handleOptions(trigger = 'monuted') {
-			// console.log("[dialogForm:handleOptions]")
+			console.log("[dialogForm:handleOptions]")
 			const promiseList = [];
 			this.rows.forEach((cols) => {
 				cols.forEach((opt) => {
@@ -169,6 +174,32 @@ export default {
 					if (opt.options) {
 						this.$set(this.optionListOf, opt.prop, opt.options);
 					} else if (opt.url) {
+						// 如果有 depends，则暂时先不获取，注册一个watcher
+						if (opt.depends) {
+							console.log("[handleOptions] setting watch")
+							this.$watch(
+								() => this.form[opt.depends],
+								(id) => {
+									console.log(opt.depends, 'changed')
+									// 清空原有选项
+									this.form[opt.prop] = null;
+									// 获取新的选项
+									this.$axios({
+										url: `${opt.url}?id=${id}`,
+									}).then((res) => {
+										this.$set(
+											this.optionListOf,
+											opt.prop,
+											res.data.map((item) => ({
+												label: item[opt.labelKey ?? 'name'],
+												value: item[opt.valueKey ?? 'id'],
+											}))
+										);
+									});
+								}
+							);
+							return;
+						}
 						// 如果是下拉框，或者新增模式下的输入框，才去请求
 						if (opt.select || (opt.input && !this.form?.id)) {
 							promiseList.push(async () => {
@@ -216,10 +247,16 @@ export default {
 			if (!promiseList.length) this.formLoading = false;
 		},
 		// 上传成功的特殊处理
-		beforeUpload(){},
+		beforeUpload() {},
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, fileList) {
-			console.log('[dialogForm:handleUploadSuccess]', response, file, fileList, this.form);
+			console.log(
+				'[dialogForm:handleUploadSuccess]',
+				response,
+				file,
+				fileList,
+				this.form
+			);
 			// 保存原始文件名
 			if ('fileNames' in this.form) this.form.fileNames.push(file.name);
 			// 保存完整地址

src/views/base/equipmentBindSection/index.vue

@@ -1,129 +1,230 @@
 <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 label="工段ID" prop="workshopSectionId">
+			:formConfigs="searchBarFormConfig"
-        <el-input v-model="queryParams.workshopSectionId" placeholder="请输入工段ID" clearable @keyup.enter.native="handleQuery"/>
+			ref="search-bar"
-      </el-form-item>
+			@headBtnClick="handleSearchBarBtnClick" />
-      <el-form-item label="设备ID" prop="equipmentId">
-        <el-input v-model="queryParams.equipmentId" placeholder="请输入设备ID" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </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:equipment-bind-section: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:equipment-bind-section: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="workshopSectionId" />
+			:page="queryParams.pageNo"
-      <el-table-column label="设备ID" align="center" prop="equipmentId" />
+			:limit="queryParams.pageSize"
-      <el-table-column label="排序" align="center" prop="sort" />
+			:table-data="list"
-      <el-table-column label="产线数据类型 0.无类型 1.进口计数 2.出口计数" align="center" prop="lineDataType">
+			@emitFun="handleEmitFun">
-        <template v-slot="scope">
+			<method-btn
-          <dict-tag :type="DICT_TYPE.EQU_DATA_TYPE" :value="scope.row.lineDataType" />
+				v-if="tableBtn.length"
-        </template>
+				slot="handleBtn"
-      </el-table-column>
+				label="操作"
-      <el-table-column label="工段数据类型 0.无类型 1.进口计数 2.出口计数" align="center" prop="sectionDataType">
+				:method-list="tableBtn"
-        <template v-slot="scope">
+				@clickBtn="handleTableBtnClick" />
-          <dict-tag :type="DICT_TYPE.EQU_DATA_TYPE" :value="scope.row.sectionDataType" />
+		</base-table>
-        </template>
+
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="版本号" align="center" prop="version" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['base:equipment-bind-section:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:equipment-bind-section: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
-                @pagination="getList"/>
+			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="workshopSectionId">
+			:dialogVisible="open"
-          <el-input v-model="form.workshopSectionId" placeholder="请输入工段ID" />
+			width="700px"
-        </el-form-item>
+			@close="cancel"
-        <el-form-item label="设备ID" prop="equipmentId">
+			@cancel="cancel"
-          <el-input v-model="form.equipmentId" placeholder="请输入设备ID" />
+			@confirm="submitForm">
-        </el-form-item>
+			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
-        <el-form-item label="排序" prop="sort">
+		</base-dialog>
-          <el-input v-model="form.sort" placeholder="请输入排序" />
-        </el-form-item>
-        <el-form-item label="产线数据类型 0.无类型 1.进口计数 2.出口计数" prop="lineDataType">
-          <el-select v-model="form.lineDataType" placeholder="请选择产线数据类型 0.无类型 1.进口计数 2.出口计数">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQU_DATA_TYPE)"
-                       :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="工段数据类型 0.无类型 1.进口计数 2.出口计数" prop="sectionDataType">
-          <el-select v-model="form.sectionDataType" placeholder="请选择工段数据类型 0.无类型 1.进口计数 2.出口计数">
-            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.EQU_DATA_TYPE)"
-                       :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="版本号" prop="version">
-          <el-input v-model="form.version" placeholder="请输入版本号" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
 	</div>
 </template>
 
 <script>
-import { createEquipmentBindSection, updateEquipmentBindSection, deleteEquipmentBindSection, getEquipmentBindSection, getEquipmentBindSectionPage, exportEquipmentBindSectionExcel } from "@/api/base/equipmentBindSection";
+import {
+	createEquipmentBindSection,
+	updateEquipmentBindSection,
+	deleteEquipmentBindSection,
+	getEquipmentBindSection,
+	getEquipmentBindSectionPage,
+	exportEquipmentBindSectionExcel,
+} from '@/api/base/equipmentBindSection';
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
 
 export default {
-  name: "EquipmentBindSection",
+	name: 'EquipmentBindSection',
-  components: {
+	components: {},
-  },
+	mixins: [basicPageMixin],
 	data() {
 		return {
-      // 遮罩层
+			searchBarKeys: ['workshopSectionId', 'equipmentName'],
-      loading: true,
+			tableBtn: [
-      // 导出遮罩层
+				this.$auth.hasPermi('base:equipment-bind-section:update')
-      exportLoading: false,
+					? {
-      // 显示搜索条件
+							type: 'edit',
-      showSearch: true,
+							btnName: '修改',
-      // 总条数
+					  }
-      total: 0,
+					: undefined,
-      // 工段设备绑定列表
+				this.$auth.hasPermi('base:equipment-bind-section:delete')
-      list: [],
+					? {
-      // 弹出层标题
+							type: 'delete',
-      title: "",
+							btnName: '删除',
+					  }
+					: undefined,
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'createTime',
+					label: '添加时间',
+					fixed: true,
+					width: 180,
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
+				{ prop: 'productionLine', label: '产线名称', align: 'center' },
+				{ prop: 'workshopSection', label: '工段名称', align: 'center' },
+				{ prop: 'equipment', label: '设备名称', align: 'center' },
+				{ prop: 'sort', label: '工段中排序', align: 'center' },
+				{
+					prop: 'lineDataType',
+					label: '产线数据类型',
+					align: 'center',
+					filter: (val) =>
+						val != null ? ['无类型', '进口计数', '出口计数'][val] : '-',
+				},
+				{
+					prop: 'sectionDataType',
+					label: '工段数据类型',
+					align: 'center',
+					filter: (val) =>
+						val != null ? ['无类型', '进口计数', '出口计数'][val] : '-',
+				},
+				// {
+				// 	action: 'show-alert',
+				// 	label: '报警',
+				// 	align: 'center',
+				// 	subcomponent: {
+				// 		props: ['injectData'],
+				// 		render: function (h) {
+				// 			const _this = this;
+				// 			return h(
+				// 				'el-button',
+				// 				{
+				// 					props: { type: 'text', size: 'mini' },
+				// 					on: {
+				// 						click: function () {
+				// 							console.log('inejctdata', _this.injectData);
+				// 							_this.$emit('emitData', {
+				// 								action: _this.injectData.action,
+				// 								value: _this.injectData.id,
+				// 							});
+				// 						},
+				// 					},
+				// 				},
+				// 				'查看报警'
+				// 			);
+				// 		},
+				// 	},
+				// },
+			],
+			searchBarFormConfig: [
+				{
+					type: 'select',
+					label: '工段',
+					placeholder: '请选择工段',
+					param: 'workshopSectionId',
+				},
+				{
+					type: 'input',
+					label: '设备',
+					placeholder: '请输入设备',
+					param: 'equipmentName',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: this.$auth.hasPermi('base:equipment-bind-section:create')
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				// {
+				// 	type: this.$auth.hasPermi('base:equipment-group:export') ? 'button' : '',
+				// 	btnName: '导出',
+				// 	name: 'export',
+				// 	color: 'warning',
+				// },
+			],
+			rows: [
+				[
+					{
+						select: true,
+						label: '产线',
+						url: '/base/production-line/listAll',
+						// prop: '__product_line', // __开头代表不传递给服务器
+						prop: 'productionLineId', // 编辑接口返回的产线id，所以不能使用上面那种形式
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						select: true,
+						label: '工段',
+						url: '/base/workshop-section/listByParentId', // 根据产线获取
+            // depends: '__product_line', // 依赖产线获取数据
+            depends: 'productionLineId',
+						prop: 'workshopSectionId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						select: true,
+						label: '设备',
+						url: '/base/equipment/page?pageNo=1&pageSize=100',
+						prop: 'equipmentId',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+					{
+						input: true,
+						label: '工段排序',
+						prop: 'sort',
+						// url: '/base/equipment-group/getCode',
+					},
+				],
+				[
+					{
+						select: true,
+						label: '产线数据类型',
+						options: [
+							{ label: '无类型', value: 0 },
+							{ label: '进口统计', value: 1 },
+							{ label: '出口统计', value: 2 },
+						],
+						prop: 'lineDataType',
+					},
+					{
+						select: true,
+						label: '工段数据类型',
+						options: [
+							{ label: '无类型', value: 0 },
+							{ label: '进口统计', value: 1 },
+							{ label: '出口统计', value: 2 },
+						],
+						prop: 'sectionDataType',
+					},
+				],
+			],
 			// 是否显示弹出层
 			open: false,
 			// 查询参数
@@ -135,11 +236,6 @@ export default {
 			},
 			// 表单参数
 			form: {},
-      // 表单校验
-      rules: {
-        workshopSectionId: [{ required: true, message: "工段ID不能为空", trigger: "blur" }],
-        equipmentId: [{ required: true, message: "设备ID不能为空", trigger: "blur" }],
-      }
 		};
 	},
 	created() {
@@ -150,7 +246,7 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-      getEquipmentBindSectionPage(this.queryParams).then(response => {
+			getEquipmentBindSectionPage(this.queryParams).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;
@@ -173,7 +269,7 @@ export default {
 				remark: undefined,
 				version: undefined,
 			};
-      this.resetForm("form");
+			this.resetForm('form');
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {
@@ -182,43 +278,43 @@ export default {
 		},
 		/** 重置按钮操作 */
 		resetQuery() {
-      this.resetForm("queryForm");
+			this.resetForm('queryForm');
 			this.handleQuery();
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
 			this.open = true;
-      this.title = "添加工段设备绑定";
+			this.title = '添加工段设备绑定';
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
 			const id = row.id;
-      getEquipmentBindSection(id).then(response => {
+			getEquipmentBindSection(id).then((response) => {
 				this.form = response.data;
 				this.open = true;
-        this.title = "修改工段设备绑定";
+				this.title = '修改工段设备绑定';
 			});
 		},
 		/** 提交按钮 */
 		submitForm() {
-      this.$refs["form"].validate(valid => {
+			this.$refs['form'].validate((valid) => {
 				if (!valid) {
 					return;
 				}
 				// 修改的提交
 				if (this.form.id != null) {
-          updateEquipmentBindSection(this.form).then(response => {
+					updateEquipmentBindSection(this.form).then((response) => {
-            this.$modal.msgSuccess("修改成功");
+						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
 					});
 					return;
 				}
 				// 添加的提交
-        createEquipmentBindSection(this.form).then(response => {
+				createEquipmentBindSection(this.form).then((response) => {
-          this.$modal.msgSuccess("新增成功");
+					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();
 				});
@@ -227,27 +323,35 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const id = row.id;
-      this.$modal.confirm('是否确认删除工段设备绑定编号为"' + id + '"的数据项?').then(function() {
+			this.$modal
+				.confirm('是否确认删除工段设备绑定编号为"' + id + '"的数据项?')
+				.then(function () {
 					return deleteEquipmentBindSection(id);
-        }).then(() => {
+				})
+				.then(() => {
 					this.getList();
-          this.$modal.msgSuccess("删除成功");
+					this.$modal.msgSuccess('删除成功');
-        }).catch(() => {});
+				})
+				.catch(() => {});
 		},
 		/** 导出按钮操作 */
 		handleExport() {
 			// 处理查询参数
-      let params = {...this.queryParams};
+			let params = { ...this.queryParams };
 			params.pageNo = undefined;
 			params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有工段设备绑定数据项?').then(() => {
+			this.$modal
+				.confirm('是否确认导出所有工段设备绑定数据项?')
+				.then(() => {
 					this.exportLoading = true;
 					return exportEquipmentBindSectionExcel(params);
-        }).then(response => {
+				})
+				.then((response) => {
 					this.$download.excel(response, '工段设备绑定.xls');
 					this.exportLoading = false;
-        }).catch(() => {});
+				})
-    }
+				.catch(() => {});
-  }
+		},
+	},
 };
 </script>

src/views/base/equipmentGroup/index.vue

@@ -39,7 +39,6 @@
 			@confirm="submitForm">
 			<DialogForm v-if="open" ref="form" :dataForm="form" :rows="rows" />
 		</base-dialog>
-
 	</div>
 </template>