From 8c51a45d5a220f5ddb4b29a50b3bd732e5ac8521 Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期五, 15 三月 2024 18:04:59 +0800
Subject: [PATCH] 检验下单 功能调整
---
src/components/view/b1-inspection-order.vue | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index ac33c7d..b180ebf 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -75,7 +75,7 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button size="medium" type="primary" @click="playOrder">涓嬪崟</el-button>
+ <el-button size="medium" type="primary" @click="playOrder(1)">涓嬪崟</el-button>
</el-col>
</el-row>
</div>
@@ -147,14 +147,16 @@
</el-dialog>
<!-- 涓嬪彂 -->
<el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="30%" :before-close="handleClose">
- <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm">
+ <el-form :label-position="labelPosition" :model="formData2" label-width="150px" ref="ruleForm">
<el-form-item label="绾﹀畾鏃堕棿锛�">
- <el-date-picker style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="formData.downTime"
+ <el-date-picker style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="formData2.appointed2"
type="date" size="small" placeholder="閫夋嫨鏃堕棿">
</el-date-picker>
</el-form-item>
+ <el-form-item >
+ </el-form-item>
<el-form-item label="鎸囨淳浜哄憳锛�">
- <el-select v-model="formData.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-select v-model="formData2.id" placeholder="璇烽�夋嫨" size="small" style="width:100%">
<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -162,12 +164,12 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-row>
- <el-button @click="handleClose">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
+ <el-button @click="handleClose2">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm2" :loading="upLoad">纭� 瀹�</el-button>
</el-row>
</span>
</el-dialog>
- <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="70%" :before-close="handleClose">
+ <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="70%" :before-close="handleClose2">
<div style="height: 70vh;overflow-y: auto;">
<ValueTable ref="ValueTableDataLook" :url="$api.deviceScope.selectDeviceParameter"
:componentData="componentDataDataLook" :key="upIndex" />
@@ -197,8 +199,16 @@
verifyDialogVisible: false,
quashDialogVisible: false,
issuedDialogVisible: false,
+ issuedDialogVisible2: false,
dataDialogVisible: false,
formData: {},
+ formData0:{},
+ formData1:{},
+ formData2:{
+ id:'',
+ orderName:'',
+ data:'',
+ },
// 浜哄憳鍒楄〃
personList: [],
labelPosition: 'right',
@@ -240,21 +250,21 @@
method: 'handleIssued'
}],
tagField: {
- deviceStatus: {
+ type: {
select: [{
value: 0,
type: 'success',
- label: '姝ｅ父'
+ label: '鏅��'
}, {
value: 1,
type: 'warning',
- label: '鎶ュ簾'
+ label: '浼樺厛'
}, {
value: 2,
type: 'danger',
- label: '淇濅慨'
+ label: '绱ф��'
}]
- }
+ },
},
linkEvent:{
deviceName:{
@@ -320,14 +330,27 @@
},
],
tabIndex: 0,
- active: 1
+ active: 0
}
},
mounted() {
this.entityCopy = this.HaveJson(this.componentData.entity)
this.getPower()
+ this.getAuthorizedPerson()
},
methods: {
+ getAuthorizedPerson(){
+ this.$axios.post(this.$api.deviceScope.selectDevicePrincipal).then(res => {
+ let data = []
+ res.data.forEach(a=>{
+ data.push({
+ label: a.name,
+ value: a.id
+ })
+ })
+ this.personList = data
+ })
+ },
refreshTable() {
this.$refs['ValueTable'].selectList()
},
@@ -367,6 +390,13 @@
this.dataDialogVisible = false;
this.upLoad = false;
},
+ handleClose2() {
+ this.verifyDialogVisible = false;
+ this.quashDialogVisible = false;
+ this.issuedDialogVisible = false;
+ this.dataDialogVisible = false;
+ this.upLoad = false;
+ },
// 璇︽儏
selectAllByOne(row) {
//鎵撳紑寮规
@@ -395,6 +425,27 @@
handleIssued(row) {
this.issuedDialogVisible = true;
},
+ submitForm2(){
+ this.upLoad = true;
+ this.$axios.post(this.$api.insOrder.getDeviceManager, this.formData2, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code === 201) {
+ this.upLoad = false
+ return
+ }
+ this.$message.success('淇敼鎴愬姛')
+ this.upLoad = false
+ this.refreshTable()
+ this.dialogVisible = false
+ }).catch(e => {
+ this.$message.error('淇敼澶辫触')
+ this.dialogVisible = false
+ this.upLoad = false
+ })
+ },
submitForm() {
this.upLoad = true;
let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
@@ -403,7 +454,7 @@
delete this.formData.createUser
delete this.formData.updateUser
this.formData.authorizedPerson = authorizedPerson
- this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
+ this.$axios.post(this.$api.insOrder.getDeviceManager, this.formData, {
headers: {
'Content-Type': 'application/json'
}
@@ -423,8 +474,8 @@
})
},
// 涓嬪崟
- playOrder() {
- this.active = 1
+ playOrder(num) {
+ this.active = num
},
handleTab(m, i) {
this.tabIndex = i;
--
Gitblit v1.9.3