From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 82 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index 19dafbd..8888f42 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -19,6 +19,14 @@
type="primary"
v-has="'dailyInspectionOrder:SW'"
>寮�宸�</a-button>
+
+ <a-button
+ :style="{marginRight: '8px'}"
+ @click="handleNormalReport"
+ :disabled="buttonDistable"
+ type="primary"
+ v-has="'dailyInspectionOrder:normalReport'"
+ >缁撴灉鍏ㄩ儴姝ｅ父</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReport"
@@ -26,13 +34,6 @@
type="primary"
v-has="'dailyInspectionOrder:report'"
>鎶ュ伐</a-button>
- <a-button
- :style="{marginRight: '8px'}"
- @click="handleNormalReport"
- :disabled="buttonDistable"
- type="primary"
- v-has="'dailyInspectionOrder:normalReport'"
- >缁撴灉姝ｅ父骞舵姤宸�</a-button>
<a-button
:style="{marginRight: '8px'}"
@click="handleReset"
@@ -144,7 +145,7 @@
slot-scope='text, record, index'
>
<div :key="col.dataIndex">
- <span
+ <!-- <span
v-if=" col.dataIndex == 'photo' && !text"
style="font-size: 12px;font-style: italic;"
>鏃犲浘鐗�</span>
@@ -155,7 +156,17 @@
height="25px"
alt=""
style="max-width:80px;font-size: 12px;font-style: italic;"
- />
+ /> -->
+ <!-- <j-dict-select-tag
+ v-if="col.dataIndex == 'inspectionProjectResult' "
+ allow-clear
+ @input="handleChange()"
+ :disabled="record.disabled"
+ :placeholder="'璇烽�夋嫨鐐规缁撴灉'"
+ :triggerChange="true"
+ style="width: 100%"
+ dictCode="inspection_project_result"
+ /> -->
<a-select
v-if="col.dataIndex == 'inspectionProjectResult' "
:value="text"
@@ -163,7 +174,6 @@
style="width: 100%"
:disabled="record.disabled"
>
- <!-- :options="record.inspectionCycles" -->
<a-select-option value="1">姝ｅ父</a-select-option>
<a-select-option value="2">寮傚父</a-select-option>
<a-select-option value="3">鏁呴殰鍋滄満</a-select-option>
@@ -196,7 +206,7 @@
:disabled="record.disabled"
/>
- <j-image-upload
+ <!-- <j-image-upload
:value="text"
v-if="col.dataIndex == 'abnormalPhoto'"
:isMultiple="false"
@@ -205,7 +215,7 @@
@change="(e)=>handleChange(e, record.key, col, index)"
:disabled="record.disabled"
>
- </j-image-upload>
+ </j-image-upload> -->
<!-- <Tooltip
placement="top"
@@ -335,6 +345,18 @@
wrapperCol: {
xs: { span: 24 },
sm: { span: 18 },
+ },
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 99,
+ pageSizeOptions: ['99'],
+ showTotal: (total, range) => {
+ return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
},
columns: [
{
@@ -475,11 +497,11 @@
// }
//update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
this.dataSource = res.result.records || res.result;
- if (res.result.total) {
- this.ipagination.total = res.result.total;
- } else {
- this.ipagination.total = 0;
- }
+ // if (res.result.total) {
+ // this.ipagination.total = res.result.total;
+ // } else {
+ // this.ipagination.total = 0;
+ // }
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
} else {
this.$message.warning(res.message)
@@ -495,7 +517,7 @@
this.loadData1(1)
},
loadData() {
- this.loadData1(1)
+ // this.loadData1(1)
},
getBackground() {
return "background-color:rgba(127, 127, 127,0.08)";
@@ -618,8 +640,20 @@
})
},
- //鎶ュ伐
+ //鎵�鏈夌粨鏋滄甯�
handleNormalReport() {
+ const that = this;
+ for (let i = 0; i < that.dataSource.length; i++) {
+ let o = this.dataSource[i]
+ o.inspectionProjectResult = "1"
+ o.abnormalDesc = ""
+ o.treatmentMeasure = null
+ }
+ },
+
+
+ //鎶ュ伐
+ handleNormalReport1() {
const that = this;
that.confirmLoading = true;
let formData = Object.assign(this.model);
@@ -745,11 +779,11 @@
// }
// } else {
target[column.dataIndex] = value;
- // if (value == "1") {
- // target['judgmentResult'] = "pass";
- // } else {
- // target['judgmentResult'] = "fail";
- // }
+ if (value == 1) {
+ target['abnormalDesc'] = null;
+ }
+ target['treatmentMeasure'] = null;
+
// if (value == null || value == "") {
// target['judgmentResult'] = "";
// }
--
Gitblit v1.9.3