diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 47596a2e..f1b731cf 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -229,6 +229,137 @@
取 消
+
+
+
+
+ 主属性
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附属属性
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -261,6 +392,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ queryOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -330,6 +462,11 @@ export default {
this.open = false;
this.reset();
},
+ // 取消按钮
+ queryCancel() {
+ this.queryOpen = false;
+ this.reset();
+ },
// 表单重置
reset() {
this.form = {
@@ -406,9 +543,12 @@ export default {
handleView(row){
this.reset();
const equipmentId = row.equipmentId || this.ids;
+ getWorkCenterList().then(response =>{
+ console.log(this.options1);
+ });
getEquipment(equipmentId).then(response => {
this.form = response.data;
- this.open = true;
+ this.queryOpen = true;
this.title = "查看设备信息";
this.optType = "view";
});
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index a02e4ced..9483fac5 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -73,7 +73,15 @@
-
+
+
+ {{scope.row.productCode}}
+
+
@@ -286,6 +294,116 @@
取 消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -315,6 +433,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ openAttached: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -395,6 +514,11 @@ export default {
this.open = false;
this.reset();
},
+ // 取消按钮
+ cancelAttached() {
+ this.openAttached = false;
+ this.reset();
+ },
// 表单重置
reset() {
this.form = {
@@ -475,6 +599,16 @@ export default {
this.title = "修改产品信息";
});
},
+ // 查询明细按钮操作
+ handleView(row){
+ this.reset();
+ const productId = row.productId || this.ids
+ getProduct(productId).then(response => {
+ this.form = response.data;
+ this.openAttached = true;
+ this.title = "查看产品信息";
+ });
+ },
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/src/views/wms/shifts/index.vue b/src/views/wms/shifts/index.vue
index 3beb36cd..f1c11fb2 100644
--- a/src/views/wms/shifts/index.vue
+++ b/src/views/wms/shifts/index.vue
@@ -219,7 +219,13 @@ export default {
form: {},
// 表单校验
rules: {
- }
+ shiftCode: [
+ { required: true, message: "班次编码", trigger: "blur" }
+ ],
+ shiftDesc: [
+ { required: true, message: "班次名称", trigger: "blur" }
+ ]
+ }
};
},
created() {
diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue
index 23f15aba..4f974545 100644
--- a/src/views/wms/supplier/index.vue
+++ b/src/views/wms/supplier/index.vue
@@ -211,12 +211,12 @@
-
+
{{ scope.row.activeFlag == 1 ? "是" : "否" }}
-
+
diff --git a/src/views/wms/team/index.vue b/src/views/wms/team/index.vue
index de316987..4cdc712c 100644
--- a/src/views/wms/team/index.vue
+++ b/src/views/wms/team/index.vue
@@ -9,9 +9,9 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
+
{{ scope.row.teamType == "team_type1" ? "生产班组" : "检验班组" }}
@@ -134,8 +134,8 @@
-
-
+
+
@@ -168,7 +168,7 @@
-
+
@@ -313,7 +313,7 @@ export default {
teamCode: [
{ required: true, message: "班组编码不能为空", trigger: "blur" }
],
- teamDescGlobal: [
+ teamDesc: [
{ required: true, message: "班组名称不能为空", trigger: "blur" }
],
active: [