Merge branch 'projects/mes-test' into projects/mes-lb

2023-11-24 19:15:23 +08:00
parent 8802c932e2 ee26741e62
commit d5507ec4c0
48 changed files with 430 additions and 208 deletions
--- a/src/views/base/coreEquipment/index.vue
+++ b/src/views/base/coreEquipment/index.vue
@@ -288,10 +288,10 @@ export default {
 				[
 					{
 						input: true,
-						label: '产品加工时间(s)',
+						label: '单件产品加工时间(s)',
 						prop: 'processingTime',
 						rules: [
-							{ required: true, message: '产品加工时间不能为空', trigger: 'blur' },
+							{ required: true, message: '单件产品加工时间不能为空', trigger: 'blur' },
 							{
 								type: 'number',
 								message: '请输入正确的数字值',
@@ -319,9 +319,16 @@ export default {
 						prop: 'description',
 					},
 				],
+				[
+					{
+						upload: true,
+						label: '上传资料',
+						prop: 'files',
+					},
+				],
 				[
 					{ input: true, label: '备注', prop: 'remark' }
-				]
+				],
 				// [
 				// 	{
 				// 		assetUpload: true,
--- a/src/views/base/coreEquipmentLineBind/index.vue
+++ b/src/views/base/coreEquipmentLineBind/index.vue
@@ -189,6 +189,10 @@ export default {
 						],
 						label: '产线统计类型',
 						prop: 'lineDataType',
+						bind: {
+							clearable: true, filterable: true
+						},
+						rules: [{ required: true, message: '产线统计类型不能为空', trigger: 'change' }],
 					},
 					{
 						select: true,
@@ -199,6 +203,10 @@ export default {
 						],
 						label: '工段统计类型',
 						prop: 'sectionDataType',
+						bind: {
+							clearable: true, filterable: true
+						},
+						rules: [{ required: true, message: '工段统计类型不能为空', trigger: 'change' }],
 					},
 				],
 			],
--- a/src/views/base/coreProductionLine/index.vue
+++ b/src/views/base/coreProductionLine/index.vue
@@ -144,8 +144,8 @@ export default {
    getDataList() {
      this.dataListLoading = true;
      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        this.tableData = response.data.list;
-				// this.getStatus(response.data.list)
+        // this.tableData = response.data.list;
+				this.getStatus(response.data.list)
        this.listQuery.total = response.data.total;
        this.dataListLoading = false;
      });
--- a/src/views/base/coreWorkOrder/add-or-updata.vue
+++ b/src/views/base/coreWorkOrder/add-or-updata.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-20 16:51:24
+ * @LastEditTime: 2023-11-24 18:20:26
 * @Description:
 -->
 <template>
@@ -29,11 +29,10 @@

 				<div class="action_btn">
 					<template>
-						<span style="display: inline-block;" @click="addNew()">
-							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
-							<span class="add">添加</span>
-						</span>
-					</template>
+            <span style="display: inline-block;">
+              <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
+            </span>
+          </template>
 				</div>
 				<base-table
 					:table-props="tableProps"
@@ -298,7 +297,7 @@ export default {
 }
 .action_btn {
  float: right;
-  margin: 5px 15px;
+  margin: -40px 15px;
  font-size: 14px;
 }
 .add {
--- a/src/views/base/coreWorkOrder/addWorkOrder.vue
+++ b/src/views/base/coreWorkOrder/addWorkOrder.vue
@@ -311,11 +311,11 @@ export default {
      if (val) {
        this.productList.map(item => {
          if (val === item.id) {
-            this.dataForm.productSpec = item.specifications
+            this.dataForm.specifications = item.specifications
          }
        })
      } else {
-        this.dataForm.productSpec = ''
+        this.dataForm.specifications = ''
      }
    }
  }
--- a/src/views/base/coreWorkOrder/detail.vue
+++ b/src/views/base/coreWorkOrder/detail.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-22 09:47:53
+ * @LastEditTime: 2023-11-23 18:45:15
 * @Description:
 -->
 <template>
@@ -49,7 +49,9 @@
 				</el-row>
 				<el-row :gutter="20">
 					<el-col :span="8">负责人:{{ dataForm.workers }}</el-col>
