瀏覽代碼

性能验证标准化修改指标名称为下拉框

zhonghuizhen 6 月之前
父節點
當前提交
59e25497b9

+ 13 - 1
src/views/business/performance/config.vue

@@ -51,7 +51,7 @@
                 prop="target"
                 prop="target"
                 :show-message="false"
                 :show-message="false"
               >
               >
-                <el-input
+               <!--<el-input
                   v-model="formData.target"
                   v-model="formData.target"
                   type="text"
                   type="text"
                   clearable
                   clearable
@@ -59,6 +59,15 @@
                   :maxlength="64"
                   :maxlength="64"
                   :disabled="readonly"
                   :disabled="readonly"
                   placeholder="请输入"
                   placeholder="请输入"
+                />--> 
+                <ibps-link-data
+                  v-model="formData.target"
+                  template-key="xnyzxnzbzly"
+                  placeholder="请选择"
+                  :disabled="readonly"
+                  :readonly="readonly"
+                
+                   style="width: 100%"
                 />
                 />
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
@@ -738,12 +747,15 @@ import 'codemirror/lib/codemirror.css'
 import 'codemirror/theme/eclipse.css'
 import 'codemirror/theme/eclipse.css'
 import 'codemirror/mode/xml/xml.js'
 import 'codemirror/mode/xml/xml.js'
 import 'codemirror/addon/selection/active-line.js'
 import 'codemirror/addon/selection/active-line.js'
