111

src/views/tentative/detect/commission.vue

@@ -3,7 +3,8 @@
         <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"
+                :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2" :entrust="1"
+                @node-tap="wbsElTreeClick"
             />
         </template>
         <hc-new-card w-to="1919">

src/views/tentative/detect/commission/sampling.vue

@@ -6,7 +6,8 @@
                 <hc-new-card 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"
+                        :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2" :entrust="1"
+                        @node-tap="wbsElTreeClick"
                     />
                 </hc-new-card>
             </template>

src/views/tentative/detect/components/linkAssociation.vue

@@ -5,7 +5,8 @@
                 <hc-new-card 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"
+                        :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2" :entrust="1"
+                        @node-tap="wbsElTreeClick"
                     />
                 </hc-new-card>
             </template>

src/views/tentative/detect/outside.vue

@@ -5,7 +5,7 @@
                 <div class="hc-project-icon-box">
                     <HcIcon name="stack" />
                 </div>
-                <div class="ml-2 project-name-box">
+                <div class="project-name-box ml-2">
                     <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
@@ -58,7 +58,7 @@
                     <div class="w-40">
                         <el-input v-model="searchForm.queryName" clearable placeholder="送样人员" />
                     </div>
-                    <div class="w-40 ml-2">
+                    <div class="ml-2 w-40">
                         <el-select v-model="searchForm.queryStatus" clearable placeholder="请选择是否合格">
                             <el-option
                                 v-for="item in qualifiedData" :key="item.value" :label="item.label"
@@ -66,10 +66,10 @@
                             />
                         </el-select>
                     </div>
-                    <div class="w-64 ml-2">
+                    <div class="ml-2 w-64">
                         <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
                     </div>
-                    <div class="w-72 ml-2">
+                    <div class="ml-2 w-72">
                         <el-input
                             v-model="searchForm.queryValue" clearable placeholder="请输入报告编号、委托编号"
                             @keyup="keyUpEvent"
@@ -297,6 +297,7 @@
                             :tenant-id="userInfo?.tenant_id"
                             :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial"
                             :wbs-type="2"
+                            :entrust="1"
                             @node-tap="sampleTreeClick"
                         />
                     </el-scrollbar>

src/views/tentative/detect/test-form.vue

@@ -149,7 +149,7 @@
                             :mix-ratio-test-tree-data="MixRatioTestTreeData" :from-type="true"
                             :node-id="nodeId" :project-id="projectId" :tenant-id="userInfo?.tenant_id"
                             :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2"
-                            @node-tap="linksRawTreeClick"
+                            :entrust="1" @node-tap="linksRawTreeClick"
                         />
                     </el-scrollbar>
                 </div>
@@ -174,7 +174,7 @@
                         <TestTree
                             :project-id="projectId" :tenant-id="userInfo?.tenant_id"
                             :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2"
-                            @node-tap="linksSampleTreeClick"
+                            :entrust="1" @node-tap="linksSampleTreeClick"
                         />
                     </el-scrollbar>
                 </div>

src/views/tentative/detect/test.vue

@@ -20,6 +20,7 @@
                         :tenant-id="userInfo?.tenant_id"
                         :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial"
                         :wbs-type="2"
+                        :entrust="1"
                         @node-tap="wbsElTreeClick"
                     />
                 </el-scrollbar>

src/views/tentative/detect/third.vue

@@ -5,7 +5,7 @@
                 <div class="hc-project-icon-box">
                     <HcIcon name="stack" />
                 </div>
-                <div class="ml-2 project-name-box">
+                <div class="project-name-box ml-2">
                     <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
@@ -58,7 +58,7 @@
                     <div class="w-40">
                         <el-input v-model="searchForm.queryName" clearable placeholder="送样人员" />
                     </div>
-                    <div class="w-40 ml-2">
+                    <div class="ml-2 w-40">
                         <el-select v-model="searchForm.queryStatus" clearable placeholder="请选择是否合格">
                             <el-option
                                 v-for="item in qualifiedData" :key="item.value" :label="item.label"
@@ -66,10 +66,10 @@
                             />
                         </el-select>
                     </div>
-                    <div class="w-64 ml-2">
+                    <div class="ml-2 w-64">
                         <HcDatePicker :dates="betweenTime" clearable @change="betweenTimeUpdate" />
                     </div>
