diff --git a/src/api/system/noticeGroup.js b/src/api/system/noticeGroup.js
new file mode 100644
index 00000000..fd900c7e
--- /dev/null
+++ b/src/api/system/noticeGroup.js
@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询通知公告-班组列表
+export function listNoticeGroup(query) {
+ return request({
+ url: '/system/noticeGroup/list',
+ method: 'get',
+ params: query
+ });
+}
+
+// 查询通知公告-班组详细
+export function getNoticeGroup(id) {
+ return request({
+ url: '/system/noticeGroup/' + id,
+ method: 'get'
+ });
+}
+
+// 新增通知公告-班组
+export function addNoticeGroup(data) {
+ return request({
+ url: '/system/noticeGroup',
+ method: 'post',
+ data: data
+ });
+}
+
+// 修改通知公告-班组
+export function updateNoticeGroup(data) {
+ return request({
+ url: '/system/noticeGroup',
+ method: 'put',
+ data: data
+ });
+}
+
+// 删除通知公告-班组
+export function delNoticeGroup(data) {
+ return request({
+ url: '/system/noticeGroup/delNoticeGroup',
+ method: 'post',
+ data: data
+ });
+}
+
+export function teamBind(data) {
+ return request({
+ url: '/system/noticeGroup/teamBind',
+ method: 'post',
+ data: data
+ });
+}
+
diff --git a/src/api/wms/product.js b/src/api/wms/product.js
index 9a8a974d..fb3c99bd 100644
--- a/src/api/wms/product.js
+++ b/src/api/wms/product.js
@@ -55,3 +55,21 @@ export function delProduct(productId) {
method: 'delete'
});
}
+
+// 修改物料附属信息
+export function updateProductAttached(data) {
+ return request({
+ url: '/wms/attached',
+ method: 'put',
+ data: data
+ });
+}
+
+// 新增物料附属信息
+export function addProductAttached(data) {
+ return request({
+ url: '/wms/attached',
+ method: 'post',
+ data: data
+ });
+}
diff --git a/src/views/system/notice/TeamBind.vue b/src/views/system/notice/TeamBind.vue
new file mode 100644
index 00000000..c2909d8b
--- /dev/null
+++ b/src/views/system/notice/TeamBind.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.teamType == "team_type1" ? "生产班组" : "检验班组" }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 19e25a00..c0b12b93 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -66,6 +66,17 @@
v-hasPermi="['system:notice:remove']"
>删除
+
+ 班组绑定
+
@@ -125,56 +136,62 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{dict.label}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{dict.label}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 5b00c479..839c3377 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -62,6 +62,18 @@
>修改
+
+ 新增/修改附属属性
+
同步物料工艺
+ >同步物料工艺
@@ -420,93 +432,120 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{
- form.productCode
- }}
- {{
- form.productDescZh
- }}
-
- {{
- form.productGroup
- }}
- {{
- form.productGroupName
- }}
- {{
- form.mtart
- }}
- {{
- form.reportRate
- }}
- {{
- form.category
- }}
- {{
- form.pc
- }}
- {{
- form.iei
- }}
- {{
- form.manStandar
- }}
- {{
- form.sprayWay
- }}
- {{
- form.blankDiameter
- }}
- {{
- form.blankNo
- }}
- {{
- form.sprayVolume
- }}
- {{
- form.liquidNo
- }}
- {{
- form.endometrialDosage
- }}
- {{
- form.outerFilmDosage
- }}
- {{
- form.support
- }}
- {{
- form.supportNo
- }}
- {{
- form.pvc
- }}
- {{
- form.supportPlate
- }}
- {{
- form.other
- }}
-
+ {{
+ form.productGroup
+ }}
+ {{
+ form.productGroupName
+ }}
+ {{
+ form.mtart
+ }}
+ {{
+ form.reportRate
+ }}
+ {{
+ form.category
+ }}
+ {{
+ form.pc
+ }}
+ {{
+ form.iei
+ }}
+ {{
+ form.manStandar
+ }}
+ {{
+ form.sprayWay
+ }}
+ {{
+ form.blankDiameter
+ }}
+ {{
+ form.blankNo
+ }}
+ {{
+ form.sprayVolume
+ }}
+ {{
+ form.liquidNo
+ }}
+ {{
+ form.endometrialDosage
+ }}
+ {{
+ form.outerFilmDosage
+ }}
+ {{
+ form.support
+ }}
+ {{
+ form.supportNo
+ }}
+ {{
+ form.pvc
+ }}
+ {{
+ form.supportPlate
+ }}
+ {{
+ form.other
+ }}
+
@@ -519,6 +558,8 @@ import {
delProduct,
addProduct,
updateProduct,
+ updateProductAttached,
+ addProductAttached,
} from "@/api/wms/product";
import { syncProductSAP } from "@/api/technology/proroute";
@@ -537,7 +578,7 @@ export default {
loading: true,
// 选中数组
ids: [],
- productCodes:[],
+ productCodes: [],
// 非单个禁用
single: true,
// 非多个禁用
@@ -552,6 +593,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ openAttachedView: false,
openAttached: false,
// 查询参数
queryParams: {
@@ -637,14 +679,22 @@ export default {
this.open = false;
this.reset();
},
- // 取消按钮
- cancelAttached() {
+ // 查看取消按钮
+ cancelAttachedView() {
+ this.openAttachedView = false;
+ this.reset();
+ },
+ // 更新附属表取消按钮
+ cancelOpenAttached() {
this.openAttached = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
+ id: null,
+ iei: null,
+ manStandar: null,
productId: null,
productCode: null,
productDescZh: null,
@@ -704,7 +754,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.productId);
- this.productCodes = selection.map(item => item.productCode)
+ this.productCodes = selection.map((item) => item.productCode);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@@ -724,16 +774,18 @@ 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.openAttachedView = true;
this.title = "查看产品信息";
});
},
+
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
@@ -754,6 +806,49 @@ export default {
}
});
},
+
+ /** 修改按钮操作 */
+ handleUpdateAttached(row) {
+ this.reset();
+ const productId = row.productId || this.ids;
+ getProduct(productId).then((response) => {
+ this.form.id = response.data.id;
+ this.form.iei = response.data.iei;
+ this.form.manStandar = response.data.manStandar;
+ this.form.productCode = response.data.productCode.slice(7,18);
+ console.log(this.form.productCode);
+ this.openAttached = true;
+ if(this.form.id == null){
+ this.title = "新增产品附属信息";
+ }else{
+ this.title = "修改产品附属信息";
+ }
+ });
+ },
+
+ /** 提交按钮 */
+ submitAttachedForm() {
+ this.$refs["form"].validate((valid) => {
+ console.log(this.form);
+ if (valid) {
+ if (this.form.id != null) {
+ console.log(this.form);
+ updateProductAttached(this.form).then((response) => {
+ this.$modal.msgSuccess("修改产品附属信息成功");
+ this.openAttached = false;
+ this.getList();
+ });
+ }else {
+ addProductAttached(this.form).then((response) => {
+ this.$modal.msgSuccess("新增产品附属信息成功");
+ this.openAttached = false;
+ this.getList();
+ });
+ }
+ }
+ });
+ },
+
/** 删除按钮操作 */
handleDelete(row) {
const productIds = row.productId || this.ids;
@@ -781,10 +876,10 @@ export default {
);
},
/**选择产品进行工艺同步**/
- handleSyncProductSAP(){
+ handleSyncProductSAP() {
const productCodes = this.productCodes;
return syncProductSAP(productCodes);
- }
+ },
},
};
diff --git a/src/views/wms/productputrecords/index.vue b/src/views/wms/productputrecords/index.vue
index 70e30b72..ed7b8ae0 100644
--- a/src/views/wms/productputrecords/index.vue
+++ b/src/views/wms/productputrecords/index.vue
@@ -177,29 +177,29 @@
-
-
-
-
-
-
-
- 修改
- 删除
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-->
-
-
- 修改
-
- 删除
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 修改
-
- 删除
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+