ZaiZai 7 months ago
parent
commit
38528d5ca2
3 changed files with 11 additions and 16 deletions
  1. 1 1
      public/version.json
  2. 2 2
      src/config/index.json
  3. 8 13
      src/views/file/collection.vue

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240812113514"
+  "value": "20240814135432"
 }

+ 2 - 2
src/config/index.json

@@ -1,7 +1,7 @@
 {
     "version": "202304141558",
-    "target": "http://192.168.0.109:8090",
-    "target2": "http://39.108.216.210:8090",
+    "target1": "http://192.168.0.109:8090",
+    "target": "http://39.108.216.210:8090",
     "target3": "http://183.247.216.148:28090",
     "socket1": "wss://measure.hczcxx.cn/websocket",
     "smsPhone": "",

+ 8 - 13
src/views/file/collection.vue

@@ -222,9 +222,6 @@
                     is-new is-row-drop quick-sort ui="hc-table-row-drop"
                     @row-drop="sortTableRowDrop" @row-sort="sortTableRowDrop"
                 >
-                    <template #key2="{ row }">
-                        <span class="text-link">{{ row?.key2 }}</span>
-                    </template>
                     <template #action="{ index }">
                         <span class="text-link text-xl" @click="upSortClick(index)">
                             <HcIcon fill name="arrow-up" />
@@ -265,7 +262,9 @@
                     <el-input v-model="row.fileName" :class="row.isFileName ? 'is-error' : ''" @input="tableIsInput($event, row, 'isFileName')" />
                 </template>
                 <template #fileTime="{ row }">
-                    <el-date-picker v-model="row.fileTime" :clearable="false" format="YYYYMMDD" type="date" value-format="YYYYMMDD" />
+                    <div class="relative w-full">
+                        <el-date-picker v-model="row.fileTime" class="w-full!" :clearable="false" format="YYYYMMDD" type="date" value-format="YYYYMMDD" />
+                    </div>
                     <!-- <el-input v-model="row.fileTime" :class="row['isFileTime'] ? 'is-error' : ''" @input="tableIsInput($event, row, 'isFileTime')"/> -->
                 </template>
                 <template v-if="isBuiltDrawing === 2" #sheetType="{ row }">
@@ -304,6 +303,7 @@
                     </el-select>
                 </template>
                 <template #action="{ row, index }">
+                    <el-button v-if="tableUploadType === 'edit'" plain size="small" type="warning" @click="tableRowName(row)">查看文件</el-button>
                     <el-button v-if="tableUploadType === 'edit'" :loading="row.newBtnLoading" plain size="small" type="primary" @click="substitutionClick(row)">替换</el-button>
                     <el-button :loading="row.delBtnLoading" class="ml-2" plain size="small" type="danger" @click="delUploadData(row, index)">删除</el-button>
                 </template>
@@ -1193,6 +1193,7 @@ const sortPageChange = ({ current, size }) => {
 const sortTableColumn = ref([
     { key: 'fileNumber', name: '文件编号', width: 160 },
     { key: 'fileName', name: '文件名称' },
+    { key: 'fileTime', name: '文件时间', width: 120 },
     { key: 'action', name: '排序', width: 90 },
 ])
 const sortTableData = ref([])
@@ -1330,7 +1331,7 @@ const tableUploadColumn = ref([
     { key: 'isNeedCertification', name: '是否需要认证' },
     { key: 'dutyUser', name: '责任者' },
     { key: 'isElement', name: '是否四要素' },
-    { key: 'action', name: '操作', width: 180 },
+    { key: 'action', name: '操作', width: 220 },
 ])
 const setTableUploadColumn = () => {
     if (isBuiltDrawing.value === 2) {
@@ -1346,7 +1347,7 @@ const setTableUploadColumn = () => {
             { key: 'isNeedCertification', name: '是否需要认证' },
             { key: 'dutyUser', name: '责任者' },
             { key: 'isElement', name: '是否四要素' },
-            { key: 'action', name: '操作', width: 180 },
+            { key: 'action', name: '操作', width: 220 },
         ]
         sheetTypeStatus()
         sheetSourceStatus()
@@ -1359,7 +1360,7 @@ const setTableUploadColumn = () => {
             { key: 'isNeedCertification', name: '是否需要认证' },
             { key: 'dutyUser', name: '责任者' },
             { key: 'isElement', name: '是否四要素' },
-            { key: 'action', name: '操作', width: 180 },
+            { key: 'action', name: '操作', width: 220 },
         ]
     }
 }
@@ -1629,27 +1630,21 @@ const CertClick = async () => {
 
 //名称被点击
 const tableRowName = (row) => {
-    console.log(row, 'row')
     if (row?.isCertificationValue === '已认证' || row?.isApprovalValue === '已审批') {
         if (row['eVisaFile']) {
             toPdfPage(row['eVisaFile'])
-            //window.open(row['eVisaFile'], '_blank')
         } else if (row['pdfFileUrl']) {
             toPdfPage(row['pdfFileUrl'])
-            //window.open(row['pdfFileUrl'], '_blank')
         } else {
             window.$message?.warning('文件不存在')
         }
     } else {
         if (row['pdfFileUrl']) {
             toPdfPage(row['pdfFileUrl'])
-            //window.open(row['pdfFileUrl'], '_blank')
         } else {
             window.$message?.warning('文件不存在')
         }
     }
-
-
 }
 
 //上报