diff --git a/hb_client/src/layout/components/Sidebar/Logo.vue b/hb_client/src/layout/components/Sidebar/Logo.vue
index 7121590..6e262bd 100644
--- a/hb_client/src/layout/components/Sidebar/Logo.vue
+++ b/hb_client/src/layout/components/Sidebar/Logo.vue
@@ -24,7 +24,7 @@ export default {
},
data() {
return {
- title: 'Django Vue Admin',
+ title: '航玻生产管理系统',
logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
}
}
diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue
index a7c9e23..9e9a3c3 100644
--- a/hb_client/src/views/inm/warehouse.vue
+++ b/hb_client/src/views/inm/warehouse.vue
@@ -26,7 +26,7 @@
新增设备新增仓库
diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue
index 34cb5ff..64f2d16 100644
--- a/hb_client/src/views/mtm/productprocess.vue
+++ b/hb_client/src/views/mtm/productprocess.vue
@@ -2,7 +2,12 @@
-
+
+
+ 产品列表
+
-
-
+
@@ -50,11 +54,15 @@
-
+
-
-
+
+ 工艺流程
+
+
@@ -268,8 +276,9 @@
{{ scope.row.step_.name }}
-
-
+
+
+
-
-
-
+
+
@@ -34,11 +38,6 @@
- 查看
-
+
- 取消
+ 取消
确认
+
+
+
+
+
+
+
+
+ 过程记录表
+
+ 新增
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
+
+
+
+ 记录字段
+
+ 新增
+
+
+
+
+ {{ options_[scope.row.field_type] }}
+
+
+
+ {{ scope.row.field_name }}
+
+
+
+ {{ scope.row.field_key }}
+
+
+ {{ scope.row.boolean_field_display }}
+
+
+ {{ scope.row.field_choice }}
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hb_client/src/views/mtm/stepdo.vue b/hb_client/src/views/mtm/stepdo.vue
index e613d63..30f7aa6 100644
--- a/hb_client/src/views/mtm/stepdo.vue
+++ b/hb_client/src/views/mtm/stepdo.vue
@@ -3,10 +3,10 @@
- {{step.name}}
- {{step.number}}
+ {{stepDO.name}}
+ {{stepDO.number}}
- {{item.name}}
@@ -37,7 +37,7 @@
>
-
+
{{ scope.row.name }}
@@ -158,11 +158,7 @@
-
-
-
-
-
@@ -220,6 +216,11 @@
确认
+
+
+
+
+
@@ -241,9 +242,12 @@ const defaultfield = {
};
export default {
components: { vueJsonEditor },
+ name: "stepdo",
+
+ props: ["stepid"],
data() {
return {
- step:"",
+ stepDO:"",
recordform: defaultrecordform,
field: defaultfield,
dialogType: "new",
@@ -328,7 +332,9 @@ export default {
};
},
computed: {},
- watch: {},
+ watch: {
+
+ },
created() {
this.getStepD();
@@ -339,9 +345,10 @@ export default {
checkPermission,
getStepD()
{
- getStep(this.$route.params.id).then((response) => {
+
+ getStep(this.stepid).then((response) => {
if (response.data) {
- this.step = response.data;
+ this.stepDO = response.data;
}
});
@@ -354,7 +361,7 @@ export default {
},
recordformLists()
{
- this.listQueryrecordform.step=this.$route.params.id;
+ this.listQueryrecordform.step=this.stepid;
getrecordformList(this.listQueryrecordform).then((response) => {
if (response.data) {
this.recordformList = response.data;
@@ -439,7 +446,7 @@ export default {
if (valid) {
const isEdit = this.dialogType === "edit";
if (isEdit) {
- this.recordform.step=this.$route.params.id
+ this.recordform.step=this.stepid
updaterecordform(this.recordform.id, this.recordform).then((res) => {
if (res.code >= 200) {
@@ -449,7 +456,7 @@ export default {
}
});
} else {
- this.recordform.step=this.$route.params.id
+ this.recordform.step=this.stepid
createrecordform(this.recordform).then((res) => {
if (res.code >= 200) {
diff --git a/hb_client/src/views/procurement/vendor.vue b/hb_client/src/views/procurement/vendor.vue
index 7ce21e2..b81b43d 100644
--- a/hb_client/src/views/procurement/vendor.vue
+++ b/hb_client/src/views/procurement/vendor.vue
@@ -95,7 +95,7 @@