Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/qms/aql/index.ts

@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 export interface AqlVO {
   id: number
-  sampleProgCode: string
+  code: string
   inspectionQualification: string
   sampleCharacterCode: string
   sampleSize: number

src/components/Detail/src/DetailQmsCode.vue

@@ -699,7 +699,6 @@ const openForm = async (type: string, row?: number) => {
 }
 // form 提交
 const submitForm = async (formType, data) => {
-  debugger
   try {
     // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
     const rs = (await props.detailValidate) ? await props.detailValidate(data) : true

src/views/qms/aql/aql.data.ts

@@ -3,7 +3,7 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const AqlRules = reactive({
-  sampleProgCode: [required],
+  code: [required],
   inspectionQualification: [required],
   sampleCharacterCode: [required],
   sampleSize: [required],
@@ -19,8 +19,8 @@ export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '编码',
-    field: 'sampleProgCode',
+    label: '采样方案编码',
+    field: 'code',
     sort: 'custom',
     isSearch: true,
   },

src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts

@@ -12,7 +12,10 @@ const trueFalse = [{
 
 // 表单校验
 export const DynamicRuleRules = reactive({
-  description: [required]
+  description: [
+    required,
+    { max: 1024, message: '不得超过1024个字符', trigger: 'blur' },
+  ]
 })
 
 export const DynamicRule = useCrudSchemas(reactive<CrudSchema[]>([

src/views/qms/basicDataManage/dynamicRule/index.vue

@@ -131,7 +131,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'qms:dynamic-rule:create'}), // 新增
   // defaultButtons.defaultImportBtn({hasPermi:'qms:dynamic-rule:import'}), // 导入
-  // defaultButtons.defaultExportBtn({hasPermi:'qms:dynamic-rule:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'qms:dynamic-rule:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置

src/views/system/dict/index.vue

@@ -12,7 +12,7 @@
       </el-form-item>
       <el-form-item label="字典分类" prop="classes">
         <el-select v-model="queryParams.classes" class="!w-240px" clearable placeholder="请选择字典分类">
-          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.DICTIONARY_CLASS)" :key="dict.value" :label="dict.label"
+          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.DICTIONARY_CLASS)" :key="dict.value" :label="dict.label"
           :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -96,7 +96,7 @@
 </template>
 
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions,getStrDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as DictTypeApi from '@/api/system/dict/dict.type'
 import DictTypeForm from './DictTypeForm.vue'