外委检测

package.json

@@ -30,7 +30,7 @@
         "@vue/compiler-sfc": "^3.2.40",
         "autoprefixer": "^10.4.12",
         "codemirror": "^6.0.1",
-        "postcss": "^8.4.17",
+        "postcss": "^8.4.18",
         "sass": "^1.55.0",
         "tailwindcss": "^3.1.8",
         "unplugin-auto-import": "^0.11.2",

src/global/components/hc-dialog/index.vue

@@ -1,8 +1,10 @@
 <template>
-    <el-dialog v-model="isShow" class="hc-modal-border" :class="[isTable?'hc-modal-table':'',ui]" :style="isBgColor?'--el-dialog-bg-color:' + isBgColor:''"
-               :title="title" :width="isWidth" draggable destroy-on-close @closed="dialogClosed">
-        <template #header v-if="isSlotHeader">
-            <slot name='header'/>
+    <el-dialog v-model="isShow" class="hc-modal-border" :class="[isTable?'hc-modal-table':'', isSlotExtra?'hc-modal-header-extra':'', ui]" :show-close="!isSlotExtra"
+               :style="isBgColor?'--el-dialog-bg-color:' + isBgColor:''" :title="title" :width="isWidth" draggable destroy-on-close @closed="dialogClosed">
+        <template #header v-if="isSlotHeader || isSlotExtra">
+            <slot name='header' v-if="isSlotHeader"/>
+            <div role="heading" class="el-dialog__title" v-if="!isSlotHeader && isSlotExtra">{{title}}</div>
+            <slot name='extra' v-if="isSlotExtra"/>
         </template>
         <slot></slot>
         <template #footer v-if="footer">
@@ -96,6 +98,7 @@ watch(() => [
 //判断<slot>是否有传值
 const slots = useSlots()
 const isSlotHeader = ref(!!slots.header);
+const isSlotExtra = ref(!!slots.extra);
 const isSlotFooter = ref(!!slots.footer);
 
 const emit = defineEmits(['close', 'save'])
@@ -111,3 +114,20 @@ const buttonSaveClick = () => {
     emit('save')
 }
 </script>
+
+<style lang="scss">
+.el-overlay-dialog {
+    .el-dialog.hc-modal-border.hc-modal-header-extra,
+    .el-dialog.hc-modal-header-extra {
+        .el-dialog__header {
+            position: relative;
+            display: flex;
+            align-items: center;
+            padding: 8px var(--el-dialog-padding-primary);
+            .el-dialog__title {
+                flex: 1;
+            }
+        }
+    }
+}
+</style>

src/global/components/hc-new-switch/index.vue

@@ -16,7 +16,7 @@ const props = defineProps({
     keys: {
         type: [String,Number],
         default: ''
-    },
+    }
 })
 
 //监听

src/styles/app/element.scss

@@ -472,6 +472,10 @@
     min-height: 22px;
 }
 
