Merge remote-tracking branch 'origin/master_hella' into master_hella

src/components/Detail/src/Detail.vue

@@ -110,16 +110,18 @@
                 :annexData="annexData"
                 @handleAnnexSuccess="handleAnnexSuccess"
                 @deleteAnnexSuccess="deleteAnnexSuccess"
-                :upData="remarksData.data"
+                :upData="remarksData.data" 
+                :key="count"
               />
             <!-- 备注组件 -->
             <Remarks v-show="tabsList[current].label=='备注'"
               :remarksData="remarksData"
               class="mt-20px"
               @remarksSubmitScuess="remarksSubmitScuess"
+              :key="count"
             />
             <!-- 变更记录组件 -->
-            <ChangeRecord v-show="tabsList[current].label=='变更记录'" :changeRecordData="changeRecordData" class="mt-20px" />
+            <ChangeRecord v-show="tabsList[current].label=='变更记录'" :changeRecordData="changeRecordData" class="mt-20px"  :key="count"/>
           </ElScrollbar> 
         </ContentWrap>
       </div>
@@ -362,7 +364,6 @@ const otherList = [...props.annexTable,{
     label:'变更记录',
     prop:'ChangeRecord'
 }]
-
 tabsList.value = [...tabsList?.value,...otherList]
 
 if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) {
@@ -498,6 +499,7 @@ const searchTableFormType = ref('') // 表单的类型：create - 新增；updat
 const formRef = ref()
 const titleNameRef = ref()
 const titleValueRef = ref()
+const count  =ref(0)
 const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
   titleNameRef.value = titleName
   titleValueRef.value = titleValue
@@ -505,6 +507,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     tableId: row.id,
     tableName: tableName
   }
+  count.value++
   // 加载明细列表
   if (!props.isBasic) {
     // 设置主表id

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

@@ -64,13 +64,6 @@ export const AqlRules = reactive({
 })
 const samplingSchemeList = await getSamplingScheme()
 export const Aql = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isTable: false,
-    isForm: false,
-  },
   {
     label: '采样方案编码',
     field: 'code',

src/views/qms/inspectionMethod/inspectionMethod.data.ts

@@ -3,18 +3,10 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const InspectionMethodRules = reactive({
-  // available: [required],
   description: [required],
 })
 
 export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isTable: false,
-    isForm: false,
-  },
   {
     label: '编码',
     field: 'code',

src/views/qms/sampleCode/sampleCode.data.ts

@@ -13,13 +13,6 @@ export const SampleCodeRules = reactive({
 })
 const samplingSchemeList = await getSamplingScheme()
 export const SampleCode = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isTable: false,
-    isForm: false,
-  },
   {
     label: '采样方案编码',
     field: 'code',

src/views/qms/samplingProcess/samplingProcess.data.ts

@@ -5,18 +5,10 @@ import { dateFormatter } from '@/utils/formatTime'
 export const SamplingProcessRules = reactive({
   sampleType: [required],
   evaluationMode: [required],
-  // available: [required],
   description: [required],
 })
 
 export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isTable: false,
-    isForm: false,
-  },
   {
     label: '编码',
     field: 'code',

src/views/qms/samplingScheme/samplingScheme.data.ts

@@ -3,18 +3,10 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const SamplingSchemeRules = reactive({
-  // available: [required],
   description: [required],
 })
 
 export const SamplingScheme = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: 'id',
-    field: 'id',
-    sort: 'custom',
-    isTable: false,
-    isForm: false,
-  },
   {
     label: '编码',
     field: 'code',