-					<el-col :span="8">关联产线:{{ dataForm.productLineNames }}</el-col>
+					<el-col :span="8">关联产线:
+						<span v-for="(item, index) in dataForm.productLineNames" :key="index" style="margin-right: 10px">{{ item }}</span>
+					</el-col>
 					<el-col :span="8">物料计算方式:{{ dataForm.materialMethod === 1 ? '产品基础' : dataForm.materialMethod === 2 ? '工艺扩展' : '' }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
--- a/src/views/base/coreWorker/add-or-updata.vue
+++ b/src/views/base/coreWorker/add-or-updata.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-22 10:26:58
+ * @LastEditTime: 2023-11-24 18:13:02
 * @Description:
 -->
 <template>
@@ -196,7 +196,7 @@ export default {
 				workCost: undefined,
        remark: undefined,
 			},
-			majorIdList: undefined,
+			majorIdList: [],
 			departmentlList: [],
 			menuOptions: [],
 			bindIds: [],
@@ -267,7 +267,7 @@ export default {
 				workCost: undefined,
        remark: undefined
 			}
-			this.majorIdList = undefined
+			this.majorIdList = []
 		},
 		// 表单提交
    dataFormSubmit() {
@@ -288,24 +288,28 @@ export default {
            this.visible = false;
            this.$emit("refreshDataList");
          });
-					this.majorIdList.forEach(majorId => {
-						createWoBindMa({
-							workerId: this.dataForm.id,
-							majorId: majorId
-						}).then(res => {})
-					});
+					if (this.majorIdList.length > 0) {
+						this.majorIdList.forEach(majorId => {
+							createWoBindMa({
+								workerId: this.dataForm.id,
+								majorId: majorId
+							}).then(res => {})
+						});
+					}
          return;
        }
        // 添加的提交
        this.urlOptions.createURL(this.dataForm).then(response => {
 					// response.data = id
 					this.workerId = response.data
-					this.majorIdList.forEach(majorId => {
-						createWoBindMa({
-							workerId: this.workerId,
-							majorId: majorId
-						}).then(res => {})
-					});
+					if (this.majorIdList.length > 0) {
+						this.majorIdList.forEach(majorId => {
+							createWoBindMa({
+								workerId: this.workerId,
+								majorId: majorId
+							}).then(res => {})
+						});
+					}
          this.$modal.msgSuccess("新增成功");
          this.visible = false;
          this.$emit("refreshDataList");
@@ -324,6 +328,7 @@ export default {
        if (this.dataForm.id) {
          this.urlOptions.infoURL(id).then(response => {
            this.dataForm = response.data;
+						this.dataForm.departmentName = undefined
          });
 					// 获取员工--专业
 					getWoBindMaPage({
--- a/src/views/base/material/index.vue
+++ b/src/views/base/material/index.vue
@@ -39,6 +39,7 @@ import {
 	deleteMaterial
 } from '@/api/base/material';
 import { listData } from "@/api/system/dict/data";
+import { publicFormatter } from '@/utils/dict';

 const tableProps = [
 	{
@@ -59,8 +60,9 @@ const tableProps = [
 		label: '英文名称'
 	},
 	{
-		prop: 'materialType',
-		label: '物料类型'
+		prop: 'type',
+		label: '物料类型',
+		filter: publicFormatter('material_type')
 	},
 	{
 		prop: 'supplierName',
--- a/src/views/base/materialProductBom/add-or-updata.vue
+++ b/src/views/base/materialProductBom/add-or-updata.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-22 11:09:44
+ * @LastEditTime: 2023-11-23 15:00:00
 * @Description:
 -->
 <template>
@@ -311,6 +311,9 @@ export default {
 						row.mUnit = u.label
 					}
 				})
+			} else {
+				row.unit = null
+				row.mUnit = ''
 			}
 			// row.materialCode = tempList[0].code
 			// row.unit = tempList[0].unit
--- a/src/views/base/materialUseLog/index.vue
+++ b/src/views/base/materialUseLog/index.vue
@@ -215,12 +215,33 @@ export default {
          this.$refs.addOrUpdate.init(val.data.id);
        });
      } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.materialName, val.data._pageIndex)
+        this.deleteHandle(val.data.id, val.data.materialName)
      } else if (val.type === "change") {
        this.changeStatus(val.data.id)
      } else {
        this.otherMethods(val)
      }
+    },
+		// 删除
+    deleteHandle(id, name) {
+      this.$confirm(`是否确认删除物料名称为${name}的数据项?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.urlOptions.deleteURL(id).then(({ data }) => {
+            this.$message({
+              message: "操作成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.getDataList();
+              },
+            });
+          });
+        })
+        .catch(() => { });
    }
 	},
 };