.env.dev

@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.33:48080'
+VUE_APP_BASE_API = 'http://192.168.1.8:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

package.json

@@ -58,7 +58,6 @@
     "js-beautify": "1.13.0",
     "jsencrypt": "3.3.1",
     "min-dash": "3.5.2",
-    "moment": "^2.29.4",
     "nprogress": "0.2.0",
     "qrcode.vue": "^1.7.0",
     "quill": "1.3.7",

src/views/quality/base/mixin.js

@@ -1,5 +0,0 @@
-export default {
-    data() {
-        
-    }
-}

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

@@ -1,35 +1,17 @@
 <template>
   <div class="app-container">
+
     <!-- 搜索工作栏 -->
-		<el-form
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			:model="queryParams"
-			ref="queryForm"
-			size="small"
-			:inline="true"
-			v-show="showSearch"
-			label-width="68px">
       <el-form-item label="检测内容" prop="content">
-				<el-input
+        <el-input v-model="queryParams.content" placeholder="请输入检测内容" clearable @keyup.enter.native="handleQuery"/>
-					v-model="queryParams.content"
-					placeholder="请输入检测内容"
-					clearable
-					@keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
-				<el-date-picker
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-					v-model="queryParams.createTime"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-					style="width: 240px"
-					value-format="yyyy-MM-dd HH:mm:ss"
-					type="daterange"
-					range-separator="-"
-					start-placeholder="开始日期"
-					end-placeholder="结束日期"
-					:default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
-				<el-button type="primary" icon="el-icon-search" @click="handleQuery">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-					搜索
-				</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -37,31 +19,14 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-				<el-button
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-					type="primary"
+                   v-hasPermi="['base:quality-inspection-det:create']">新增</el-button>
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['base:quality-inspection-det:create']">
-					新增
-				</el-button>
       </el-col>
       <el-col :span="1.5">
-				<el-button
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-					type="warning"
+                   v-hasPermi="['base:quality-inspection-det:export']">导出</el-button>
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					:loading="exportLoading"
-					v-hasPermi="['base:quality-inspection-det:export']">
-					导出
-				</el-button>
       </el-col>
-			<right-toolbar
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-				:showSearch.sync="showSearch"
-				@queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
@@ -71,54 +36,26 @@
       <el-table-column label="检测内容" align="center" prop="content" />
       <el-table-column label="检测编码" align="center" prop="code" />
       <el-table-column label="备注" align="center" prop="remark" />
-			<el-table-column
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-				label="创建时间"
-				align="center"
-				prop="createTime"
-				width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-			<el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				label="操作"
-				align="center"
-				class-name="small-padding fixed-width">
         <template v-slot="scope">
-					<el-button
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-						size="mini"
+                     v-hasPermi="['base:quality-inspection-det:update']">修改</el-button>
-						type="text"
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-						icon="el-icon-edit"
+                     v-hasPermi="['base:quality-inspection-det:delete']">删除</el-button>
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['base:quality-inspection-det:update']">
-						修改
-					</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['base:quality-inspection-det:delete']">
-						删除
-					</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-		<pagination
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
-		<el-dialog
+    <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag append-to-body>
-			:title="title"
-			:visible.sync="open"
-			width="500px"
-			v-dialogDrag
-			append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="检测类型id" prop="typeId">
           <el-select v-model="form.typeId" placeholder="请选择检测类型id">
@@ -144,18 +81,12 @@
 </template>
 
 <script>
