From cf91288ecebb860a48f885261fb3620059fbfb16 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 26 四月 2024 13:45:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/calculate/order/index.vue | 43 ++++++++++++++++---------------------------
1 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/src/views/system/calculate/order/index.vue b/src/views/system/calculate/order/index.vue
index 155ebdc..6cba56b 100644
--- a/src/views/system/calculate/order/index.vue
+++ b/src/views/system/calculate/order/index.vue
@@ -22,18 +22,6 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
- <el-select v-model="queryParams.examineRange" clearable @clear="handleQuery" placeholder="鑰冩牳鑼冨洿">
- <el-option
- label="甯傚眬鑰冩牳"
- value="2">
- </el-option>
- <el-option
- label="鍒嗗眬鑰冩牳"
- value="1">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item label="鑰冩牳鏃堕棿">
<el-date-picker
v-model="daterangeCheckTime"
@@ -69,6 +57,7 @@
icon="el-icon-delete"
size="mini"
:disabled="multiple"
+ v-hasPermi="['system:result:remove']"
@click="handleDelete"
>鍒犻櫎</el-button>
</el-col>
@@ -78,6 +67,7 @@
plain
icon="el-icon-download"
size="mini"
+ v-hasPermi="['system:result:export']"
@click="handleExport"
>瀵煎嚭</el-button>
</el-col>
@@ -86,14 +76,17 @@
<el-card class="box-card" v-for="(item) in checkResultList">
<div slot="header" class="clearfix">
- <span>{{ item.checkUnitName }}</span>
- <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">璇︽儏</el-button>
+ <span>{{ checkUnitName }}</span>
+ <el-button style="float: right; padding: 3px 6px" type="text" @click="handleDetail(item)">璇︽儏</el-button>
+ <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">鎵撳垎</el-button>
</div>
- <div class="text item">鑰冩牳<span class="time">{{ item.examineName }}</span></div>
+ <div class="text item">鑰冩牳<span class="time">{{ examineName }}</span></div>
<div class="text item">鑰冩牳棰戠巼<span class="time">{{ "瀛ｅ害鑰冩牳" }}</span></div>
<div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.checkScore }}</span></div>
<div class="text item">鑰冩牳鏃堕棿
<span class="time">{{ item.checkTime }}</span>
+ <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1" v-hasPermi="['result:contract:publish']">纭鍙戝竷</el-button>
+ <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish == 1" v-hasPermi="['result:contract:publish']">宸插彂甯�</el-button>
</div>
</el-card>
@@ -155,21 +148,14 @@
<i class="el-icon-user"></i>
鑰冩牳瀵硅薄
</template>
- {{detail.checkUnitName}}
+ {{checkUnitName}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-s-management"></i>
鑰冩牳鍚嶇О
</template>
- {{detail.examineName}}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-full-screen"></i>
- 鑰冩牳鑼冨洿
- </template>
- <el-tag size="small">{{detail.examineRange === 1 ? '鍒嗗眬鑰冩牳' : '甯傚眬鑰冩牳'}}</el-tag>
+ {{examineName}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
@@ -231,6 +217,8 @@
detail:{
},
+ checkUnitName: '鎴愰兘x杩愮淮',
+ examineName: '鎴愰兘x杩愮淮鑰冩牳',
tableData: [{
name: '瑙嗛骞冲潎鍦ㄧ嚎鐜�',
content: '97%',
@@ -313,7 +301,7 @@
this.queryParams["end"] = this.daterangeCheckTime[1];
}
listCheckResult(this.queryParams).then(response => {
- this.checkResultList = response.data;
+ this.checkResultList = response.rows;
this.total = response.total;
this.loading = false;
});
@@ -364,7 +352,7 @@
handleDetail(row) {
this.detail = row;
this.detail.carOnlineRate = '97%';
- this.detailTitle = row.checkUnitName + '鑰冩牳缁撴灉';
+ this.detailTitle = '鑰冩牳缁撴灉';
this.detailOpen = true;
},
@@ -447,7 +435,8 @@
this.download('system/checkResult/export', {
...this.queryParams
}, `checkResult_${new Date().getTime()}.xlsx`)
- }
+ },
+
}
};
</script>
--
Gitblit v1.8.0