瀏覽代碼

reactor:质检模板至少保留一个质检项;

zhangchong 1 年之前
父節點
當前提交
82e25d734e

+ 1 - 1
src/views/auxiliary/notice/component/Notice-add.vue

@@ -199,7 +199,7 @@
 </template>
 
 <script setup lang="tsx" name="noticeDetail">
-import { reactive, ref, defineAsyncComponent, computed, unref, FunctionalComponent, Ref } from 'vue';
+import { reactive, ref, defineAsyncComponent, computed, unref, FunctionalComponent } from 'vue';
 import '@wangeditor/editor/dist/css/style.css'; // 引入 css
 import { bulletinAdd, bulletinAddBaseData, circularAdd, circularAddBaseData, getAllUsers } from '/@/api/auxiliary/notice';
 import { throttle } from '/@/utils/tools';

+ 5 - 1
src/views/quality/template/components/Template-add.vue

@@ -56,7 +56,7 @@
 				<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 					<el-form-item label="扣分值"> {{ item.grade }} <span class="ml5">分</span> </el-form-item>
 				</el-col>
-				<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" v-if="index != 0">
+				<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 					<el-form-item label="">
 						<el-button link type="primary" @click="deleteProject(index)"> <SvgIcon name="ele-Delete" /> </el-button>
 					</el-form-item>
@@ -144,6 +144,10 @@ const changeProject = (item: any, index: number | string) => {
 };
 // 删除质检项
 const deleteProject = (index: number|string) => {
+  if (state.ruleForm.templateDetails.length === 1) {
+		ElMessage.warning('请至少保留一个质检项');
+		return;
+	}
 	ElMessageBox.confirm(`您确定要删除此质检项,是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',

+ 5 - 1
src/views/quality/template/components/Template-edit.vue

@@ -56,7 +56,7 @@
 				<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 					<el-form-item label="扣分值"> {{ item.grade }} <span class="ml5">分</span> </el-form-item>
 				</el-col>
-				<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" v-if="index != 0">
+				<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
 					<el-form-item label="">
 						<el-button link type="primary" @click="deleteProject(index)"> <SvgIcon name="ele-Delete" /> </el-button>
 					</el-form-item>
@@ -184,6 +184,10 @@ const getEnableAcceptType = () => {
 };
 // 删除质检项
 const deleteProject = (index: number | string) => {
+  if (state.ruleForm.templateDetails.length === 1) {
+    ElMessage.warning('请至少保留一个质检项');
+    return;
+  }
 	ElMessageBox.confirm(`您确定要删除此质检项,是否继续?`, '提示', {
 		confirmButtonText: '确认',
 		cancelButtonText: '取消',

+ 11 - 3
src/views/system/menu/index.vue

@@ -51,7 +51,7 @@
 	</div>
 </template>
 
-<script lang="ts" setup name="systemMenu">
+<script setup lang="ts" name="systemMenu">
 import {defineAsyncComponent, h, onMounted, reactive, ref, watch} from 'vue';
 import {RouteRecordRaw} from 'vue-router';
 import type {FormInstance} from 'element-plus';
@@ -81,10 +81,18 @@ const state = reactive({
 			title: '菜单名称',
 			width: 300,
 			cellRenderer: (data: any) => {
-				return h('p', { style: { display:'flex',alignItems:'center' } }, [
+
+      return
+       /* (
+          <p style="display: flex;align-items: center;">
+            <MenuSvgIcon name={data.rowData.icon} />
+            <span class="pl5">{data.rowData.pageName}</span>
+          <p/>
+      )*/
+/*				return h('p', { style: { display:'flex',alignItems:'center' } }, [
 					h(MenuSvgIcon, { name: data.rowData.icon }, ''),
 					h('span', { class: 'pl5' }, { default: () => data.rowData.pageName }),
-				]);
+				]);*/
 			},
 		},
 		{

+ 11 - 14
src/views/todo/urge/index.vue

@@ -62,7 +62,7 @@
 				<el-table-column label="操作" width="160" fixed="right" align="center">
 					<template #default="{ row }">
 						<el-button link type="primary" @click="onDetail(row)" title="查看工单详情"> 催办详情 </el-button>
-						<order-detail :order="row.order" @updateList="queryList"/>
+						<order-detail :order="row.order" @updateList="queryList" />
 					</template>
 				</el-table-column>
 				<template #empty>
@@ -108,19 +108,16 @@ const state = reactive(<any>{
 });
 /** 获取列表 */
 const queryList = throttle(() => {
-	if (!auth('todo:urge:query')) ElMessage.error('抱歉,您没有权限查看工单催办待办列表!');
-	else {
-		state.loading = true;
-		urgeList(state.queryParams)
-			.then((res: any) => {
-				state.tableData = res.result?.items ?? [];
-				state.total = res.result?.total ?? 0;
-				state.loading = false;
-			})
-			.catch((err: any) => {
-				state.loading = false;
-			});
-	}
+	state.loading = true;
+	urgeList(state.queryParams)
+		.then((res: any) => {
+			state.tableData = res.result?.items ?? [];
+			state.total = res.result?.total ?? 0;
+			state.loading = false;
+		})
+		.catch((err: any) => {
+			state.loading = false;
+		});
 }, 300);
 
 /** 重置按钮操作 */