新主题

src/views/data-fill/collapse-form/index.vue

@@ -215,17 +215,14 @@
     </hc-new-dialog>
 
     <!-- 关联试验文件 -->
-    <HcDialog
-        v-model="fileModal" :loading="fileModalLoading" is-table save-text="保存" title="关联试验文件"
-        widths="84%" @close="fileModalClose" @save="savefileModal"
-    >
+    <hc-new-dialog v-model="fileModal" :loading="fileModalLoading" is-table save-text="保存" title="关联试验文件" widths="84%" @close="fileModalClose" @save="savefileModal">
         <HcTestFile
             v-if="fileModal" ref="testFileRefs" :contract-id="contract_id" :project-id="projectId"
             :tenant-id="tenant_id"
             :tree-id="treeId" :wbs-id="wbsTemp_id"
             :wbs-type="wbs_type"
         />
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 公式参数配置 -->
     <hc-new-dialog

src/views/ledger/components/table-form.vue

@@ -120,10 +120,7 @@
         </div>
 
         <!-- 关联工序 -->
-        <HcDialog
-            :show="processNodeModal" title="选择关联工序" widths="62rem" is-table
-            @close="processNodeModal = false" @save="processNodeClick"
-        >
+        <hc-new-dialog v-model="processNodeModal" title="选择关联工序" widths="62rem" is-table @save="processNodeClick">
             <div class="node-many-tree">
                 <!-- <el-tree
                     ref="processElTree" :default-checked-keys="defaultChecked"
@@ -142,14 +139,10 @@
                     @load="ElTreeLoadNode"
                 />
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 复制任意时间 -->
-        <HcDialog
-            :loading="copyTimeLoading" :padding="false" :show="copyTimeModal" is-table save-text="复制"
-            title="复制任意时间"
-            widths="62rem" @close="copyTimeModal = false" @save="copyTimeSaveClick"
-        >
+        <hc-new-dialog v-model="copyTimeModal" :loading="copyTimeLoading" :padding="false" is-table save-text="复制" title="复制任意时间" widths="62rem" @save="copyTimeSaveClick">
             <div class="hc-user-time-box">
                 <div class="tree-box">
                     <el-scrollbar>
@@ -169,7 +162,7 @@
                     />
                 </div>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 批量上报审批 -->
         <HcReportModal

src/views/other/components/ListItem.vue

@@ -120,15 +120,12 @@
     <HcContextMenu ref="contextMenuRef" :datas="tableFormMenu" @item-click="handleMenuSelect" />
 
     <!-- 上传文件 -->
-    <HcDialog :footer="false" :show="uploadModal" title="上传文件" widths="38rem" @close="uploadModal = false">
+    <hc-new-dialog v-model="uploadModal" :footer="false" title="上传文件" widths="38rem">
         <HcUpload :datas="uploadData" :file-list="fileListData" @change="uploadChange" />
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 插入设计值/频率 -->
-    <HcDialog
-        :show="IDVFModal" save-text="确认插入" title="插入设计值/频率" widths="600px" @close="closeIDVFModal"
-        @save="IDVFModalSaveClick"
-    >
+    <hc-new-dialog v-model="IDVFModal" save-text="确认插入" title="插入设计值/频率" widths="600px" @close="closeIDVFModal" @save="IDVFModalSaveClick">
         <el-alert :closable="false" title="填写完设计值和频率，系统自动计算实测值" type="warning" />
         <el-form ref="formIDVFRef" :model="formIDVFModel" label-width="auto" size="large">
             <div class="form-item-div text-center mb-3">
@@ -168,13 +165,10 @@
                 />
             </el-form-item>
         </el-form>
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 插入特殊字符 -->
-    <HcDialog
-        :show="specialModal" save-text="确认插入" title="插入特殊字符" widths="600px" @close="specialModal = false"
-        @save="specialNodeClick"
-    >
+    <hc-new-dialog v-model="specialModal" save-text="确认插入" title="插入特殊字符" widths="600px" @save="specialNodeClick">
         <el-form
             ref="specialFormRef" :model="specialFormModel" :rules="specialFormRules" class="mb-6" label-width="0px"
             size="large"
@@ -193,10 +187,10 @@
                 </div>
             </el-col>
         </el-row>
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 关联试验数据 -->
-    <HcDialog :footer="false" :show="CTDModal" title="关联试验数据" widths="84%" @close="CTDModal = false">
+    <hc-new-dialog v-model="CTDModal" :footer="false" title="关联试验数据" widths="84%">
         <div class="adding-form-dialog-box">
             <div class="dialog-tree-box">
                 <el-scrollbar>
@@ -243,12 +237,9 @@
                 </div>
             </div>
         </div>
-    </HcDialog>
+    </hc-new-dialog>
     <!-- 选择要插入的数据 -->
-    <HcDialog
-        :show="insertDataShow" save-text="保存" title="选择需要插入的数据" widths="84%" @close="cancelinsertData"
-        @save="submitinsertData"
-    >
+    <hc-new-dialog v-model="insertDataShow" save-text="保存" title="选择需要插入的数据" widths="84%" @close="cancelinsertData" @save="submitinsertData">
         <div>
             <div class="flex-1" style="padding-left:20px">
                 <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" :round="false" size="default" @change="tabTypeChange" />
@@ -291,12 +282,9 @@
                 </div>
             </div>
         </div>
-    </HcDialog>
+    </hc-new-dialog>
     <!-- 复制本表 -->
-    <HcDialog
-        :show="CopyModal" save-text="确认复制" title="复制本表" widths="1200px" @close="CopyModal = false"
-        @save="CopyModal = false"
-    >
+    <hc-new-dialog v-model="CopyModal" save-text="确认复制" title="复制本表" widths="1200px">
         <el-alert
             :closable="false" title="复跨节点复制: 把当前表格已形成的数据复制到其他工程部位的相同表格里面"
             type="warning"
@@ -332,12 +320,9 @@
                 </el-scrollbar>
             </div>
         </div>
-    </HcDialog>
+    </hc-new-dialog>
     <!-- 关联试验文件 -->
-    <HcDialog
-        :show="fileModal" save-text="保存" title="关联试验文件" widths="84%" @close="fileModal = false"
-        @save="savefileModal"
-    >
+    <hc-new-dialog v-model="fileModal" save-text="保存" title="关联试验文件" widths="84%" @save="savefileModal">
         <div class="radio-box">
             <el-radio-group v-model="fileModalradio" @change="radioChange">
                 <el-radio :label="1">试验检测</el-radio>
@@ -419,7 +404,7 @@
                 </div>
             </div>
         </div>
-    </HcDialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

src/views/tentative/collect/monthly.vue

@@ -113,12 +113,9 @@
         </div>
 
         <!-- 编辑备注 -->