-                    <div class="w-72 ml-2">
+                    <div class="ml-2 w-72">
                         <el-input
                             v-model="searchForm.queryValue" clearable placeholder="请输入报告编号、委托编号"
                             @keyup="keyUpEvent"
@@ -299,7 +299,7 @@
                             :project-id="projectId"
                             :tenant-id="userInfo?.tenant_id"
                             :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial"
-                            :wbs-type="2"
+                            :wbs-type="2" :entrust="1"
                             @node-tap="sampleTreeClick"
                         />
                     </el-scrollbar>
@@ -621,12 +621,12 @@ const copyFormApi = async () => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         addEditFormModal.value = false
-     
+
         await getTableData()
     } else {
         window?.$message?.error(msg)
     }
- 
+
 }
 
 //批量复制 提交保存

src/views/tentative/device/components/HcSelectTree.vue

@@ -4,58 +4,62 @@
             <div :id="uuid" class="form-item-div" @click="itemClick">
                 <div v-if="nodeId && nodeTitle" class="lable truncate">{{ nodeTitle }}</div>
                 <div v-else class="placeholder truncate">{{ placeholder }}</div>
-                <HcIcon name="arrow-down-s"/>
+                <HcIcon name="arrow-down-s" />
             </div>
         </template>
         <div v-click-outside="onClickOutside">
-            <TestTree :contractId="contractId" :projectId="projectId" :wbsId="wbsId" ui="hc-select-tree"
-                      @nodeTap="testTreeClick"/>
+            <TestTree
+                :contract-id="contractId" :project-id="projectId" :wbs-id="wbsId" ui="hc-select-tree"
+                :entrust="1" @node-tap="testTreeClick"
+            />
         </div>
     </el-popover>
 </template>
 
 <script setup>
-import {ref, watch, nextTick} from "vue";
-import {getRandom} from "js-fast-way"
-import TestTree from "./TestTree.vue"
-import {ClickOutside as vClickOutside} from 'element-plus'
+import { nextTick, ref, watch } from 'vue'
+import { getRandom } from 'js-fast-way'
+import TestTree from './TestTree.vue'
+import { ClickOutside as vClickOutside } from 'element-plus'
 
 const props = defineProps({
     modelValue: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     title: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     projectId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     contractId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     wbsId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     placeholder: {
         type: [String, Number],
-        default: '请选择一个树节点'
+        default: '请选择一个树节点',
     },
 })
 
+//事件
+const emit = defineEmits(['update:modelValue', 'change'])
 //变量
 const uuid = getRandom()
 const widths = ref(266)
 const nodeId = ref(props.modelValue)
 const nodeTitle = ref(props.title)
 
-const projectId = ref(props.projectId);
-const contractId = ref(props.contractId);
-const wbsId = ref(props.wbsId);
+const projectId = ref(props.projectId)
+const contractId = ref(props.contractId)
+const wbsId = ref(props.wbsId)
 
 const visible = ref(false)
 
@@ -88,12 +92,9 @@ const onClickOutside = () => {
     visible.value = false
 }
 
-//事件
-const emit = defineEmits(['update:modelValue', 'change'])
-
 //树被点击
 const testTreeClick = (data) => {
-    const {title, primaryKeyId} = data
+    const { title, primaryKeyId } = data
     nodeTitle.value = title
     nodeId.value = primaryKeyId
     visible.value = false
@@ -117,6 +118,7 @@ const testTreeClick = (data) => {
     }
 }
 </style>
+
 <style lang="scss">
 .form-item-div .hc-icon-i {
     color: #a7abb2;

src/views/tentative/laboratory/print.vue

@@ -5,7 +5,7 @@
                 <div class="hc-project-icon-box">
                     <HcIcon name="stack" />
                 </div>
-                <div class="ml-2 project-name-box">
+                <div class="project-name-box ml-2">
                     <span class="project-alias">{{ projectInfo.projectName }}</span>
                 </div>
             </div>
@@ -17,7 +17,7 @@
                         :project-id="projectId"
                         :tenant-id="userInfo?.tenant_id"
                         :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial"
-                        :wbs-type="2"
+                        :wbs-type="2" :entrust="1"
                         @node-tap="wbsElTreeClick"
                     />
                 </el-scrollbar>

src/views/tentative/material/components/TestTree.vue

@@ -6,10 +6,10 @@
         :indent="0"
         :load="ElTreeLoadNode"
         :props="ElTreeProps"
-        accordion
+
         class="hc-tree-node tree-line"
-        highlight-current
-        lazy
+
+        accordion lazy highlight-current
         node-key="primaryKeyId"
         @node-click="ElTreeClick"
     >
@@ -68,6 +68,10 @@ const props = defineProps({
         type: [String, Number],
         default: '',
     },
+    entrust: {
+        type: [String, Number],
+        default: '',
+    },
 })
 
 //事件
