From 6141e7a1aa4f6e6cf6085cbf3ed24d61cd54f2e9 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 15 一月 2026 10:32:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue | 4 ++--
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 2 +-
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue | 4 ++--
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 2 +-
src/store/modules/permission.js | 4 ++--
src/router/index.js | 8 ++++----
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 7cdaf7a..5934fcc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1057,7 +1057,7 @@
},
//#endregion
- //#region 瀹瑰櫒棰嗙敤閫�搴撳崟鍒楄〃
+ //#region 瀹瑰櫒鍏ュ簱鍗曞垪琛�
{
path: "/scMould/warehouse/Sc_MouldProdBackBillList",
component: Layout,
@@ -1074,13 +1074,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
name: "Sc_MouldProdBackBillList",
- meta: { title: "瀹瑰櫒棰嗙敤閫�搴撳崟缁存姢", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒鍏ュ簱鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 瀹瑰櫒棰嗙敤閫�搴撳崟
+ //#region 瀹瑰櫒鍏ュ簱鍗�
{
path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
component: Layout,
@@ -1096,7 +1096,7 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
name: "Sc_MouldProdBackBillEdit",
- meta: { title: "瀹瑰櫒棰嗙敤閫�搴撳崟缂栬緫", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒鍏ュ簱鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
],
},
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index d4cc6e6..923ec59 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1242,7 +1242,7 @@
icon: "build",
link: null,
noCache: false,
- title: "瀹瑰櫒棰嗙敤閫�搴撳崟缁存姢",
+ title: "瀹瑰櫒鍏ュ簱鍗曠淮鎶�",
},
component: () =>
import(
@@ -1257,7 +1257,7 @@
icon: "build",
link: null,
noCache: false,
- title: "瀹瑰櫒棰嗙敤閫�搴撳崟",
+ title: "瀹瑰櫒鍏ュ簱鍗�",
},
component: () =>
import(
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index a705dda..1870ecd 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -141,7 +141,7 @@
</el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-tickets" size="mini"
- @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝鍣ㄩ鐢ㄩ��搴撳崟锛�</el-button>
+ @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝鍣ㄥ叆搴撳崟锛�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
@@ -208,7 +208,7 @@
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<!-- 涓嬫帹 -->
- <el-dialog title="涓嬫帹瀹瑰櫒棰嗙敤閫�搴撳崟" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="涓嬫帹瀹瑰櫒鍏ュ簱鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
<push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
@editClose="pushClose" v-if="pushShow" />
</el-dialog>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index 1455ae6..368c309 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -7,7 +7,7 @@
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
- <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">瀹瑰櫒棰嗙敤閫�搴撳崟</div>
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">瀹瑰櫒鍏ュ簱鍗�</div>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index 1f23706..797cb34 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -192,7 +192,7 @@
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫瀹瑰櫒棰嗙敤閫�搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="缂栬緫瀹瑰櫒鍏ュ簱鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
diff --git a/src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue b/src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue
index 77324fd..8893229 100644
--- a/src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue
+++ b/src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue
@@ -137,7 +137,7 @@
</el-col>
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-tickets" size="mini"
- @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝鍣ㄩ鐢ㄩ��搴撳崟锛�</el-button>
+ @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝鍣ㄥ叆搴撳崟锛�</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
@@ -204,7 +204,7 @@
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<!-- 涓嬫帹 -->
- <el-dialog title="涓嬫帹瀹瑰櫒棰嗙敤閫�搴撳崟" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="涓嬫帹瀹瑰櫒鍏ュ簱鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
<push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
@editClose="pushClose" v-if="pushShow" />
</el-dialog>
--
Gitblit v1.9.1