合并

src/views/formalities/formalitiesAreConsolidated/index.vue

@@ -90,14 +90,7 @@
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
                 >修改</el-button
               >
-              <el-button
+              <el-button link type="primary" icon="Upload" @click="handleUpload(scope.row)">上传</el-button>
-                link
-                type="primary"
-                icon="Upload"
-                @click="handleUpload(scope.row)"
-                v-hasPermi="['formalities:formalitiesAreConsolidated:edit']"
-                >上传</el-button
-              >
               <el-button
                 link
                 type="primary"

src/views/materials/appointment/index.vue

@@ -6,7 +6,14 @@
         <h2 class="text-2xl font-bold flex items-center"><i class="el-icon-user-circle mr-3"></i>人员配置</h2>
         <p class="text-blue-100 mt-2 opacity-90">请配置采购专员信息</p>
         <!-- ，带 <span class="text-red-300">*</span> 为必填项 -->
-        <el-button @click="isDisabled = false" class="px-8 py-2.5 transition-all duration-300 font-medium" v-if="isDisabled"> 点击编辑 </el-button>
+        <el-button
+          @click="isDisabled = false"
+          class="px-8 py-2.5 transition-all duration-300 font-medium"
+          v-if="isDisabled"
+          v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
+        >
+          点击编辑
+        </el-button>
       </div>
 
       <!-- 表单内容区域 -->
@@ -31,6 +38,7 @@
             @click="submitForm"
             icon="Check"
             class="px-8 py-2.5 transition-all duration-300 transform hover:scale-105 bg-blue-500 hover:bg-blue-600 text-white font-medium"
+            v-hasPermi="['cailiaoshebei:purchaseUser:addOrUpdate']"
           >
             确认提交
           </el-button>

src/views/materials/batchPlan/index.vue

@@ -7,10 +7,26 @@
           <template #header>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5" :offset="0"
-                ><el-button type="primary" size="default" @click="handleAdd" icon="FolderAdd" plain>新增</el-button></el-col
+                ><el-button
+                  type="primary"
+                  v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']"
+                  size="default"
+                  @click="handleAdd"
+                  icon="FolderAdd"
+                  plain
+                  >新增</el-button
+                ></el-col
               >
               <el-col :span="1.5" :offset="0"
-                ><el-button type="danger" size="default" @click="handleDeleteBatch" icon="FolderDelete" plain>删除</el-button></el-col
+                ><el-button
+                  type="danger"
+                  size="default"
+                  v-hasPermi="['cailiaoshebei:batchPlan:remove']"
+                  @click="handleDeleteBatch"
+                  icon="FolderDelete"
+                  plain
+                  >删除</el-button
+                ></el-col
               >
             </el-row>
           </template>
@@ -159,17 +175,7 @@
 </template>
 
 <script setup name="Cailiaoshebei" lang="ts">
-import {
+import { getCailiaoshebei, updateCailiaoshebei, listBatch, getBatch, delBatch, listSelectCailiaoshebei } from '@/api/materials/batchPlan';
-  listCailiaoshebei,
-  getCailiaoshebei,
-  delCailiaoshebei,
-  addCailiaoshebei,
-  updateCailiaoshebei,
-  listBatch,
-  getBatch,
-  delBatch,
-  listSelectCailiaoshebei
-} from '@/api/materials/batchPlan';
 import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
 import { useUserStoreHook } from '@/store/modules/user';
 
@@ -374,23 +380,6 @@ const handleUpdata = () => {
   dialog.title = '修改物资-需求';
 };
 
-/** 提交按钮 */
-const submitForm = async () => {
-  buttonLoading.value = true;
-  cailiaoshebeiList.value.forEach((item) => {
-    if (item.id) {
-      delete item.id;
-    }
-  });
-  await addCailiaoshebei({
-    addDataList: cailiaoshebeiList.value,
-    batchNumber: form.value.batchNumber,
-    projectId: currentProject.value?.id
-  } as any).finally(() => (buttonLoading.value = false));
-  proxy?.$modal.msgSuccess('操作成功');
-  dialog.visible = false;
-};
-
 /** 提交数据 */
 const submitTransferForm = async () => {
   const result = validateAndClean(form.value.planList);