iZaiZaiA 2 anni fa
parent
commit
79fa809954

+ 1 - 1
src/views/data-fill/components/ListItem.vue

@@ -559,7 +559,7 @@ const handleMenuSelect = ({key}) => {
 //插入设计值
 const IDVFModal = ref(false)
 const formIDVFRef = ref(null)
-const formIDVFModel = ref({type: '', design: '', size: '', dev: '', key: '', capacity: '', fail: '', pkId: ''})
+const formIDVFModel = ref({type: 1, design: '', size: '', dev: '', key: '', capacity: '', fail: '', pkId: ''})
 
 //插入特殊字符
 const specialModal = ref(false)

+ 529 - 14
src/views/tentative/detect/outside.vue

@@ -1,30 +1,545 @@
 <template>
-    <div class="hc-layout-box">
-        第三方检测
+    <div class="hc-page-layout-box">
+        <div class="hc-layout-left-box" :style="'width:' + leftWidth + 'px;'">
+            <div class="hc-project-box">
+                <div class="hc-project-icon-box">
+                    <HcIcon name="stack"/>
+                </div>
+                <div class="ml-2 project-name-box">
+                    <span class="text-xl text-cut project-alias">{{projectInfo['projectAlias']}}</span>
+                    <div class="text-xs text-cut project-name">{{projectInfo['name']}}</div>
+                </div>
+            </div>
+            <div class="hc-tree-box">
+                <el-scrollbar>
+                    <WbsTree :autoExpandKeys="treeAutoExpandKeys" :menus="ElTreeMenu" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick" @menuTap="ElTreeMenuClick"/>
+                </el-scrollbar>
+            </div>
+            <!--左右拖动-->
+            <div class="horizontal-drag-line" @mousedown="onmousedown"/>
+        </div>
+        <div class="hc-page-content-box">
+            <HcCard :scrollbar="false" actionSize="lg">
+                <template #header>
+                    <HcTooltip keys="tentative_detect_outside_add">
+                        <el-button type="primary" hc-btn @click="addFormModalClick">
+                            <HcIcon name="add-circle"/>
+                            <span>新增</span>
+                        </el-button>
+                    </HcTooltip>
+                    <HcTooltip keys="tentative_detect_outside_edit">
+                        <el-button hc-btn @click="editFormModalClick">
+                            <HcIcon name="edit"/>
+                            <span>编辑</span>
+                        </el-button>
+                    </HcTooltip>
+                    <HcTooltip keys="tentative_detect_outside_copy">
+                        <el-button hc-btn @click="copyTableModalClick">
+                            <HcIcon name="file-copy-2"/>
+                            <span>复制</span>
+                        </el-button>
+                    </HcTooltip>
+                    <HcTooltip keys="tentative_detect_outside_del">
+                        <el-button hc-btn @click="delModalClick">
+                            <HcIcon name="delete-bin-2"/>
+                            <span>删除</span>
+                        </el-button>
+                    </HcTooltip>
+                </template>
+                <template #search>
+                    <div class="w-40">
+                        <el-select v-model="searchForm.user" placeholder="请选择送样人员" clearable>
+                            <el-option v-for="item in userData" :key="item.value" :label="item['label']" :value="item['value']"/>
+                        </el-select>
+                    </div>
+                    <div class="w-40 ml-2">
+                        <el-select v-model="searchForm.qualified" placeholder="请选择是否合格" clearable>
+                            <el-option v-for="item in qualifiedData" :key="item.value" :label="item['label']" :value="item['value']"/>
+                        </el-select>
+                    </div>
+                    <div class="w-64 ml-2">
+                        <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate"/>
+                    </div>
+                    <div class="w-72 ml-2">
+                        <el-input v-model="searchForm.queryValue" placeholder="请输入报告编号、委托编号" clearable @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" isCheck @selection-change="tableSelection"/>
+                <template #action>
+                    <HcPages :pages="searchForm" @change="pageChange"/>
+                </template>
+            </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="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="合同段">
+                        <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="合格状态">
+                        <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="委托编号">
+                        <el-input v-model="addEditFormModel.key3"/>
+                    </el-form-item>
+                    <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-input v-model="addEditFormModel.key5"/>
+                    </el-form-item>
+                    <el-form-item label="样品编号">
+                        <el-input v-model="addEditFormModel.key6"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="证书编号">
+                        <el-input v-model="addEditFormModel.key7" placeholder="检测机构资质证书编号"/>
+                    </el-form-item>
+                    <el-form-item label="样品数量">
+                        <el-input v-model="addEditFormModel.key8"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="取样人">
+                        <el-input v-model="addEditFormModel.key9"/>
+                    </el-form-item>
+                    <el-form-item label="代表数量">
+                        <el-input v-model="addEditFormModel.key10"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="见证人">
+                        <el-input v-model="addEditFormModel.key11"/>
+                    </el-form-item>
+                    <el-form-item label="检测机构">
+                        <el-input v-model="addEditFormModel.key12"/>
+                    </el-form-item>
+                </div>
+                <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.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>
+                <el-button type="primary" hc-btn @click="linksSampleModalClick">
+                    <HcIcon name="links"/>
+                    <span>选择样品信息</span>
+                </el-button>
+            </template>
+            <template #rightRowFooter>
+                <el-button size="large" @click="addEditFormModalClose">
+                    <HcIcon name="close"/>
+                    <span>取消</span>
+                </el-button>
+                <el-button type="primary" hc-btn :loading="addEditFormLoading" @click="addEditFormClick">
+                    <HcIcon name="check"/>
+                    <span>确认</span>
+                </el-button>
+            </template>
+        </HcDialog>
+
+        <!--选择样品信息-->
+        <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>
 </template>
 
 <script setup>
-import {ref,watch,onMounted} from "vue";
-import {useRouter, useRoute} from 'vue-router'
+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 router = useRouter()
-const useRoutes = useRoute()
+//变量
 const useAppState = useAppStore()
-//const {getObjValue, getArrValue} = isType()
-
-//全局变量
 const projectId = ref(useAppState.getProjectId);
 const contractId = ref(useAppState.getContractId);
+const projectInfo = ref(useAppState.getProjectInfo);
+const isCollapse = ref(useAppState.getCollapse)
 
-</script>
+//监听
+watch(() => [
+    useAppState.getCollapse
+], ([Collapse]) => {
+    isCollapse.value = Collapse
+})
 
-<style lang="scss" scoped>
+//自动展开缓存
+const treeAutoExpandKeys = ref(getStoreData('wbsTreeExpandKeys') || [])
 
-</style>
+//渲染完成
+onMounted(() => {
+    setElTreeMenu()
+})
+
+const userData = ref([
+    {label: 'xxx', value: '1'}
+])
+
+const qualifiedData = ref([
+    {label: '是', value: '1'}
+])
+
+//搜索表单
+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_outside_tree_add')) {
+        newArr.push({icon: 'add-circle', label: '新增节点', key: "add"})
+    }
+    if (HcIsButton('tentative_detect_outside_tree_edit')) {
+        newArr.push({icon: 'draft', label: '修改节点', key: "edit"})
+    }
+    if (HcIsButton('tentative_detect_outside_tree_del')) {
+        newArr.push({icon: 'delete-bin', label: '删除节点', key: "del"})
+    }
+    ElTreeMenu.value = newArr
+}
+
+//树相关的变量
+const primaryKeyId = ref('')
+const nodeItemInfo = ref({})
+const nodeDataInfo = ref({})
+
+//树被点击
+const wbsElTreeClick = ({node, data, keys}) => {
+    nodeItemInfo.value = node
+    nodeDataInfo.value = data
+    primaryKeyId.value = data['primaryKeyId'] || ''
+    //缓存自动展开
+    treeAutoExpandKeys.value = keys
+    setStoreData('wbsTreeExpandKeys',keys)
+    //改变搜索表单数据
+    //searchForm.value.wbsId = data['contractIdRelation'] ? data['id'] : data['primaryKeyId']
+    //searchForm.value.contractIdRelation = data['contractIdRelation']
+    searchForm.value.current = 1;
+    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}) => {
+    betweenTime.value = arr
+    searchForm.value.betweenTime = query
+}
+
+//回车搜索
+const keyUpEvent = (e) => {
+    if (e.key === "Enter") {
+        searchForm.value.current = 1;
+        getTableData()
+    }
+}
+
+//搜索
+const searchClick = () => {
+    searchForm.value.current = 1;
+    getTableData()
+}
+
+//分页被点击
+const pageChange = ({current, size}) => {
+    searchForm.value.current = current
+    searchForm.value.size = size
+    getTableData()
+}
 
