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/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue | 96 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 84 insertions(+), 12 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
index 35c64b4..967fa43 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
@@ -7,14 +7,20 @@
cancelText="鍏抽棴"
@cancel="handleCancel"
:confirmLoading="confirmLoading"
+ title="闄勫綍6"
>
<!-- :title="title" -->
<a-spin :spinning="confirmLoading">
<a-form :form="form">
+ <span
+ class="ant-descriptions-title"
+ style="font-size: large;font-size: 15px;float: right;"
+ >{{this.model.receiptsNum2}}</span>
<a-divider
orientation="center"
style="font-size: large;font-style: normal;font-size: 30px;color: #66aeed;"
- > 鐢熶骇璁惧绮惧害妫�楠屽崟 </a-divider>
+ > {{this.model.receiptsName2}} </a-divider>
+ <!-- 鐢熶骇璁惧绮惧害妫�楠屽崟 -->
<a-row :gutter="24">
<a-col :span="8">
<a-form-item
@@ -64,7 +70,7 @@
:wrapperCol="wrapperCol"
label="淇濆吇鍗曚綅"
>
- <span v-if="this.model != null">{{ this.model.actualEndTime }}</span>
+ <span v-if="this.model != null">{{ this.model.manageName }}</span>
<span v-else>-</span>
</a-form-item>
</a-col>
@@ -174,19 +180,29 @@
</a-col>
</a-row>
</div>
- <div :style="{height: '115px',float: 'left',width: '10%',border: '1px solid #e9e9e9',padding: '50px 20px',background: '#fff',}">
+ <div :style="{height: '175px',float: 'left',width: '10%',border: '1px solid #e9e9e9',padding: '50px 20px',background: '#fff',}">
<span
class="ant-descriptions-title"
style="font-size: large;font-style: normal;font-size: 15px;"
>闆朵欢鐘舵��</span>
</div>
- <div :style="{height: '115px',float: 'right',width: '90%',border: '1px solid #e9e9e9',padding: '10px 10px',background: '#fff',}">
+ <div :style="{height: '175px',float: 'right',width: '90%',border: '1px solid #e9e9e9',padding: '10px 10px',background: '#fff',}">
<a-row :gutter="24">
<a-col :span="12">
<a-form-item
:labelCol="{ span: 8 }"
- :wrapperCol="{ span: 4 }"
+ :wrapperCol="{ span: 12 }"
label="妫�娴嬭皟璇曞悗璇曞姞宸ラ浂浠跺彿锛�"
+ >
+ <a-input v-model="model.sparePart" />
+ </a-form-item>
+ </a-col>
+
+ <a-col :span="12">
+ <a-form-item
+ :labelCol="{ span: 8 }"
+ :wrapperCol="{ span: 4 }"
+ label="闆朵欢鍔犲伐锛�"
>
<a-switch
checked-children="鍚堟牸"
@@ -196,7 +212,10 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
+ </a-row>
+ <a-row :gutter="24">
+
+ <!-- <a-col :span="12">
<a-form-item
:labelCol="{ span: 8 }"
:wrapperCol="{ span: 4 }"
@@ -208,6 +227,35 @@
@change="handle5Switch(model.meetProcessRequire)"
:checked="model.meetProcessRequire == '1'"
/>
+ </a-form-item>
+ </a-col> -->
+ <a-col :span="12">
+ <a-form-item
+ style="font-size: large;font-style: normal;font-size: 15px;"
+ :labelCol="{ span: 8 }"
+ :wrapperCol="{ span: 12 }"
+ label="鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰"
+ >
+ <j-dict-select-tag
+ style="font-size: large;font-style: normal;font-size: 15px;width: 100%"
+ allow-clear
+ :triggerChange="true"
+ dictCode="meet_process_require"
+ v-model="model.meetProcessRequire"
+ />
+
+ </a-form-item>
+ </a-col>
+ <a-col
+ v-if="model.meetProcessRequire =='3'"
+ :span="12"
+ >
+ <a-form-item
+ :labelCol="{ span: 8 }"
+ :wrapperCol="{ span: 12 }"
+ label="鑷畾涔夎鏄庯細"
+ >
+ <a-input v-model="model.meetProcessRequireRemark" />
</a-form-item>
</a-col>
</a-row>
@@ -295,8 +343,9 @@
@click="handleOk()"
type="primary"
:loading="confirmLoading"
- :disabled="disableSubmit || confirmLoading"
+ :disabled="this.model.precisionInspectionStatus == '5'"
>纭畾</a-button>
+
</template>
</a-modal>
@@ -359,6 +408,7 @@
dataSource: [],
model: {},
departs: [],
+
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
@@ -380,6 +430,7 @@
add: "/eam/precisionInspection/precisionInspection",
getPrecisionInspection: "/eam/precisionInspection/getPrecisionInspectionList",
list: "/eam/dailyMaintenanceOrder/getMaintenanceCycleByStandardId",
+ getSysFileName: "/eam/sysFileName/getSysFileName",
},
}
@@ -389,7 +440,9 @@
edit(record) {
let that = this;
-
+ if (record.receipts2 == "" || record.receipts2 == null) {
+ this.getSysFileName()
+ }
this.form.resetFields();
// record.eachTolerance = '0'
// record.partTolerance = '0'
@@ -417,9 +470,19 @@
},
handleOk() {
-
+ // if (this.model.precisionInspectionStatus === '2') {
+ // if ((this.model.eachTolerance === "0" || this.model.eachTolerance === 0) && (this.model.partTolerance === "0" || this.model.partTolerance === 0)) {
+ // this.$message.warning("璇峰绮惧害鐘舵�佺粨鏋滃嬀閫夛紒");
+ // return
+ // }
+ // }
+ // if (this.model.precisionInspectionStatus === '3') {
+ // if ((this.model.processPass === "0" || this.model.processPass === 0) && (this.model.meetProcessRequire === "0" || this.model.meetProcessRequire === 0)) {
+ // this.$message.warning("璇峰闆朵欢鐘舵�佺粨鏋滃嬀閫夛紒");
+ // return
+ // }
+ // }
const that = this;
- // 瑙﹀彂琛ㄥ崟楠岃瘉
that.form.validateFields((err, values) => {
if (!err) {
this.$confirm({
@@ -456,8 +519,8 @@
getAction(this.url.getPrecisionInspection, { maintenanceOrderId: this.model.id }).then((res) => {
if (res.success) {
this.dataSource = res.result[0].precisionInspectionDetails
- this.model = Object.assign({}, res.result[0]);
- debugger
+ this.model = Object.assign(this.model, res.result[0]);
+ this.model = Object.assign({}, this.model);
}
})
},
@@ -500,6 +563,7 @@
onChangeJudgmentResult(e) {
this.model.judgmentResult = e.target.value
+ this.model = Object.assign({}, this.model);
},
handleChange(value, key, column, index) {
@@ -515,6 +579,14 @@
}
},
+ getSysFileName() {
+ getAction(this.url.getSysFileName, { name: '16' }).then((res) => {
+ if (res.success) {
+ this.model = Object.assign(this.model, res.result[0]);
+ }
+ })
+ },
+
},
}
</script>
--
Gitblit v1.9.3