功能调整

李林

2024-02-29 f8fc7760fb9b40483a90869ce50676108e0e4073

功能调整

 src/components/tool/value-table.vue

@@ -30,6 +30,10 @@
        align-items: center;
        justify-content: center;
    }

    .body{
        overflow-x: hidden;
    }
</style>
<style>
    .value-table .el-upload {
@@ -46,7 +50,8 @@
        <div class="table">
            <el-table ref="eltable" :data="tableData" style="width: 100%;" height="100%" tooltip-effect="dark" border
                @selection-change="selectChange" @select="select" v-loading="loading" @sort-change="sortChange"
                @row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0" :summary-method="getSummaries">
                @row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
                :summary-method="getSummaries">
                <el-table-column type="selection" width="65" v-if="data.showSelect">
                </el-table-column>
                <el-table-column align="center" type="index" label="序号" width="70" v-if="data.isIndex">
@@ -76,43 +81,79 @@
                :total="total">
            </el-pagination>
        </div>
        <el-dialog title="编辑" :visible.sync="upDia" width="500px">
            <div class="body" v-if="upDia">
                <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
                    <el-col :span="6" style="text-align: right;">
                        <span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}：
                    </el-col>
                    <el-col :span="16" :offset="1">
                        <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`请输入${a.value}`"
                            v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
                        <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
                            style="width: 100%;" :disabled="isDisabled(a.label)">
                            <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                :label="b.label"></el-option>
                        </el-select>
                    </el-col>
                </el-row>
        <el-dialog title="编辑" :visible.sync="upDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'">
            <div class="body" v-if="upDia" style="max-height: 550px;overflow-y: auto;padding: 5px 0;">
                <div v-if="data.row > 1">
                    <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
                        <el-col :span="6/data.row" style="text-align: right;">
                            <span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}：
                        </el-col>
                        <el-col :span="16/data.row" :offset="1">
                            <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`请输入${a.value}`"
                                v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
                            <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
                                style="width: 100%;" :disabled="isDisabled(a.label)">
                                <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                    :label="b.label"></el-option>
                            </el-select>
                        </el-col>
                    </div>
                </div>
                <div v-else>
                    <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
                        <el-col :span="6" style="text-align: right;">
                            <span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}：
                        </el-col>
                        <el-col :span="16" :offset="1">
                            <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`请输入${a.value}`"
                                v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
                            <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
                                style="width: 100%;" :disabled="isDisabled(a.label)">
                                <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                    :label="b.label"></el-option>
                            </el-select>
                        </el-col>
                    </el-row>
                </div>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="upDia = false">取 æ¶ˆ</el-button>
                <el-button type="primary" @click="saveUpData" :loading="upLoad">ç¡® å®š</el-button>
            </span>
        </el-dialog>
        <el-dialog title="新增" :visible.sync="addDia" width="500px">
        <el-dialog title="新增" :visible.sync="addDia" :width="data.row==1?'500px':500+data.row * 200 + 'px'">
            <div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 0;">
                <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
                    <el-col :span="6" style="text-align: right;"><span class="required-span" v-if="showAddReq(a.label)">*
                        </span>{{a.value}}：</el-col>
                    <el-col :span="16" :offset="1">
                        <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`请输入${a.value}`"
                            v-if="showType(a.label, data.selectField) == null"></el-input>
                        <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
                            style="width: 100%;" :placeholder="`请选择${a.value}`">
                            <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                :label="b.label"></el-option>
                        </el-select>
                    </el-col>
                </el-row>
                <div v-if="data.row > 1">
                    <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
                        <el-col :span="6/data.row" style="text-align: right;"><span class="required-span"
                                v-if="showAddReq(a.label)">*
                            </span>{{a.value}}：</el-col>
                        <el-col :span="16/data.row" :offset="1">
                            <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`请输入${a.value}`"
                                v-if="showType(a.label, data.selectField) == null"></el-input>
                            <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
                                style="width: 100%;" :placeholder="`请选择${a.value}`">
                                <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                    :label="b.label"></el-option>
                            </el-select>
                        </el-col>
                    </div>
                </div>
                <div v-else>
                    <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
                        <el-col :span="6" style="text-align: right;"><span class="required-span" v-if="showAddReq(a.label)">*
                            </span>{{a.value}}：</el-col>
                        <el-col :span="16" :offset="1">
                            <el-input v-model="upData[a.label]" size="small" clearable :placeholder="`请输入${a.value}`"
                                v-if="showType(a.label, data.selectField) == null"></el-input>
                            <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
                                style="width: 100%;" :placeholder="`请选择${a.value}`">
                                <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
                                    :label="b.label"></el-option>
                            </el-select>
                        </el-col>
                    </el-row>
                </div>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="addDia = false">取 æ¶ˆ</el-button>
