Merge pull request '更新生产基础' (#11) from zwq into test

Reviewed-on: #11

src/api/core/base/productionLine.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2023-07-26 09:56:38
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-04 13:59:23
+ * @Description:
+ */
 import request from '@/utils/request'
 
 // 创建工厂产线
@@ -15,7 +22,13 @@ export function getCode() {
     method: 'get'
   })
 }
-
+// 获得产线status
+export function getStatus(ids) {
+  return request({
+    url: '/base/equipment-status-realtime/lineStatus?ids=' + ids,
+    method: 'get'
+  })
+}
 // 更新工厂产线
 export function updateProductionLine(data) {
   return request({

src/views/core/base/factory/index.vue

@@ -114,17 +114,6 @@ export default {
 					placeholder: '工厂名称',
 					param: 'name',
 				},
-				{
-					type: 'datePicker',
-					label: '创建时间',
-					dateType: 'daterange',
-					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始时间',
-					endPlaceholder: '结束时间',
-					param: 'createTime',
-				},
 				{
 					type: 'button',
 					btnName: '搜索',
@@ -173,7 +162,6 @@ export default {
 					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name;
 					this.listQuery.code = val.code;
-					this.listQuery.createTime = val.createTime;
 					this.getDataList();
 					break;
 				case 'reset':

src/views/core/base/product/add-or-updata.vue

@@ -318,9 +318,9 @@ export default {
 			if (raw.type === 'delete') {
 				this.$confirm(
 					`确定对${
-						val.data.name
+						raw.data.name
-							? '[名称=' + val.data.name + ']'
+							? '[名称=' + raw.data.name + ']'
-							: '[序号=' + val.data._pageIndex + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
 					}进行删除操作?`,
 					'提示',
 					{
@@ -330,7 +330,7 @@ export default {
 					}
 				)
 					.then(() => {
-						deleteProductAttr(val.data.id).then(({ data }) => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
 							this.$message({
 								message: '操作成功',
 								type: 'success',

src/views/core/base/productionLine/index.vue

@@ -5,7 +5,7 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
-      v-loading="dataListLoading"
+			v-loading="dataListLoading"
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
@@ -40,12 +40,14 @@
 <script>
 import AddOrUpdate from './add-or-updata';
 import basicPage from '../../mixins/basic-page';
+import codeFilter from '../../mixins/code-filter';
 import { parseTime } from '../../mixins/code-filter';
 import {
-  deleteProductionLine,
+	deleteProductionLine,
-  getProductionLinePage,
+	getProductionLinePage,
-  exportProductionLineExcel
+	exportProductionLineExcel,
-} from "@/api/core/base/productionLine";
+	getStatus,
+} from '@/api/core/base/productionLine';
 
 const tableProps = [
 	{
@@ -63,6 +65,17 @@ const tableProps = [
 		label: '工厂',
 		align: 'center',
 	},
+	{
+		prop: 'externalCode',
+		label: '额外编码',
+		align: 'center',
+	},
+	{
+		prop: 'status',
+		label: '当前状态',
+		align: 'center',
+		filter: codeFilter('lineStatus'),
+	},
 	{
 		prop: 'description',
 		label: '描述',
@@ -98,13 +111,13 @@ export default {
 							btnName: '编辑',
 					  }
 					: undefined,
-          this.$auth.hasPermi(`base:production-line:delete`)
+				this.$auth.hasPermi(`base:production-line:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
-			].filter((v)=>v),
+			].filter((v) => v),
 			tableData: [],
 			formConfig: [
 				{
@@ -131,7 +144,9 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('base:production-line:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:production-line:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -154,6 +169,28 @@ export default {
 	},
 	created() {},
 	methods: {
+		// 获取数据列表
+		getDataList() {
+			this.dataListLoading = true;
+			this.urlOptions.getDataListURL(this.listQuery).then((response) => {
+				this.total = response.data.total;
+				this.getStatus(response.data.list);
+				this.dataListLoading = false;
+			});
+		},
+		getStatus(list) {
+			const ids = list.map((i) => {
+				return i.id;
+			});
+			getStatus(ids).then((response) => {
+				response.forEach((a) => {
+					list.forEach((b) => {
+						if (b.id === a.id) b.status = a.status;
+					});
+				});
+				this.tableData = list;
+			});
+		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':

src/views/core/mixins/code-filter.js

@@ -8,45 +8,10 @@
  */
 
 const table = {
-  eightDisciplineType: {
+  lineStatus: {
-    1: '客诉问题',
+    1: '生产中',
-    2: '重大质量问题',
+    2: '停止',
-    0: '重复发生问题',
+    3: '未知',
-  },
-  examineStatus: {
-    1: '需要审批',
-    0: '不需要审批',
-  },
-  gradeFinish: {
-    1: '已打分',
-    0: '未打分',
-  },
-  step: {
-    0: 'D0',
-    1: 'D1',
-    2: 'D2',
-    3: 'D3',
-    4: 'D4',
-    5: 'D5',
-    6: 'D6',
-    7: 'D7',
-    8: 'D8',
-  },
-  containmentLocaleName:
-  {
-    1: "装配线",
-    2: "生产线",
-    3: "实验室",
-    4: "成品在途",
-    5: "第三方中间商",
-  },
-  developCountermeasuresName:
-  {
-    1: "让步接收",
-    2: "分选返工",
-    3: "隔离",
-    4: "退换货",
-    5: "通知供应商",
   },
 }