-        <HcDialog
-            :loading="editorsNoteLoading" :show="editorsNoteModal" title="编辑备注信息" widths="45rem"
-            @close="editorsNoteModalClose" @save="editorsNoteModalSave"
-        >
+        <hc-new-dialog v-model="editorsNoteModal" :loading="editorsNoteLoading" title="编辑备注信息" widths="45rem" @close="editorsNoteModalClose" @save="editorsNoteModalSave">
             <el-input v-model="editorsNoteVal" :autosize="{ minRows: 5 }" placeholder="编辑备注信息" type="textarea" />
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/detect/collapse-form/src/index.vue

@@ -133,7 +133,7 @@
     </template>
 
     <!-- 操作提示 -->
-    <HcDialog :footer="false" :show="actionTipModal" title="操作提示" widths="38rem" @close="actionTipModalClose">
+    <hc-new-dialog v-model="actionTipModal" :footer="false" title="操作提示" widths="38rem" @close="actionTipModalClose">
         <div class="data-fill-table-tip-box">
             <div class="text-gray-400 tip-item">1、灰色框代表可通过系统识别计算，公式自动引用，可通过公式计算少量数据，(表头数据及简单)，也可只填写白色框数据</div>
             <div class="text-gray-400 tip-item">
@@ -144,7 +144,7 @@
             </div>
             <div class="text-orange-500 tip-item">3、完善资料填写后记得一定要保存哦</div>
         </div>
-    </HcDialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

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

@@ -5,22 +5,23 @@
         <div v-if="uploadValue" class="text-hover" @click.stop="previewClick">预览文件</div>
     </div>
 
-    <!--上传-->
-    <HcDialog :loading="uploadDisabled" :show="importModal" saveText="确认上传" title="上传文件" widths="38rem"
-              @close="importModalClose" @save="importModalYesClick">
-        <el-upload ref="uploadRef" :accept="accept" :action="api + action" :auto-upload="false"
-                   :before-upload="beforeUpload" :data="uploadData" :disabled="uploadDisabled"
-                   :headers="getTokenHeader()" :limit="1"
-                   :on-change="uploadChange"
-                   :on-error="uploadError" :on-exceed="uploadExceed" :on-progress="uploadprogress" 
-                   :on-success="uploadSuccess" :show-file-list="false" class="hc-upload-border approach" drag>
+    <!-- 上传 -->
+    <hc-new-dialog v-model="importModal" :loading="uploadDisabled" save-text="确认上传" title="上传文件" widths="38rem" @close="importModalClose" @save="importModalYesClick">
+        <el-upload
+            ref="uploadRef" :accept="accept" :action="api + action" :auto-upload="false"
+            :before-upload="beforeUpload" :data="uploadData" :disabled="uploadDisabled"
+            :headers="getTokenHeader()" :limit="1"
+            :on-change="uploadChange"
+            :on-error="uploadError" :on-exceed="uploadExceed" :on-progress="uploadprogress"
+            :on-success="uploadSuccess" :show-file-list="false" class="hc-upload-border approach" drag
+        >
             <div v-loading="uploadDisabled" class="hc-upload-loading upload-file-info" element-loading-text="上传中...">
                 <template v-if="uploadFileInfo?.name">
-                    <HcIcon class="upload-file-icon" name="file-text"/>
+                    <HcIcon class="upload-file-icon" name="file-text" />
                     <div class="upload-file-name">{{ uploadFileInfo?.name }}</div>
                 </template>
                 <template v-else>
-                    <HcIcon class="upload-icon" name="upload-cloud"/>
+                    <HcIcon class="upload-icon" name="upload-cloud" />
                     <div class="el-upload__text">拖动文件到这里 或 <em>点击这里选择文件</em> 并上传</div>
                 </template>
             </div>
@@ -28,63 +29,65 @@
                 <div class="el-upload__tip">允许格式：{{ formatTip }}， 文件大小 小于 {{ size }}MB</div>
             </template>
         </el-upload>
-    </HcDialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>
-import {ref, watch, onMounted} from "vue";
-import {getTokenHeader} from '~src/api/request/header';
-import {isFileSize} from "js-fast-way"
-import {genFileId} from "element-plus";
+import { onMounted, ref, watch } from 'vue'
+import { getTokenHeader } from '~src/api/request/header'
+import { isFileSize } from 'js-fast-way'
+import { genFileId } from 'element-plus'
 
 const props = defineProps({
     modelValue: {
         type: String,
-        default: ''
+        default: '',
     },
     datas: {
         type: Object,
-        default: () => ({})
+        default: () => ({}),
     },
     action: {
         type: String,
-        default: "upload-file"
+        default: 'upload-file',
     },
     accept: {
         type: String,
-        default: "image/png,image/jpg,image/jpeg,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/pdf,.doc,.docx,application/msword"
+        default: 'image/png,image/jpg,image/jpeg,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/pdf,.doc,.docx,application/msword',
     },
     size: {
         type: Number,
-        default: 20
+        default: 20,
     },
     formatTip: {
         type: String,
-        default: "png/jpg/jpeg/excel/pdf/doc/docx"
+        default: 'png/jpg/jpeg/excel/pdf/doc/docx',
     },
     fileName:{
         type: String,
-        default: ''
-    }
+        default: '',
+    },
 
 })
 
+//事件
+const emit = defineEmits(['progress', 'change', 'update:modelValue'])
 //变量
 const uploadRef = ref(null)
 const uploadData = ref(props.datas)
 const uploadFileInfo = ref({})
 const uploadDisabled = ref(false)
 const uploadValue = ref(props.modelValue)