+import IbpsLinkData from '@/business/platform/data/templaterender/link-data'
+
 export default {
 export default {
   components: {
   components: {
     IbpsAttachment: () =>
     IbpsAttachment: () =>
       import('@/business/platform/file/attachment/selector'),
       import('@/business/platform/file/attachment/selector'),
     IbpsUeditor: () => import('@/components/ibps-ueditor'),
     IbpsUeditor: () => import('@/components/ibps-ueditor'),
     FormulaPreview: () => import('./components/formula-preview'),
     FormulaPreview: () => import('./components/formula-preview'),
+    'ibps-link-data': IbpsLinkData,
     codemirror
     codemirror
   },
   },
   props: {
   props: {

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

@@ -21,16 +21,15 @@
           <div>起:{{ scope.row.kaiShiShiJian }}</div>
           <div>起:{{ scope.row.kaiShiShiJian }}</div>
           <div>止:{{ scope.row.jieShuShiJian }}</div>
           <div>止:{{ scope.row.jieShuShiJian }}</div>
         </template>
         </template>
-        <!--
+        
         <template slot="xingNengZhiBiaSearch">
         <template slot="xingNengZhiBiaSearch">
           <ibps-link-data
           <ibps-link-data
-            v-model="searchFormData['Q^xing_neng_zhi_bia^SL']"
+            v-model="xingNengZhiBiaoValue"
             template-key="xnyzxnzbzly"
             template-key="xnyzxnzbzly"
             placeholder="请选择"
             placeholder="请选择"
-            style="width: 100%"
+            style="width: 250px"
           />
           />
         </template>
         </template>
-        -->
       </ibps-crud>
       </ibps-crud>
       <ExperimentalView
       <ExperimentalView
         v-if="showConfig"
         v-if="showConfig"
@@ -76,6 +75,7 @@
         params: {},
         params: {},
         targetOption: [],
         targetOption: [],
         methodOption: [],
         methodOption: [],
+        xingNengZhiBiaoValue: '',
         listConfig: {
         listConfig: {
           toolbars: [{ key: 'search' }, { key: 'remove' }],
           toolbars: [{ key: 'search' }, { key: 'remove' }],
           searchForm: {
           searchForm: {
@@ -84,8 +84,7 @@
             forms: [
             forms: [
 
 
               { prop: 'Q^shi_yan_xiang_mu_^SL', label: '实验项目' },
               { prop: 'Q^shi_yan_xiang_mu_^SL', label: '实验项目' },
-              //{ prop: 'Q^xing_neng_zhi_bia^SL', label: '性能指标', fieldType: 'slot', slotName: 'xingNengZhiBiaSearch' },
-              { prop: 'Q^xing_neng_zhi_bia^SL', label: '性能指标' },
+              { prop: 'Q^xing_neng_zhi_bia^SL', label: '性能指标', fieldType: 'slot', slotName: 'xingNengZhiBiaSearch' },
               { prop: 'Q^fang_an_lei_xing_^SL', label: '方案类型' },
               { prop: 'Q^fang_an_lei_xing_^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: '样本类型' },
@@ -191,6 +190,7 @@
         const searchParam = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
         const searchParam = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
         const { userId } = this.$store.getters || {}
         const { userId } = this.$store.getters || {}
         searchParam['Q^create_by_^S'] = userId
         searchParam['Q^create_by_^S'] = userId
+        searchParam['Q^xing_neng_zhi_bia^SL'] = this.xingNengZhiBiaoValue
         return ActionUtils.formatParams(searchParam, this.pagination, this.sorts)
         return ActionUtils.formatParams(searchParam, this.pagination, this.sorts)
       },
       },
       /**
       /**

+ 17 - 5
src/views/business/performance/record.vue

@@ -21,6 +21,14 @@
         <div>起:{{ scope.row.kaiShiShiJian }}</div>
         <div>起:{{ scope.row.kaiShiShiJian }}</div>
         <div>止:{{ scope.row.jieShuShiJian }}</div>
         <div>止:{{ scope.row.jieShuShiJian }}</div>
       </template>
       </template>
+      <template slot="xingNengZhiBiaSearch">
+          <ibps-link-data
+            v-model="xingNengZhiBiaoValue"
+            template-key="xnyzxnzbzly"
+            placeholder="请选择"
+            style="width: 250px"
+          />
+        </template>
     </ibps-crud>
     </ibps-crud>
     <ExperimentalView
     <ExperimentalView
       v-if="showConfig"
       v-if="showConfig"
@@ -37,10 +45,12 @@
 import { queryExperimental, removeExperimental } from '@/api/business/pv'
 import { queryExperimental, removeExperimental } from '@/api/business/pv'
 import ActionUtils from '@/utils/action'
 import ActionUtils from '@/utils/action'
 import FixHeight from '@/mixins/height'
 import FixHeight from '@/mixins/height'
+import IbpsLinkData from '@/business/platform/data/templaterender/link-data'
 
 
 export default {
 export default {
   components: {
   components: {
-    ExperimentalView: () => import('./experimentalView')
+    ExperimentalView: () => import('./experimentalView'),
+    'ibps-link-data': IbpsLinkData
   },
   },
   mixins: [FixHeight],
   mixins: [FixHeight],
   data() {
   data() {
@@ -63,15 +73,15 @@ export default {
       params: {},
       params: {},
       targetOption: [],
       targetOption: [],
       methodOption: [],
       methodOption: [],
+      xingNengZhiBiaoValue: '',
       listConfig: {
       listConfig: {
         toolbars: [{ key: 'search' }, { key: 'remove' }],
         toolbars: [{ key: 'search' }, { key: 'remove' }],
         searchForm: {
         searchForm: {
           itemWidth: 250,
           itemWidth: 250,
           forms: [
           forms: [
-            // { 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^shi_yan_xiang_mu_^SL', label: '实验项目' },
             { 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^xing_neng_zhi_bia^SL', label: '性能指标', fieldType: 'slot', slotName: 'xingNengZhiBiaSearch' },
             { prop: 'Q^fang_an_lei_xing_^SL', label: '方案类型' },
             { prop: 'Q^fang_an_lei_xing_^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: '样本类型' },
@@ -171,8 +181,10 @@ export default {
      * 获取格式化参数
      * 获取格式化参数
      */
      */
     getSearchFormData() {
     getSearchFormData() {
+      const searchParam = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
+      searchParam['Q^xing_neng_zhi_bia^SL'] = this.xingNengZhiBiaoValue
       return ActionUtils.formatParams(
       return ActionUtils.formatParams(
-        this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {},
+        searchParam,
         this.pagination,
         this.pagination,
         this.sorts
         this.sorts
       )
       )

+ 6 - 7
src/views/business/performance/recordVerify.vue

@@ -21,16 +21,14 @@
         <div>起:{{ scope.row.kaiShiShiJian }}</div>
         <div>起:{{ scope.row.kaiShiShiJian }}</div>
         <div>止:{{ scope.row.jieShuShiJian }}</div>
         <div>止:{{ scope.row.jieShuShiJian }}</div>
       </template>
       </template>
-      <!--
       <template slot="xingNengZhiBiaSearch">
       <template slot="xingNengZhiBiaSearch">
         <ibps-link-data
         <ibps-link-data
-          v-model="searchFormData['Q^xing_neng_zhi_bia^SL']"
+          v-model="xingNengZhiBiaoValue"
           template-key="xnyzxnzbzly"
           template-key="xnyzxnzbzly"
           placeholder="请选择"
           placeholder="请选择"
-          style="width: 100%"
+          style="width: 250px"
         />
         />
       </template>
       </template>
-      -->
     </ibps-crud>
     </ibps-crud>
     <ExperimentalView
     <ExperimentalView
       v-if="showConfig"
       v-if="showConfig"
@@ -78,6 +76,7 @@ export default {
       params: {},
       params: {},
       targetOption: [],
       targetOption: [],
       methodOption: [],
       methodOption: [],
+      xingNengZhiBiaoValue: '',
       listConfig: {
       listConfig: {
         toolbars: [{ key: 'search' }, { key: 'remove' }],
         toolbars: [{ key: 'search' }, { key: 'remove' }],
         searchForm: {
         searchForm: {
@@ -85,8 +84,7 @@ export default {
           itemWidth: 250,
           itemWidth: 250,
           forms: [
           forms: [
             { prop: 'Q^shi_yan_xiang_mu_^SL', label: '实验项目' },
             { prop: 'Q^shi_yan_xiang_mu_^SL', label: '实验项目' },
-            //{ prop: 'Q^xing_neng_zhi_bia^SL', label: '性能指标', fieldType: 'slot', slotName: 'xingNengZhiBiaSearch' },
-            { prop: 'Q^xing_neng_zhi_bia^SL', label: '性能指标' },
+            { prop: 'Q^xing_neng_zhi_bia^SL', label: '性能指标', fieldType: 'slot', slotName: 'xingNengZhiBiaSearch' },
             { prop: 'Q^fang_an_lei_xing_^SL', label: '方案类型' },
             { prop: 'Q^fang_an_lei_xing_^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: '样本类型' },
@@ -179,7 +177,7 @@ export default {
      */
      */
      getSearchFormData() {
      getSearchFormData() {
       const searchParam = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
       const searchParam = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
-       
+      searchParam['Q^xing_neng_zhi_bia^SL'] = this.xingNengZhiBiaoValue
       const userRole = this.$store.getters.userInfo.role || []
       const userRole = this.$store.getters.userInfo.role || []
       const jsfzrFlag = userRole.some(role => role.alias === 'jsfzr') 
       const jsfzrFlag = userRole.some(role => role.alias === 'jsfzr') 
       const zcFlag = userRole.some(role => role.alias === 'zhsfzr') 
       const zcFlag = userRole.some(role => role.alias === 'zhsfzr') 
@@ -243,6 +241,7 @@ export default {
               value: searchParam[el]
               value: searchParam[el]
             })
             })
           })
           })
+
         }
         }
       }
       }
       const param = {
       const param = {