bug修复12/23

2024-12-23 10:54:39 +08:00 · 2024-12-23 10:54:39 +08:00 · 57bb23c926
parent 031102bec8
commit 57bb23c926
5 changed files with 70 additions and 28 deletions
--- a/src/views/demand-details/index.vue
+++ b/src/views/demand-details/index.vue
@ -167,7 +167,7 @@
                        <span>{{ item.description }}</span>
                    </el-col>
                </el-row>
-                <div class="label" style="padding: 10px 0">参考图片/样式：</div>
+                <!-- <div class="label" style="padding: 10px 0">参考图片/样式：</div>
                <el-row>
                    <el-col :span="12" v-for="img in item.fileInfoList" :key="img.id">
                        <el-image
@ -183,7 +183,7 @@
                            :preview-teleported="true"
                        />
                    </el-col>
-                </el-row>
+                </el-row> -->
            </div>
        </div>

--- a/src/views/equip/detail.vue
+++ b/src/views/equip/detail.vue
@ -213,14 +213,13 @@
                        </div>
                    </el-col>
                </el-row>
-                <el-row>
+                <!-- <el-row>
                    <el-col :span="2">
                        <div>检测证明：</div>
                    </el-col>
                    <el-col :span="22">
                        <div class="prove-container">
                            <div v-for="item in pageData.examinationPdf" :key="item.id">
-                                <!-- <img :src="item.fileUrl" alt="" /> -->
                                <el-image
                                    style="width: 100%; height: 100%"
                                    :src="item.fileUrl"
@ -236,7 +235,7 @@
                            </div>
                        </div>
                    </el-col>
-                </el-row>
+                </el-row> -->
            </div>
        </div>
        <div class="appearance">
@ -250,6 +249,18 @@
                    <el-table-column align="center" type="index" label="序号" width="80" />
                    <el-table-column align="center" prop="qcTime" label="检测日期" />
                    <el-table-column align="center" prop="maintenanceAlarmDay" label="有效期" />
+                    <el-table-column align="center" prop="fileInfo" label="检测证明" >
+                        <template #default="row">
+                        <a
+                         v-if="row.row.fileInfo && row.row.fileInfo.fileUrl"
+                        :href="row.row.fileInfo.fileUrl"
+                        target="_blank"
+                        style="color: #00a288; text-decoration: underline"
+                        >查看</a
+                    >
+                    <span v-else>无检测证明</span>
+                        </template>
+                    </el-table-column>
                    <el-table-column align="center" prop="comName" label="检测单位" />
                </el-table>
            </div>
@ -980,6 +991,16 @@ const submit = async (Ref) => {
    })
 }