@@ -185,6 +226,7 @@
                        isIndex: true,
                        showSelect: true,
                        select: true,
                        row: 1,
                        do: [{
                            id: 'update',
                            font: '编辑',
@@ -225,6 +267,7 @@
                    isIndex: true,
                    showSelect: true,
                    select: true,
                    row: 1,
                    do: [{
                        font: '删除',
                        type: 'text'
@@ -372,7 +415,7 @@
                else if (val.method == 'doDiy') {
                    if (val.id == 'update') {
                        this.upDia = true,
                        this.upData = this.HaveJson(row)
                            this.upData = this.HaveJson(row)
                        this.upHead = this.HaveJson(this.tableHead)
                        this.upHead = this.upHead.filter(a => a.label != 'createTime' && a.label != 'updateTime')
                        delete this.upData.orderBy
@@ -634,13 +677,13 @@
                        return;
                    }
                    const values = data.map(item => Number(item[column.property]));
                    if(this.data.countFleid==undefined){
                    if (this.data.countFleid == undefined) {
                        sums[index] = ''
                        return
                    }
                    if (this.data.countFleid.filter(str=>{
                        return str === column.property
                    }).length > 0) {
                    if (this.data.countFleid.filter(str => {
                            return str === column.property
                        }).length > 0) {
                        sums[index] = values.reduce((prev, curr) => {
                            const value = Number(curr);
                            if (!isNaN(value)) {

 src/components/view/a5-capacity-scope.vue

ÎļþÃû´Ó src/components/view/5capacity-scope.vue ÐÞ¸Ä
@@ -131,6 +131,7 @@
                    isIndex: false,
                    showSelect: true,
                    select: true,
                    row: 2,
                    do: [{
                        id: 'update',
                        font: '编辑',
@@ -149,6 +150,9 @@
                        },
                        valueType: {
                            select: []
                        },
                        bsm:{
                            select: []
                        }
                    },
                    selectField: {
@@ -157,10 +161,13 @@
                        },
                        valueType: {
                            select: []
                        },
                        bsm:{
                            select: []
                        }
                    },
                    requiredAdd: ['inspectionItem', 'manHour', 'inspectionItemType', 'manHourGroup'],
                    requiredUp: ['inspectionItem', 'manHour', 'inspectionItemType', 'manHourGroup']
                    requiredAdd: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType'],
                    requiredUp: ['inspectionItem', 'manHour', 'inspectionItemType','inspectionItemClassify','laboratory','unit','method','price','manDay','deviceGroup','checkoutNumber','valueType']
                },
                testObjectData: {
                    entity: {
@@ -203,6 +210,7 @@
            this.testObjectDataEntityCopy = this.HaveJson(this.testObjectData.entity)
            this.selectEnumByCategory()
            this.selectEnumByCategoryForValue()
            this.selectEnumByCategoryForSpecial()
            this.getPower('0')
        },
        methods: {
@@ -255,6 +263,14 @@
                    this.itemParameterData.tagField.valueType.select = res.data
                })
            },
            selectEnumByCategoryForSpecial() {
                this.$axios.post(this.$api.enums.selectEnumByCategory, {
                    category: "特殊标识"
                }).then(res => {
                    this.itemParameterData.selectField.bsm.select = res.data
                    this.itemParameterData.tagField.bsm.select = res.data
                })
            },
            // æƒé™åˆ†é…
            getPower(radio) {
                let power = JSON.parse(sessionStorage.getItem('power'))

 src/components/view/system-log.vue

@@ -98,7 +98,6 @@
        },
        mounted() {
            this.entityCopy = this.HaveJson(this.componentData.entity)
            this.getPower()
        },
        methods: {
            refreshTable() {
@@ -110,4 +109,4 @@
            }
        }
    }
</script>
</script>

 static/js/menu.js

@@ -238,7 +238,7 @@
        }, {
            v: "能力范围",
            i: "font icon-24gl-clipboardList",
            u: "5capacity-scope",
            u: "a5-capacity-scope",
            g: "C能力范围和资质",
            p: "selectItemParameterList selectTestObjectList"
        }, {