diff --git a/src/config/index.js b/src/config/index.js
index d59b0eb5..d669a5b7 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -6,7 +6,7 @@ const DEFAULT_CONFIG = {
DASHBOARD_URL: "/dashboard",
//版本号
- APP_VER: "2.7.2025082515",
+ APP_VER: "2.7.2025092816",
//内核版本号
CORE_VER: "1.6.9",
diff --git a/src/utils/enum.js b/src/utils/enum.js
index 2aa1b961..c7acbd90 100644
--- a/src/utils/enum.js
+++ b/src/utils/enum.js
@@ -239,5 +239,5 @@ export const interveneTypeEnum = new EnumFactory({
})
export const mCateEnum = new EnumFactory({
- 'list': ['主要辅材','办公辅料','设备维护辅料','包装辅材','标识辅材','防护辅材','其他辅材','常规辅材','医护辅材','检测辅材','倒角辅材','减薄辅材','磨抛辅材','多线切辅材','精雕辅材','扫边辅材','黑化辅材']
+ 'list': ['主要辅材','办公辅材','设备维护辅材','包装辅材','标识辅材','防护辅材','其他辅材','常规辅材','医护辅材','检测辅材','倒角辅材','减薄辅材','磨抛辅材','多线切辅材','精雕辅材','扫边辅材','黑化辅材']
})
\ No newline at end of file
diff --git a/src/views/inm/good_mio.vue b/src/views/inm/good_mio.vue
index 61c79520..904fee4f 100644
--- a/src/views/inm/good_mio.vue
+++ b/src/views/inm/good_mio.vue
@@ -113,7 +113,8 @@
v-auth="'mio.submit'"
v-if="scope.row.state == 10"
>
- 提交
+ 接收
+ 提交
-
+
上一步
- 提交
+ 确定
+ 提交
@@ -522,6 +523,12 @@ export default {
// that.$emit("closed");
});
},
+ table_submit_in(){
+ let that = this;
+ that.$emit('closed')
+ that.$message.success("保存成功");
+ that.visible = false;
+ },
submitOut() {},
//打印
handlePrint(){
diff --git a/src/views/wpm_gx/inmrecord.vue b/src/views/wpm_gx/inmrecord.vue
index 685b9820..31fde791 100644
--- a/src/views/wpm_gx/inmrecord.vue
+++ b/src/views/wpm_gx/inmrecord.vue
@@ -121,7 +121,7 @@
type="primary"
@click="table_submit(scope.row)"
v-auth="'mio.submit'"
- v-if="scope.row.state == 10"
+ v-if="scope.row.state == 10&&scope.row.type!=='do_in'"
>
提交