소스 검색

性能验证记录列表

zhonghuizhen 6 달 전
부모
커밋
f69658e64e
3개의 변경된 파일43개의 추가작업 그리고 20개의 파일을 삭제
  1. 1 1
      src/views/business/performance/myRecord.vue
  2. 39 18
      src/views/business/performance/record.vue
  3. 3 1
      src/views/business/performance/recordVerify.vue

+ 1 - 1
src/views/business/performance/myRecord.vue

@@ -253,7 +253,7 @@
           shiFouGuoShen: shiFouGuoShen
           shiFouGuoShen: shiFouGuoShen
         }
         }
         this.readonly = key === 'detail'
         this.readonly = key === 'detail'
-        this.showConfig = true // Ensure only experimentalView is opened
+        this.showConfig = true 
       },
       },
       handleReport(data) {
       handleReport(data) {
         console.log('wwww')
         console.log('wwww')

+ 39 - 18
src/views/business/performance/record.vue

@@ -22,7 +22,7 @@
         <div>止:{{ scope.row.jieShuShiJian }}</div>
         <div>止:{{ scope.row.jieShuShiJian }}</div>
       </template>
       </template>
     </ibps-crud>
     </ibps-crud>
-    <Experimental
+    <ExperimentalView
       v-if="showConfig"
       v-if="showConfig"
       :visible.sync="showConfig"
       :visible.sync="showConfig"
       :params="params"
       :params="params"
@@ -40,7 +40,7 @@ import FixHeight from '@/mixins/height'
 
 
 export default {
 export default {
   components: {
   components: {
-    Experimental: () => import('./experimental')
+    ExperimentalView: () => import('./experimentalView')
   },
   },
   mixins: [FixHeight],
   mixins: [FixHeight],
   data() {
   data() {
@@ -70,12 +70,24 @@ export default {
           forms: [
           forms: [
             // { prop: 'Q^name_^SL', label: '性能指标', fieldType: 'select', options: this.targetOption },
             // { prop: 'Q^name_^SL', label: '性能指标', fieldType: 'select', options: this.targetOption },
             // { prop: 'Q^fang_an_lei_xing_^SL', label: '方案类型', fieldType: 'select', options: this.methodOption },
             // { prop: 'Q^fang_an_lei_xing_^SL', label: '方案类型', fieldType: 'select', options: this.methodOption },
+            { prop: 'Q^shi_yan_xiang_mu_^SL', label: '实验项目' },
             { prop: 'Q^xing_neng_zhi_bia^SL', label: '性能指标' },
             { prop: 'Q^xing_neng_zhi_bia^SL', label: '性能指标' },
             { prop: 'Q^fang_an_lei_xing_^SL', label: '方案类型' },
             { prop: 'Q^fang_an_lei_xing_^SL', label: '方案类型' },
-            { prop: 'Q^shi_yan_xiang_mu_^SL', label: '实验项目' },
             { prop: 'Q^shi_yan_fang_fa_^SL', label: '实验方法' },
             { prop: 'Q^shi_yan_fang_fa_^SL', label: '实验方法' },
             { prop: 'Q^yang_ben_lei_xing^SL', label: '样本类型' },
             { prop: 'Q^yang_ben_lei_xing^SL', label: '样本类型' },
-            { prop: 'Q^shi_yan_yi_qi_^SL', label: '实验仪器' },
+            {
+                prop: 'Q^shi_fou_guo_shen_^SL',
+                label: '状态',
+                fieldType: 'select',
+                options: [
+                  { label: '已暂存', value: '已暂存' },
+                  { label: '已编制', value: '已编制' },
+                  { label: '已审核', value: '已审核' },
+                  { label: '已完成', value: '已完成' },
+                  { label: '已退回', value: '已退回' },
+                  { label: '已终止', value: '已终止' }
+                ]
+              },
             {
             {
               prop: ['Q^create_time_^DL', 'Q^create_time_^DG'],
               prop: ['Q^create_time_^DL', 'Q^create_time_^DG'],
               label: '创建时间',
               label: '创建时间',
@@ -121,13 +133,19 @@ export default {
         rowHandle: {
         rowHandle: {
           effect: 'display',
           effect: 'display',
           actions: [
           actions: [
+            /*
             {
             {
               key: 'edit',
               key: 'edit',
               label: '编辑',
               label: '编辑',
               type: 'primary',
               type: 'primary',
               icon: 'ibps-icon-edit'
               icon: 'ibps-icon-edit'
-            }
-            // { key: 'report', label: '实验报告', type: 'success', icon: 'ibps-icon-file-text-o' }
+            }*/
+            {
+                key: 'detail',
+                label: '查阅',
+                type: 'primary',
+                icon: 'ibps-icon-eye',
+              }
           ]
           ]
         }
         }
       }
       }
@@ -188,7 +206,7 @@ export default {
           ActionUtils.setFirstPagination(this.pagination)
           ActionUtils.setFirstPagination(this.pagination)
           this.search()
           this.search()
           break
           break
-        case 'edit':
+        case 'detail':
           this.handleEdit(data, command)
           this.handleEdit(data, command)
           break
           break
         case 'report':
         case 'report':
@@ -206,18 +224,21 @@ export default {
       }
       }
     },
     },
     /**
     /**
-     * 处理编辑
-     */
-    async handleEdit({ id, zhiBiaoId, fangFaId, fangFaKey }, key) {
-      this.params = {
-        targetId: zhiBiaoId,
-        methodId: fangFaId,
-        methodKey: fangFaKey,
-        recordId: id
-      }
-      this.readonly = key === 'detail'
-      this.showConfig = true
+      * 处理编辑\查阅
+    */
+    async handleEdit(data, key) {
+        const { id, zhiBiaoId, fangFaId, fangFaKey, shiFouGuoShen } = data || {}
+        this.params = {
+          targetId: zhiBiaoId,
+          methodId: fangFaId,
+          methodKey: fangFaKey,
+          recordId: id,
+          shiFouGuoShen: shiFouGuoShen
+        }
+        this.readonly = key === 'detail'
+        this.showConfig = true 
     },
     },
+
     handleReport(data) {
     handleReport(data) {
       console.log('wwww')
       console.log('wwww')
     },
     },

+ 3 - 1
src/views/business/performance/recordVerify.vue

@@ -69,7 +69,9 @@ export default {
       height: document.clientHeight,
       height: document.clientHeight,
       listData: [],
       listData: [],
       pagination: {},
       pagination: {},
-      sorts: {},
+      sorts: {
+        create_time_: "asc"
+      },
       searchFormData: {}, // 新增:为搜索表单创建独立的数据模型
       searchFormData: {}, // 新增:为搜索表单创建独立的数据模型
       showConfig: false,
       showConfig: false,
       readonly: false,
       readonly: false,