-const fileNameVal=ref(props.fileName)
-const api = '/api/blade-resource/oss/endpoint/';
+const fileNameVal = ref(props.fileName)
+const api = '/api/blade-resource/oss/endpoint/'
 
 //监听
 watch(() => [
     props.datas,
     props.modelValue,
-    props.fileName
-  
-], ([datas, val,name]) => {
+    props.fileName,
+
+], ([datas, val, name]) => {
     uploadData.value = datas
     uploadValue.value = val
     // getFileName(val)
@@ -93,12 +96,9 @@ watch(() => [
 
 onMounted(() => {
     // getFileName(props.modelValue)
-  
-    fileNameValue.value=fileNameVal.value
-})
 
-//事件
-const emit = defineEmits(['progress', 'change', 'update:modelValue'])
+    fileNameValue.value = fileNameVal.value
+})
 
 //上传弹窗
 const importModal = ref(false)
@@ -132,10 +132,10 @@ const getFileName = (url) => {
 //上传前
 const beforeUpload = async (file) => {
     if (isFileSize(file?.size, props.size)) {
-        return true;
+        return true
     } else {
-        window?.$message?.warning('文件大小, 不能过' + props.size + 'M!');
-        return false;
+        window?.$message?.warning('文件大小, 不能过' + props.size + 'M!')
+        return false
     }
 }
 
@@ -154,23 +154,23 @@ const uploadprogress = () => {
 }
 
 //上传完成
-const uploadSuccess = ({code, data}) => {
+const uploadSuccess = ({ code, data }) => {
     uploadDisabled.value = false
     emit('progress', false)
     // const pdfUrl = data?.pdfUrl ?? ''
     const pdfUrl = data
     if (code === 200 && pdfUrl) {
         uploadValue.value = pdfUrl
-        window?.$message?.success('上传成功');
+        window?.$message?.success('上传成功')
         importModal.value = false
         // getFileName(pdfUrl)
-        fileNameValue.value=data?.originalName
+        fileNameValue.value = data?.originalName
         //事件
-        emit('update:modelValue',  data?.pdfUrl)
+        emit('update:modelValue', data?.pdfUrl)
         emit('change', data?.pdfUrl)
-       
+
     } else {
-        window?.$message?.error('上传失败');
+        window?.$message?.error('上传失败')
     }
 }
 
@@ -178,7 +178,7 @@ const uploadSuccess = ({code, data}) => {
 const uploadError = () => {
     uploadDisabled.value = false
     emit('progress', false)
-    window?.$message?.error('上传失败');
+    window?.$message?.error('上传失败')
 }
 
 //文件改变时

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

@@ -31,10 +31,7 @@
     </HcContextMenu>
 
     <!-- 新增/编辑 节点 -->
-    <HcDialog
-        :loading="nodeFormLoading" :show="nodeFormModal" :title="`${nodeFormModel.id ? '编辑' : '新增'}节点`"
-        widths="30rem" @close="nodeFormModalClose" @save="nodeFormModalSave"
-    >
+    <hc-new-dialog v-model="nodeFormModal" :loading="nodeFormLoading" :title="`${nodeFormModel.id ? '编辑' : '新增'}节点`" widths="30rem" @close="nodeFormModalClose" @save="nodeFormModalSave">
         <el-form
             ref="nodeFormRef" :model="nodeFormModel" :rules="nodeFormRules" label-position="top" label-width="auto"
             size="large"
@@ -43,7 +40,7 @@
                 <el-input v-model="nodeFormModel.nodeName" placeholder="请输入节点名称" />
             </el-form-item>
         </el-form>
-    </HcDialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

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

@@ -111,18 +111,15 @@
     <HcContextMenu ref="contextMenuRef" :datas="tableFormMenu" @item-click="handleMenuSelect" />
 
     <!-- 上传文件 -->
-    <HcDialog :footer="false" :show="uploadModal" title="上传文件" widths="38rem" @close="uploadModal = false">
+    <hc-new-dialog v-model="uploadModal" :footer="false" title="上传文件" widths="38rem">
         <HcUpload
             :base-data="baseData" :contract-id="contractId" :datas="uploadData" :file-list="fileListData"
             :table-type-value="tableTypeValue" @change="uploadChange"
         />
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 插入特殊字符 -->
-    <HcDialog
-        :show="specialModal" save-text="确认插入" title="插入特殊字符" widths="600px" @close="specialModal = false"
-        @save="specialNodeClick"
-    >
+    <hc-new-dialog v-model="specialModal" save-text="确认插入" title="插入特殊字符" widths="600px" @save="specialNodeClick">
         <el-form
             ref="specialFormRef" :model="specialFormModel" :rules="specialFormRules" class="mb-6" label-width="0px"
             size="large"
@@ -141,13 +138,10 @@
                 </div>
             </el-col>
         </el-row>
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 引用容器参数 -->
-    <HcDialog
-        :show="vesselModal" is-table save-text="确认引用" title="引用容器参数" widths="84%"
-        @close="vesselModalClose" @save="vesselModalSave"
-    >
+    <hc-new-dialog v-model="vesselModal" is-table save-text="确认引用" title="引用容器参数" widths="84%" @close="vesselModalClose" @save="vesselModalSave">
         <div class="adding-form-dialog-box">
             <div class="dialog-tree-box">
                 <el-scrollbar>
@@ -167,13 +161,10 @@
                 </div>
             </div>
         </div>
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 引用设备仪器 -->
-    <HcDialog
-        :show="deviceModal" is-table save-text="确认引用" title="引用设备仪器" widths="84%"
-        @close="deviceModalClose" @save="deviceModalSave"
-    >
+    <hc-new-dialog v-model="deviceModal" is-table save-text="确认引用" title="引用设备仪器" widths="84%" @close="deviceModalClose" @save="deviceModalSave">
         <!-- <HcTable ref="deviceTableRef" :column="deviceTableColumn" :datas="deviceTableData" :loading="deviceTableLoading" isCheck @selection-change="deviceTableSelection"/> -->
         <div class="adding-form-dialog-box">
             <div class="dialog-tree-box">
@@ -197,7 +188,7 @@
                 </div>
             </div>
         </div>
-    </HcDialog>
+    </hc-new-dialog>
 
     <!-- 查看表单 -->
     <template v-for="(item, index) in DragModalTableForm">
@@ -222,7 +213,7 @@
     </template>
 
     <!-- 操作提示 -->
-    <HcDialog :footer="false" :show="actionTipModal" title="操作提示" widths="38rem" @close="actionTipModalClose">
+    <hc-new-dialog v-model="actionTipModal" :footer="false" title="操作提示" widths="38rem" @close="actionTipModalClose">
         <div class="data-fill-table-tip-box">
             <div class="text-gray-400 tip-item">
                 1、灰色框代表可通过系统识别计算，公式自动引用，可通过公式计算少量数据，(表头数据及简单)，也可只填写白色框数据
@@ -232,7 +223,7 @@
             </div>
             <div class="text-orange-500 tip-item">3、完善资料填写后记得一定要保存哦</div>
         </div>
-    </HcDialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>

src/views/tentative/detect/outside.vue

@@ -98,10 +98,7 @@
         </div>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :is-close="false" :show="addEditFormModal" :title="`${formModalTitle} 第三方试验信息`" is-row-footer
-            widths="70rem" @close="addEditFormModalClose"
-        >
+        <hc-new-dialog :is-close="false" :show="addEditFormModal" :title="`${formModalTitle} 第三方试验信息`" is-row-footer widths="70rem" @close="addEditFormModalClose">
             <template #extra>
                 <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
             </template>
@@ -288,13 +285,10 @@
                     <span>确认</span>
                 </el-button>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 选择样品信息 -->
-        <HcDialog
-            :show="linksSampleModal" is-row-footer is-table title="选择样品信息" widths="70%"
-            @close="linksSampleModalClose"
-        >
+        <hc-new-dialog v-model="linksSampleModal" is-row-footer is-table title="选择样品信息" widths="70%" @close="linksSampleModalClose">
             <div class="hc-links-sample-modal-box">
                 <div class="hc-links-sample-tree-box">
                     <el-scrollbar>
@@ -332,7 +326,7 @@
             <template #rightRowFooter>
                 <HcPages :pages="searchSampleForm" @change="pageSampleChange" />
             </template>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

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

@@ -123,10 +123,7 @@
         </HcNewCard>
 
         <!-- 关联工程用途及部位 -->
-        <HcDialog
-            :show="linksRelateModal" is-table save-text="确认关联" title="关联工程用途及部位" widths="50rem"
-            @close="linksRelateModalClose" @save="linksRelateModalSave"
-        >
+        <hc-new-dialog v-model="linksRelateModal" is-table save-text="确认关联" title="关联工程用途及部位" widths="50rem" @close="linksRelateModalClose" @save="linksRelateModalSave">
             <div class="hc-links-relate-tree-box">
                 <div class="hc-search-tree-val">
                     <el-input
@@ -179,13 +176,10 @@
                     </el-scrollbar>
                 </div>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 关联原材检测报告 -->
-        <HcDialog
-            :show="linksRawModal" is-table save-text="确认关联" title="关联原材检测报告" widths="75rem"
-            @close="linksRawModalClose" @save="linksRawModalSave"
-        >
+        <hc-new-dialog v-model="linksRawModal" is-table save-text="确认关联" title="关联原材检测报告" widths="75rem" @close="linksRawModalClose" @save="linksRawModalSave">
             <div class="hc-links-sample-modal-box">
                 <div class="hc-links-sample-tree-box">
                     <el-scrollbar>
@@ -205,13 +199,10 @@
                     />
                 </div>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 关联取样 -->
-        <HcDialog
-            :show="linksSampleModal" is-table save-text="确认" title="关联取样信息" widths="75rem"
-            @close="linksSampleModalClose" @save="linksSampleModalSave"
-        >
+        <hc-new-dialog v-model="linksSampleModal" is-table save-text="确认" title="关联取样信息" widths="75rem" @close="linksSampleModalClose" @save="linksSampleModalSave">
             <div class="hc-links-sample-modal-box">
                 <div class="hc-links-sample-tree-box">
                     <el-scrollbar>
@@ -230,7 +221,7 @@
                     />
                 </div>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 批量上报审批 -->
         <HcReportModal

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

@@ -86,10 +86,7 @@
         </HcTabCard>
 
         <!-- 关联工程用途及部位 -->
-        <HcDialog
-            :show="linksRelateModal" is-table save-text="确认关联" title="关联工程用途及部位" widths="50rem"
-            @close="linksRelateModalClose" @save="linksRelateModalSave"
-        >
+        <hc-new-dialog :show="linksRelateModal" is-table save-text="确认关联" title="关联工程用途及部位" widths="50rem" @close="linksRelateModalClose" @save="linksRelateModalSave">
             <div class="hc-links-relate-tree-box">
                 <div class="hc-search-tree-val">
                     <el-input v-model="linksRelateSearchTreeVal" block clearable placeholder="请输入名称关键词检索" @keyup="searchTreeKeyUp">
@@ -139,13 +136,10 @@
                     </el-scrollbar>
                 </div>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 关联原材检测报告 -->
-        <HcDialog
-            :show="linksRawModal" is-table save-text="确认关联" title="关联原材检测报告" widths="75rem"
-            @close="linksRawModalClose" @save="linksRawModalSave"
-        >
+        <hc-new-dialog v-model="linksRawModal" is-table save-text="确认关联" title="关联原材检测报告" widths="75rem" @close="linksRawModalClose" @save="linksRawModalSave">
             <div class="hc-links-sample-modal-box">
                 <div class="hc-links-sample-tree-box">
                     <el-scrollbar>
@@ -165,13 +159,10 @@
                     />
                 </div>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 关联取样 -->
-        <HcDialog
-            :show="linksSampleModal" is-table save-text="确认" title="关联取样信息" widths="75rem"
-            @close="linksSampleModalClose" @save="linksSampleModalSave"
-        >
+        <hc-new-dialog v-model="linksSampleModal" is-table save-text="确认" title="关联取样信息" widths="75rem" @close="linksSampleModalClose" @save="linksSampleModalSave">
             <div class="hc-links-sample-modal-box">
                 <div class="hc-links-sample-tree-box">
                     <el-scrollbar>
@@ -190,7 +181,7 @@
                     />
                 </div>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 批量上报审批 -->
         <HcReportModal

src/views/tentative/detect/test.vue

@@ -187,10 +187,7 @@
         </div>
 
         <!-- 查看附件 -->
-        <HcDialog
-            :footer="false" :show="viewAttachmentModal" is-table title="查看附件" widths="70rem"
-            @close="viewAttachmentModalClose"
-        >
+        <hc-new-dialog :footer="false" :show="viewAttachmentModal" is-table title="查看附件" widths="70rem" @close="viewAttachmentModalClose">
             <template #extra>
                 <HcNewSwitch :datas="tabTypeTab" :keys="tabTypeKey" size="default" @change="tabTypeChange" />
             </template>
@@ -217,18 +214,15 @@
                     </div>
                 </div>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 查看样品信息 -->
-        <HcDialog
-            :footer="false" :show="samplingRecordModal" is-table title="查看样品信息" widths="60%"
-            @close="samplingRecordModalClose"
-        >
+        <hc-new-dialog :footer="false" :show="samplingRecordModal" is-table title="查看样品信息" widths="60%" @close="samplingRecordModalClose">
             <HcTable
                 :column="samplingTableColumn" :datas="samplingTableData" :is-index="false"
                 :loading="samplingTableLoading" is-new
             />
-        </HcDialog>
+        </hc-new-dialog>
         <!-- 批量上报审批 -->
         <HcReportModal
 

src/views/tentative/detect/third.vue

@@ -99,8 +99,8 @@
         </div>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :is-close="false" :show="addEditFormModal" :title="`${formModalTitle} 外委试验信息`" is-row-footer
+        <hc-new-dialog
+            v-model="addEditFormModal" :is-close="false" :title="`${formModalTitle} 外委试验信息`" is-row-footer
             widths="70rem" @close="addEditFormModalClose"
         >
             <template #extra>
@@ -288,13 +288,10 @@
                     <span>确认</span>
                 </el-button>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 选择样品信息 -->
-        <HcDialog
-            :show="linksSampleModal" is-row-footer is-table title="选择样品信息" widths="70%"
-            @close="linksSampleModalClose"
-        >
+        <hc-new-dialog v-model="linksSampleModal" is-row-footer is-table title="选择样品信息" widths="70%" @close="linksSampleModalClose">
             <div class="hc-links-sample-modal-box">
                 <div class="hc-links-sample-tree-box">
                     <el-scrollbar>
@@ -332,7 +329,7 @@
             <template #rightRowFooter>
                 <HcPages :pages="searchSampleForm" @change="pageSampleChange" />
             </template>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/device/approach.vue

@@ -110,8 +110,8 @@
         </div>
 
         <!-- 新增/编辑 节点 -->
-        <HcDialog
-            :loading="addEditNodeFormLoading" :show="addEditNodeFormModal" :title="`${addEditNodeFormModel.id ? '编辑' : '新增'}分类`"
+        <hc-new-dialog
+            v-model="addEditNodeFormModal" :loading="addEditNodeFormLoading" :title="`${addEditNodeFormModel.id ? '编辑' : '新增'}分类`"
             widths="30rem" @close="addEditNodeFormModalClose" @save="addEditNodeFormModalSave"
         >
             <el-form
@@ -122,11 +122,11 @@
                     <el-input v-model="addEditNodeFormModel.className" placeholder="请输入分类名称" />
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :loading="addEditFormLoading" :show="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}设备信息`"
+        <hc-new-dialog
+            v-model="addEditFormModal" :loading="addEditFormLoading" :title="`${addEditFormModel.id ? '编辑' : '新增'}设备信息`"
             widths="50rem" @close="addEditFormModalClose" @save="addEditFormClick"
         >
             <el-form
@@ -224,11 +224,11 @@
                     />
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 导入 -->
-        <HcDialog
-            :loading="importModalLoading" :show="importModal" is-footer-center is-table title="导入设备数据"
+        <hc-new-dialog
+            v-model="importModal" :loading="importModalLoading" is-footer-center is-table title="导入设备数据"
             widths="70rem" @close="importModalClose" @save="importModalYesClick"
         >
             <div class="text-orange mb-6">
@@ -253,7 +253,7 @@
                     </template>
                 </HcTable>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/device/employ.vue

@@ -78,8 +78,8 @@
         </div>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :loading="addEditFormLoading" :show="addEditFormModal" title="新增/编辑 设备使用信息" widths="50rem"
+        <hc-new-dialog
+            v-model="addEditFormModal" :loading="addEditFormLoading" title="新增/编辑 设备使用信息" widths="50rem"
             @close="addEditFormModalClose" @save="addEditFormClick"
         >
             <el-form
@@ -171,11 +171,11 @@
                     />
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 导入 -->
-        <HcDialog
-            :loading="importModalLoading" :show="importModal" is-footer-center is-table title="导入设备使用数据"
+        <hc-new-dialog
+            v-model="importModal" :loading="importModalLoading" is-table title="导入设备使用数据"
             widths="70rem" @close="importModalClose" @save="importModalYesClick"
         >
             <div class="text-orange mb-6">
@@ -198,7 +198,7 @@
                     </template>
                 </HcTable>
             </div>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/device/overhaul.vue

@@ -78,8 +78,8 @@
         </div>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :loading="addEditFormLoading" :show="addEditFormModal" title="新增/编辑 设备检修信息" widths="50rem"
+        <hc-new-dialog
+            v-model="addEditFormModal" :loading="addEditFormLoading" title="新增/编辑 设备检修信息" widths="50rem"
             @close="addEditFormModalClose" @save="addEditFormClick"
         >
             <el-form
@@ -142,11 +142,11 @@
                     <el-input v-model="addEditFormModel.remarks" :autosize="{ minRows: 3 }" type="textarea" />
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 导入 -->
-        <HcDialog
-            :loading="importModalLoading" :show="importModal" is-footer-center is-table title="导入设备检修数据"
+        <hc-new-dialog
+            v-model="importModal" :loading="importModalLoading" is-table title="导入设备检修数据"
             widths="70rem" @close="importModalClose" @save="importModalYesClick"
         >
             <div class="text-orange mb-6">
@@ -162,7 +162,7 @@
                     @selection-change="tableImportSelection"
                 />
             </div>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/laboratory/components/FormItemUpload.vue

@@ -5,21 +5,25 @@
         <div v-if="uploadValue" class="text-hover" @click.stop="previewClick">预览文件</div>
     </div>
 
-    <!--上传-->
-    <HcDialog :loading="uploadDisabled" :show="importModal" saveText="确认上传" title="上传文件" widths="38rem"
-              @close="importModalClose" @save="importModalYesClick">
-        <el-upload ref="uploadRef" :accept="accept" :action="api + action" :auto-upload="false"
-                   :before-upload="beforeUpload" :data="uploadData" :disabled="uploadDisabled" :headers="getTokenHeader()" :limit="1"
-                   :on-change="uploadChange"
-                   :on-error="uploadError" :on-exceed="uploadExceed" :on-progress="uploadprogress"
-                   :on-success="uploadSuccess" :show-file-list="false" class="hc-upload-border approach" drag>
+    <!-- 上传 -->
+    <hc-new-dialog
+        v-model="importModal" :loading="uploadDisabled" save-text="确认上传" title="上传文件" widths="38rem"
+        @close="importModalClose" @save="importModalYesClick"
+    >
+        <el-upload
+            ref="uploadRef" :accept="accept" :action="api + action" :auto-upload="false"
+            :before-upload="beforeUpload" :data="uploadData" :disabled="uploadDisabled" :headers="getTokenHeader()" :limit="1"
+            :on-change="uploadChange"
+            :on-error="uploadError" :on-exceed="uploadExceed" :on-progress="uploadprogress"
+            :on-success="uploadSuccess" :show-file-list="false" class="hc-upload-border approach" drag
+        >
             <div v-loading="uploadDisabled" class="hc-upload-loading upload-file-info" element-loading-text="上传中...">
                 <template v-if="uploadFileInfo?.name">
-                    <HcIcon class="upload-file-icon" name="file-text"/>
+                    <HcIcon class="upload-file-icon" name="file-text" />
                     <div class="upload-file-name">{{ uploadFileInfo?.name }}</div>
                 </template>
                 <template v-else>
-                    <HcIcon class="upload-icon" name="upload-cloud"/>
+                    <HcIcon class="upload-icon" name="upload-cloud" />
                     <div class="el-upload__text">拖动文件到这里 或 <em>点击这里选择文件</em> 并上传</div>
                 </template>
             </div>
@@ -27,42 +31,44 @@
                 <div class="el-upload__tip">允许格式：{{ formatTip }}， 文件大小 小于 {{ size }}MB</div>
             </template>
         </el-upload>
-    </HcDialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>
-import {ref, watch, onMounted} from "vue";
-import {getTokenHeader} from '~src/api/request/header';
-import {isFileSize} from "js-fast-way"
-import {genFileId} from "element-plus";
+import { onMounted, ref, watch } from 'vue'
+import { getTokenHeader } from '~src/api/request/header'
+import { isFileSize } from 'js-fast-way'
+import { genFileId } from 'element-plus'
 
 const props = defineProps({
     modelValue: {
         type: String,
-        default: ''
+        default: '',
     },
     datas: {
         type: Object,
-        default: () => ({})
+        default: () => ({}),
     },
     action: {
         type: String,
-        default: "upload-file"
+        default: 'upload-file',
     },
     accept: {
         type: String,
-        default: "image/png,image/jpg,image/jpeg,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/pdf,.doc,.docx,application/msword"
+        default: 'image/png,image/jpg,image/jpeg,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/pdf,.doc,.docx,application/msword',
     },
     size: {
         type: Number,
-        default: 20
+        default: 20,
     },
     formatTip: {
         type: String,
-        default: "png/jpg/jpeg/excel/pdf/doc/docx"
+        default: 'png/jpg/jpeg/excel/pdf/doc/docx',
     },
 })
 
+//事件
+const emit = defineEmits(['progress', 'change', 'update:modelValue'])
 //变量
 const uploadRef = ref(null)
 const uploadData = ref(props.datas)
@@ -70,12 +76,12 @@ const uploadFileInfo = ref({})
 const uploadDisabled = ref(false)
 const uploadValue = ref(props.modelValue)
 
-const api = '/api/blade-resource/oss/endpoint/';
+const api = '/api/blade-resource/oss/endpoint/'
 
 //监听
 watch(() => [
     props.datas,
-    props.modelValue
+    props.modelValue,
 ], ([datas, val]) => {
     uploadData.value = datas
     uploadValue.value = val
@@ -86,9 +92,6 @@ onMounted(() => {
     getFileName(props.modelValue)
 })
 
-//事件
-const emit = defineEmits(['progress', 'change', 'update:modelValue'])
-
 //上传弹窗
 const importModal = ref(false)
 const importModalClick = () => {
@@ -121,10 +124,10 @@ const getFileName = (url) => {
 //上传前
 const beforeUpload = async (file) => {
     if (isFileSize(file?.size, props.size)) {
-        return true;
+        return true
     } else {
-        window?.$message?.warning('文件大小, 不能过' + props.size + 'M!');
-        return false;
+        window?.$message?.warning('文件大小, 不能过' + props.size + 'M!')
+        return false
     }
 }
 
@@ -143,20 +146,20 @@ const uploadprogress = () => {
 }
 
 //上传完成
-const uploadSuccess = ({code, data}) => {
+const uploadSuccess = ({ code, data }) => {
     uploadDisabled.value = false
     emit('progress', false)
     const pdfUrl = data?.pdfUrl ?? ''
     if (code === 200 && pdfUrl) {
         uploadValue.value = pdfUrl
-        window?.$message?.success('上传成功');
+        window?.$message?.success('上传成功')
         importModal.value = false
         getFileName(pdfUrl)
         //事件
         emit('update:modelValue', pdfUrl)
         emit('change', pdfUrl)
     } else {
-        window?.$message?.error('上传失败');
+        window?.$message?.error('上传失败')
     }
 }
 
@@ -164,7 +167,7 @@ const uploadSuccess = ({code, data}) => {
 const uploadError = () => {
     uploadDisabled.value = false
     emit('progress', false)
-    window?.$message?.error('上传失败');
+    window?.$message?.error('上传失败')
 }
 
 //文件改变时

src/views/tentative/laboratory/user.vue

@@ -53,8 +53,8 @@
         </HcNewCard>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :is-close="false" :loading="addEditFormLoading" :show="addEditFormModal"
+        <hc-new-dialog
+            v-model="addEditFormModal" :is-close="false" :loading="addEditFormLoading"
             :title="`${addEditFormModel.id ? '编辑' : '新增'}人员档案`" widths="70rem" @close="addEditFormModalClose"
             @save="addEditFormClick"
         >
@@ -200,7 +200,7 @@
                     </el-form-item>
                 </template>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/material/approach.vue

@@ -98,8 +98,8 @@
         </HcNewCard>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :loading="addEditFormLoading" :show="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}材料进场`"
+        <hc-new-dialog
+            v-model="addEditFormModal" :loading="addEditFormLoading" :title="`${addEditFormModel.id ? '编辑' : '新增'}材料进场`"
             widths="45rem" @close="addEditFormModalClose" @save="addEditFormClick"
         >
             <el-form
@@ -172,11 +172,11 @@
                     <FormItemUpload v-model="addEditFormModel.otherAccessories" :file-name="otherAccessoriesName" />
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 复制材料登记信息 -->
-        <HcDialog
-            :loading="copyTableLoading" :show="copyTableModal" is-table title="复制材料登记信息" widths="60rem"
+        <hc-new-dialog
+            v-model="copyTableModal" :loading="copyTableLoading" is-table title="复制材料登记信息" widths="60rem"
             @close="copyTableModalClose" @save="copyTableClick"
         >
             <HcTable :column="copyTableColumn" :datas="copyTableData" is-new :index-style="{ width: 60 }">
@@ -190,10 +190,10 @@
                     <el-button plain size="small" type="danger" @click="materialNumberDel(index)">删除</el-button>
                 </template>
             </HcTable>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 导入 -->
-        <HcDialog :show="importModal" is-row-footer title="导入" widths="38rem" @close="importModalClose">
+        <hc-new-dialog v-model="importModal" is-row-footer title="导入" widths="38rem" @close="importModalClose">
             <HcDragUpload
                 ref="uploadRef" api="/api/blade-business/material/" :datas="uploadData" action="mobilization/import"
                 @finished="uploadFinished" @progress="uploadprogress"
@@ -214,11 +214,11 @@
                     <span>确认导入</span>
                 </el-button>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 查看附件 -->
-        <HcDialog
-            :show="viewAttachmentModal" is-table title="查看附件" widths="70rem" is-row-footer
+        <hc-new-dialog
+            v-model="viewAttachmentModal" is-table title="查看附件" widths="70rem" is-row-footer
             @close="viewAttachmentModalClose"
         >
             <template #extra>
@@ -269,13 +269,10 @@
                     <span>删除</span>
                 </el-button>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 取样记录 -->
-        <HcDialog
-            :footer="false" :show="samplingRecordModal" is-table title="取样记录" widths="60%"
-            @close="samplingRecordModalClose"
-        >
+        <hc-new-dialog v-model="samplingRecordModal" :footer="false" is-table title="取样记录" widths="60%" @close="samplingRecordModalClose">
             <HcTable
                 :column="samplingTableColumn" :datas="samplingTableData" :is-index="false"
                 :loading="samplingTableLoading" is-new
@@ -284,7 +281,7 @@
                     <span>{{ row.isOutsourcing === 1 ? '是' : '否' }}</span>
                 </template>
             </HcTable>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

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

@@ -5,21 +5,22 @@
         <div v-if="uploadValue" class="text-hover" @click.stop="previewClick">预览文件</div>
     </div>
 
-    <!--上传-->
-    <HcDialog :loading="uploadDisabled" :show="importModal" saveText="确认上传" title="上传文件" widths="38rem"
-              @close="importModalClose" @save="importModalYesClick">
-        <el-upload ref="uploadRef" :accept="accept" :action="api + action" :auto-upload="false"
-                   :before-upload="beforeUpload" :data="uploadData" :disabled="uploadDisabled" :headers="getTokenHeader()" :limit="1"
-                   :on-change="uploadChange"
-                   :on-error="uploadError" :on-exceed="uploadExceed" :on-progress="uploadprogress"
-                   :on-success="uploadSuccess" :show-file-list="false" class="hc-upload-border approach" drag>
+    <!-- 上传 -->
+    <hc-new-dialog v-model="importModal" :loading="uploadDisabled" save-text="确认上传" title="上传文件" widths="38rem" @close="importModalClose" @save="importModalYesClick">
+        <el-upload
+            ref="uploadRef" :accept="accept" :action="api + action" :auto-upload="false"
+            :before-upload="beforeUpload" :data="uploadData" :disabled="uploadDisabled" :headers="getTokenHeader()" :limit="1"
+            :on-change="uploadChange"
+            :on-error="uploadError" :on-exceed="uploadExceed" :on-progress="uploadprogress"
+            :on-success="uploadSuccess" :show-file-list="false" class="hc-upload-border approach" drag
+        >
             <div v-loading="uploadDisabled" class="hc-upload-loading upload-file-info" element-loading-text="上传中...">
                 <template v-if="uploadFileInfo?.name">
-                    <HcIcon class="upload-file-icon" name="file-text"/>
+                    <HcIcon class="upload-file-icon" name="file-text" />
                     <div class="upload-file-name">{{ uploadFileInfo?.name }}</div>
                 </template>
                 <template v-else>
-                    <HcIcon class="upload-icon" name="upload-cloud"/>
+                    <HcIcon class="upload-icon" name="upload-cloud" />
                     <div class="el-upload__text">拖动文件到这里 或 <em>点击这里选择文件</em> 并上传</div>
                 </template>
             </div>
@@ -27,62 +28,64 @@
                 <div class="el-upload__tip">允许格式：{{ formatTip }}， 文件大小 小于 {{ size }}MB</div>
             </template>
         </el-upload>
-    </HcDialog>
+    </hc-new-dialog>
 </template>
 
 <script setup>
-import {ref, watch, onMounted} from "vue";
-import {getTokenHeader} from '~src/api/request/header';
-import {isFileSize} from "js-fast-way"
-import {genFileId} from "element-plus";
+import { onMounted, ref, watch } from 'vue'
+import { getTokenHeader } from '~src/api/request/header'
+import { isFileSize } from 'js-fast-way'
+import { genFileId } from 'element-plus'
 
 const props = defineProps({
     modelValue: {
         type: String,
-        default: ''
+        default: '',
     },
     datas: {
         type: Object,
-        default: () => ({})
+        default: () => ({}),
     },
     action: {
         type: String,
-        default: "upload-file"
+        default: 'upload-file',
     },
     accept: {
         type: String,
-        default: "image/png,image/jpg,image/jpeg,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/pdf,.doc,.docx,application/msword"
+        default: 'image/png,image/jpg,image/jpeg,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/pdf,.doc,.docx,application/msword',
     },
     size: {
         type: Number,
-        default: 20
+        default: 20,
     },
     formatTip: {
         type: String,
-        default: "png/jpg/jpeg/excel/pdf/doc/docx"
+        default: 'png/jpg/jpeg/excel/pdf/doc/docx',
     },
     fileName:{
         type: String,
-        default: ""
-    }
+        default: '',
+    },
 })
 
+//事件
+const emit = defineEmits(['progress', 'change', 'update:modelValue'])
 //变量
 const uploadRef = ref(null)
 const uploadData = ref(props.datas)
 const uploadFileInfo = ref({})
 const uploadDisabled = ref(false)
 const uploadValue = ref(props.modelValue)
-const fileNameVal=ref(props.fileName)
+const fileNameVal = ref(props.fileName)
 
-const api = '/api/blade-resource/oss/endpoint/';
+const api = '/api/blade-resource/oss/endpoint/'
 
 //监听
 watch(() => [
     props.datas,
     props.modelValue,
-    props.fileName
-], ([datas, val,name]) => {
+    props.fileName,
+], ([datas, val, name]) => {
     uploadData.value = datas
     uploadValue.value = val
     fileNameVal.value = name
@@ -91,12 +94,9 @@ watch(() => [
 })
 
 onMounted(() => {
-    fileNameValue.value=fileNameVal.value
+    fileNameValue.value = fileNameVal.value
 })
 
-//事件
-const emit = defineEmits(['progress', 'change', 'update:modelValue'])
-
 //上传弹窗
 const importModal = ref(false)
 const importModalClick = () => {
@@ -129,10 +129,10 @@ const getFileName = (url) => {
 //上传前
 const beforeUpload = async (file) => {
     if (isFileSize(file?.size, props.size)) {
-        return true;
+        return true
     } else {
-        window?.$message?.warning('文件大小, 不能过' + props.size + 'M!');
-        return false;
+        window?.$message?.warning('文件大小, 不能过' + props.size + 'M!')
+        return false
     }
 }
 
@@ -151,22 +151,22 @@ const uploadprogress = () => {
 }
 
 //上传完成
-const uploadSuccess = ({code, data}) => {
+const uploadSuccess = ({ code, data }) => {
     uploadDisabled.value = false
     emit('progress', false)
     const pdfUrl = data?.pdfUrl ?? ''
     if (code === 200 && pdfUrl) {
         uploadValue.value = pdfUrl
-        window?.$message?.success('上传成功');
+        window?.$message?.success('上传成功')
         importModal.value = false
-        console.log(data,'data');
-        fileNameValue.value=data?.originalName
+        console.log(data, 'data')
+        fileNameValue.value = data?.originalName
         // getFileName(pdfUrl)
         //事件
         emit('update:modelValue', pdfUrl)
         emit('change', pdfUrl)
     } else {
-        window?.$message?.error('上传失败');
+        window?.$message?.error('上传失败')
     }
 }
 
@@ -174,7 +174,7 @@ const uploadSuccess = ({code, data}) => {
 const uploadError = () => {
     uploadDisabled.value = false
     emit('progress', false)
-    window?.$message?.error('上传失败');
+    window?.$message?.error('上传失败')
 }
 
 //文件改变时

src/views/tentative/material/sampling.vue

@@ -105,8 +105,8 @@
         </div>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :show="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}样品信息`" is-row-footer
+        <hc-new-dialog
+            v-model="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}样品信息`" is-row-footer
             widths="50rem" @close="addEditFormModalClose"
         >
             <el-form
@@ -202,13 +202,10 @@
                     <span>确认</span>
                 </el-button>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 关联进场材料 -->
-        <HcDialog
-            :show="linksApproachModal" is-row-footer is-table title="关联进场材料信息" widths="60%"
-            @close="linksApproachModalClose"
-        >
+        <hc-new-dialog v-model="linksApproachModal" is-row-footer is-table title="关联进场材料信息" widths="60%" @close="linksApproachModalClose">
             <HcTable
                 :column="linksApproachTableColumn" :datas="linksApproachTableData"
                 :is-index="false" :loading="linksApproachTableLoading" is-new
@@ -241,11 +238,11 @@
                     <span>确定</span>
                 </el-button>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 复制样品登记信息 -->
-        <HcDialog
-            :loading="copyTableLoading" :show="copyTableModal" is-table title="复制样品登记信息" widths="60rem"
+        <hc-new-dialog
+            v-model="copyTableModal" :loading="copyTableLoading" is-table title="复制样品登记信息" widths="60rem"
             @close="copyTableModalClose" @save="copyTableClick"
         >
             <HcTable :column="copyTableColumn" :datas="copyTableData" is-new :index-style="{ width: 60 }">
@@ -256,10 +253,10 @@
                     <el-button plain size="small" type="danger" @click="specificationNumberDel(index)">删除</el-button>
                 </template>
             </HcTable>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 导入 -->
-        <HcDialog :show="importModal" is-row-footer title="导入" widths="38rem" @close="importModalClose">
+        <hc-new-dialog v-model="importModal" is-row-footer title="导入" widths="38rem" @close="importModalClose">
             <HcDragUpload
                 ref="uploadRef" api="/api/blade-business/material/" :datas="uploadData"
                 action="sample/import"
@@ -281,7 +278,7 @@
                     <span>确认导入</span>
                 </el-button>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/parameter/compactness.vue

@@ -32,8 +32,8 @@
         </HcNewCard>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :loading="addEditFormLoading" :show="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}压实度参数`"
+        <hc-new-dialog
+            v-model="addEditFormModal" :loading="addEditFormLoading" :title="`${addEditFormModel.id ? '编辑' : '新增'}压实度参数`"
             widths="30rem" @close="addEditFormModalClose" @save="addEditFormClick"
         >
             <el-form
@@ -53,7 +53,7 @@
                     <el-input v-model="addEditFormModel.assuranceRateNinetyPercent" />
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/parameter/container.vue

@@ -77,8 +77,8 @@
         </div>
 
         <!-- 新增/编辑 节点 -->
-        <HcDialog
-            :show="addEditNodeFormModal" :title="`${addEditNodeFormModel.id ? '编辑' : '新增'}试验容器`"
+        <hc-new-dialog
+            v-model="addEditNodeFormModal" :title="`${addEditNodeFormModel.id ? '编辑' : '新增'}试验容器`"
             is-row-footer widths="30rem" @close="addEditNodeFormModalClose"
         >
             <el-form :model="addEditNodeFormModel" label-position="top" label-width="auto" size="large">
@@ -132,11 +132,11 @@
                     <span>提交</span>
                 </el-button>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :loading="addEditFormLoading" :show="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}数据`"
+        <hc-new-dialog
+            v-model="addEditFormModal" :loading="addEditFormLoading" :title="`${addEditFormModel.id ? '编辑' : '新增'}数据`"
             widths="30rem" @close="addEditFormModalClose" @save="addEditFormClick"
         >
             <el-form
@@ -157,10 +157,10 @@
                     </el-form-item>
                 </template>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 导入 -->
-        <HcDialog :show="importModal" is-row-footer title="导入" widths="38rem" @close="importModalClose">
+        <hc-new-dialog v-model="importModal" is-row-footer title="导入" widths="38rem" @close="importModalClose">
             <HcDragUpload ref="uploadRef" :datas="uploadData" action="/api/blade-business/container/data/import-excel" @finished="uploadFinished" @progress="uploadprogress" />
             <template #leftRowFooter>
                 <el-button size="large" :loading="downloadLoading" @click="download">
@@ -178,7 +178,7 @@
                     <span>确认导入</span>
                 </el-button>
             </template>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/parameter/density.vue

@@ -32,8 +32,8 @@
         </HcNewCard>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :loading="addEditFormLoading" :show="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}温度信息`"
+        <hc-new-dialog
+            v-model="addEditFormModal" :loading="addEditFormLoading" :title="`${addEditFormModel.id ? '编辑' : '新增'}温度信息`"
             widths="30rem" @close="addEditFormModalClose" @save="addEditFormClick"
         >
             <el-form
@@ -47,7 +47,7 @@
                     <el-input v-model="addEditFormModel.waterDensity" />
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>
 

src/views/tentative/parameter/sieve.vue

@@ -65,8 +65,8 @@
         </div>
 
         <!-- 新增/编辑 节点 -->
-        <HcDialog
-            :loading="addEditNodeFormLoading" :show="addEditNodeFormModal" :title="`${addEditNodeFormModel.id ? '编辑' : '新增'}类型`"
+        <hc-new-dialog
+            v-model="addEditNodeFormModal" :loading="addEditNodeFormLoading" :title="`${addEditNodeFormModel.id ? '编辑' : '新增'}类型`"
             widths="30rem" @close="addEditNodeFormModalClose" @save="addEditNodeFormModalSave"
         >
             <el-form
@@ -77,11 +77,11 @@
                     <el-input v-model="addEditNodeFormModel.name" placeholder="请输入类型名称" />
                 </el-form-item>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
 
         <!-- 新增/编辑 -->
-        <HcDialog
-            :loading="addEditFormLoading" :show="addEditFormModal" :title="`${addEditFormModel.id ? '编辑' : '新增'}筛孔尺寸信息`"
+        <hc-new-dialog
+            v-model="addEditFormModal" :loading="addEditFormLoading" :title="`${addEditFormModel.id ? '编辑' : '新增'}筛孔尺寸信息`"
             widths="45rem" @close="addEditFormModalClose" @save="addEditFormClick"
         >
             <el-form
@@ -121,7 +121,7 @@
                     </el-form-item>
                 </div>
             </el-form>
-        </HcDialog>
+        </hc-new-dialog>
     </div>
 </template>