+.el-form-item--large.mb-0 {
+    margin-bottom: 0;
+}
+
 //输入框验证问题
 .el-input.is-error .el-input__wrapper {
     box-shadow: 0 0 0 1px var(--el-color-danger) inset;

src/styles/tentative/detect/third.scss

@@ -0,0 +1,17 @@
+.hc-links-sample-modal-box {
+    position: relative;
+    height: 100%;
+    display: flex;
+    .hc-links-sample-tree-box,
+    .hc-links-sample-table-box {
+        position: relative;
+        height: 100%;
+    }
+    .hc-links-sample-tree-box {
+        margin-right: 24px;
+        border: 1px solid #EEEEEE;
+    }
+    .hc-links-sample-table-box {
+        flex: 1;
+    }
+}

src/views/data-fill/division.vue

@@ -278,7 +278,7 @@ const treeAutoExpandKeys = ref(getStoreData('wbsTreeExpandKeys') || [])
 
 //渲染完成
 onMounted(() => {
-    setElTreeMenu()
+    //setElTreeMenu()
     getWbsNodeTypeApi()
     getMajorDataTypeApi()
     getWbsNodeTableTypeApi()
@@ -422,8 +422,14 @@ const searchNodeAllTableApi = async (pid) => {
 
 
 //树菜单配置
-const ElTreeMenu = ref([])
-const setElTreeMenu = () => {
+const ElTreeMenu = ref([
+    {icon: 'add-circle', label: '新增节点', key: "add"},
+    {icon: 'file-copy-2', label: '复制节点', key: "copy"},
+    {icon: 'draft', label: '修改节点', key: "edit"},
+    {icon: 'sort-asc', label: '调整排序', key: "sort"},
+    {icon: 'delete-bin', label: '删除节点', key: "del"}
+])
+/*const setElTreeMenu = () => {
     let newArr = [];
     if (HcIsButton('wbs_tree_add')) {
         newArr.push({icon: 'add-circle', label: '新增节点', key: "add"})
@@ -441,7 +447,7 @@ const setElTreeMenu = () => {
         newArr.push({icon: 'delete-bin', label: '删除节点', key: "del"})
     }
     ElTreeMenu.value = newArr
-}
+}*/
 
 //树菜单被点击
 const ElTreeMenuClick = async ({key,node,data}) => {

src/views/tentative/detect/third.vue

@@ -12,7 +12,7 @@
             </div>
             <div class="hc-tree-box">
                 <el-scrollbar>
-                    <WbsTree :autoExpandKeys="treeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick"/>
+                    <WbsTree :autoExpandKeys="treeAutoExpandKeys" :menus="ElTreeMenu" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick"/>
                 </el-scrollbar>
             </div>
             <!--左右拖动-->
@@ -21,25 +21,25 @@
         <div class="hc-page-content-box">
             <HcCard :scrollbar="false" actionSize="lg">
                 <template #header>
-                    <HcTooltip keys="tentative_material_sampling_add">
+                    <HcTooltip keys="tentative_detect_third_add">
                         <el-button type="primary" hc-btn @click="addFormModalClick">
                             <HcIcon name="add-circle"/>
                             <span>新增</span>
                         </el-button>
                     </HcTooltip>
-                    <HcTooltip keys="tentative_material_sampling_edit">
+                    <HcTooltip keys="tentative_detect_third_edit">
                         <el-button hc-btn @click="editFormModalClick">
                             <HcIcon name="edit"/>
                             <span>编辑</span>
                         </el-button>
                     </HcTooltip>
-                    <HcTooltip keys="tentative_material_sampling_copy">
+                    <HcTooltip keys="tentative_detect_third_copy">
                         <el-button hc-btn @click="copyTableModalClick">
                             <HcIcon name="file-copy-2"/>
                             <span>复制</span>
                         </el-button>
                     </HcTooltip>
-                    <HcTooltip keys="tentative_material_sampling_del">
+                    <HcTooltip keys="tentative_detect_third_del">
                         <el-button hc-btn @click="delModalClick">
                             <HcIcon name="delete-bin-2"/>
                             <span>删除</span>
@@ -77,79 +77,135 @@
             </HcCard>
         </div>
 
+        <!--新增/编辑 节点-->
+        <HcDialog :show="addEditNodeFormModal" title="新增/编辑 节点" widths="30rem" :loading="addEditNodeFormLoading" @save="addEditNodeFormModalSave" @close="addEditNodeFormModalClose">
+            <el-form :model="addEditNodeFormModel" label-width="auto" label-position="top" size="large">
+                <el-form-item class="mb-0" label="节点名称">
+                    <el-input v-model="addEditNodeFormModel.key1" placeholder="请输入节点名称"/>
+                </el-form-item>
+            </el-form>
+        </HcDialog>
+
         <!--新增/编辑-->
-        <HcDialog :show="addEditFormModal" title="新增/编辑 样品信息" widths="50rem" isRowFooter @close="addEditFormModalClose">
-            <el-form ref="addEditFormRef" :model="addEditFormModel" :rules="addEditFormRules" label-width="auto" size="large">
+        <HcDialog :show="addEditFormModal" title="新增/编辑 外委试验信息" widths="70rem" isRowFooter @close="addEditFormModalClose">
+            <template #extra>
+                <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" @change="tabTypeChange"/>
+            </template>
+            <el-form ref="addEditFormRef" :model="addEditFormModel" :rules="addEditFormRules" label-width="auto" size="large" v-if="tabTypeKey === 'tab1'">
                 <div class="hc-form-item">
-                    <el-form-item label="样品名称" prop="key1">
-                        <el-input v-model="addEditFormModel.key1"/>
+                    <el-form-item label="合同段">
+                        <el-select v-model="addEditFormModel.key1" block placeholder="请选择合同段">
+                            <el-option v-for="item in projectInfo?.contractInfoList" :key="item.id" :label="item['name']" :value="item['id']"/>
+                        </el-select>
                     </el-form-item>
-                    <el-form-item label="进场日期" prop="key9">
-                        <el-date-picker type="date" v-model="addEditFormModel.key9" class="block" value-format="YYYY-MM-DD" :clearable="false"/>
+                    <el-form-item label="合格状态">
+                        <el-radio-group v-model="addEditFormModel.key2" size="large">
+                            <el-radio :label="1">不合格</el-radio>
+                            <el-radio :label="2">合格</el-radio>
+                        </el-radio-group>
                     </el-form-item>
                 </div>
                 <div class="hc-form-item">
-                    <el-form-item label="样品编号" prop="key3">
+                    <el-form-item label="委托编号">
                         <el-input v-model="addEditFormModel.key3"/>
                     </el-form-item>
-                    <el-form-item label="取样日期" prop="key4">
-                        <el-date-picker type="date" v-model="addEditFormModel.key4" class="block" value-format="YYYY-MM-DD" :clearable="false"/>
+                    <el-form-item label="样品名称">
+                        <el-input v-model="addEditFormModel.key4"/>
                     </el-form-item>
                 </div>
                 <div class="hc-form-item">
-                    <el-form-item label="规格型号" prop="key5">
+                    <el-form-item label="委托单位" prop="key5">
                         <el-input v-model="addEditFormModel.key5"/>
                     </el-form-item>
-                    <el-form-item label="取样地点" prop="key6">
+                    <el-form-item label="样品编号">
                         <el-input v-model="addEditFormModel.key6"/>
                     </el-form-item>
                 </div>
                 <div class="hc-form-item">
-                    <el-form-item label="试样数量" prop="key7">
-                        <el-input v-model="addEditFormModel.key7"/>
+                    <el-form-item label="证书编号">
+                        <el-input v-model="addEditFormModel.key7" placeholder="检测机构资质证书编号"/>
                     </el-form-item>
-                    <el-form-item label="是否外委" prop="key8">
-                        <el-radio-group v-model="addEditFormModel.key8" size="large">
-                            <el-radio :label="1">是</el-radio>
-                            <el-radio :label="2">否</el-radio>
-                        </el-radio-group>
+                    <el-form-item label="样品数量">
+                        <el-input v-model="addEditFormModel.key8"/>
                     </el-form-item>
                 </div>
                 <div class="hc-form-item">
-                    <el-form-item label="代表数量" prop="key9">
+                    <el-form-item label="取样人">
                         <el-input v-model="addEditFormModel.key9"/>
                     </el-form-item>
-                    <el-form-item label="供应商" prop="key10">
+                    <el-form-item label="代表数量">
                         <el-input v-model="addEditFormModel.key10"/>
                     </el-form-item>
                 </div>
                 <div class="hc-form-item">
-                    <el-form-item label="计算单位" prop="key11">
+                    <el-form-item label="见证人">
                         <el-input v-model="addEditFormModel.key11"/>
                     </el-form-item>
-                    <el-form-item label="生产批号" prop="key12">
+                    <el-form-item label="检测机构">
                         <el-input v-model="addEditFormModel.key12"/>
                     </el-form-item>
                 </div>
                 <div class="hc-form-item">
-                    <el-form-item label="取样人" prop="key13">
-                        <el-input v-model="addEditFormModel.key13"/>
+                    <el-form-item label="送样日期">
+                        <el-date-picker type="date" v-model="addEditFormModel.key13" class="block" value-format="YYYY-MM-DD" :clearable="false"/>
                     </el-form-item>
-                    <el-form-item label="拟用部位" prop="key14">
+                    <el-form-item label="产地">
                         <el-input v-model="addEditFormModel.key14"/>
                     </el-form-item>
                 </div>
-                <el-form-item label="样品描述" prop="key15">
-                    <el-input v-model="addEditFormModel.key15"/>
+                <div class="hc-form-item">
+                    <el-form-item label="取样日期">
+                        <el-date-picker type="date" v-model="addEditFormModel.key13" class="block" value-format="YYYY-MM-DD" :clearable="false"/>
+                    </el-form-item>
+                    <el-form-item label="取样地点">
+                        <el-input v-model="addEditFormModel.key14"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="报告日期">
+                        <el-date-picker type="date" v-model="addEditFormModel.key15" class="block" value-format="YYYY-MM-DD" :clearable="false"/>
+                    </el-form-item>
+                    <el-form-item label="生产批号">
+                        <el-input v-model="addEditFormModel.key16"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="报告编号">
+                        <el-input v-model="addEditFormModel.key17"/>
+                    </el-form-item>
+                    <el-form-item label="工程部位">
+                        <el-input v-model="addEditFormModel.key18"/>
+                    </el-form-item>
+                </div>
+                <el-form-item label="委托单附件" prop="key13">
+                    <div class="form-item-dashed hover">上传文件（待定，看后端接口后，再定）</div>
+                </el-form-item>
+                <el-form-item label="记录表附件" prop="key13">
+                    <div class="form-item-dashed hover">上传文件（待定，看后端接口后，再定）</div>
+                </el-form-item>
+                <el-form-item label="报告单附件" prop="key13">
+                    <div class="form-item-dashed hover">上传文件（待定，看后端接口后，再定）</div>
+                </el-form-item>
+            </el-form>
+            <el-form ref="addEditFormRef" :model="addEditFormModel" label-position="top" label-width="auto" size="large" v-if="tabTypeKey === 'tab2'">
+                <el-form-item label="检测依据">
+                    <el-input v-model="addEditFormModel.desc1" type="textarea" placeholder="请输入检测依据" :autosize="{ minRows: 3}"/>
+                </el-form-item>
+                <el-form-item label="评定标准">
+                    <el-input v-model="addEditFormModel.desc2" type="textarea" placeholder="请输入评定标准" :autosize="{ minRows: 3}"/>
+                </el-form-item>
+                <el-form-item label="检测结论">
+                    <el-input v-model="addEditFormModel.desc3" type="textarea" placeholder="请输入检测结论" :autosize="{ minRows: 3}"/>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <el-input v-model="addEditFormModel.desc4" type="textarea" placeholder="请输入备注" :autosize="{ minRows: 3}"/>
                 </el-form-item>
             </el-form>
             <template #leftRowFooter>
-                <HcTooltip keys="tentative_material_sampling_links">
-                    <el-button type="primary" hc-btn @click="linksApproachModalClick">
-                        <HcIcon name="links"/>
-                        <span>关联进场材料</span>
-                    </el-button>
-                </HcTooltip>
+                <el-button type="primary" hc-btn @click="linksSampleModalClick">
+                    <HcIcon name="links"/>
+                    <span>选择样品信息</span>
+                </el-button>
             </template>
             <template #rightRowFooter>
                 <el-button size="large" @click="addEditFormModalClose">
@@ -163,48 +219,18 @@
             </template>
         </HcDialog>
 
-        <!--关联进场材料-->
-        <HcDialog :show="linksApproachModal" title="关联进场材料信息" widths="60%" isTable saveText="确认" @close="linksApproachModalClose" @save="linksApproachModalSave">
-            <HcTable :column="linksApproachTableColumn" :datas="linksApproachTableData" :loading="linksApproachTableLoading" :isIndex="false">
-                <template #action="{row}">
-                    <HcTooltip keys="tentative_material_approach_annex">
-                        <el-button type="primary" size="small" plain @click="linksApproachRow(row)">关联</el-button>
-                    </HcTooltip>
-                </template>
-            </HcTable>
-        </HcDialog>
-
-        <!--复制样品登记信息-->
-        <HcDialog :show="copyTableModal" title="复制样品登记信息" widths="60rem" isTable :loading="copyTableLoading" @close="copyTableModalClose" @save="copyTableClick">
-            <HcTable :column="copyTableColumn" :datas="copyTableData">
-                <template #key1="{row}">
-                    <el-input v-model="row.key1" placeholder="请输入材料编号"/>
-                </template>
-                <template #action="{row}">
-                    <el-button type="danger" size="small" plain>删除</el-button>
-                </template>
-            </HcTable>
-        </HcDialog>
-
-        <!--导入-->
-        <HcDialog :show="importModal" title="导入" widths="38rem" isRowFooter @close="importModalClose">
-            123456
-            <template #leftRowFooter>
-                <el-button size="large">
-                    <HcIcon name="download-2"/>
-                    <span>下载模板</span>
-                </el-button>
-            </template>
-            <template #rightRowFooter>
-                <el-button size="large" @click="importModalClose">
-                    <HcIcon name="close"/>
-                    <span>取消导入</span>
-                </el-button>
-                <el-button type="primary" hc-btn :loading="importModalLoading" @click="importModalYesClick">
-                    <HcIcon name="folder-upload"/>
-                    <span>确认导入</span>
-                </el-button>
-            </template>
+        <!--选择样品信息-->
+        <HcDialog :show="linksSampleModal" title="选择样品信息" widths="70%" isTable saveText="确认" @close="linksSampleModalClose" @save="linksSampleModalSave">
+            <div class="hc-links-sample-modal-box">
+                <div class="hc-links-sample-tree-box">
+                    <el-scrollbar>
+                        <WbsTree :autoExpandKeys="treeAutoExpandKeys" :projectId="projectId" :contractId="contractId"/>
+                    </el-scrollbar>
+                </div>
+                <div class="hc-links-sample-table-box">
+                    <HcTable ref="tableSampleRef" :column="linksSampleTableColumn" :datas="linksSampleTableData" :loading="linksSampleTableLoading" :isIndex="false" isCheck @selection-change="linksSampleTableSelection"/>
+                </div>
+            </div>
         </HcDialog>
 
     </div>
@@ -215,6 +241,7 @@ import {ref, watch, onMounted} from "vue";
 import {useAppStore} from "~src/store";
 import WbsTree from "../../data-fill/components/WbsTree.vue"
 import {getStoreData, setStoreData} from '~src/utils/storage'
+import {HcIsButton} from "~src/plugins/IsButtons";
 
 //变量
 const useAppState = useAppStore()
@@ -235,7 +262,7 @@ const treeAutoExpandKeys = ref(getStoreData('wbsTreeExpandKeys') || [])
 
 //渲染完成
 onMounted(() => {
-
+    setElTreeMenu()
 })
 
 const userData = ref([
@@ -249,6 +276,21 @@ const qualifiedData = ref([
 //搜索表单
 const searchForm = ref({user: null, qualified: null, betweenTime: null, queryValue: null, current: 1, size: 20, total: 0})
 
+//树菜单配置
+const ElTreeMenu = ref([])
+const setElTreeMenu = () => {
+    let newArr = [];
+    if (HcIsButton('tentative_detect_third_tree_add')) {
+        newArr.push({icon: 'add-circle', label: '新增节点', key: "add"})
+    }
+    if (HcIsButton('tentative_detect_third_tree_edit')) {
+        newArr.push({icon: 'draft', label: '修改节点', key: "edit"})
+    }
+    if (HcIsButton('tentative_detect_third_tree_del')) {
+        newArr.push({icon: 'delete-bin', label: '删除节点', key: "del"})
+    }
+    ElTreeMenu.value = newArr
+}
 
 //树相关的变量
 const primaryKeyId = ref('')
@@ -270,6 +312,47 @@ const wbsElTreeClick = ({node, data, keys}) => {
     getTableData()
 }
 
+//树菜单被点击
+const ElTreeMenuClick = async ({key,node,data}) => {
+    nodeItemInfo.value = node
+    nodeDataInfo.value = data
+    if (key === 'add') {
+        addEditNodeFormModal.value = true
+    } else if (key === 'edit') {
+        addEditNodeFormModal.value = true
+    } else if (key === 'del') {
+        delNodeModalClick()
+    }
+}
+
+//新增/编辑 节点
+const addEditNodeFormModal = ref(false)
+const addEditNodeFormModel = ref({key1: ''})
+//保存节点信息
+const addEditNodeFormLoading = ref(false)
+const addEditNodeFormModalSave = () => {
+    addEditNodeFormModal.value = false
+}
+//关闭节点编辑弹窗
+const addEditNodeFormModalClose = () => {
+    addEditNodeFormModal.value = false
+}
+
+//删除节点
+const delNodeModalClick = () => {
+    window?.$messageBox?.alert('请谨慎考虑后，确认是否需要删除？', '删除提醒', {
+        showCancelButton: true,
+        confirmButtonText: '确认删除',
+        cancelButtonText: '取消',
+        type: 'warning',
+        callback: (action) => {
+            if (action === 'confirm') {
+                //removeContractTreeNode()
+            }
+        }
+    })
+}
+
 //日期时间被选择
 const betweenTime = ref(null)
 const betweenTimeUpdate = ({arr,query}) => {
@@ -301,15 +384,20 @@ const pageChange = ({current, size}) => {
 //表格数据
 const tableRef = ref(null)
 const tableColumn = ref([
-    {key:'key1', name: '取样名称'},
-    {key:'key2', name: '取样日期'},
+    {key:'key1', name: '委托编号'},
+    {key:'key2', name: '报告编号'},
     {key:'key3', name: '样品编号'},
-    {key:'key4', name: '规格型号'},
-    {key:'key5', name: '试样数量'},
-    {key:'key6', name: '计算单位'},
-    {key:'key7', name: '拟用部位'},
-    {key:'key8', name: '代表数量'},
-    {key:'key9', name: '取样人'}
+    {key:'key4', name: '试验类型'},
+    {key:'key5', name: '样品名称'},
+    {key:'key6', name: '规格型号'},
+    {key:'key7', name: '委托单位'},
+    {key:'key8', name: '检测机构'},
+    {key:'key9', name: '工程部位'},
+    {key:'key10', name: '送样人'},
+    {key:'key11', name: '送样日期'},
+    {key:'key12', name: '报告日期'},
+    {key:'key13', name: '检测结果'},
+    {key:'key14', name: '备注'},
 ])
 
 //获取数据
@@ -329,8 +417,7 @@ const tableSelection = (rows) => {
     })
 }
 
-
-//新增/编辑 材料进场
+//新增/编辑
 const addEditFormModal = ref(false)
 const addFormModalClick = () => {
     addEditFormModal.value = true
@@ -342,20 +429,25 @@ const addEditFormModalClose = () => {
     addEditFormModal.value = false
 }
 
+//类型tab数据和相关处理
+const tabTypeKey = ref('tab1')
+const tabTypeTab = ref([
+    {key:'tab1',  name: '基础信息'},
+    {key:'tab2', name: '检查结论'},
+]);
+const tabTypeChange = (item) => {
+    tabTypeKey.value = item?.key
+}
+
 //新增/编辑 表单
 const addEditFormRef = ref(null)
 const addEditFormModel = ref({})
 const addEditFormRules = {
-    key1: {
-        required: true,
-        trigger: 'blur',
-        message: "请输入"
-    },
-    key3: {
+    key5: {
         required: true,
         trigger: 'blur',
         message: "请输入"
-    },
+    }
 }
 
 //新增/编辑 保存
@@ -365,31 +457,8 @@ const addEditFormClick = () => {
 }
 
 //复制
-const copyTableModal = ref(false)
-
 const copyTableModalClick = () => {
-    copyTableModal.value = true
-}
-
-//复制表格
-const copyTableColumn = ref([
-    {key:'key3', name: '样品名称'},
-    {key:'key1', name: '样品编号'},
-    {key:'action', name: '操作', width: 100},
-])
-const copyTableData = ref([
-    {key3: '名称', key1: '编号...'},
-    {key3: '名称1', key1: '编号1...'},
-])
-
-const copyTableModalClose = () => {
-    copyTableModal.value = false
-}
-
-//复制 保存
-const copyTableLoading = ref(false)
-const copyTableClick = () => {
-    copyTableModal.value = false
+    addEditFormModal.value = true
 }
 
 //删除
@@ -407,57 +476,43 @@ const delModalClick = () => {
     })
 }
 
-//导入
-const importModal = ref(false)
-const importModalClick = () => {
-    importModal.value = true
-}
-
-//确认导入
-const importModalLoading = ref(false)
-const importModalYesClick = () => {
-    importModal.value = false
-}
-
-//关闭导入
-const importModalClose = () => {
-    importModal.value = false
-}
-
-
 //关联进场材料
-const linksApproachModal = ref(false)
-const linksApproachModalClick = (row) => {
-    linksApproachModal.value = true
+const linksSampleModal = ref(false)
+const linksSampleModalClick = (row) => {
+    linksSampleModal.value = true
 }
 
 //关联进场材料数据
-const linksApproachTableColumn = ref([
-    {key:'key1', name: '材料编号'},
-    {key:'key2', name: '进场日期'},
-    {key:'key3', name: '材料名称'},
-    {key:'key4', name: '材料类型'},
-    {key:'key5', name: '规格型号'},
-    {key:'key6', name: '供应商单位'},
+const tableSampleRef = ref(null)
+const linksSampleTableColumn = ref([
+    {key:'key1', name: '样品名称'},
+    {key:'key2', name: '取样日期'},
+    {key:'key3', name: '样品编号'},
+    {key:'key4', name: '规格型号'},
+    {key:'key5', name: '试样数量'},
+    {key:'key6', name: '计算单位'},
     {key:'key7', name: '拟用部位'},
-    {key:'key8', name: '记录人'},
-    {key:'action', name: '操作', width: 100, fixed: 'right', align: 'center'},
+    {key:'key8', name: '代表数量'},
+    {key:'key9', name: '取样人'},
 ])
-const linksApproachTableData = ref([])
-const linksApproachTableLoading = ref(false)
-
-//关联
-const linksApproachRow = (row) => {
+const linksSampleTableData = ref([])
+const linksSampleTableLoading = ref(false)
 
+//多选
+const tableSampleCheckedKeys = ref([]);
+const linksSampleTableSelection = (rows) => {
+    tableSampleCheckedKeys.value = rows.filter((item) => {
+        return (item??'') !== '';
+    })
 }
 
-const linksApproachModalSave = () => {
+const linksSampleModalSave = () => {
 
 }
 
 //关闭关联进场材料
-const linksApproachModalClose = () => {
-    linksApproachModal.value = false
+const linksSampleModalClose = () => {
+    linksSampleModal.value = false
 }
 
 

yarn.lock

@@ -1107,10 +1107,10 @@ postcss@^8.1.10, postcss@^8.4.14, postcss@^8.4.16:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.17:
-  version "8.4.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.17.tgz#f87863ec7cd353f81f7ab2dec5d67d861bbb1be5"
-  integrity sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==
+postcss@^8.4.18:
+  version "8.4.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2"
+  integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==
   dependencies:
     nanoid "^3.3.4"
     picocolors "^1.0.0"