董国庆
2025-05-23 c1a3186cdd69d21166ce188ff0a058336a9671c0
化验师OA页面修改
5个文件已修改
438 ■■■■■ 已修改文件
laboratory/src/views/chemistQa/pilotAndProduction/index.vue 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
laboratory/src/views/chemistQa/productApproval/index.vue 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
laboratory/src/views/chemistQa/projectTesting/index.vue 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
laboratory/src/views/chemistQa/rawMaterials/index.vue 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
laboratory/src/views/dataManagement/approvalPlan/list.vue 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
laboratory/src/views/chemistQa/pilotAndProduction/index.vue
@@ -27,17 +27,18 @@
                </el-form>
            </template>
            <template #setting>
                <el-button @click="handleAddProject" class="el-icon-plus" type="primary">
                    新增</el-button>
                <div class="table-setting">
                    <div class="table-title">
                    <div class="flex a-center">
                        <div class="table-title" :class="{ active: currentType === 'list' }" @click="handleTypeChange('list')">
                        中试、生产验证试验检验分析报告
                    </div>
                    <div class="table-tit">
                        <div class="table-tit" :class="{ active: currentType === 'draft' }" @click="handleTypeChange('draft')">
                        草稿箱
                    </div>
                </div>
                    <el-button @click="handleAddProject" class="el-icon-plus" type="primary">
                        新增</el-button>
                </div>
            </template>
            <template #table>
                <el-table-column prop="name" label="所属项目组" />
