Merge branch 'master' into test-dev

src/views/data-fill/query.vue

@@ -424,7 +424,7 @@ import website from '~src/config'
 import { getDictionaryData } from '~uti/tools'
 import { getDictionary, userConfigSave } from '~api/other'
 import { useClick } from 'hc-vue3-ui'
-import { nodeModuleNameResolver } from 'typescript'
+
 
 //变量
 const useAppState = useAppStore()

src/views/data-fill/wbs.vue

@@ -3639,6 +3639,13 @@ const getOrSaveNodeBaseInfo = async ()=>{
   if (!error && code === 200) {
       console.log(data, 'data')
        autoFormData.value = getObjValue(data)
+       autoFormData.value.unit = data.unit === null ? '' : data.unit || ''
+       autoFormData.value.subUnit = data.subUnit === null ? '' : data.subUnit || ''
+       autoFormData.value.division = data.division === null ? '' : data.division || ''
+       autoFormData.value.subDivision = data.subDivision === null ? '' : data.subDivision || ''
+       autoFormData.value.subItem = data.subItem === null ? '' : data.subItem || ''
+       autoFormData.value.item = data.item === null ? '' : data.item || ''
+       autoFormData.value.processes = data.processes === null ? '' : data.processes || ''
        window?.$message?.success(msg)
   } 
 }

src/views/gauge/testdata.vue

@@ -15,7 +15,7 @@
                         <span>导入</span>
                     </el-button>
                 </HcTooltip>
-                <div class="w-60 ml-6">
+                <div class="ml-6 w-60">
                     <el-input v-model="searchForm.searchValue" clearable :placeholder="placeTitle" @keyup="keyUpEvent" />
                 </div>
                 <div class="ml-2">
@@ -77,7 +77,7 @@
                         <el-input v-model="formRowValue.batchNumber" placeholder="请输入试验批准文号" />
                     </el-form-item>
                     <el-form-item label="准备数量" prop="total">
-                        <el-input v-model="formRowValue.total" placeholder="请输入准备数量" />
+                        <el-input-number v-model="formRowValue.total" placeholder="请输入准备数量" :controls="false" class="w-full" />
                     </el-form-item>
                 </el-form>
                 <el-form v-if="tabsTypeKey === '1'" ref="matchformRowRef" :model="matchformRowValue" :rules="matchrulesRow" label-width="auto" size="large">

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

@@ -166,3 +166,30 @@ const uploadRemove = () => {
     }
 }
 </script>
+
+<style scoped lang="scss">
+/* 可以添加到你的样式文件中 */
+.hc-new-dialog .el-dialog__body {
+  max-height: 80vh; /* 限制弹窗内容最大高度为视口的80% */
+  overflow-y: auto; /* 内容超出时才显示滚动条 */
+  padding: 20px;
+}
+
+/* 调整上传组件的进度条样式 */
+.hc-upload-border .el-upload-list__item {
+  position: relative;
+}
+
+.hc-upload-border .el-progress {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  margin: 0;
+}
+
+/* 确保上传列表项有足够的底部空间容纳进度条 */
+.hc-upload-border .el-upload-list__item {
+  padding-bottom: 24px;
+}
+</style>

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

@@ -97,7 +97,7 @@
     <hc-context-menu ref="contextMenuRef" :datas="tableFormMenu" @item-click="handleMenuSelect" />
 
     <!-- 上传文件 -->
-    <hc-new-dialog v-model="uploadModal" :footer="false" title="上传文件" widths="38rem">
+    <hc-new-dialog v-model="uploadModal" :footer="false" title="上传文件" widths="38rem" height="300px">
         <HcUpload
             :base-data="baseData" :contract-id="contractId" :datas="uploadData" :file-list="fileListData"
             :table-type-value="tableTypeValue" @change="uploadChange"

src/views/tentative/material/approach.vue

@@ -109,7 +109,7 @@
                 <div class="hc-form-item">
                     <el-form-item label="材料类型" prop="materialType">
                         <el-select v-model="addEditFormModel.materialType" block>
-                            <el-option v-for="item in typeData" :label="item.dictValue" :value="item.dictKey" />
+                            <el-option v-for="(item, index) in typeData" :key="index" :label="item.dictValue" :value="item.dictKey" />
                         </el-select>
                     </el-form-item>
                     <el-form-item label="材料单价" prop="materialPrice">
@@ -280,7 +280,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
 import HcDragUpload from './components/HcDragUpload.vue'
 import FormItemUpload from './components/FormItemUpload.vue'
@@ -480,6 +480,24 @@ const addEditFormModalClose = () => {
 //新增/编辑 表单
 const addEditFormRef = ref(null)
 const addEditFormModel = ref({})
+
+
+watch(() => addEditFormModel.value.productionCertificate, (newVal) => {
+  if (newVal) {
+     addEditFormModel.value.productionCertificatePdfUrl = newVal
+  }
+})
+
+watch(() => addEditFormModel.value.qualityInspectionReport, (newVal) => {
+  if (newVal) {
+    addEditFormModel.value.qualityInspectionReportPdfUrl = newVal
+  }
+})
+watch(() => addEditFormModel.value.otherAccessories, (newVal) => {
+  if (newVal) {
+    addEditFormModel.value.otherAccessoriesPdfUrl = newVal
+  }
+})
 const otherAccessoriesName = ref('')
 const productionCertificateName = ref('')
 const qualityInspectionReportName = ref('')