From e5472658db11d318cf2607d7e0a47460573da3f0 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 18 十一月 2022 11:15:43 +0800
Subject: [PATCH] 1.设备保养项目、设备点检标准、设备保养标准导入接口提交
---
src/views/scgl/gd.vue | 105 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 87 insertions(+), 18 deletions(-)
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index a132a69..1730c68 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -146,8 +146,8 @@
v-model="radioSelected"
:label="row.wo_code"
style="color: transparent;padding-left: 10px;"
- @change.native="getCurrentRow(row.wo_code)"
/>
+ <!-- @change.native="getCurrentRow(row.wo_code)"-->
</template>
</el-table-column>
<el-table-column
@@ -205,6 +205,7 @@
prop="partname"
min-width="150"
label="浜у搧鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -587,6 +588,22 @@
</el-select>
</el-form-item>
</div>
+ <el-form-item label="鐗╂枡娓呭崟" prop="bomId">
+ <el-select
+ v-model="dialogForm.bomId"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in bomIdArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
<el-date-picker
v-model="dialogForm.planstartdate"
@@ -622,6 +639,12 @@
:value="item.code"
/>
</el-select>
+ </el-form-item>
+ <el-form-item label="鏄惁鎺掔▼" prop="isAps">
+ <el-radio-group v-model="dialogForm.isAps">
+ <el-radio key="Y" label="Y" value="Y">鏄�</el-radio>
+ <el-radio key="N" label="N" value="N">鍚�</el-radio>
+ </el-radio-group>
</el-form-item>
</el-form>
@@ -1262,7 +1285,11 @@
style="display: flex;height: 96px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ />
</div>
<div
style="display: flex;height: 32px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
@@ -1319,7 +1346,11 @@
style="display: flex;height: 96px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ />
</div>
<div
style="display: flex;height: 32px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
@@ -1376,7 +1407,11 @@
style="display: flex;height: 60px;border-bottom:1px solid #000;
justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+ <div
+ id="qrCode2"
+ ref="qrCodeDiv2"
+ style="overflow-y: hidden;height:60px;position: absolute;left: 14px;"
+ />
</div>
<div
style="display: flex;height: 20px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
@@ -1629,9 +1664,16 @@
planstartdate: '', // 璁″垝寮�濮嬫椂闂�
planenddate: '', // 璁″垝瀹屾垚鏃堕棿
orderlev: '', // 宸ュ崟绛夌骇
-
+ isAps: 'N', // 鏄惁鎺掔▼
+ bomId: '', // 鐗╂枡娓呭崟id
OperType: '' // 鎿嶄綔绫诲瀷
},
+ bomIdArr: [// 鐗╂枡娓呭崟涓嬫媺 鍥犱负鎺ュ彛杩樻病鍐欙紝鏆傛椂鐢ㄥ啓姝荤殑鍊�
+ { code: 15, name: 'V5' },
+ { code: 14, name: 'V1' },
+ { code: 17, name: 'V7' },
+ { code: 16, name: 'V6' }
+ ],
ordertypeArr: [// 宸ュ崟绫诲瀷
{ code: 'PO', name: '鏍囧噯宸ュ崟' },
{ code: 'FO', name: '鎶ュ簾琛ュ崟' }
@@ -1672,6 +1714,12 @@
],
orderlev: [
{ required: true, message: '璇烽�夋嫨宸ュ崟绛夌骇', trigger: ['blur', 'change'] }
+ ],
+ isAps: [
+ { required: true, message: '璇烽�夋嫨鏄惁鎺掔▼', trigger: ['blur', 'change'] }
+ ],
+ bomId: [
+ { required: true, message: '璇烽�夋嫨鐗╂枡娓呭崟', trigger: ['blur', 'change'] }
]
},
@@ -1901,8 +1949,21 @@
this.dialogForm.planstartdate = handleDatetime(new Date())
this.dialogForm.planenddate = handleDatetime(new Date())
this.dialogForm.orderlev = 3
- },
+ this.dialogForm.bomId = this.getMaxBomId()
+ },
+ // 鏌ユ壘鐗╂枡娓呭崟閲岄潰鐗堟湰鏈�澶х殑鍊�
+ getMaxBomId() {
+ let max = 0// 鏈�澶у��
+ let code = ''// 鏈�澶у�煎搴旂殑code
+ this.bomIdArr.forEach(item => {
+ if (parseFloat(item.name.substring(1)) > max) {
+ max = parseFloat(item.name.substring(1))
+ code = item.code
+ }
+ })
+ return code
+ },
// 浜у搧淇℃伅鍊兼敼鍙�
async partcodeChange(val) {
console.log(val, 22)
@@ -1977,6 +2038,8 @@
this.dialogForm.planstartdate = row.plan_startdate !== null ? row.plan_startdate : handleDatetime(new Date())
this.dialogForm.planenddate = row.plan_enddate !== null ? row.plan_enddate : handleDatetime(new Date())
this.dialogForm.orderlev = row.piroque !== null ? row.piroque : 3 // 绛夌骇
+
+ this.dialogForm.bomId = this.getMaxBomId() // 鏆傛椂鍐欐
})
},
// 鍒犻櫎鎸夐挳
@@ -1991,7 +2054,7 @@
}).then(() => {
console.log(row, 1)
const data = {
- souceid: row.sourceid,
+ souceid: row.sourceid ? row.sourceid : '',
wocode: row.wo_code,
m_po: row.m_po,
orderqty: row.plan_qty
@@ -2076,7 +2139,8 @@
this.dialogForm.planstartdate = '' // 璁″垝寮�濮嬫椂闂�
this.dialogForm.planenddate = '' // 璁″垝瀹屾垚鏃堕棿
this.dialogForm.orderlev = '' // 宸ュ崟绛夌骇
-
+ this.dialogForm.isAps = 'N' // 鏄惁鎺掔▼
+ this.dialogForm.bomId = this.getMaxBomId()
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -2108,6 +2172,8 @@
planstartdate: this.dialogForm.planstartdate, // 璁″垝寮�濮嬫椂闂�
planenddate: this.dialogForm.planenddate, // 璁″垝瀹屾垚鏃堕棿
orderlev: this.dialogForm.orderlev, // 宸ュ崟绛夌骇
+ is_aps: this.dialogForm.isAps, // 鏄惁鎺掔▼
+ bom_id: this.dialogForm.bomId, // 鏄惁鎺掔▼
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
this.$store.state.app.buttonIsDisabled = true
@@ -2524,9 +2590,10 @@
this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
},
// 琛岀偣鍑讳簨浠�
- async rowClick(row, event, column) {
+ async rowClick(row, event, column) {
console.log(row, event, column)
console.log(row.wo_code, event, column)
+ this.radioSelected = row.wo_code
const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
this.tableDataDetail = res
},
@@ -2672,12 +2739,12 @@
margin-bottom: 0;
}
-//.elTableDiv {
-::v-deep .el-radio__label {
- display: none;
-}
+.elTableDiv {
+ ::v-deep .el-radio__label {
+ display: none;
+ }
-//}
+}
.el-table::before {
height: 0;
@@ -2846,16 +2913,18 @@
//}
}
-::v-deep .el-select__caret{
+::v-deep .el-select__caret {
display: flex;
align-items: center;
justify-content: center;
}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
height: 100% !important;
}
}
--
Gitblit v1.9.3