@@ -70,8 +71,12 @@
    },
    data() {
        return {
            currentType: 'list', // 当前显示类型:list-列表,draft-草稿箱
            form: {
                name: ''
                name: '',
                status: '',
                pageNum: 1,
                pageSize: 10
            },
            showDelConfirm: false,
            rowId: '',
@@ -124,6 +129,11 @@
        },
        getList() {
        },
        handleTypeChange(type) {
            this.currentType = type;
            this.form.status = type === 'draft' ? -1 : '';
            this.getList();
        }
    }
}
@@ -165,47 +175,67 @@
.table-setting {
    display: flex;
    gap: 14px;
    padding-bottom: 20px;
    justify-content: space-between;
    align-items: center;
}
.table-tit {
    background: #FAFAFC;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #DCDFE6;
    width: 166px;
.flex {
    display: flex;
    align-items: center;
}
.table-title {
    // width: 220px;
    padding: 0 29px;
    height: 50px;
    background: #FFFFFF;
    background: #fafafc;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #dcdfe6;
    display: flex;
    align-items: center;
    justify-content: center;
    // margin-bottom: 21px;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #049C9A;
    color: #606266;
    line-height: 27px;
    cursor: pointer;
    transition: all 0.3s ease;
    &.active {
        color: #049c9a;
        background: #ffffff;
        border: 1px solid #049c9a;
    }
}
.table-tit {
    width: 166px;
    height: 50px;
    background: #fafafc;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #dcdfe6;
    display: flex;
    align-items: center;
    justify-content: center;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #606266;
    line-height: 27px;
    margin-left: 16px;
    cursor: pointer;
    transition: all 0.3s ease;
    &.active {
        color: #049c9a;
        background: #ffffff;
        border: 1px solid #049c9a;
    }
}
.list {
    height: 100%;
}
.table-title {
    // width: 166px;1
    height: 50px;
    padding: 0 29px;
    background: #FFFFFF;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #049C9A;
    display: flex;
    align-items: center;
    justify-content: center;
    // margin-bottom: 21px;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #049C9A;
    line-height: 27px;
}
</style>
laboratory/src/views/chemistQa/productApproval/index.vue
@@ -27,17 +27,18 @@
                </el-form>
            </template>
            <template #setting>
                <el-button @click="handleAddProject" class="el-icon-plus" type="primary">
                    新增</el-button>
                <div class="table-setting">
                    <div class="table-title">
                    <div class="flex a-center">
                        <div class="table-title" :class="{ active: currentType === 'list' }" @click="handleTypeChange('list')">
                        原辅料、包材、竞品检验分析报告
                    </div>
                    <div class="table-tit">
                        <div class="table-tit" :class="{ active: currentType === 'draft' }" @click="handleTypeChange('draft')">
                        草稿箱
                    </div>
                </div>
                    <el-button @click="handleAddProject" class="el-icon-plus" type="primary">
                        新增</el-button>
                </div>
            </template>
            <template #table>
                <el-table-column prop="name" label="所属项目组" />
@@ -70,8 +71,12 @@
    },
    data() {
        return {
            currentType: 'list', // 当前显示类型:list-列表,draft-草稿箱
            form: {
                name: ''
                name: '',
                status: '',
                pageNum: 1,
                pageSize: 10
            },
            showDelConfirm: false,
            rowId: '',
@@ -124,6 +129,11 @@
        },
        getList() {
        },
        handleTypeChange(type) {
            this.currentType = type;
            this.form.status = type === 'draft' ? -1 : '';
            this.getList();
        }
    }
}
@@ -165,47 +175,67 @@
.table-setting {
    display: flex;
    gap: 14px;
    padding-bottom: 20px;
    justify-content: space-between;
    align-items: center;
}
.table-tit {
    background: #FAFAFC;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #DCDFE6;
    width: 166px;
.flex {
    display: flex;
    align-items: center;
}
.table-title {
    // width: 220px;
    padding: 0 29px;
    height: 50px;
    background: #FFFFFF;
    background: #fafafc;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #dcdfe6;
    display: flex;
    align-items: center;
    justify-content: center;
    // margin-bottom: 21px;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #049C9A;
    color: #606266;
    line-height: 27px;
    cursor: pointer;
    transition: all 0.3s ease;
    &.active {
        color: #049c9a;
        background: #ffffff;
        border: 1px solid #049c9a;
    }
}
.table-tit {
    width: 166px;
    height: 50px;
    background: #fafafc;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #dcdfe6;
    display: flex;
    align-items: center;
    justify-content: center;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #606266;
    line-height: 27px;
    margin-left: 16px;
    cursor: pointer;
    transition: all 0.3s ease;
    &.active {
        color: #049c9a;
        background: #ffffff;
        border: 1px solid #049c9a;
    }
}
.list {
    height: 100%;
}
.table-title {
    // width: 166px;1
    height: 50px;
    padding: 0 29px;
    background: #FFFFFF;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #049C9A;
    display: flex;
    align-items: center;
    justify-content: center;
    // margin-bottom: 21px;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #049C9A;
    line-height: 27px;
}
</style>
laboratory/src/views/chemistQa/projectTesting/index.vue
@@ -30,17 +30,18 @@
                </el-form>
            </template>
            <template #setting>
                <el-button @click="handleAddProject" class="el-icon-plus" type="primary">
                    新增检测项</el-button>
                <div class="table-setting">
                    <div class="table-title">
                    <div class="flex a-center">
                        <div class="table-title" :class="{ active: currentType === 'list' }" @click="handleTypeChange('list')">
                        项目检测项、检验包列表
                    </div>
                    <div class="table-tit">
                        <div class="table-tit" :class="{ active: currentType === 'draft' }" @click="handleTypeChange('draft')">
                        草稿箱
                    </div>
                </div>
                    <el-button @click="handleAddProject" class="el-icon-plus" type="primary">
                        新增检测项</el-button>
                </div>
            </template>
            <template #tableCustom>
                <Table :data="tableData" :total="0" @row-click="handleRowClick" row-key="id"
@@ -112,8 +113,12 @@
    },
    data() {
        return {
            currentType: 'list', // 当前显示类型:list-列表,draft-草稿箱
            form: {
                name: ''
                name: '',
                status: '',
                pageNum: 1,
                pageSize: 10
            },
            showDelConfirm: false,
            rowId: '',
@@ -190,6 +195,11 @@
        },
        getList() {
        },
        handleTypeChange(type) {
            this.currentType = type;
            this.form.status = type === 'draft' ? -1 : '';
            this.getList();
        }
    }
}
@@ -231,65 +241,67 @@
.table-setting {
    display: flex;
    gap: 14px;
    padding-bottom: 20px;
    justify-content: space-between;
    align-items: center;
}
.table-tit {
    background: #FAFAFC;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #DCDFE6;
    width: 166px;
    height: 50px;
    background: #FFFFFF;
    border-radius: 8px 8px 0px 0px;
.flex {
    display: flex;
    align-items: center;
    justify-content: center;
    // margin-bottom: 21px;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #049C9A;
    line-height: 27px;
}
.list {
    height: 100%;
}
.table-title {
    // width: 166px;1
    height: 50px;
    padding: 0 29px;
    background: #FFFFFF;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #049C9A;
    display: flex;
    align-items: center;
    justify-content: center;
    // margin-bottom: 21px;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #049C9A;
    line-height: 27px;
}
.table-title {
    width: 220px;
    height: 50px;
    background: #FFFFFF;
    background: #fafafc;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #049C9A;
    border: 1px solid #dcdfe6;
    display: flex;
    align-items: center;
    justify-content: center;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #049C9A;
    color: #606266;
    line-height: 27px;
    cursor: pointer;
    transition: all 0.3s ease;
    &.active {
        color: #049c9a;
        background: #ffffff;
        border: 1px solid #049c9a;
    }
}
.table-tit {
    width: 166px;
    height: 50px;
    background: #fafafc;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #dcdfe6;
    display: flex;
    align-items: center;
    justify-content: center;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #606266;
    line-height: 27px;
    margin-left: 16px;
    cursor: pointer;
    transition: all 0.3s ease;
    &.active {
        color: #049c9a;
        background: #ffffff;
        border: 1px solid #049c9a;
    }
}
.list {
    height: 100%;
}
.expand-box {
laboratory/src/views/chemistQa/rawMaterials/index.vue
@@ -27,17 +27,18 @@
                </el-form>
            </template>
            <template #setting>
                <el-button @click="handleAddProject" class="el-icon-plus" type="primary">
                    新增</el-button>
                <div class="table-setting">
                    <div class="table-title">
                    <div class="flex a-center">
                        <div class="table-title" :class="{ active: currentType === 'list' }" @click="handleTypeChange('list')">
                        原辅料、包材、竞品检验分析报告
                    </div>
                    <div class="table-tit">
                        <div class="table-tit" :class="{ active: currentType === 'draft' }" @click="handleTypeChange('draft')">
                        草稿箱
                    </div>
                </div>
                    <el-button @click="handleAddProject" class="el-icon-plus" type="primary">
                        新增</el-button>
                </div>
            </template>
            <template #table>
                <el-table-column prop="name" label="所属项目组" />
@@ -70,8 +71,12 @@
    },
    data() {
        return {
            currentType: 'list', // 当前显示类型:list-列表,draft-草稿箱
            form: {
                name: ''
                name: '',
                status: '',
                pageNum: 1,
                pageSize: 10
            },
            showDelConfirm: false,
            rowId: '',
@@ -124,6 +129,11 @@
        },
        getList() {
        },
        handleTypeChange(type) {
            this.currentType = type;
            this.form.status = type === 'draft' ? -1 : '';
            this.getList();
        }
    }
}
@@ -165,47 +175,67 @@
.table-setting {
    display: flex;
    gap: 14px;
    padding-bottom: 20px;
    justify-content: space-between;
    align-items: center;
}
.table-tit {
    background: #FAFAFC;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #DCDFE6;
    width: 166px;
.flex {
    display: flex;
    align-items: center;
}
.table-title {
    // width: 220px;
    padding: 0 29px;
    height: 50px;
    background: #FFFFFF;
    background: #fafafc;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #dcdfe6;
    display: flex;
    align-items: center;
    justify-content: center;
    // margin-bottom: 21px;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #049C9A;
    color: #606266;
    line-height: 27px;
    cursor: pointer;
    transition: all 0.3s ease;
    &.active {
        color: #049c9a;
        background: #ffffff;
        border: 1px solid #049c9a;
    }
}
.table-tit {
    width: 166px;
    height: 50px;
    background: #fafafc;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #dcdfe6;
    display: flex;
    align-items: center;
    justify-content: center;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #606266;
    line-height: 27px;
    margin-left: 16px;
    cursor: pointer;
    transition: all 0.3s ease;
    &.active {
        color: #049c9a;
        background: #ffffff;
        border: 1px solid #049c9a;
    }
}
.list {
    height: 100%;
}
.table-title {
    // width: 166px;1
    height: 50px;
    padding: 0 29px;
    background: #FFFFFF;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #049C9A;
    display: flex;
    align-items: center;
    justify-content: center;
    // margin-bottom: 21px;
    font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #049C9A;
    line-height: 27px;
}
</style>
laboratory/src/views/dataManagement/approvalPlan/list.vue
@@ -26,12 +26,12 @@
        </el-form>
      </template>
      <template #setting>
        <div class="tableTitle">
        <div class="table-setting">
          <div class="flex a-center">
            <div class="title" :class="{ active: currentType === 'list' }" @click="handleTypeChange('list')">
            <div class="table-title" :class="{ active: currentType === 'list' }" @click="handleTypeChange('list')">
              项目课题方案列表
            </div>
            <div v-if="isProcessEngineer" class="drafts" :class="{ active: currentType === 'draft' }"
            <div v-if="isProcessEngineer" class="table-tit drafts" :class="{ active: currentType === 'draft' }"
              @click="handleTypeChange('draft')">
              草稿箱
            </div>
@@ -359,32 +359,44 @@
  align-items: center;
}
.tableTitle {
.table-setting {
  display: flex;
  padding-bottom: 20px;
  justify-content: space-between;
  align-items: center;
}
  .title {
    background: #fafafc;
.table-title {
  width: 220px;
  height: 50px;
  background: #ffffff;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #dcdfe6;
    padding: 16px 29px;
  border: 1px solid #049c9a;
  display: flex;
  align-items: center;
  justify-content: center;
  font-family: SourceHanSansCN, SourceHanSansCN;
    font-weight: bold;
    font-size: 18px;
    color: #606266;
    width: unset;
  color: #049c9a;
  line-height: 27px;
    cursor: pointer;
  }
  .drafts {
    padding: 16px 65px;
.table-tit {
  width: 166px;
  height: 50px;
    background: #fafafc;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #dcdfe6;
    font-weight: 400;
  display: flex;
  align-items: center;
  justify-content: center;
  font-family: SourceHanSansCN, SourceHanSansCN;
  font-weight: bold;
    font-size: 18px;
    color: #606266;
  line-height: 27px;
    margin-left: 16px;
    cursor: pointer;
  }
@@ -392,8 +404,10 @@
  .active {
    color: #049c9a;
    background: #ffffff;
    border-radius: 8px 8px 0px 0px;
    border: 1px solid #049c9a;
  }
.el-icon-plus {
  margin-bottom: 20px;
}
</style>