-<style lang="scss">
+//表格数据
+const tableRef = ref(null)
+const tableColumn = 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:'key9', name: '工程部位'},
+    {key:'key10', name: '送样人'},
+    {key:'key11', name: '送样日期'},
+    {key:'key12', name: '报告日期'},
+    {key:'key13', name: '检测结果'},
+    {key:'key14', name: '备注'},
+])
 
+//获取数据
+const tableLoading = ref(false)
+const tableData = ref([
+    {}
+])
+const getTableData = async () => {
+
+}
+
+//多选
+const tableCheckedKeys = ref([]);
+const tableSelection = (rows) => {
+    tableCheckedKeys.value = rows.filter((item) => {
+        return (item??'') !== '';
+    })
+}
+
+//新增/编辑
+const addEditFormModal = ref(false)
+const addFormModalClick = () => {
+    addEditFormModal.value = true
+}
+const editFormModalClick = () => {
+    addEditFormModal.value = true
+}
+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 = {
+    key5: {
+        required: true,
+        trigger: 'blur',
+        message: "请输入"
+    }
+}
+
+//新增/编辑 保存
+const addEditFormLoading = ref(false)
+const addEditFormClick = () => {
+
+}
+
+//复制
+const copyTableModalClick = () => {
+    addEditFormModal.value = true
+}
+
+//删除
+const delModalClick = () => {
+    window?.$messageBox?.alert('请谨慎考虑后,确认是否需要删除?', '删除提醒', {
+        showCancelButton: true,
+        confirmButtonText: '确认删除',
+        cancelButtonText: '取消',
+        type: 'warning',
+        callback: (action) => {
+            if (action === 'confirm') {
+                //removeContractTreeNode()
+            }
+        }
+    })
+}
+
+//关联进场材料
+const linksSampleModal = ref(false)
+const linksSampleModalClick = (row) => {
+    linksSampleModal.value = true
+}
+
+//关联进场材料数据
+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:'key9', name: '取样人'},
+])
+const linksSampleTableData = ref([])
+const linksSampleTableLoading = ref(false)
+
+//多选
+const tableSampleCheckedKeys = ref([]);
+const linksSampleTableSelection = (rows) => {
+    tableSampleCheckedKeys.value = rows.filter((item) => {
+        return (item??'') !== '';
+    })
+}
+
+const linksSampleModalSave = () => {
+
+}
+
+//关闭关联进场材料
+const linksSampleModalClose = () => {
+    linksSampleModal.value = false
+}
+
+
+//拼接ID
+const rowsToId = (rows) => {
+    return rows.map((obj) => {
+        return obj.id;
+    }).join(",")
+}
+
+//左右拖动,改变树形结构宽度
+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;
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../../../styles/tentative/detect/third.scss";
 </style>