-import {
+import { createQualityInspectionDet, updateQualityInspectionDet, deleteQualityInspectionDet, getQualityInspectionDet, getQualityInspectionDetPage, exportQualityInspectionDetExcel } from "@/api/base/qualityInspectionDet";
-	createQualityInspectionDet,
-	updateQualityInspectionDet,
-	deleteQualityInspectionDet,
-	getQualityInspectionDet,
-	getQualityInspectionDetPage,
-	exportQualityInspectionDetExcel,
-} from '@/api/base/qualityInspectionDet';
 
 export default {
-	name: 'QualityInspectionDet',
+  name: "QualityInspectionDet",
-	components: {},
+  components: {
+  },
   data() {
     return {
       // 遮罩层
@@ -169,7 +100,7 @@ export default {
       // 质量检测信息基础列表
       list: [],
       // 弹出层标题
-			title: '',
+      title: "",
       // 是否显示弹出层
       open: false,
       // 查询参数
@@ -183,13 +114,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-				typeId: [
+        typeId: [{ required: true, message: "检测类型id不能为空", trigger: "change" }],
-					{ required: true, message: '检测类型id不能为空', trigger: 'change' },
+        content: [{ required: true, message: "检测内容不能为空", trigger: "blur" }],
-				],
+      }
-				content: [
-					{ required: true, message: '检测内容不能为空', trigger: 'blur' },
-				],
-			},
     };
   },
   created() {
@@ -200,7 +127,7 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-			getQualityInspectionDetPage(this.queryParams).then((response) => {
+      getQualityInspectionDetPage(this.queryParams).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -220,7 +147,7 @@ export default {
         code: undefined,
         remark: undefined,
       };
-			this.resetForm('form');
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -229,43 +156,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;
-			getQualityInspectionDet(id).then((response) => {
+      getQualityInspectionDet(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) {
-					updateQualityInspectionDet(this.form).then((response) => {
+          updateQualityInspectionDet(this.form).then(response => {
-						this.$modal.msgSuccess('修改成功');
+            this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.getList();
           });
           return;
         }
         // 添加的提交
-				createQualityInspectionDet(this.form).then((response) => {
+        createQualityInspectionDet(this.form).then(response => {
-					this.$modal.msgSuccess('新增成功');
+          this.$modal.msgSuccess("新增成功");
           this.open = false;
           this.getList();
         });
@@ -274,16 +201,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-			this.$modal
+      this.$modal.confirm('是否确认删除质量检测信息基础编号为"' + id + '"的数据项?').then(function() {
-				.confirm('是否确认删除质量检测信息基础编号为"' + id + '"的数据项?')
-				.then(function () {
           return deleteQualityInspectionDet(id);
-				})
+        }).then(() => {
-				.then(() => {
           this.getList();
-					this.$modal.msgSuccess('删除成功');
+          this.$modal.msgSuccess("删除成功");
-				})
+        }).catch(() => {});
-				.catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -291,18 +214,14 @@ export default {
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;
-			this.$modal
+      this.$modal.confirm('是否确认导出所有质量检测信息基础数据项?').then(() => {
-				.confirm('是否确认导出所有质量检测信息基础数据项?')
-				.then(() => {
           this.exportLoading = true;
           return exportQualityInspectionDetExcel(params);
-				})
+        }).then(response => {
-				.then((response) => {
           this.$download.excel(response, '质量检测信息基础.xls');
           this.exportLoading = false;
-				})
+        }).catch(() => {});
-				.catch(() => {});
+    }
-		},
+  }
-	},
 };
 </script>

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

@@ -1,26 +1,111 @@
 <template>
 	<div class="app-container">
 		<!-- 搜索工作栏 -->
+		<el-form
+			:model="queryParams"
+			ref="queryForm"
+			size="small"
+			:inline="true"
+			v-show="showSearch"
+			label-width="68px">
+			<el-form-item label="检测类型名称" prop="name">
+				<el-input
+					v-model="queryParams.name"
+					placeholder="请输入检测类型名称"
+					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>
+
+		<div
+			class="s"
+			style="
+				margin: 8px 0;
+				padding: 4px 12px;
+				border: 1px solid #ccc;
+				background: #f3f3f3;
+			">
 			<SearchBar
 				:formConfigs="searchBarFormConfig"
 				ref="search-bar"
 				@headBtnClick="handleSearchBarBtnClick" />
+		</div>
+
+		<!-- 操作工具栏 -->
+		<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-type: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-type:export']">
+					导出
+				</el-button>
+			</el-col>
+			<right-toolbar
+				:showSearch.sync="showSearch"
+				@queryTable="getList"></right-toolbar>
+		</el-row>
 
 		<!-- 列表 -->
-		<base-table
+		<el-table v-loading="loading" :data="list">
-			:table-props="tableProps"
+			<el-table-column label="ID" align="center" prop="id" />
-			:page="queryParams.pageNo"
+			<el-table-column label="检测类型名称" align="center" prop="name" />
-			:limit="queryParams.pageSize"
+			<el-table-column label="检测类型编码" align="center" prop="code" />
-			:table-data="list"
+			<el-table-column label="备注" align="center" prop="remark" />
-			@emit-fun="handleEmitFun">
+			<el-table-column
-			<method-btn
+				label="创建时间"
-				v-if="tableBtn.length"
+				align="center"
-				slot="handleBtn"
+				prop="createTime"
+				width="180">
+				<template v-slot="scope">
+					<span>{{ parseTime(scope.row.createTime) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column
 				label="操作"
-				:method-list="tableBtn"
+				align="center"
-				@clickBtn="handleTableBtnClick" />
+				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-type:update']">
+						修改
+					</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['base:quality-inspection-type:delete']">
+						删除
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
 		<!-- 分页组件 -->
 		<pagination
 			v-show="total > 0"
@@ -30,12 +115,13 @@
 			@pagination="getList" />
 
 		<!-- 对话框(添加 / 修改) -->
-		<base-dialog
+		<el-dialog
-			:dialogTitle="title"
+			:title="title"
-			:dialogVisible="open"
+			:visible.sync="open"
-			@cancel="cancel"
+			width="500px"
-			@confirm="submitForm">
+			v-dialogDrag
-			<el-form ref="form" :model="form" :rules="rules" label-width="128px">
+			append-to-body>
+			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 				<el-form-item label="检测类型名称" prop="name">
 					<el-input v-model="form.name" placeholder="请输入检测类型名称" />
 				</el-form-item>
@@ -46,14 +132,15 @@
 					<el-input v-model="form.remark" placeholder="请输入备注" />
 				</el-form-item>
 			</el-form>
-		</base-dialog>
+			<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 moment from 'moment';
-
 import {
 	createQualityInspectionType,
 	updateQualityInspectionType,
@@ -68,61 +155,6 @@ export default {
 	components: {},
 	data() {
 		return {
-			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '修改',
-				},
-				{
-					type: 'delete',
-					btnName: '删除',
-				},
-			],
-			tableData: [],
-			tableProps: [
-				{
-					prop: 'createTime',
-					label: '添加时间',
-					fixed: true,
-					width: 180,
-					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
-				},
-				{ prop: 'name', label: '检测类型名称', align: 'center' },
-				{ prop: 'code', label: '检测类型编码', align: 'center' },
-				{ prop: 'remark', label: '备注', align: 'center' },
-				// {
-				// 	label: '操作',
-				// 	alignt: 'center',
-				// 	subcomponent: {
-				// 		render: function (h) {
-				// 			return h('div', null, [
-				// 				h(
-				// 					'el-button',
-				// 					{
-				// 						props: {
-				// 							icon: 'el-icon-edit',
-				// 							size: 'mini',
-				// 							type: 'text',
-				// 						},
-				// 					},
-				// 					' 修改'
-				// 				),
-				// 				h(
-				// 					'el-button',
-				// 					{
-				// 						props: {
-				// 							icon: 'el-icon-edit',
-				// 							size: 'mini',
-				// 							type: 'text',
-				// 						},
-				// 					},
-				// 					' 修改'
-				// 				),
-				// 			]);
-				// 		},
-				// 	},
-				// },
-			],
 			// 遮罩层
 			loading: true,
 			// 导出遮罩层
@@ -167,31 +199,24 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-				// {
-				// 	type: 'button',
-				// 	btnName: '重置',
-				// 	name: 'reset',
-				// },
 				{
-					type: 'separate'
+					type: 'button',
+					btnName: '重置',
+					name: 'reset',
 				},
 				{
-					type: this.$auth.hasPermi('base:quality-inspection-type:create')
+					type: 'button',
-						? 'button'
-						: '',
 					btnName: '新增',
 					name: 'add',
           plain: true,
-					color: 'success',
+          color: 'primary',
+				},
+				{
+					type: 'button',
+					btnName: '导出',
+					name: 'export',
+          color: 'warning'
 				},
-				// {
-				// 	type: this.$auth.hasPermi('base:quality-inspection-type:export')
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '导出',
-				// 	name: 'export',
-				// 	color: 'warning',
-				// },
 			],
 		};
 	},
@@ -199,36 +224,18 @@ export default {
 		this.getList();
 	},
 	methods: {
-		/** base table related */
-		handleTableBtnClick({ data, type }) {
-			switch (type) {
-				case 'edit':
-					this.handleUpdate(data);
-					break;
-				case 'delete':
-					this.handleDelete(data);
-					break;
-			}
-		},
 		/** search bar related */
 		handleSearchBarBtnClick(btn) {
-			const keys = ['name'];
+      console.log('btn', btn)
 			switch (btn.btnName) {
 				case 'search':
-					keys.forEach((key) => {
+					this.getList();
-						this.queryParams[key] = btn[key] || null;
-					});
-					this.handleQuery();
-					break;
-				case 'add':
-					this.handleAdd();
-					break;
-				case 'export':
-					this.handleExport();
 					break;
 				case 'reset':
 					this.$refs['search-bar'].resetForm();
-					this.resetQuery();
+					this.$nextTick(() => {
+						this.getList();
+					});
 					break;
 			}
 		},
@@ -274,9 +281,6 @@ export default {
 			this.open = true;
 			this.title = '添加质量检测类型基础';
 		},
-		handleEmitFun(val) {
-			console.log('emit unf', val);
-		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();

yarn.lock

@@ -6842,11 +6842,6 @@ moddle@^5.0.2:
   dependencies:
     min-dash "^3.0.0"
 
-moment@^2.29.4:
-  version "2.29.4"
-  resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
-
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz"