|
|
@@ -1,127 +1,91 @@
|
|
|
<template>
|
|
|
- <div class="hc-page-layout-box">
|
|
|
- <div :style="`width:${leftWidth}px;`" class="hc-layout-left-box bg-white">
|
|
|
- <div class="hc-project-box">
|
|
|
- <div class="hc-project-icon-box">
|
|
|
- <HcIcon name="stack" />
|
|
|
+ <hc-body split :project-nmae="projectInfo?.projectName">
|
|
|
+ <template #tree>
|
|
|
+ <TestTree
|
|
|
+ :auto-expand-keys="treeAutoExpandKeys" :project-id="projectId" :tenant-id="userInfo?.tenant_id"
|
|
|
+ :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2" @node-tap="wbsElTreeClick"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ <hc-new-card w-to="1650">
|
|
|
+ <template #headerToSearch>
|
|
|
+ <div class="w-64">
|
|
|
+ <hc-date-picker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
|
|
|
</div>
|
|
|
- <div class="ml-2 project-name-box">
|
|
|
- <span class="project-alias">{{ projectInfo.projectName }}</span>
|
|
|
+ <div class="ml-2 w-72">
|
|
|
+ <el-input v-model="searchForm.queryValue" clearable placeholder="请输入名称、规格、材料编号查询" @keyup="keyUpEvent" />
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div class="hc-tree-box">
|
|
|
- <el-scrollbar>
|
|
|
- <TestTree
|
|
|
- :auto-expand-keys="treeAutoExpandKeys"
|
|
|
- :project-id="projectId"
|
|
|
- :tenant-id="userInfo?.tenant_id"
|
|
|
- :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial"
|
|
|
- :wbs-type="2"
|
|
|
- @node-tap="wbsElTreeClick"
|
|
|
- />
|
|
|
- </el-scrollbar>
|
|
|
- </div>
|
|
|
- <!-- 左右拖动 -->
|
|
|
- <div class="horizontal-drag-line" @mousedown="onmousedown" />
|
|
|
- </div>
|
|
|
- <div class="hc-page-content-box">
|
|
|
- <HcNewCard :scrollbar="false" action-size="lg">
|
|
|
- <template #header>
|
|
|
- <HcTooltip keys="tentative_material_sampling_add">
|
|
|
- <el-button :disabled="!primaryKeyId" hc-btn type="primary" @click="addFormModalClick">
|
|
|
- <HcIcon name="add-circle" />
|
|
|
- <span>新增</span>
|
|
|
- </el-button>
|
|
|
- </HcTooltip>
|
|
|
- <HcTooltip keys="tentative_material_sampling_edit">
|
|
|
- <el-button
|
|
|
- :disabled="tableCheckedKeys.length <= 0" hc-btn type="primary"
|
|
|
- color="#12C060" style="color: white;"
|
|
|
- @click="editFormModalClick"
|
|
|
- >
|
|
|
- <HcIcon name="edit" />
|
|
|
- <span>编辑</span>
|
|
|
- </el-button>
|
|
|
- </HcTooltip>
|
|
|
- <HcTooltip keys="tentative_material_sampling_copy">
|
|
|
- <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#A16222" @click="copyTableModalClick">
|
|
|
- <HcIcon name="file-copy-2" />
|
|
|
- <span>复制</span>
|
|
|
- </el-button>
|
|
|
- </HcTooltip>
|
|
|
- <HcTooltip keys="tentative_material_sampling_del">
|
|
|
- <el-button v-del-com:[delModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
|
|
|
- <HcIcon name="delete-bin-2" />
|
|
|
- <span>删除</span>
|
|
|
- </el-button>
|
|
|
- </HcTooltip>
|
|
|
- <HcTooltip keys="tentative_material_sampling_printer">
|
|
|
- <el-button
|
|
|
- :disabled="tableCheckedKeys.length <= 0" :loading="printerLoading" hc-btn color="#567722"
|
|
|
- @click="printerClick"
|
|
|
- >
|
|
|
- <HcIcon name="printer" />
|
|
|
- <span>打印</span>
|
|
|
- </el-button>
|
|
|
- </HcTooltip>
|
|
|
- <HcTooltip keys="tentative_material_sampling_import">
|
|
|
- <el-button :disabled="!primaryKeyId" hc-btn color="#567722" @click="importModalClick">
|
|
|
- <HcIcon name="folder-upload" />
|
|
|
- <span>导入</span>
|
|
|
- </el-button>
|
|
|
- </HcTooltip>
|
|
|
- </template>
|
|
|
- <template #search>
|
|
|
- <div class="w-64">
|
|
|
- <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
|
|
|
- </div>
|
|
|
- <div class="w-72 ml-2">
|
|
|
- <el-input
|
|
|
- v-model="searchForm.queryValue" clearable
|
|
|
- placeholder="请输入名称、规格、材料编号进行查询" @keyup="keyUpEvent"
|
|
|
- />
|
|
|
- </div>
|
|
|
- <div class="ml-2">
|
|
|
- <el-button type="primary" @click="searchClick">
|
|
|
- <HcIcon name="search-2" />
|
|
|
- <span>搜索</span>
|
|
|
- </el-button>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- <HcTable
|
|
|
- ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading"
|
|
|
- is-new :index-style="{ width: 60 }" is-check :check-style="{ width: 29 }"
|
|
|
- @selection-change="tableSelection"
|
|
|
- >
|
|
|
- <template #materialCount="{ row }">{{ row.materialCount === -1 ? "" : row.materialCount }}</template>
|
|
|
- <template #representativeCount="{ row }">
|
|
|
- {{ row.representativeCount === -1 ? "" : row.representativeCount }}
|
|
|
- </template>
|
|
|
- </HcTable>
|
|
|
- <template #action>
|
|
|
- <HcPages :pages="searchForm" @change="pageChange" />
|
|
|
+ <div class="ml-2">
|
|
|
+ <el-button type="primary" @click="searchClick">
|
|
|
+ <hc-icon name="search-2" />
|
|
|
+ <span>搜索</span>
|
|
|
+ </el-button>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ <template #extraToHeader>
|
|
|
+ <hc-tooltip keys="tentative_material_sampling_add">
|
|
|
+ <el-button :disabled="!primaryKeyId" hc-btn type="primary" @click="addFormModalClick">
|
|
|
+ <hc-icon name="add-circle" />
|
|
|
+ <span>新增</span>
|
|
|
+ </el-button>
|
|
|
+ </hc-tooltip>
|
|
|
+ <hc-tooltip keys="tentative_material_sampling_edit">
|
|
|
+ <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn type="primary" color="#12C060" style="color: white;" @click="editFormModalClick">
|
|
|
+ <hc-icon name="edit" />
|
|
|
+ <span>编辑</span>
|
|
|
+ </el-button>
|
|
|
+ </hc-tooltip>
|
|
|
+ <hc-tooltip keys="tentative_material_sampling_copy">
|
|
|
+ <el-button :disabled="tableCheckedKeys.length <= 0" hc-btn color="#A16222" @click="copyTableModalClick">
|
|
|
+ <hc-icon name="file-copy-2" />
|
|
|
+ <span>复制</span>
|
|
|
+ </el-button>
|
|
|
+ </hc-tooltip>
|
|
|
+ <hc-tooltip keys="tentative_material_sampling_del">
|
|
|
+ <el-button v-del-com:[delModalClick] :disabled="tableCheckedKeys.length <= 0" hc-btn color="#e03997">
|
|
|
+ <hc-icon name="delete-bin-2" />
|
|
|
+ <span>删除</span>
|
|
|
+ </el-button>
|
|
|
+ </hc-tooltip>
|
|
|
+ <hc-tooltip keys="tentative_material_sampling_printer">
|
|
|
+ <el-button :disabled="tableCheckedKeys.length <= 0" :loading="printerLoading" hc-btn color="#567722" @click="printerClick">
|
|
|
+ <hc-icon name="printer" />
|
|
|
+ <span>打印</span>
|
|
|
+ </el-button>
|
|
|
+ </hc-tooltip>
|
|
|
+ <hc-tooltip keys="tentative_material_sampling_import">
|
|
|
+ <el-button :disabled="!primaryKeyId" hc-btn color="#567722" @click="importModalClick">
|
|
|
+ <hc-icon name="folder-upload" />
|
|
|
+ <span>导入</span>
|
|
|
+ </el-button>
|
|
|
+ </hc-tooltip>
|
|
|
+ <el-button hc-btn color="#E75643" @click="delegationClick">
|
|
|
+ <hc-icon name="slack" />
|
|
|
+ <span>委托</span>
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ <hc-table
|
|
|
+ ref="tableRef" :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check
|
|
|
+ :index-style="{ width: 60 }" :check-style="{ width: 29 }" @selection-change="tableSelection"
|
|
|
+ >
|
|
|
+ <template #materialCount="{ row }">{{ row.materialCount === -1 ? "" : row.materialCount }}</template>
|
|
|
+ <template #representativeCount="{ row }">
|
|
|
+ {{ row.representativeCount === -1 ? "" : row.representativeCount }}
|
|
|
</template>
|
|
|
- </HcNewCard>
|
|
|
- </div>
|
|
|
+ </hc-table>
|
|
|
+ <template #action>
|
|
|
+ <hc-pages :pages="searchForm" @change="pageChange" />
|
|
|
+ </template>
|
|
|
+ </hc-new-card>
|
|
|
|
|
|
<!-- 新增/编辑 -->
|
|
|
- <hc-new-dialog
|
|
|
- v-model="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}样品信息`" is-row-footer
|
|
|
- widths="50rem" @close="addEditFormModalClose"
|
|
|
- >
|
|
|
- <el-form
|
|
|
- ref="addEditFormRef" :model="addEditFormModel" :rules="addEditFormRules" label-width="auto"
|
|
|
- size="large"
|
|
|
- >
|
|
|
+ <hc-new-dialog v-model="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}样品信息`" is-row-footer widths="50rem" @close="addEditFormModalClose">
|
|
|
+ <el-form ref="addEditFormRef" :model="addEditFormModel" :rules="addEditFormRules" label-width="auto" size="large">
|
|
|
<div class="hc-form-item">
|
|
|
<el-form-item label="样品名称" prop="materialName">
|
|
|
<el-input v-model="addEditFormModel.materialName" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="进场日期">
|
|
|
- <el-date-picker
|
|
|
- v-model="addEditFormModel.mobilizationDate" :clearable="false" class="block"
|
|
|
- type="date" value-format="YYYY-MM-DD"
|
|
|
- />
|
|
|
+ <el-date-picker v-model="addEditFormModel.mobilizationDate" :clearable="false" class="block" type="date" value-format="YYYY-MM-DD" />
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="hc-form-item">
|
|
|
@@ -129,10 +93,7 @@
|
|
|
<el-input v-model="addEditFormModel.specificationNumber" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="取样日期">
|
|
|
- <el-date-picker
|
|
|
- v-model="addEditFormModel.samplingDate" :clearable="false" class="block"
|
|
|
- type="date" value-format="YYYY-MM-DD"
|
|
|
- />
|
|
|
+ <el-date-picker v-model="addEditFormModel.samplingDate" :clearable="false" class="block" type="date" value-format="YYYY-MM-DD" />
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="hc-form-item">
|
|
|
@@ -149,8 +110,8 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="是否外委">
|
|
|
<el-radio-group v-model="addEditFormModel.isOutsourcing" size="large">
|
|
|
- <el-radio :label="1">是</el-radio>
|
|
|
- <el-radio :label="0">否</el-radio>
|
|
|
+ <el-radio :value="1">是</el-radio>
|
|
|
+ <el-radio :value="0">否</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
@@ -173,7 +134,7 @@
|
|
|
<div class="hc-form-item">
|
|
|
<el-form-item label="取样人">
|
|
|
<el-select v-model="addEditFormModel.userId" block @change="changeusername">
|
|
|
- <el-option v-for="item in userListData" :label="item.userName" :value="item.userId" />
|
|
|
+ <el-option v-for="item in userListData" :key="item.userId" :label="item.userName" :value="item.userId" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="拟用部位">
|
|
|
@@ -183,22 +144,25 @@
|
|
|
<el-form-item label="样品描述">
|
|
|
<el-input v-model="addEditFormModel.sampleDescription" />
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="RFID编号">
|
|
|
+ <el-input v-model="addEditFormModel.rfid" />
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
<template #leftRowFooter>
|
|
|
- <HcTooltip keys="tentative_material_sampling_links">
|
|
|
+ <hc-tooltip keys="tentative_material_sampling_links">
|
|
|
<el-button hc-btn type="primary" @click="linksApproachModalClick(addEditFormModel.mobilizationId)">
|
|
|
- <HcIcon name="links" />
|
|
|
+ <hc-icon name="links" />
|
|
|
<span>关联进场材料</span>
|
|
|
</el-button>
|
|
|
- </HcTooltip>
|
|
|
+ </hc-tooltip>
|
|
|
</template>
|
|
|
<template #rightRowFooter>
|
|
|
<el-button size="large" @click="addEditFormModalClose">
|
|
|
- <HcIcon name="close" />
|
|
|
+ <hc-icon name="close" />
|
|
|
<span>取消</span>
|
|
|
</el-button>
|
|
|
<el-button :loading="addEditFormLoading" hc-btn type="primary" @click="addEditFormClick">
|
|
|
- <HcIcon name="check" />
|
|
|
+ <hc-icon name="check" />
|
|
|
<span>确认</span>
|
|
|
</el-button>
|
|
|
</template>
|
|
|
@@ -206,80 +170,71 @@
|
|
|
|
|
|
<!-- 关联进场材料 -->
|
|
|
<hc-new-dialog v-model="linksApproachModal" is-row-footer is-table title="关联进场材料信息" widths="60%" @close="linksApproachModalClose">
|
|
|
- <HcTable
|
|
|
- :column="linksApproachTableColumn" :datas="linksApproachTableData"
|
|
|
- :is-index="false" :loading="linksApproachTableLoading" is-new
|
|
|
- >
|
|
|
+ <hc-table :column="linksApproachTableColumn" :datas="linksApproachTableData" :is-index="false" :loading="linksApproachTableLoading">
|
|
|
<template #materialType="{ row }">{{ getRowTableMaterialType(row.materialType) }}</template>
|
|
|
<template #action="{ row }">
|
|
|
- <HcTooltip keys="tentative_material_approach_annex">
|
|
|
- <el-button
|
|
|
- v-if="mobilizationId === row.id" plain size="small" type="primary"
|
|
|
- @click="cancelApproachRow(row)"
|
|
|
- >
|
|
|
- 取消关联
|
|
|
- </el-button>
|
|
|
- <el-button v-else plain size="small" type="primary" @click="linksApproachRow(row)">
|
|
|
- 关联
|
|
|
- </el-button>
|
|
|
- </HcTooltip>
|
|
|
+ <hc-tooltip keys="tentative_material_approach_annex">
|
|
|
+ <el-button v-if="mobilizationId === row.id" plain size="small" type="primary" @click="cancelApproachRow(row)">取消关联</el-button>
|
|
|
+ <el-button v-else plain size="small" type="primary" @click="linksApproachRow(row)">关联</el-button>
|
|
|
+ </hc-tooltip>
|
|
|
</template>
|
|
|
- </HcTable>
|
|
|
+ </hc-table>
|
|
|
<template #leftRowFooter>
|
|
|
- <HcPages :pages="ApproachSearchForm" @change="linksApproachPageChange" />
|
|
|
+ <hc-pages :pages="ApproachSearchForm" @change="linksApproachPageChange" />
|
|
|
</template>
|
|
|
<template #rightRowFooter>
|
|
|
<el-button size="large" @click="linksApproachModalClose">
|
|
|
- <HcIcon name="close" />
|
|
|
+ <hc-icon name="close" />
|
|
|
<span>取消</span>
|
|
|
</el-button>
|
|
|
<el-button hc-btn type="primary" @click="linksApproachModalSave">
|
|
|
- <HcIcon name="check" />
|
|
|
+ <hc-icon name="check" />
|
|
|
<span>确定</span>
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</hc-new-dialog>
|
|
|
|
|
|
<!-- 复制样品登记信息 -->
|
|
|
- <hc-new-dialog
|
|
|
- v-model="copyTableModal" :loading="copyTableLoading" is-table title="复制样品登记信息" widths="60rem"
|
|
|
- @close="copyTableModalClose" @save="copyTableClick"
|
|
|
- >
|
|
|
- <HcTable :column="copyTableColumn" :datas="copyTableData" is-new :index-style="{ width: 60 }">
|
|
|
+ <hc-new-dialog v-model="copyTableModal" :loading="copyTableLoading" is-table title="复制样品登记信息" widths="60rem" @close="copyTableModalClose" @save="copyTableClick">
|
|
|
+ <hc-table :column="copyTableColumn" :datas="copyTableData" is-new :index-style="{ width: 60 }">
|
|
|
<template #specificationNumber="{ row }">
|
|
|
<el-input v-model="row.specificationNumber" placeholder="请输入样品编号" />
|
|
|
</template>
|
|
|
<template #action="{ index }">
|
|
|
<el-button plain size="small" type="danger" @click="specificationNumberDel(index)">删除</el-button>
|
|
|
</template>
|
|
|
- </HcTable>
|
|
|
+ </hc-table>
|
|
|
</hc-new-dialog>
|
|
|
|
|
|
<!-- 导入 -->
|
|
|
<hc-new-dialog v-model="importModal" is-row-footer title="导入" widths="38rem" @close="importModalClose">
|
|
|
- <HcDragUpload
|
|
|
- ref="uploadRef" api="/api/blade-business/material/" :datas="uploadData"
|
|
|
- action="sample/import"
|
|
|
- @finished="uploadFinished" @progress="uploadprogress"
|
|
|
- />
|
|
|
+ <HcDragUpload ref="uploadRef" api="/api/blade-business/material/" :datas="uploadData" action="sample/import" @finished="uploadFinished" @progress="uploadprogress" />
|
|
|
<template #leftRowFooter>
|
|
|
<el-button size="large" @click="downloadImportClick">
|
|
|
- <HcIcon name="download-2" />
|
|
|
+ <hc-icon name="download-2" />
|
|
|
<span>下载模板</span>
|
|
|
</el-button>
|
|
|
</template>
|
|
|
<template #rightRowFooter>
|
|
|
<el-button size="large" @click="importModalClose">
|
|
|
- <HcIcon name="close" />
|
|
|
+ <hc-icon name="close" />
|
|
|
<span>取消导入</span>
|
|
|
</el-button>
|
|
|
<el-button :loading="importModalLoading" hc-btn type="primary" @click="importModalYesClick">
|
|
|
- <HcIcon name="folder-upload" />
|
|
|
+ <hc-icon name="folder-upload" />
|
|
|
<span>确认导入</span>
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</hc-new-dialog>
|
|
|
- </div>
|
|
|
+
|
|
|
+ <!-- 创建委托 -->
|
|
|
+ <hc-new-dialog v-model="delegateModal" is-footer-center is-table title="创建委托" widths="60rem" @close="delegateModalClose">
|
|
|
+ 11231233
|
|
|
+ <template #footer>
|
|
|
+ <el-button hc-btn type="primary" @click="creatingDelegate">创建</el-button>
|
|
|
+ </template>
|
|
|
+ </hc-new-dialog>
|
|
|
+ </hc-body>
|
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
|
@@ -303,10 +258,8 @@ const projectInfo = ref(useAppState.getProjectInfo)
|
|
|
const isCollapse = ref(useAppState.getCollapse)
|
|
|
|
|
|
//监听
|
|
|
-watch(() => [
|
|
|
- useAppState.getCollapse,
|
|
|
-], ([Collapse]) => {
|
|
|
- isCollapse.value = Collapse
|
|
|
+watch(() => useAppState.getCollapse, (collapse) => {
|
|
|
+ isCollapse.value = collapse
|
|
|
})
|
|
|
|
|
|
//自动展开缓存
|
|
|
@@ -799,20 +752,20 @@ const downloadImportClick = () => {
|
|
|
window.open('https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20221109/1f1cc15e4e4918d8c793fa6ec0a2ae2a.xlsx', '_blank')
|
|
|
}
|
|
|
|
|
|
-//左右拖动，改变树形结构宽度
|
|
|
-const leftWidth = ref(382)
|
|
|
-const onmousedown = () => {
|
|
|
- const leftNum = isCollapse.value ? 142 : 272
|
|
|
- document.onmousemove = (ve) => {
|
|
|
- let diffVal = ve.clientX - leftNum
|
|
|
- if (diffVal >= 310 && diffVal <= 900) {
|
|
|
- leftWidth.value = diffVal
|
|
|
- }
|
|
|
- }
|
|
|
- document.onmouseup = () => {
|
|
|
- document.onmousemove = null
|
|
|
- document.onmouseup = null
|
|
|
- }
|
|
|
+//委托
|
|
|
+const delegateModal = ref(false)
|
|
|
+const delegationClick = () => {
|
|
|
+ delegateModal.value = true
|
|
|
+}
|
|
|
+
|
|
|
+//创建委托
|
|
|
+const creatingDelegate = async () => {
|
|
|
+ delegateModalClose()
|
|
|
+}
|
|
|
+
|
|
|
+//关闭委托
|
|
|
+const delegateModalClose = () => {
|
|
|
+ delegateModal.value = false
|
|
|
}
|
|
|
</script>
|
|
|
|
