Merge remote-tracking branch 'origin/master'

package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.4.2",
         "element-plus": "^2.5.1",
-        "hc-vue3-ui": "^2.9.0",
+        "hc-vue3-ui": "^2.9.6",
         "js-base64": "^3.7.5",
         "js-cookie": "^3.0.5",
         "js-fast-way": "^0.3.8",

src/global/components/hc-report-experts/index.vue

@@ -130,7 +130,7 @@ const formRules = ref({
             if (!value) {
                 callback(new Error('请输入手机号'))
             } else if (!isPhone(value)) {
-                callback(new Error('身份证号码格式错误'))
+                callback(new Error('手机号格式错误'))
             } else {
                 callback()
             }

src/global/components/hc-report-modal/index.vue

@@ -21,7 +21,9 @@
             </el-form-item>
             <el-form-item label="上传附件">
                 <HcFormUpload
-                    :src="formModel.attachmentPdfUrlName"
+                    :src="fileList"
+                    :h-props="uploadFormProps"
+             
                     @upload="formItemUpload"
                 />
             </el-form-item>
@@ -62,7 +64,7 @@
 <script setup>
 import { onMounted, ref, watch } from 'vue'
 import tasksFlowApi from '~api/tasks/flow'
-import { arrIndex, formValidate, getArrValue } from 'js-fast-way'
+import { arrIndex, formValidate, getArrValue, isNullES } from 'js-fast-way'
 import { getTokenHeader } from '~src/api/request/header'
 import initialgApi from '~api/initial/initial'
 
@@ -211,7 +213,8 @@ const getProcessData = async () => {
     })
     if (!error && code === 200) {
         const arr = getArrValue(data['records'])
-        processData.value = [...processDefaultData, ...arr]
+        processData.value = processDefaultData
+        // processData.value = [...processDefaultData, ...arr]
     } else {
         processData.value = processDefaultData
     }
@@ -292,6 +295,11 @@ const formItemUpload = () => {
     HcUploadFileRef.value?.selectFile()
 }
 
+const uploadFormProps = {
+    url: 'filePdfUrl',
+    name: 'fileName',
+}
+const fileList = ref([])
 
 
 
@@ -304,8 +312,21 @@ const HcUploadFileFinish = () => {
 }
 // 文件全部上传成功
 const HcUploadFileSuccess = (res) => {
-    formModel.value.attachmentPdfUrl = res.resData.link
-    formModel.value.attachmentPdfUrlName = res.resData.originalName
+    const { pdfUrl } = res.resData
+    if (isNullES(pdfUrl)) {
+        window.$message.warning('该文件不能生成pdf,请更换文件上传')
+    } {
+        formModel.value.attachmentPdfUrl = res.resData.pdfUrl
+        formModel.value.attachmentPdfUrlName = res.resData.originalName
+        fileList.value = [{
+                fileName: res.resData.originalName ?? '',
+                filePdfUrl: res.resData.pdfUrl ?? '',
+                fileUrl:  res.resData.link ?? '',
+            }]
+    }
+
+   
+  console.log( fileList.value, ' fileList.value ')
 }
 const tableData = ref([])
 const needle = ref(10)

src/views/transfer/components/carry-spot-checks.vue

@@ -5,7 +5,9 @@
             uis="hc-carry-spot-checks-target" @close="onCarrySpotChecksDrawerClose"
         >
             <div class="hc-carry-spot-checks-pdf">
-                <HcPdf v-loading="pdfLoading" :src="pdfUrl" />
+                <tepmplate v-loading="pdfLoading"> 
+                    <HcPdf :src="pdfUrl" />
+                </tepmplate>
                 <el-tooltip :disabled="!isBubble" content="展开/收起 右侧目录" placement="top">
                     <div class="hc-csc-pdf-btn" @click="onCarryDataShow">
                         <HcIcon v-show="isCarryDataShow" name="arrow-right-s" />

src/views/transfer/components/conclusion/table-opinion.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref, watch } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import { getArrValue } from 'js-fast-way'
 import initialgApi from '~api/initial/initial'
 
@@ -33,7 +33,7 @@ const contractId = ref(props.contractId)
 const currentId = ref('')
 
 //渲染完成
