质量管理

.env.dev

@@ -13,8 +13,8 @@ VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://100.64.0.26:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
+VUE_APP_BASE_API = 'http://192.168.1.164:48082'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'

src/api/equipment/analysis/statistics.js

@@ -25,3 +25,13 @@ export function exportEqAnalysisExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 导出设备状态追溯
+export function exportEfficiencyExcel(query) {
+  return request({
+    url: '/analysis/equipment-analysis/export-efficiency',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

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

@@ -307,7 +307,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除"' + row.sectionName + '"?')
+				.delConfirm(row.buttonId)
 				.then(function () {
 					return deleteQualityInspectionBoxBtn(id);
 				})

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

@@ -288,7 +288,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除检测信息"' + row.content + '"?')
+				.delConfirm(row.content)
 				.then(function () {
 					return deleteQualityInspectionDet(id);
 				})

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

@@ -273,7 +273,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除该质量检测类型?')
+				.delConfirm(row.name)
 				.then(function () {
 					return deleteQualityInspectionType(id);
 				})

src/views/devConfig/quality/qualityScrapDet/basic-page.js

@@ -0,0 +1,159 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: DY
+ * @LastEditTime: 2023-09-21 16:02:07
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        getDataListURL: '',
+        deleteURL: '',
+        statusUrl: '',
+        exportURL: ''
+      },
+      tableData: [],
+      listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id) {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    cancel(id) {
+      this.$refs["popover-" + id].showPopper = false;
+    },
+    //改变状态
+    changeStatus(id) {
+      this.$http
+        .post(this.urlOptions.statusUrl, { id })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.$refs["popover-" + id].showPopper = false;
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500,
+            onClose: () => {
+              this.getDataList();
+            },
+          });
+        })
+        .catch(() => { });
+    },
+    //tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.content)
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id,name) {
+      this.$modal
+				.delConfirm(name)
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.getDataList();
+            this.$modal.msgSuccess('删除成功');
+          });
+        })
+        .catch(() => { });
+    },
+    //search-bar点击
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          this.listQuery.xm1 = val.xm1;
+          this.listQuery.xm2 = val.xm2;
+          this.listQuery.pageNo = 1;
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.addOrUpdate.dataFormSubmit()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '工厂.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+}

src/views/devConfig/quality/qualityScrapDet/index.vue

@@ -40,7 +40,7 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../../core/mixins/basic-page';
+import basicPage from './basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
 import {
 	getQualityScrapDetPage,

src/views/devConfig/quality/qualityScrapType/basic-page.js

@@ -0,0 +1,159 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: DY
+ * @LastEditTime: 2023-09-21 16:02:07
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        getDataListURL: '',
+        deleteURL: '',
+        statusUrl: '',
+        exportURL: ''
+      },
+      tableData: [],
+      listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id) {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    cancel(id) {
+      this.$refs["popover-" + id].showPopper = false;
+    },
+    //改变状态
+    changeStatus(id) {
+      this.$http
+        .post(this.urlOptions.statusUrl, { id })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.$refs["popover-" + id].showPopper = false;
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500,
+            onClose: () => {
+              this.getDataList();
+            },
+          });
+        })
+        .catch(() => { });
+    },
+    //tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.name)
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id,name) {
+      this.$modal
+				.delConfirm(name)
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.getDataList();
+            this.$modal.msgSuccess('删除成功');
+          });
+        })
+        .catch(() => { });
+    },
+    //search-bar点击
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          this.listQuery.xm1 = val.xm1;
+          this.listQuery.xm2 = val.xm2;
+          this.listQuery.pageNo = 1;
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.addOrUpdate.dataFormSubmit()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '工厂.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+}

src/views/devConfig/quality/qualityScrapType/index.vue

@@ -40,7 +40,7 @@
 
 <script>
 import AddOrUpdate from './add-or-updata';
