资料查询的树，增加数量

src/views/data-fill/components/HcTreeData.vue

@@ -8,6 +8,7 @@
                     <span :class="data?.colorStatus === 2?'text-blue':data?.colorStatus === 3?'text-orange':data?.colorStatus === 4?'text-green':''" v-if="isColor">{{ node.label }}</span>
                     <span v-else>{{ node.label }}</span>
                 </div>
+                <div class="text-blue submit-counts" v-if="isSubmitCounts">【{{ data.submitCounts ?? 0 }}】</div>
                 <!--树组件，操作菜单-->
                 <div class="menu-icon" :class="node.showTreeMenu?'show':''" v-if="node.level !== 1 && menusData.length > 0" @click.stop>
                     <div class="cu-tree-node-popover-menu-icon" @click.prevent.stop="ElTreeLabelContextMenu($event,data,node)">
@@ -68,6 +69,10 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
+    submitCounts: {
+        type: Boolean,
+        default: false
+    },
 })
 
 //变量
@@ -84,6 +89,7 @@ const menuMark = ref(props.isMark)
 const isAutoKeys = ref(props.isAutoKeys)
 const TreeExpandKey = ref(props.autoExpandKeys)
 const idPrefix = ref(props.idPrefix);
+const isSubmitCounts = ref(props.submitCounts);
 
 //监听
 watch(() => [
@@ -92,12 +98,14 @@ watch(() => [
     props.isAutoKeys,
     props.autoExpandKeys,
     props.idPrefix,
-], ([menus, isMark, AutoKeys, expandKeys, UserIdPrefix]) => {
+    props.submitCounts,
+], ([menus, isMark, AutoKeys, expandKeys, UserIdPrefix, submitCounts]) => {
     menusData.value = menus
     menuMark.value = isMark
     isAutoKeys.value = AutoKeys
     TreeExpandKey.value = expandKeys
     idPrefix.value = UserIdPrefix
+    isSubmitCounts.value = submitCounts
 })
 
 //事件

src/views/data-fill/components/WbsTree.vue

@@ -8,6 +8,7 @@
                     <span :class="data?.colorStatus === 2?'text-blue':data?.colorStatus === 3?'text-orange':data?.colorStatus === 4?'text-green':''" v-if="isColor">{{ node.label }}</span>
                     <span v-else>{{ node.label }}</span>
                 </div>
+                <div class="text-blue submit-counts" v-if="isSubmitCounts">【{{ data.submitCounts ?? 0 }}】</div>
                 <!--树组件，操作菜单-->
                 <div class="menu-icon" :class="node.showTreeMenu?'show':''" v-if="node.level !== 1 && menusData.length > 0">
                     <div class="cu-tree-node-popover-menu-icon" @click.prevent.stop="ElTreeLabelContextMenu($event,data,node)">
@@ -78,6 +79,10 @@ const props = defineProps({
         type: String,
         default: ''
     },
+    submitCounts: {
+        type: Boolean,
+        default: false
+    },
 })
 
 //变量
@@ -96,6 +101,7 @@ const TreeExpandKey = ref(props.autoExpandKeys)
 const projectId = ref(props.projectId);
 const contractId = ref(props.contractId);
 const idPrefix = ref(props.idPrefix);
+const isSubmitCounts = ref(props.submitCounts);
 
 //监听
 watch(() => [
@@ -106,7 +112,8 @@ watch(() => [
     props.projectId,
     props.contractId,
     props.idPrefix,
-], ([menus, isMark, AutoKeys, expandKeys, UserProjectId, UserContractId,UserIdPrefix]) => {
+    props.submitCounts,
+], ([menus, isMark, AutoKeys, expandKeys, UserProjectId, UserContractId, UserIdPrefix, submitCounts]) => {
     menusData.value = menus
     menuMark.value = isMark
     isAutoKeys.value = AutoKeys
@@ -114,6 +121,7 @@ watch(() => [
     projectId.value = UserProjectId
     contractId.value = UserContractId
     idPrefix.value = UserIdPrefix
+    isSubmitCounts.value = submitCounts
 })
 
 //事件

src/views/data-fill/query.vue

@@ -22,10 +22,10 @@
                     <el-scrollbar>
                         <KeepAlive>
                             <template v-if="isSearchTree">
-                                <HcTreeData :datas="searchTreeData" :autoExpandKeys="treeAutoExpandKeys" isColor @nodeTap="wbsElTreeClick"/>
+                                <HcTreeData :datas="searchTreeData" :autoExpandKeys="treeAutoExpandKeys" submitCounts isColor @nodeTap="wbsElTreeClick"/>
                             </template>
                             <template v-else>
-                                <WbsTree :autoExpandKeys="treeAutoExpandKeys" :projectId="projectId" :contractId="contractId" isColor @nodeTap="wbsElTreeClick"/>
+                                <WbsTree :autoExpandKeys="treeAutoExpandKeys" :projectId="projectId" :contractId="contractId" submitCounts isColor @nodeTap="wbsElTreeClick"/>
                             </template>
                         </KeepAlive>
                     </el-scrollbar>
@@ -618,7 +618,7 @@ const rowsToId = (rows) => {
 }
 
 //左右拖动，改变树形结构宽度
-const leftWidth = ref(382);
+const leftWidth = ref(505);
 const onmousedown = () => {
     const leftNum = isCollapse.value ? 142 : 272
     document.onmousemove = (ve) => {

src/views/tentative/laboratory/user.vue

@@ -96,21 +96,21 @@
                                 <el-option label="离职" value="2"/>
                             </el-select>
                         </el-form-item>
-                        <el-form-item label="职称" prop="key5">
+                        <el-form-item label="职称" prop="key11">
                             <el-input v-model="addEditFormModel.key11"/>
                         </el-form-item>
-                        <el-form-item label="工作职务" prop="key6">
+                        <el-form-item label="工作职务" prop="key12">
                             <el-input v-model="addEditFormModel.key12"/>
                         </el-form-item>
                     </div>
                     <div class="hc-form-item">
-                        <el-form-item label="进场时间">
+                        <el-form-item label="进场时间" prop="key13">
                             <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>
-                        <el-form-item label="从事检测工作时间">
+                        <el-form-item label="从事检测工作时间" prop="key15">
                             <el-input v-model="addEditFormModel.key15"/>
                         </el-form-item>
                     </div>
@@ -166,6 +166,7 @@
 <script setup>
 import {ref} from "vue";
 import {useAppStore} from "~src/store";
+import { isIdCard } from "vue-utils-plus"
 
 //初始变量
 const useAppState = useAppStore()
@@ -262,11 +263,44 @@ const tabTypeChange = (item) => {
 const addEditFormRef = ref(null)
 const addEditFormModel = ref({})
 const addEditFormRules = {
+    key1: {
+        required: true,
+        trigger: 'blur',
+        message: "请输入"
+    },
     key2: {
+        required: true,
+        validator: (rule, value, callback) => {
+            if (!value) {
+                callback(new Error('请输入身份证号码'))
+            } else if (!isIdCard(value)) {
+                callback(new Error('身份证号码格式错误'))
+            } else {
+                callback()
+            }
+        },
+        trigger: 'blur'
+    },
+    key4: {
+        required: true,
+        trigger: 'blur',
+        message: "请选择"
+    },
+    key11: {
         required: true,
         trigger: 'blur',
         message: "请输入"
     },
+    key13: {
+        required: true,
+        trigger: 'blur',
+        message: "请选择"
+    },
+    key15: {
+        required: true,
+        trigger: 'blur',
+        message: "请选择"
+    },
 }
 
 //新增/编辑 保存