-onMounted(async () => {
+onActivated(async () => {
     await getCurrentIdData()
     getTableData()
 })

src/views/transfer/components/conclusion/table-score.vue

@@ -2,25 +2,25 @@
     <HcTable ui="no-border" is-new :column="tableColumn" :datas="tableData" :loading="tableLoading" :is-index="false">
         <template #integrality="{ row }">
             <div v-if="row.isEdit" class="table-score-input-box">
-                <el-input v-model="row.integrality" placeholder="" />
+                <el-input-number v-model="row.integrality" placeholder="" :controls="false" style="width: 100%;" :precision="0" />
             </div>
             <span v-else>{{ row.integrality || '-' }}</span>
         </template>
         <template #integralityDeduction="{ row }">
             <div v-if="row.isEdit" class="table-score-input-box">
-                <el-input v-model="row.integralityDeduction" placeholder="" />
+                <el-input-number v-model="row.integralityDeduction" placeholder="" :controls="false" style="width: 100%;" :precision="0" />
             </div>
             <span v-else>{{ row.integralityDeduction || '-' }}</span>
         </template>
         <template #normativeDeduction="{ row }">
             <div v-if="row.isEdit" class="table-score-input-box">
-                <el-input v-model="row.normativeDeduction" placeholder="" />
+                <el-input-number v-model="row.normativeDeduction" placeholder="" :controls="false" style="width: 100%;" :precision="0" />
             </div>
             <span v-else>{{ row.normativeDeduction || '-' }}</span>
         </template>
         <template #normative="{ row }">
             <div v-if="row.isEdit" class="table-score-input-box">
-                <el-input v-model="row.normative" placeholder="" />
+                <el-input-number v-model="row.normative" placeholder="" :controls="false" style="width: 100%;" :precision="0" />
             </div>
             <span v-else>{{ row.normative || '-' }}</span>
         </template>
@@ -36,7 +36,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref, watch } from 'vue'
+import { onActivated, ref, watch } from 'vue'
 import { getArrValue } from 'js-fast-way'
 import writeApi from '~api/transfer/write-conclusion'
 
@@ -71,7 +71,7 @@ watch(() => [
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
     getTotalData()
 })
 

src/views/transfer/components/conclusion/table-stats.vue

@@ -39,7 +39,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, ref } from 'vue'
 import { getArrValue } from 'js-fast-way'
 import initialgApi from '~api/initial/initial'
 
@@ -61,7 +61,7 @@ const totalInspectRatio = ref('')
 const tips = ref('')
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
     getTableData()
 })
 

src/views/transfer/components/table-collect.vue

@@ -262,8 +262,9 @@ const reportTaskTagClose = (index) => {
 const showReportFinish = async () => {
     showReportModal.value = false
     tableKeys.value = []
-    await getBtnstatus()
-    getTotalData()
+    // await getBtnstatus()
+    // getTotalData()
+    window?.location?.reload() //刷新页面
 }
 //撤回验收申请
 const cancelClick = ()=>{

src/views/transfer/inspects.vue

@@ -16,7 +16,9 @@
         <!-- 展开抽查 -->
         <HcDrawer :show="isCarrySpotChecksDrawer" uis="hc-carry-spot-checks-target" to-id="carry-spot-checks-layout-target1" @close="onCarrySpotChecksDrawerClose">
             <div class="hc-carry-spot-checks-pdf">
-                <HcPdf v-loading="pdfLoading" :src="pdfUrl" />
+                <tepmplate v-loading="pdfLoading"> 
+                    <HcPdf :src="pdfUrl" />
+                </tepmplate>
                 <el-tooltip content="展开/收起 右侧目录" placement="top" :disabled="!isBubble">
                     <div class="hc-csc-pdf-btn" @click="onCarryDataShow">
                         <HcIcon v-show="isCarryDataShow" name="arrow-right-s" />

src/views/transfer/preliminary-examination.vue

@@ -157,6 +157,7 @@ const tabData = ref([
 ])
 const tabChange = (item) => {
     tabKey.value = item?.key
+    treeLoading.value = true
 }
 
 

src/views/using/query.vue

@@ -278,7 +278,10 @@
         <HcDrawer :show="isCarrySpotChecksDrawer" uis="hc-carry-spot-checks-target" to-id="carry-spot-checks-layout-target" @close="onCarrySpotChecksDrawerClose">
             <div class="hc-carry-spot-checks-pdf">
                 <!-- <HcPdf src="https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20221212/ce9799c7d18efc03efefd6f242439f2e.pdf"/> -->
-                <HcPdf v-loading="pdfLoading" :src="pdfUrl" />
+                <tepmplate v-loading="pdfLoading"> 
+                    <HcPdf :src="pdfUrl" />
+                </tepmplate>
+             
                 <el-tooltip content="展开/收起 右侧目录" placement="top" :disabled="!isBubble">
                     <div class="hc-csc-pdf-btn" @click="onCarryDataShow">
                         <HcIcon v-show="isCarryDataShow" name="arrow-right-s" />

yarn.lock

@@ -1324,10 +1324,10 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
-hc-vue3-ui@^2.9.0:
-  version "2.9.0"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-2.9.0.tgz#c459af857d8ae07f3b061311be05a88cae0200ec"
-  integrity sha512-xbNCR/SJChpWUxms57VcRdmgEhJ8yuDgF3TmhDbssfQ8RehvZ4x9AXmi5km+CAFlulDFeDXnzET85xsOacxmAQ==
+hc-vue3-ui@^2.9.6:
+  version "2.9.6"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-2.9.6.tgz#fd3280a23e59583fb1f18b0e6db04feb379c9b32"
+  integrity sha512-p7KnHCMe+8XlFBPZfMqN8jCTmcc3LvUR7nc1GNXz7OXa382C9nD2RtEuCPBAiBCLA5qIzKRyKHuUGNP69+U+Wg==
 
 html2canvas@1.4.1:
   version "1.4.1"