-import basicPage from '../../../core/mixins/basic-page';
+import basicPage from './basic-page';
 import { parseTime } from '../../../core/mixins/code-filter';
 import {
 	getQualityScrapTypePage,

src/views/quality/monitoring/equipmentTraceability/index.vue

@@ -78,6 +78,7 @@
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import PieChart from './components/pieChart.vue';
 import tableHeightMixin from '@/mixins/tableHeightMixin';
+import { exportEfficiencyExcel } from '@/api/equipment/analysis/statistics.js';
 
 export default {
 	name: 'EfficiencyAnalysis',
@@ -200,6 +201,7 @@ export default {
 					param: 'workOrderId',
 					selectOptions: [],
 					filterable: true,
+					clearable: false,
 				},
 				{
 					// parent: 'dateFilterType',
@@ -274,7 +276,13 @@ export default {
 				this.list = data;
 			}
 		},
-
+		exportExcel() {
+			this.loading = true;
+			exportEfficiencyExcel({ ...this.queryParams }).then((res) => {
+				this.$download.excel(res, '设备状态追溯.xls');
+				this.loading = false;
+			});
+		},
 		handleSearchBarBtnClick({ btnName, ...payload }) {
 			console.log(btnName);
 			console.log(payload);
@@ -283,7 +291,8 @@ export default {
 				this.queryParams.recordTime = payload.recordTime || undefined;
 				this.getList();
 			} else {
-				this.queryParams.recordTime = null;
+				// this.queryParams.recordTime = null;
+				this.exportExcel();
 				console.log('导出');
 			}
 		},

src/views/quality/monitoring/materielDateFrom/index.vue

@@ -13,7 +13,7 @@
 		<pagination
 			:limit.sync="listQuery.pageSize"
 			:page.sync="listQuery.pageNo"
-			:total="listQuery.total"
+			:total="total"
 			@pagination="getList" />
 	</div>
 </template>
@@ -101,11 +101,11 @@ export default {
 			listQuery: {
 				pageSize: 10,
 				pageNo: 1,
-				total: 0,
 				workOrderId: undefined,
 				startTime: undefined,
 				endTime: undefined,
 			},
+			total: 0,
 			formConfig: [
 				{
 					type: 'select',
@@ -160,7 +160,7 @@ export default {
 		getList() {
 			getMaterialUseLogPage({ ...this.listQuery }).then((res) => {
 				this.list = res.data || [];
-				this.listQuery.total = res.data.total || 0;
+				this.total = res.data.total || 0;
 			});
 		},
 		getDict() {
@@ -179,12 +179,8 @@ export default {
 			let params = { ...this.listQuery };
 			params.pageNo = undefined;
 			params.pageSize = undefined;
-			this.$modal
-				.confirm('是否确认导出所有数据项?')
-				.then(() => {
 			this.exportLoading = true;
-					return exportEnergyPlcExcel(params);
+			exportEnergyPlcExcel(params)
-				})
 				.then((response) => {
 					this.$download.excel(response, '物料信息追溯  ');
 					this.exportLoading = false;

src/views/quality/monitoring/rawMaterialTraceability/index.vue

@@ -101,6 +101,9 @@ export default {
 					labelField: 'name',
 					valueField: 'id',
 					param: 'workOrderId',
+					clearable: false,
+					filterable: true,
+					defaultSelect: '',
 				},
 				{
 					type: 'button',
@@ -130,6 +133,8 @@ export default {
 						id: item.id,
 					};
 				});
+				this.formConfig[0].defaultSelect =
+					this.formConfig[0].selectOptions[0].id || '';
 				console.log(this.formConfig[0].selectOptions);
 			});
 		},

src/views/quality/qualityInspectionRecord/index.vue

@@ -322,7 +322,7 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除"' + row.inspectionDetContent + '"?')
+				.delConfirm(row.inspectionDetContent)
 				.then(function () {
 					return deleteQualityInspectionRecord(id);
 				})

src/views/quality/qualityScrapLog/add-or-updata.vue

@@ -7,10 +7,10 @@
 		label-width="auto">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="工单号" prop="workOrderId">
+				<el-form-item label="工单名称" prop="workOrderId">
 					<el-select
 						v-model="dataForm.workOrderId"
-						placeholder="请选择工单号"
+						placeholder="请选择工单名称"
 						style="width: 100%"
 						:disabled="showDetail">
 						<el-option
@@ -80,7 +80,7 @@
 						v-model="dataForm.logTime"
 						type="datetime"
 						label-format="yyyy-MM-dd HH:mm:ss"
-						value-format="yyyy-MM-dd HH:mm:ss"
+						value-format="timestamp"
 						style="width: 100%"
 						placeholder="选择日期"
 						:disabled="showDetail"></el-date-picker>

src/views/quality/qualityScrapLog/basic-page.js

@@ -0,0 +1,159 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-08-24 11:19:43
+ * @LastEditors: DY
+ * @LastEditTime: 2023-09-21 16:02:07
+ * @Description:
+ */
+export default {
+  data() {
+    /* eslint-disable */
+    return {
+      urlOptions: {
+        getDataListURL: '',
+        deleteURL: '',
+        statusUrl: '',
+        exportURL: ''
+      },
+      tableData: [],
+      listQuery: {
+        pageSize: 10,
+        pageNo: 1,
+        total: 1,
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      addOrEditTitle: '',
+      addOrUpdateVisible: false,
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        this.tableData = response.data.list;
+        this.listQuery.total = response.data.total;
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.listQuery.pageSize = val;
+      this.listQuery.pageNo = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.listQuery.pageNo = val;
+      this.getDataList();
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(id) {
+      this.addOrUpdateVisible = true;
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id);
+      });
+    },
+    cancel(id) {
+      this.$refs["popover-" + id].showPopper = false;
+    },
+    //改变状态
+    changeStatus(id) {
+      this.$http
+        .post(this.urlOptions.statusUrl, { id })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.$refs["popover-" + id].showPopper = false;
+          this.$message({
+            message: this.$t("prompt.success"),
+            type: "success",
+            duration: 500,
+            onClose: () => {
+              this.getDataList();
+            },
+          });
+        })
+        .catch(() => { });
+    },
+    //tableBtn点击
+    handleClick(val) {
+      if (val.type === "edit") {
+        this.addOrUpdateVisible = true;
+        this.addOrEditTitle = "编辑";
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(val.data.id);
+        });
+      } else if (val.type === "delete") {
+        this.deleteHandle(val.data.id, val.data.detContent)
+      } else if (val.type === "change") {
+        this.changeStatus(val.data.id)
+      } else {
+        this.otherMethods(val)
+      }
+    },
+    // 删除
+    deleteHandle(id, detContent) {
+      this.$modal
+				.delConfirm(detContent)
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.getDataList();
+					  this.$modal.msgSuccess('删除成功');
+          });
+        })
+        .catch(() => { });
+    },
+    //search-bar点击
+    buttonClick(val) {
+      switch (val.btnName) {
+        case "search":
+          this.listQuery.xm1 = val.xm1;
+          this.listQuery.xm2 = val.xm2;
+          this.listQuery.pageNo = 1;
+          this.getDataList();
+          break;
+        case "add":
+          this.addOrEditTitle = '新增'
+          this.addOrUpdateVisible = true;
+          this.addOrUpdateHandle()
+          break;
+        default:
+          console.log(val)
+      }
+    },
+    handleCancel() {
+      this.$refs.addOrUpdate.formClear()
+      this.addOrUpdateVisible = false
+      this.addOrEditTitle = ''
+    },
+    handleConfirm() {
+      this.$refs.addOrUpdate.dataFormSubmit()
+    },
+    successSubmit() {
+      this.handleCancel()
+      this.getDataList()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return this.urlOptions.exportURL(params);
+      }).then(response => {
+        this.$download.excel(response, '工厂.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+}

src/views/quality/qualityScrapLog/index.vue

@@ -54,7 +54,7 @@
 <script>
 import AddOrUpdate from './add-or-updata';
 
-import basicPage from '../../core/mixins/basic-page';
+import basicPage from './basic-page';
 import { parseTime } from '../../core/mixins/code-filter';
 import {
 	getQualityScrapLogPage,

src/views/system/dept/index.vue

@@ -410,7 +410,6 @@ export default {
 		handleDelete(row) {
 			this.$modal
 				.delConfirm(row.name)
-				.closeConfirm()
 				.then(function () {
 					return delDept(row.id);
 				})