From f7717fdc747e9e7c7e053f6490b7bda9cb19eea7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 06 三月 2024 17:54:27 +0800
Subject: [PATCH] 完成检验下单列表静态页面
---
src/components/view/a6-device-overview.vue | 3 +
src/components/view/a6-device-management.vue | 2
src/components/view/b1-inspection-order.vue | 166 +++++++++++++++++++++++++++++++++++++++++++++---------
3 files changed, 141 insertions(+), 30 deletions(-)
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index c73d33b..6e6d2e8 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -377,7 +377,7 @@
linkEvent:{
deviceName:{
id: 'delete',
- method:'doDiy',
+ method:'selectAllByOne',
}
},
selectField: {},
diff --git a/src/components/view/a6-device-overview.vue b/src/components/view/a6-device-overview.vue
index acfeafb..9b0b5b4 100644
--- a/src/components/view/a6-device-overview.vue
+++ b/src/components/view/a6-device-overview.vue
@@ -288,6 +288,9 @@
this.finishLoding = true;
}
this.list = this.list.concat(list)
+ if(this.total==this.list.length){
+ this.finishLoding = true;
+ }
}
}
this.loading = false
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 9f1829b..d46a9d4 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -61,13 +61,6 @@
.el-form-item{
margin-bottom: 16px;
}
- .picName{
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- word-break: break-all;
- width: 120px;
- }
</style>
<template>
@@ -117,10 +110,15 @@
<!-- 瀹℃牳 -->
<el-dialog
title="涓嬪崟瀹℃牳"
- :visible.sync="dialogVisible0"
+ :visible.sync="verifyDialogVisible"
width="30%"
:before-close="handleClose">
- <p style="font-size:16px;color:#333333">濮旀墭缂栧彿<span style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚﹂�氳繃</p>
+ <p style="font-size:16px;color:#333333" v-if="!isPass">濮旀墭缂栧彿<span style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚﹂�氳繃</p>
+ <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
+ <el-form-item label="璇疯緭鍏ユ牱鍝佸簱浣嶅彿锛�" >
+ <el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input>
+ </el-form-item>
+ </el-form>
<span slot="footer" class="dialog-footer">
<el-row v-if="!isPass">
<el-button @click="handleClose">閫� 鍥�</el-button>
@@ -131,6 +129,77 @@
<el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
</el-row>
</span>
+ </el-dialog>
+ <!-- 鎾ら攢 -->
+ <el-dialog
+ title="涓嬪崟鎾ら攢"
+ :visible.sync="quashDialogVisible"
+ width="30%"
+ :before-close="handleClose">
+ <p style="font-size:16px;color:#333333" v-if="!isQuash">濮旀墭缂栧彿<span style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚︽挙閿�</p>
+ <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
+ <el-form-item label="璇疯緭鍏ユ挙閿�鍘熷洜锛�" >
+ <el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-row v-if="!isQuash">
+ <el-button @click="handleClose">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
+ </el-row>
+ <el-row v-else>
+ <el-button @click="handleClose">杩� 鍥�</el-button>
+ <el-button type="primary" @click="submitForm" :loading="upLoad">纭� 瀹�</el-button>
+ </el-row>
+ </span>
+ </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-item label="绾﹀畾鏃堕棿锛�" >
+ <el-date-picker
+ style="width:100%"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd"
+ v-model="formData.downTime"
+ type="date"
+ size="small"
+ placeholder="閫夋嫨鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鎸囨淳浜哄憳锛�" >
+ <el-select v-model="formData.equipmentManager" 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>
+ </el-form-item>
+ </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-row>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="鏁版嵁鏌ョ湅"
+ :visible.sync="dataDialogVisible"
+ width="70%"
+ :before-close="handleClose">
+ <ValueTable
+ ref="ValueTableDataLook"
+ :url="$api.deviceScope.selectDeviceParameter"
+ :componentData="componentDataDataLook"
+ :key="upIndex" style="height: calc(100% - 44px)" />
</el-dialog>
</div>
</template>
@@ -143,13 +212,18 @@
},
data() {
return {
- //鏄惁閫氳繃 true鏄� false涓嶆槸
- isPass: true,
+ //鏄惁瀹℃牳閫氳繃 true鏄� false涓嶆槸
+ isPass: false,
+ //鏄惁瀹℃牳鎾ら攢 true鏄� false涓嶆槸
+ isQuash:false,
+ verifyDialogVisible: false,
+ quashDialogVisible:false,
+ issuedDialogVisible:false,
+ dataDialogVisible:false,
formData: {},
- value: '',
- options: [],
+ // 浜哄憳鍒楄〃
+ personList:[],
labelPosition: 'right',
- dialogVisible0: false,
componentData: {
entity: {
deviceStatus: null,
@@ -216,18 +290,41 @@
requiredAdd:['largeCategory','subclass','deviceName','internalCode','specificationModel','manufacturer'],
requiredUp:['largeCategory','subclass','deviceName','internalCode','specificationModel','manufacturer']
},
+ componentDataDataLook:{
+ entity: {
+ orderBy: {
+ field: 'id',
+ order: 'asc'
+ }
+ },
+ isIndex: false,
+ showSelect: false,
+ select: false,
+ do: [],
+ tagField: {
+ deviceStatus: {
+ select: [{
+ value: 0,
+ type: 'success',
+ label: '姝ｅ父'
+ },{
+ value: 1,
+ type: 'warning',
+ label: '鎶ュ簾'
+ },{
+ value: 2,
+ type: 'danger',
+ label: '淇濅慨'
+ }]
+ }
+ },
+ selectField: {},
+ requiredAdd:[],
+ requiredUp:[]
+ },
entityCopy: {},
upIndex: 0,
- addDia: true,
addPower: true,
- //璁惧绫诲瀷鍒楄〃
- equipmentList:[],
- // 璐熻矗浜哄垪琛�
- responsiblePersonList:[],
- // 鎺堟潈浜哄垪琛�
- authorizerList:[],
- // 璁惧鐘舵�佸垪琛�
- deviceStatusList:[],
upLoad:false,
tabList:[
{
@@ -288,7 +385,10 @@
this.addPower = add
},
handleClose(){
- this.dialogVisible0 = false;
+ this.verifyDialogVisible = false;
+ this.quashDialogVisible = false;
+ this.issuedDialogVisible = false;
+ this.dataDialogVisible = false;
this.upLoad = false;
},
// 璇︽儏
@@ -300,17 +400,25 @@
this.formData=this.HaveJson(row);
},
// 鏁版嵁鏌ョ湅
- handleDataLook(row){},
+ handleDataLook(row){
+ this.dataDialogVisible = true;
+ },
// 涓嬭浇鎶ュ憡
- download(row){},
+ download(row){
+
+ },
// 瀹℃牳
handleVerify(row){
- this.dialogVisible0 = true;
+ this.verifyDialogVisible = true;
},
// 鎾ら攢
- handlEquash(row){},
+ handlEquash(row){
+ this.quashDialogVisible = true;
+ },
// 涓嬪彂
- handleIssued(row){},
+ handleIssued(row){
+ this.issuedDialogVisible = true;
+ },
submitForm(){
this.upLoad = true;
let authorizedPerson = this.formData.authorizedPerson.length>0?this.formData.authorizedPerson.join(','):''
--
Gitblit v1.9.3