Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-03-19 e9352432fd356691e8322af7a79781983f9932f9

Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

 src/components/do/b1-ins-order/add.vue

@@ -220,7 +220,7 @@
                <el-table-column label="操作" width="65" align="center">
                    <template slot-scope="scope">
                        {{scope.index}}
                        <el-button type="text" size="small" @click="sampleList.splice(scope.$index, 1)" :disabled="active!=1">删除</el-button>
                        <el-button type="text" size="small" @click="delSampleAndProduct" :disabled="active!=1">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -848,6 +848,10 @@
          this.sampleList = obj.sampleList;
                })
      },
      delSampleAndProduct(){
        this.sampleList.splice(scope.$index, 1)
        this.productList = []
      }
        }
    }
</script>

 src/components/tool/value-table.vue

@@ -76,7 +76,7 @@
                </el-table-column>
                <el-table-column type="index" align="center" label="序号" width="70" v-if="data.isIndex" :key="Math.random()">
                </el-table-column>
                <el-table-column :prop="a.label" :label="a.value" sortable="custom" v-for="(a, ai) in tableHead" :key="ai"
                <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" v-for="(a, ai) in tableHead" :key="ai"
         show-overflow-tooltip min-width="160">
                    <template slot-scope="scope">
                        <div v-if="showType(a.label, data.tagField) != null">

 src/components/view/b1-inspect-order-plan.vue

@@ -177,6 +177,7 @@
                    isIndex: true,
                    showSelect: false,
                    select: false,
                    sort: false,
                    do: [{
                            id: '',
                            font: '检验',

 src/components/view/b1-inspection-order.vue

@@ -241,7 +241,7 @@
                        type: 'text',
                        method: 'download',
                        disabFun: (row, index) => {
                            return row.state != 1
                            return row.state != 1 || row.reportId == null
                        }
                    }, {
                        id: 'verify',
@@ -255,7 +255,10 @@
                        id: 'quash',
                        font: '撤销',
                        type: 'text',
                        method: 'handlEquash'
                        method: 'handlEquash',
                        disabFun: (row, index) => {
                            return row.state == 2 || row.state == 3
                        }
                    }, {
                        font: '下发',
                        type: 'text',

 src/components/view/b2-standard.vue

@@ -99,7 +99,7 @@
            </el-row>
            <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }"
                node-key="label" :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current
                @node-expand="nodeOpen" @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="false" :default-expanded-keys="expandedKeys">
                @node-expand="nodeOpen" @node-collapse="nodeClose" v-loading="treeLoad" :expand-on-click-node="true" :default-expanded-keys="expandedKeys">
                <div class="custom-tree-node" slot-scope="{ node, data }">
                    <el-row>
                        <el-col :span="21">
@@ -465,9 +465,10 @@
                    this.list = res.data
                    this.list.forEach(a=>{
                        a.children.forEach(b=>{
                            b.children.forEach(c=>{
                            /* b.children.forEach(c=>{
                                this.expandedKeys.push(c.label)
                            })
                            }) */
                            this.expandedKeys.push(b.label)
                        })
                    })
                    this.treeLoad = false

 src/view/index.vue

@@ -230,7 +230,7 @@
    }

    .right_key_menu {
        width: 120px;
        width: 130px;
        position: absolute;
        top: 0;
        left: 0;
@@ -249,7 +249,7 @@
    }

    .right_key_menu li i {
        margin-right: 14px;
        margin-right: 10px;
    }

    .right_key_menu li:hover {
@@ -329,6 +329,7 @@
                    <ul>
                        <li @click="removeTab(activeIndex)"><i class="el-icon-close"></i>关闭</li>
                        <li @click="allDel"><i class="el-icon-delete"></i>关闭所有</li>
                        <li @click="rightDel(activeIndex)"><i class="el-icon-d-arrow-right"></i>关闭右侧页签</li>
                        <el-divider></el-divider>
                        <li @click="refreshTable"><i class="el-icon-refresh"></i>刷新</li>
                    </ul>
@@ -428,6 +429,13 @@
                let data = this.tabs[this.tabs.length - 1]
                this.upTabActive(data.k)
            },
            rightDel(index){
                for (var i = this.tabs.length - 1; i > index; i--) {
                    this.tabs.splice(i, 1);
                }
                let data = this.tabs[this.tabs.length - 1]
                this.upTabActive(data.k)
            },
            allDel() {
                this.activeBox = 0
                this.activeP = 0