@@ -87,17 +91,13 @@ const tenantId = ref(props.tenantId)
 const wbsType = ref(props.wbsType)
 const idPrefix = ref(props.idPrefix)
 const fromTypedata = ref(props.fromType)
+const hideEntrust = ref(props.entrust)
+
 //监听
 watch(() => [
-    props.autoExpandKeys,
-    props.projectId,
-    props.contractId,
-    props.wbsTempId,
-    props.tenantId,
-    props.idPrefix,
-    props.wbsType,
-    props.fromType,
-], ([expandKeys, UserProjectId, UserContractId, UserWbsTempId, UserTenantId, UserIdPrefix, wbs_type, fromType]) => {
+    props.autoExpandKeys, props.projectId, props.contractId, props.wbsTempId,
+    props.tenantId, props.idPrefix, props.wbsType, props.fromType, props.entrust,
+], ([expandKeys, UserProjectId, UserContractId, UserWbsTempId, UserTenantId, UserIdPrefix, wbs_type, fromType, entrust]) => {
     TreeExpandKey.value = expandKeys
     projectId.value = UserProjectId
     contractId.value = UserContractId
@@ -106,6 +106,7 @@ watch(() => [
     idPrefix.value = UserIdPrefix
     wbsType.value = wbs_type
     fromTypedata.value = fromType
+    hideEntrust.value = entrust
 })
 
 //树形结构异步加载数据
@@ -120,6 +121,7 @@ const ElTreeLoadNode = async (node, resolve) => {
         //获取数据
         const { error, code, data } = await samplingApi.getMixRatioTestTree({
             pKeyId: props.nodeId,
+            isHideEntrust: hideEntrust.value,
         })
         //处理数据
         if (!error && code === 200) {
@@ -162,7 +164,6 @@ const ElTreeLoadNode = async (node, resolve) => {
             }
             resolve([])
         }
-
     } else {
         //获取数据
         const { error, code, data } = await samplingApi.queryLazyTree({
@@ -171,6 +172,7 @@ const ElTreeLoadNode = async (node, resolve) => {
             projectId: projectId.value,
             parentId,
             wbsType: wbsType.value,
+            isHideEntrust: hideEntrust.value,
         })
         //处理数据
         if (!error && code === 200) {
@@ -214,7 +216,6 @@ const ElTreeLoadNode = async (node, resolve) => {
             resolve([])
         }
     }
-
 }
 
 //节点被点击

src/views/tentative/material/components/TestTreeMaterial.vue

@@ -1,105 +1,106 @@
 <template>
-    <ElTree ref="ElTreeRef"
-            :class="ui"
-            :data="treedata"
-            :default-expanded-keys="defaultExpandedCids"
-            :indent="0"
-            :props="ElTreeProps"
-            accordion
-            class="hc-tree-node tree-line"
-            highlight-current
-            node-key="primaryKeyId"
-            @node-click="ElTreeClick">
+    <ElTree
+        ref="ElTreeRef"
+        :class="ui"
+        :data="treedata"
+        :default-expanded-keys="defaultExpandedCids"
+        :indent="0"
+        :props="ElTreeProps"
+        accordion
+        class="hc-tree-node tree-line"
+        highlight-current
+        node-key="primaryKeyId"
+        @node-click="ElTreeClick"
+    >
         <template #default="{ node, data }">
-            <div :id="`${idPrefix}${data['primaryKeyId']}`" class="data-custom-tree-node">
-                <div :class="node.level === 1?'level-name':''" class="label">{{ node.label }}</div>
+            <div :id="`${idPrefix}${data.primaryKeyId}`" class="data-custom-tree-node">
+                <div :class="node.level === 1 ? 'level-name' : ''" class="label">{{ node.label }}</div>
             </div>
         </template>
     </ElTree>
-
 </template>
 
 <script setup>
-import {ref, nextTick, watch} from "vue";
-import samplingApi from "~api/tentative/material/sampling"
+import { nextTick, ref, watch } from 'vue'
+import samplingApi from '~api/tentative/material/sampling'
 
 //参数
 const props = defineProps({
     projectId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     contractId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     wbsTempId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     tenantId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     wbsType: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     autoExpandKeys: {
         type: Array,
-        default: () => ([])
+        default: () => ([]),
     },
     idPrefix: {
         type: String,
-        default: 'test-tree-'
+        default: 'test-tree-',
     },
     ui: {
         type: String,
-        default: ''
+        default: '',
     },
     fromType: {
         type: Boolean,
-        default: false
+        default: false,
     },
     nodeId: {
         type: [String, Number],
-        default: ''
+        default: '',
     },
     MixRatioTestTreeData: {
         type: Array,
-        default: () => ([])
-    }
+        default: () => ([]),
+    },
+    entrust: {
+        type: [String, Number],
+        default: '',
+    },
 })
 
+//事件
+const emit = defineEmits(['menuTap', 'nodeTap', 'nodeLoading'])
 //变量
 const ElTreeRef = ref(null)
 const ElTreeProps = ref({
     label: 'title',
     children: 'children',
-    isLeaf: 'hasChildren'
+    isLeaf: 'hasChildren',
 })
 const TreeExpandKey = ref(props.autoExpandKeys)
-const projectId = ref(props.projectId);
-const contractId = ref(props.contractId);
-const wbsTempId = ref(props.wbsTempId);
-const tenantId = ref(props.tenantId);
-const wbsType = ref(props.wbsType);
-const idPrefix = ref(props.idPrefix);
+const projectId = ref(props.projectId)
+const contractId = ref(props.contractId)
+const wbsTempId = ref(props.wbsTempId)
+const tenantId = ref(props.tenantId)
+const wbsType = ref(props.wbsType)
+const idPrefix = ref(props.idPrefix)
 const fromTypedata = ref(props.fromType)
 const treedata = ref(props.MixRatioTestTreeData)
+const hideEntrust = ref(props.entrust)
 
 //监听
 watch(() => [
-    props.autoExpandKeys,
-    props.projectId,
-    props.contractId,
-    props.wbsTempId,
-    props.tenantId,
-    props.idPrefix,
-    props.wbsType,
-    props.fromType,
-    props.MixRatioTestTreeData
-], ([expandKeys, UserProjectId, UserContractId, UserWbsTempId, UserTenantId, UserIdPrefix, wbs_type, fromType, MixRatioTest_treeData]) => {
+    props.autoExpandKeys, props.projectId, props.contractId, props.wbsTempId, props.tenantId,
+    props.idPrefix, props.wbsType, props.fromType, props.MixRatioTestTreeData, props.entrust,
+], ([expandKeys, UserProjectId, UserContractId, UserWbsTempId, UserTenantId, UserIdPrefix, wbs_type, fromType, MixRatioTest_treeData, entrust]) => {
     TreeExpandKey.value = expandKeys
     projectId.value = UserProjectId
     contractId.value = UserContractId
@@ -109,11 +110,9 @@ watch(() => [
     wbsType.value = wbs_type
     fromTypedata.value = fromType
     treedata.value = MixRatioTest_treeData
+    hideEntrust.value = entrust
 })
 
-//事件
-const emit = defineEmits(['menuTap', 'nodeTap', 'nodeLoading'])
-
 //树形结构异步加载数据
 const defaultExpandedCids = ref([])
 
@@ -122,7 +121,7 @@ const ElTreeClick = async (data, node) => {
     let autoKeysArr = []
     await getNodeExpandKeys(node, autoKeysArr)
     const autoKeys = autoKeysArr.reverse()
-    emit('nodeTap', {node, data, keys: autoKeys})
+    emit('nodeTap', { node, data, keys: autoKeys })
 }
 
 //处理自动展开的节点KEY

src/views/tentative/material/sampling.vue

@@ -3,7 +3,8 @@
         <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"
+                :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2" :entrust="1"
+                @node-tap="wbsElTreeClick"
             />
         </template>
         <hc-new-card w-to="1919">

src/views/tentative/material/testSample.vue

@@ -3,7 +3,8 @@
         <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"
+                :wbs-temp-id="projectInfo?.referenceWbsTemplateIdTrial" :wbs-type="2" :entrust="1"
+                @node-tap="wbsElTreeClick"
             />
         </template>
         <hc-tab-card :tabs="tabsData" :tab-key="tabsKey" @change="tabsChange">