Эх сурвалжийг харах

reactor:消息通知对接;

zhangchong 1 жил өмнө
parent
commit
6c5cc2aa39

+ 4 - 4
src/layout/navBars/breadcrumb/userNews.vue

@@ -1,6 +1,6 @@
 <template>
-	<div class="layout-navbars-breadcrumb-user-news">
-		<el-popover placement="bottom" v-model:visible="visible" trigger="click" popper-class="layout-navbars-breadcrumb-user-news" transition="el-zoom-in-top" :width="300" :persistent="false">
+	<div class="layout-navBars-breadcrumb-user-news">
+		<el-popover placement="bottom" v-model:visible="visible" trigger="click" popper-class="layout-navBars-breadcrumb-user-news" transition="el-zoom-in-top" :width="300" :persistent="false">
 			<template #reference>
 				<el-badge :value="messageCount" :max="99" :hidden="messageHidden">
 					<SvgIcon name="ele-Bell" size="18px" />
@@ -53,7 +53,7 @@ const messageHidden = computed(() => {
 // 获取数量
 const getNumAndList = async ()=>{
   try {
-    const [megcountRes,muqueryRes] = await Promise.all([megcount(),muquery({circularState:2,IsRead:false})])
+    const [megcountRes,muqueryRes] = await Promise.all([megcount(),muquery({circularState:2,IsRead:false,PageIndex:1,PageSize:999})])
     messageCount.value = megcountRes.result?.personCount+megcountRes.result?.orgCount;
     state.newsList = muqueryRes.result?.items ?? [];
   }catch (e) {
@@ -98,7 +98,7 @@ onMounted(()=>{
 </script>
 
 <style lang="scss">
-.layout-navbars-breadcrumb-user-news {
+.layout-navBars-breadcrumb-user-news {
 	.head-box {
 		display: flex;
 		border-bottom: 1px solid var(--el-border-color-lighter);

+ 0 - 63
src/utils/tools.ts

@@ -115,69 +115,6 @@ export function fileType(file: string): string {
             return 'ele-Document';
     }
 }
-/**
- * @description 阿拉伯数字转大写,整数转大写
- * @returns
- * @param {string | number} num 需要转换的数字
- * @param {string} type
- * @returns {string | number} 返回转换后的数字
- */
-export function uppercaseNumber(num: string | number, type:string = ''):number | string {
-    if (!num) return 0
-    const strNum = Number((num + '').replace(/[,,]*/g, '')) + '' // 记录字符
-    num = parseInt(strNum) // 转为整数,
-    let capitalAr = '零一二三四五六七八九十'
-    let unitAr = ['十', '百', '千', '万', '十', '百', '千', '亿', '十', '百', '千']
-    if (type) {
-        capitalAr = '零壹贰叁肆伍陆柒捌玖拾'
-        unitAr = ['拾', '佰', '仟', '万', '拾', '佰', '仟', '亿', '拾', '佰', '仟'] // 单位
-    }
-    const resultAr = <EmptyArrayType>[] // 记录结果,后边json.in就可
-    let index = strNum.length - 1 //记录位数
-    let idx = 0 // 记录单位
-    let percent = 10
-    const turnNum = (num: number, percent: number, index: number) => {
-        const unit = num / percent
-        const capital = capitalAr[Number(strNum[index])]
-        if (unit < 1) {
-            resultAr.push(capital)
-            // 出现11【一十一】这种情况
-            if (Number(strNum[index]) === 1 && (strNum.length === 2 || strNum.length === 6 || strNum.length === 10)) {
-                resultAr.pop()
-            }
-            return false //结束递归
-        } else {
-            if (capital === '零') {
-                // 万和亿单位不删除
-                if (!['万', '亿'].includes(resultAr[resultAr.length - 1])) {
-                    resultAr.pop()
-                }
-                // 前面有零在删掉一个零
-                if (resultAr[resultAr.length - 1] === '零') {
-                    resultAr.pop()
-                }
-            }
-            resultAr.push(capital)
-            // 过滤存在【零万】【零亿】这种情况
-            if (['万', '亿'].includes(resultAr[resultAr.length - 2]) && capital === '零') {
-                resultAr.pop()
-            }
-            // 过滤【1亿万】这种情况
-            if (resultAr[0] === '万' && resultAr[1] === '亿') {
-                resultAr.shift()
-            }
-            // 末尾【零】删掉
-            if (resultAr[0] === '零') {
-                resultAr.pop()
-            }
-            resultAr.push(unitAr[idx++])
-            turnNum(num, percent * 10, --index)
-        }
-    }
-    turnNum(num, percent, index)
-    return resultAr.reverse().join('')
-}
-
 /**
  * @description 生成guid
  * @returns {string} 返回guid

+ 1 - 2
src/views/quality/index/components/Quality-inspection.vue

@@ -164,7 +164,7 @@ const openDialog = async (row: any, source?: string | number | undefined) => {
   qualityId.value = row.id;
 	if (source) {
     state.source = source;
-		const { result } = await templateList({ IsEnable: 1, Grouping: source });
+		const { result } = await templateList({ IsEnable: 1, Grouping: source,PageIndex:1,PageSize:999 });
 		projectArray.value = result?.items[0]?.templateDetails ?? [];
 		switch (source) {
 			case 1:
@@ -231,7 +231,6 @@ const onAddItem = () => {
 // 选择扣分项
 const changeProject = (val: any) => {
 	const item = projectArray.value.filter((v: any) => v.name === val)[0];
-  console.log(item,'21')
 	state.ruleItemForm.grade = item.grade;
 	state.ruleItemForm.content = item.content;
 	getEnableAcceptType();

+ 102 - 111
src/views/quality/project/components/Project-add.vue

@@ -1,138 +1,129 @@
 <template>
-  <el-dialog title="新增质检项" v-model="state.dialogVisible" width="769px" draggable @close="close">
-    <el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px">
-      <el-row :gutter="10">
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="质检项名称" prop="name" :rules="[{ required: true, message: '请输入质检项名称', trigger: 'blur' }]">
-            <el-input v-model="state.ruleForm.name" placeholder="请输入质检项名称" clearable></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="质检项分组" prop="groupingName" :rules="[{ required: true, message: '请选择质检项分组', trigger: 'change' }]">
-            <el-select v-model="state.ruleForm.groupingName" placeholder="请选择质检项分组" class="w100">
-              <el-option v-for="item in props.qualityItemGrouping" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="质检项分值" prop="grade" :rules="[{ required: true, message: '请输入质检项分值', trigger: 'blur' }]">
-            <el-input-number
-                v-model="state.ruleForm.grade"
-                :precision="0"
-                :min="1"
-                :max="100"
-                placeholder="请输入质检项分值"
-            />
-            <span class="ml10">分</span>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="是否智能质检" prop="isIntelligent" :rules="[{ required: false, message: '请选择是否智能质检', trigger: 'change' }]">
-            <el-switch
-                v-model="state.ruleForm.isIntelligent"
-                inline-prompt
-                active-text="是"
-                inactive-text="否"
-                :active-value="1"
-                :inactive-value="0"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="是否启用" prop="isEnable" :rules="[{ required: false, message: '请选择是否启用性', trigger: 'change' }]">
-            <el-switch
-                v-model="state.ruleForm.isEnable"
-                inline-prompt
-                active-text="是"
-                inactive-text="否"
-                :active-value="1"
-                :inactive-value="0"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-          <el-form-item label="质检项描述" prop="describe" :rules="[{ required: false, message: '请输入质检项描述', trigger: 'blur' }]">
-            <el-input v-model="state.ruleForm.describe" placeholder="请输入质检项描述" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-				<span class="dialog-footer">
-					<el-button @click="closeDialog" class="default-button">取 消</el-button>
-					<el-button type="primary" @click="onSubmit(ruleFormRef)" :loading="state.loading">确 定 </el-button>
-				</span>
-    </template>
-  </el-dialog>
+	<el-dialog title="新增质检项" v-model="state.dialogVisible" width="769px" draggable @close="close">
+		<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px">
+			<el-row :gutter="10">
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="质检项名称" prop="name" :rules="[{ required: true, message: '请输入质检项名称', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.name" placeholder="请输入质检项名称" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="质检项分组" prop="groupingName" :rules="[{ required: true, message: '请选择质检项分组', trigger: 'change' }]">
+						<el-select v-model="state.ruleForm.groupingName" placeholder="请选择质检项分组" class="w100">
+							<el-option v-for="item in props.qualityItemGrouping" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="质检项分值" prop="grade" :rules="[{ required: true, message: '请输入质检项分值', trigger: 'blur' }]">
+						<el-input-number v-model="state.ruleForm.grade" :precision="0" :min="1" :max="100" placeholder="请输入质检项分值" />
+						<span class="ml10">分</span>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="是否智能质检" prop="isIntelligent" :rules="[{ required: false, message: '请选择是否智能质检', trigger: 'change' }]">
+						<el-switch
+							v-model="state.ruleForm.isIntelligent"
+							inline-prompt
+							active-text="是"
+							inactive-text="否"
+							:active-value="1"
+							:inactive-value="0"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="是否启用" prop="isEnable" :rules="[{ required: false, message: '请选择是否启用性', trigger: 'change' }]">
+						<el-switch v-model="state.ruleForm.isEnable" inline-prompt active-text="是" inactive-text="否" :active-value="1" :inactive-value="0" />
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+					<el-form-item label="质检项描述" prop="describe" :rules="[{ required: false, message: '请输入质检项描述', trigger: 'blur' }]">
+						<el-input
+							v-model="state.ruleForm.describe"
+							placeholder="请输入质检项描述"
+							type="textarea"
+							:autosize="{ minRows: 4, maxRows: 8 }"
+						></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="closeDialog" class="default-button">取 消</el-button>
+				<el-button type="primary" @click="onSubmit(ruleFormRef)" :loading="state.loading">确 定 </el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="qualityProjectAdd">
-import {reactive, ref} from 'vue';
-import {ElInput, ElMessage, FormInstance} from 'element-plus';
-import {projectAdd} from '/@/api/quality/project';
+import { reactive, ref } from 'vue';
+import { ElInput, ElMessage, FormInstance } from 'element-plus';
+import { projectAdd } from '/@/api/quality/project';
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
 
 const props = defineProps({
-  qualityItemGrouping: {
-    type: Array,
-    default: () => [],
-  }
-})
-
+	qualityItemGrouping: {
+		type: Array,
+		default: () => [],
+	},
+});
 
 // 定义变量内容
 const ruleFormRef = ref<FormInstance>();
 const state = reactive<any>({
-  dialogVisible: false, // 弹窗显示隐藏
-  ruleForm: {
-    name: '', // 质检项名称
-    groupingName: '', // 质检项分组
-    grade: 1, // 质检项分值
-    isIntelligent: 0, // 是否智能质检
-    isEnable: 1, // 是否启用
-    describe: '', // 质检项描述
-  },
-  loading: false, // 确定按钮loading
+	dialogVisible: false, // 弹窗显示隐藏
+	ruleForm: {
+		name: '', // 质检项名称
+		groupingName: '', // 质检项分组
+		grade: 1, // 质检项分值
+		isIntelligent: 0, // 是否智能质检
+		isEnable: 1, // 是否启用
+		describe: '', // 质检项描述
+	},
+	loading: false, // 确定按钮loading
 });
 
 // 打开弹窗
 const openDialog = async () => {
-  state.dialogVisible = true;
+	state.dialogVisible = true;
 };
 // 关闭弹窗
 const closeDialog = () => {
-  state.dialogVisible = false;
+	state.dialogVisible = false;
+};
+const close = () => {
+	ruleFormRef.value?.clearValidate();
+	ruleFormRef.value?.resetFields();
 };
-const close = ()=>{
-  ruleFormRef.value?.clearValidate();
-  ruleFormRef.value?.resetFields();
-}
 // 新增
 const onSubmit = (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
-  formEl.validate((valid: boolean) => {
-    if (!valid) return;
-    state.loading = true;
-    const request = {
-      ...state.ruleForm
-    }
-    projectAdd(request)
-        .then(() => {
-          emit('updateList');
-          closeDialog(); // 关闭弹窗
-          ElMessage.success('操作成功');
-          state.loading = false;
-        })
-        .catch(() => {
-          emit('updateList');
-          state.loading = false;
-        });
-  });
+	if (!formEl) return;
+	formEl.validate((valid: boolean) => {
+		if (!valid) return;
+		state.loading = true;
+		const request = {
+			...state.ruleForm,
+		};
+		projectAdd(request)
+			.then(() => {
+				emit('updateList');
+				closeDialog(); // 关闭弹窗
+				ElMessage.success('操作成功');
+				state.loading = false;
+			})
+			.catch(() => {
+				emit('updateList');
+				state.loading = false;
+			});
+	});
 };
 // 暴露变量
 defineExpose({
-  openDialog,
-  closeDialog,
+	openDialog,
+	closeDialog,
 });
 </script>

+ 108 - 118
src/views/quality/project/components/Project-edit.vue

@@ -1,145 +1,135 @@
 <template>
-  <el-dialog title="编辑质检项" v-model="state.dialogVisible" width="769px" draggable @close="close">
-    <el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px">
-      <el-row :gutter="10">
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="质检项名称" prop="name" :rules="[{ required: true, message: '请输入质检项名称', trigger: 'blur' }]">
-            <el-input v-model="state.ruleForm.name" placeholder="请输入质检项名称" clearable></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="质检项分组" prop="groupingName" :rules="[{ required: true, message: '请选择质检项分组', trigger: 'change' }]">
-            <el-select v-model="state.ruleForm.groupingName" placeholder="请选择质检项分组" class="w100">
-              <el-option v-for="item in props.qualityItemGrouping" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="质检项分值" prop="grade" :rules="[{ required: true, message: '请输入质检项分值', trigger: 'blur' }]">
-            <el-input-number
-                v-model="state.ruleForm.grade"
-                :precision="0"
-                :min="1"
-                :max="100"
-                placeholder="请输入质检项分值"
-            />
-            <span class="ml10">分</span>
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="是否智能质检" prop="isIntelligent" :rules="[{ required: false, message: '请选择是否智能质检', trigger: 'change' }]">
-            <el-switch
-                v-model="state.ruleForm.isIntelligent"
-                inline-prompt
-                active-text="是"
-                inactive-text="否"
-                :active-value="1"
-                :inactive-value="0"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-          <el-form-item label="是否启用" prop="isEnable" :rules="[{ required: false, message: '请选择是否启用性', trigger: 'change' }]">
-            <el-switch
-                v-model="state.ruleForm.isEnable"
-                inline-prompt
-                active-text="是"
-                inactive-text="否"
-                :active-value="1"
-                :inactive-value="0"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
-          <el-form-item label="质检项描述" prop="describe" :rules="[{ required: false, message: '请输入质检项描述', trigger: 'blur' }]">
-            <el-input v-model="state.ruleForm.describe" placeholder="请输入质检项描述" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-				<span class="dialog-footer">
-					<el-button @click="closeDialog" class="default-button">取 消</el-button>
-					<el-button type="primary" @click="onSubmit(ruleFormRef)" :loading="state.loading">确 定 </el-button>
-				</span>
-    </template>
-  </el-dialog>
+	<el-dialog title="编辑质检项" v-model="state.dialogVisible" width="769px" draggable @close="close">
+		<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="110px">
+			<el-row :gutter="10">
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="质检项名称" prop="name" :rules="[{ required: true, message: '请输入质检项名称', trigger: 'blur' }]">
+						<el-input v-model="state.ruleForm.name" placeholder="请输入质检项名称" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="质检项分组" prop="groupingName" :rules="[{ required: true, message: '请选择质检项分组', trigger: 'change' }]">
+						<el-select v-model="state.ruleForm.groupingName" placeholder="请选择质检项分组" class="w100">
+							<el-option v-for="item in props.qualityItemGrouping" :value="item.dicDataValue" :key="item.dicDataValue" :label="item.dicDataName" />
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="质检项分值" prop="grade" :rules="[{ required: true, message: '请输入质检项分值', trigger: 'blur' }]">
+						<el-input-number v-model="state.ruleForm.grade" :precision="0" :min="1" :max="100" placeholder="请输入质检项分值" />
+						<span class="ml10">分</span>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="是否智能质检" prop="isIntelligent" :rules="[{ required: false, message: '请选择是否智能质检', trigger: 'change' }]">
+						<el-switch
+							v-model="state.ruleForm.isIntelligent"
+							inline-prompt
+							active-text="是"
+							inactive-text="否"
+							:active-value="1"
+							:inactive-value="0"
+						/>
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-form-item label="是否启用" prop="isEnable" :rules="[{ required: false, message: '请选择是否启用性', trigger: 'change' }]">
+						<el-switch v-model="state.ruleForm.isEnable" inline-prompt active-text="是" inactive-text="否" :active-value="1" :inactive-value="0" />
+					</el-form-item>
+				</el-col>
+				<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+					<el-form-item label="质检项描述" prop="describe" :rules="[{ required: false, message: '请输入质检项描述', trigger: 'blur' }]">
+						<el-input
+							v-model="state.ruleForm.describe"
+							placeholder="请输入质检项描述"
+							type="textarea"
+							:autosize="{ minRows: 4, maxRows: 8 }"
+						></el-input>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="closeDialog" class="default-button">取 消</el-button>
+				<el-button type="primary" @click="onSubmit(ruleFormRef)" :loading="state.loading">确 定 </el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="qualityProjectEdit">
-import {reactive, ref} from 'vue';
-import {ElInput, ElMessage, FormInstance} from 'element-plus';
-import {projectDetail,projectUpdate} from '/@/api/quality/project'
+import { reactive, ref } from 'vue';
+import { ElInput, ElMessage, FormInstance } from 'element-plus';
+import { projectDetail, projectUpdate } from '/@/api/quality/project';
 // 定义子组件向父组件传值/事件
 const emit = defineEmits(['updateList']);
 
 const props = defineProps({
-  qualityItemGrouping: {
-    type: Array,
-    default: () => [],
-  }
-})
-
+	qualityItemGrouping: {
+		type: Array,
+		default: () => [],
+	},
+});
 
 // 定义变量内容
 const ruleFormRef = ref<FormInstance>();
 const state = reactive<any>({
-  dialogVisible: false, // 弹窗显示隐藏
-  ruleForm: {
-    name: '', // 质检项名称
-    groupingName: '', // 质检项分组
-    grade: 1, // 质检项分值
-    isIntelligent: 0, // 是否智能质检
-    isEnable: 1, // 是否启用
-    describe: '', // 质检项描述
-  },
-  loading: false, // 确定按钮loading
+	dialogVisible: false, // 弹窗显示隐藏
+	ruleForm: {
+		name: '', // 质检项名称
+		groupingName: '', // 质检项分组
+		grade: 1, // 质检项分值
+		isIntelligent: 0, // 是否智能质检
+		isEnable: 1, // 是否启用
+		describe: '', // 质检项描述
+	},
+	loading: false, // 确定按钮loading
 });
 
 // 打开弹窗
 const openDialog = async (row: any) => {
-  try {
-    const res = await projectDetail(row.id);
-    state.ruleForm = res.result ?? {};
-    state.dialogVisible = true;
-  }catch (e) {
-    console.log(e);
-  }
-
+	try {
+		const res = await projectDetail(row.id);
+		state.ruleForm = res.result ?? {};
+		state.dialogVisible = true;
+	} catch (e) {
+		console.log(e);
+	}
 };
 // 关闭弹窗
 const closeDialog = () => {
-  state.dialogVisible = false;
+	state.dialogVisible = false;
+};
+const close = () => {
+	ruleFormRef.value?.clearValidate();
+	ruleFormRef.value?.resetFields();
 };
-const close = ()=>{
-  ruleFormRef.value?.clearValidate();
-  ruleFormRef.value?.resetFields();
-}
 // 保存
 const onSubmit = (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
-  formEl.validate((valid: boolean) => {
-    if (!valid) return;
-    state.loading = true;
-    const request = {
-      ...state.ruleForm
-    }
-    projectUpdate(request)
-        .then(() => {
-          emit('updateList');
-          closeDialog(); // 关闭弹窗
-          ElMessage.success('操作成功');
-          state.loading = false;
-        })
-        .catch(() => {
-          emit('updateList');
-          state.loading = false;
-        });
-  });
+	if (!formEl) return;
+	formEl.validate((valid: boolean) => {
+		if (!valid) return;
+		state.loading = true;
+		const request = {
+			...state.ruleForm,
+		};
+		projectUpdate(request)
+			.then(() => {
+				emit('updateList');
+				closeDialog(); // 关闭弹窗
+				ElMessage.success('操作成功');
+				state.loading = false;
+			})
+			.catch(() => {
+				emit('updateList');
+				state.loading = false;
+			});
+	});
 };
 // 暴露变量
 defineExpose({
-  openDialog,
-  closeDialog,
+	openDialog,
+	closeDialog,
 });
 </script>

+ 11 - 11
src/views/quality/project/index.vue

@@ -32,10 +32,10 @@
 				<el-table-column prop="describe" label="质检项描述" show-overflow-tooltip width="130"></el-table-column>
 				<el-table-column prop="groupingName" label="质检项分组" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="type" label="是否智能质检" show-overflow-tooltip>
-          <template #default="{ row }">
-            {{row.isIntelligent === 1 ? '是' : '否'}}
-          </template>
-        </el-table-column>
+					<template #default="{ row }">
+						{{ row.isIntelligent === 1 ? '是' : '否' }}
+					</template>
+				</el-table-column>
 				<el-table-column prop="grade" label="分值(分)" show-overflow-tooltip></el-table-column>
 				<el-table-column label="是否启用" show-overflow-tooltip>
 					<template #default="{ row }">
@@ -47,10 +47,10 @@
 							active-text="启用"
 							inactive-text="禁用"
 							@change="changeIsEnable(row)"
-              v-if="auth('quality:project:edit')"
+							v-if="auth('quality:project:edit')"
 						/>
-            <span v-else>{{ row.isEnable === 1 ? '启用' : '禁用' }}</span>
-					</template >
+						<span v-else>{{ row.isEnable === 1 ? '启用' : '禁用' }}</span>
+					</template>
 				</el-table-column>
 				<el-table-column prop="creatorName" label="创建人" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="creationTime" label="创建时间" show-overflow-tooltip width="170">
@@ -202,12 +202,12 @@ const changeIsEnable = (row: any) => {
 					queryList();
 				})
 				.catch(() => {
-          queryList();
-        });
+					queryList();
+				});
 		})
 		.catch(() => {
-      queryList();
-    });
+			queryList();
+		});
 };
 // 页面加载时
 onMounted(() => {

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

@@ -109,10 +109,9 @@ const projectArray = ref<EmptyArrayType>([]); // 质检项
 // 打开弹窗
 const openDialog = async () => {
 	try {
-		const res = await projectList({  IsEnable: 1 });
+		const res = await projectList({  IsEnable: 1,PageIndex:1,PageSize:999 });
 		projectArray.value = res.result?.items ?? [];
 		state.dialogVisible = true;
-    console.log(state.ruleForm)
 	} catch (e) {
 		console.log(e);
 	}

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

@@ -117,7 +117,7 @@ const openDialog = async (row: any) => {
 				i.obj = { ...i };
 			}
 		}
-		const response = await projectList({  IsEnable: 1 });
+		const response = await projectList({  IsEnable: 1,PageIndex:1,PageSize:999 });
 		projectArray.value = response.result?.items ?? [];
 		state.dialogVisible = true;
 	} catch (e) {