From 9b825939b7f0a7439d704b379812362dd95697fc Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 11 七月 2022 17:49:26 +0800
Subject: [PATCH] 1.优化代码2.修改实施部提出的bug3.生产开报工外协列表自动弹窗实现部分
---
src/views/scgl/scdd.vue | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 0314c4e..9f936fa 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -13,6 +13,7 @@
<el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.erporderstus"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -39,18 +40,13 @@
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="浜や粯鏃堕棿" style=" display: flex;">
- <!-- <el-date-picker-->
- <!-- v-model="form.paydate"-->
- <!-- type="date"-->
- <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
- <!-- style="width: 200px"-->
- <!-- placeholder="閫夋嫨鏃ユ湡"-->
- <!-- />-->
<el-date-picker
v-model="form.paydate"
type="daterange"
range-separator="~"
size="mini"
+ style="width: 240px"
+ :clearable="false"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
/>
@@ -61,23 +57,26 @@
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
- <!-- <el-date-picker-->
- <!-- v-model="form.createdate"-->
- <!-- type="date"-->
- <!-- value-format="yyyy-MM-dd HH:mm:ss"-->
- <!-- style="width: 200px"-->
- <!-- placeholder="閫夋嫨鏃ユ湡"-->
- <!-- />-->
<el-date-picker
v-model="form.createdate"
type="daterange"
+ :clearable="false"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
+ style="width: 240px"
end-placeholder="缁撴潫鏃ユ湡"
size="mini"
/>
<!-- :picker-options="expireTimeOption"-->
-
+ <!-- <el-date-picker-->
+ <!-- v-model="form.createdate"-->
+ <!-- type="date"-->
+ <!-- size="mini"-->
+ <!-- :clearable="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- format="yyyy-MM-dd"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- />-->
</el-form-item>
</div>
<div style="min-height: 100px">
@@ -138,7 +137,7 @@
<div class="elTableDiv">
<el-table
:data="tableData"
- :height="tableHeight"
+ :height="tableHeight+'px'"
border
stripe
:style="{width: 100+'%',height:tableHeight+'px',}"
@@ -153,6 +152,7 @@
<!-- />-->
<el-table-column
width="50"
+ fixed
>
<template slot-scope="{row}">
<el-radio
@@ -359,7 +359,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SCDD',
components: {
Pagination
},
@@ -474,7 +474,8 @@
partspec: this.form.partspec, // 浜у搧瑙勬牸
paydate: tempDate2, // 浜や粯鏃堕棿
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
- createdate: tempDate, // 鍒涘缓鏃堕棿
+ // createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
+ createdate: tempDate,
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -640,7 +641,7 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
- this.isFullscreen = window.innerHeight < 800
+ // this.isFullscreen = window.innerHeight < 800
if (this.isFullscreen) {
this.tableHeight = this.tableHeight - 50
}
--
Gitblit v1.9.3