+const dialogVisibles = ref(false)
+const imgIndex = ref(0)
+const dialogImageUrls = ref([])
+//查看检测证明
+const picturesPreview = (row:any) => {
+    dialogImageUrls.value = []
+
+    // window.open(url)
+}
+
 // const init = async () => {
 //     await gethotList()
 //     await getData()
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@ -1781,7 +1781,10 @@ const changeDate = (row:any,index:number) => {
                        </el-form-item>
                    </el-col>
                </el-row>
-                <TitleTip :titleText="`装备证书`" />
+                <div style="display: flex;align-items: center;">
+                    <TitleTip :titleText="`装备证书`" />
+                    <el-button size="mini" type="primary" @click="handleAddBack" style="margin-left: 20px;margin-top: 20px" :disabled="!addAndEditForm.deviceTypeList" v-if="settleinTitle=='新增装备'">添加</el-button>
+                </div>
                <!-- <el-row :gutter="20" v-if="!isEditForm && !isViewForm">
                    <el-col :span="24">
                        <el-button class="primary-lease" type="primary" @click="onAddDescription">
@ -2122,10 +2125,9 @@ const changeDate = (row:any,index:number) => {
                        height: 40px;
                        display: flex;
                        align-items: center;
-                        justify-content: space-between;
+                        justify-content: center;
                      "
                    >
-                    <el-button size="mini" type="primary" @click="handleAddBack">添加</el-button>
                    <el-button size="mini" type="danger" @click="handleDeleteBack($index)" v-show="$index!=0">删除</el-button>
                    </div>
                  </template>
--- a/src/views/user/lessor/quality-manage/index.vue
+++ b/src/views/user/lessor/quality-manage/index.vue
@ -72,7 +72,7 @@
            <el-form-item>
                <el-button @click="onSearch" type="primary" class="primary-lease">查询</el-button>
                <el-button @click="onReset" type="primary" class="primary-lease">重置</el-button>
-                <el-button
+                <!-- <el-button
                    @click="
                        () => {
                            isRepublish = true
@ -84,7 +84,7 @@
                    class="primary-lease"
                >
                    新建
-                </el-button>
+                </el-button> -->
            </el-form-item>
        </el-form>

@ -105,8 +105,17 @@
            <el-table-column align="center" prop="createBy" label="创建人" width="120" />
            <el-table-column align="center" prop="createTime" label="上传时间" />
            <el-table-column align="center" prop="updateTime" label="更新时间" />
-            <el-table-column align="center" label="操作" :width="220">
+            <el-table-column align="center" label="操作" :width="280">
                <template #default="{ row }">
+                    <el-button
+                    size="small"
+                    type="primary"
+                    class="primary-lease"
+                     @click="onAddQualityRecord(row)"
+                    >
+                    新建
+                     </el-button>
+
                    <el-button
                        size="small"
                        type="primary"
@ -170,7 +179,7 @@
                    :model="addOrEditForm"
                    :rules="addOrEditFormRules"
                >
-                    <el-row :gutter="20">
+                    <!-- <el-row :gutter="20">
                        <el-col :span="24">
                            <el-form-item label="关联装备" style="width: 100%" prop="maId">
                                <el-select
@ -190,7 +199,7 @@
                                </el-select>
                            </el-form-item>
                        </el-col>
-                    </el-row>
+                    </el-row> -->
                    <!-- <el-row :gutter="20">
                        <el-col :span="24">
                            <el-form-item label="质检名称" prop="qcName">
@ -625,6 +634,28 @@ const getLeaseListDataInDialog = async () => {
    totalInDialog.value = res.total
 }

+//质检新增
+const onAddQualityRecord = (row: any) => {
+    isRepublish.value = true
+    dialogTitle.value = '质检新增'
+    addOrEditDialogVisible.value = true
+    addOrEditForm.value.qcTime = ''
+    addOrEditForm.value.nextCheckTime = ''
+    addOrEditForm.value.maId = row.maId
+    warningDays.value = row.maintenanceAlarmDay
+    // const onChange = (value: any) => {
+    //     addOrEditForm.value.qcTime = ''
+    //     addOrEditForm.value.nextCheckTime = ''
+    //     associationList.value.forEach((e: any) => {
+    //         if (e.maId === value) {
+    //             console.log('11111111',e.maintenanceAlarmDay)
+    //             warningDays.value = Number(e.maintenanceAlarmDay)
+    //         }
+    //     })
+    // }
+}
+
+
 // 自定义事件
 const onFileChange = (fileList: any) => {
    addOrEditForm.value.fileInfoTempList = []
@ -639,18 +670,6 @@ const onFileChange = (fileList: any) => {
 }

 const warningDays: any = ref(0)
-const onChange = (value: any) => {
-    console.log('11111',value)
-        addOrEditForm.value.qcTime = ''
-        addOrEditForm.value.nextCheckTime = ''
-        console.log('11111111',associationList)
-        associationList.value.forEach((e: any) => {
-            if (e.maId === value) {
-                console.log('11111111',e.maintenanceAlarmDay)
-                warningDays.value = Number(e.maintenanceAlarmDay)
-            }
-        })
-}
 const onQcChange = (value: any) => {
    const currentDate = new Date(value);
    currentDate.setDate(currentDate.getDate() + warningDays.value);
--- a/src/views/user/orderManagementCz/components/cost-settlement-model.vue
+++ b/src/views/user/orderManagementCz/components/cost-settlement-model.vue
@ -290,8 +290,8 @@
                    color: '#fff',
                }"
            >
-                <el-table-column prop="fileName" align="center" label="文件名称" />
-                <el-table-column align="center" label="文件" width="120">
+                <!-- <el-table-column prop="fileName" align="center" label="文件名称" /> -->
+                <el-table-column align="center" label="文件" >
                    <template #default="{ row }">
                        <el-image
                            style="width: 60px; height: 60px"
@ -307,7 +307,7 @@
                        />
                    </template>
                </el-table-column>
-                <el-table-column align="center" label="文件" width="120">
+                <el-table-column align="center" label="操作" >
                    <template #default="{ row }">
                        <el-button type="primary" size="mini" @click="onDownload(row)">
                            下载