From 93ce8553a5509fbaa71ad420f339fd879961e122 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 18 二月 2025 17:31:25 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/standard/standardLibrary/index.vue | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/views/standard/standardLibrary/index.vue b/src/views/standard/standardLibrary/index.vue
index c30d290..ff3c615 100644
--- a/src/views/standard/standardLibrary/index.vue
+++ b/src/views/standard/standardLibrary/index.vue
@@ -575,11 +575,19 @@
></el-table-column>
<el-table-column label="鎿嶄綔" prop="section" width="160">
<template slot-scope="scope">
- <el-button type="text" @click="sectionUp(scope.row)"
+ <el-button
+ type="text"
+ @click="sectionUp(scope.row)"
+ :disabled="
+ !checkPermi(['standard:standardLibrary:upStandardProduct'])
+ "
>鍖洪棿璁剧疆</el-button
>
<el-button
type="text"
+ :disabled="
+ !checkPermi(['standard:standardLibrary:upStandardProduct'])
+ "
@click="bindSupplierDensitySecond(scope.row)"
>缁戝畾鍘傚</el-button
>
@@ -756,12 +764,19 @@
></el-button>
</span>
</el-dialog>
- <!-- <bindSupplierDensityDialogAsk v-if="bindSupplierDensityDialog"
- :bindSupplierDensityDialog="bindSupplierDensityDialog"
- :currentRow="currentSupplierDensityRow"
- @closeBindPartDialog="closeBindSupplierDensityDialog"></bindSupplierDensityDialogAsk> -->
- <!-- <BatchCopy v-if="batchCopyDia" ref="BatchCopy" :selectTree1="selectTree"
- :standardId="standardId" @refreshList="refreshList"></BatchCopy> -->
+ <bindSupplierDensityDialogAsk
+ v-if="bindSupplierDensityDialog"
+ :bindSupplierDensityDialog="bindSupplierDensityDialog"
+ :currentRow="currentSupplierDensityRow"
+ @closeBindPartDialog="closeBindSupplierDensityDialog"
+ ></bindSupplierDensityDialogAsk>
+ <BatchCopy
+ v-if="batchCopyDia"
+ ref="BatchCopy"
+ :selectTree1="selectTree"
+ :standardId="standardId"
+ @refreshList="refreshList"
+ ></BatchCopy>
</div>
</template>
@@ -790,16 +805,13 @@
getStandardTemplate,
selectStandardProductByMethodId,
selectStandardProductEnumByMethodId,
- resetTreeOfPrice,
- resetTreeOfHour,
} from "@/api/standard/standardLibrary";
-import { checkPermi } from "@/utils/permission"; // 鏉冮檺鍒ゆ柇鍑芥暟
-// import bindSupplierDensityDialogAsk from "../do/a5-capacity-scope/bindSupplierDensityDialogAsk.vue";
-// import BatchCopy from "../do/a5-capacity-scope/BatchCopy.vue";
+import bindSupplierDensityDialogAsk from "./components/bindSupplierDensityDialogAsk.vue";
+import BatchCopy from "./components/BatchCopy.vue";
export default {
components: {
- // BatchCopy,
- // bindSupplierDensityDialogAsk,
+ BatchCopy,
+ bindSupplierDensityDialogAsk,
draggable,
},
dicts: ["sys_factory", "sys_sub_lab", "sys_samp_type"],
@@ -889,7 +901,6 @@
};
},
methods: {
- checkPermi,
// 淇敼鏈�瀛愮骇鍚嶅瓧
editTreeName(info) {
this.updateDia = true;
--
Gitblit v1.9.3