田源
2023-12-08 9b51b2a07769ee049937e16dd45d8c36c87dcc3c
主数据 枚举配置模板配置 参照配置表格显示问题处理
已修改2个文件
48 ■■■■ 文件已修改
Source/UBCS-WEB/src/components/Master/MasterTree.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -155,6 +155,7 @@
        page: this.currentPage,
        limit: this.pageSize,
      }).then(res => {
        // console.log('tab',res)
        this.loading = false;
        this.$emit('loading', this.loading)
        this.tableDataArray = res.data.data;
@@ -185,7 +186,7 @@
          List.forEach(item => {
            let columnItem = {
              label: item.title,
              prop: item.queryField,
              prop: item.field,
              // type: this.columnType[item.type],
              sortable: item.sort,
              width: item.minWidth
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -46,15 +46,15 @@
                <el-table-column v-if="tableData.length != 0" fixed label="序号" type="index" width="55">
                </el-table-column>
                <!--              生命周期-->
                <el-table-column v-for="(item,index) in lcstatusArray"
                                 v-if=" lcstatusArray.length >= 0 && !item.hidden"
                                 key="index" :show-overflow-tooltip="true" :sortable="item.sortable"
                                 :width="item.width" align="center" label="生命周期值"
                                 prop="lcstatus">
                  <template slot-scope="scope">
                    <span>{{ scope.row.lcstatus_text }}</span>
                  </template>
                </el-table-column>
<!--                <el-table-column v-for="(item,index) in lcstatusArray"-->
<!--                                 v-if=" lcstatusArray.length >= 0 && !item.hidden"-->
<!--                                 key="index" :show-overflow-tooltip="true" :sortable="item.sortable"-->
<!--                                 :width="item.width" align="center" label="生命周期值"-->
<!--                                 prop="lcstatus">-->
<!--                  <template slot-scope="scope">-->
<!--                    <span>{{ scope.row.lcstatus_text }}</span>-->
<!--                  </template>-->
<!--                </el-table-column>-->
                <!--              编号-->
                <el-table-column v-for="(item, index) in CodeArray" v-if="CodeArray.length !== 0 && !item.hidden"
                                 key="index" :label="item.label" :prop="item.prop"
@@ -67,26 +67,27 @@
                  </template>
                </el-table-column>
                <el-table-column v-for="item in this.tableHeadFindData"
                                 v-if="!item.hidden && item.prop !== 'id' && item.prop !== 'lcstatus' && Object.keys(item.referConfig).length <= 0"
                                 v-if="!item.hidden && item.prop !== 'id'"
                                 :key="item.id"
                                 :formatter="item.formatter"
                                 :label="item.label" :prop="item.prop"
                                 :label="item.label"
                                 :prop="item.prop"
                                 :show-overflow-tooltip="true"
                                 :sortable="item.sortable"
                                 :width="item.width"
                                 align="center">
                </el-table-column>
                <!--               参照数据-->
                <el-table-column v-for="(item,index) in referArray"
                                 v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"
                                 :key="index"
                                 :label="item.title" :show-overflow-tooltip="true"
                                 :sortable="item.sortable" :width="item.width" align="center"
                                 prop="jiliangdw">
                  <template slot-scope="scope">
                    <span>{{ scope.row.jiliangdwname }}</span>
                  </template>
                </el-table-column>
<!--                <el-table-column v-for="(item,index) in referArray"-->
<!--                                 v-if="item.referConfig && Object.keys(item.referConfig).length > 0 && !item.hidden"-->
<!--                                 :key="index"-->
<!--                                 :label="item.title" :show-overflow-tooltip="true"-->
<!--                                 :sortable="item.sortable" :width="item.width" align="center"-->
<!--                                 :prop="item.prop">-->
<!--                  <template slot-scope="scope">-->
<!--                    <span>{{ scope.row[item.showField] }}</span>-->
<!--                  </template>-->
<!--                </el-table-column>-->
              </el-table>
            </div>
          </el-row>
@@ -411,6 +412,7 @@
    },
    tableDataArray: {
      handler(newval, oldval) {
        // console.log('tableData',newval)
        this.tableData = newval;
        this.searchResults = newval
        this.doLayout();
@@ -418,6 +420,7 @@
    },
    tableHeadFindData: {
      handler(newval, oldval) {
        // console.log(newval)
        newval.forEach((record, _index) => {
          if (record.queryField == 'id' && validatenull(record.templet)) {
            //企业编码的默认添加超链接,暂未实现