From bed893abbebac6a1e43478b693e1f862a6b6c8fe Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 09 七月 2022 17:25:20 +0800
Subject: [PATCH] 1.生产开报工实现部分2.修改bug
---
src/views/scgl/scdd.vue | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 42439ad..1d7193e 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -44,6 +44,7 @@
type="daterange"
range-separator="~"
size="mini"
+ style="width: 240px"
:clearable="false"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
@@ -55,17 +56,25 @@
<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="daterange"-->
+ <!-- :clearable="false"-->
+ <!-- range-separator="~"-->
+ <!-- start-placeholder="寮�濮嬫棩鏈�"-->
+ <!-- end-placeholder="缁撴潫鏃ユ湡"-->
+ <!-- size="mini"-->
+ <!-- />-->
+ <!-- :picker-options="expireTimeOption"-->
<el-date-picker
v-model="form.createdate"
- type="daterange"
- :clearable="false"
- range-separator="~"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
+ type="date"
size="mini"
+ :clearable="false"
+ style="width: 200px;"
+ format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
/>
- <!-- :picker-options="expireTimeOption"-->
-
</el-form-item>
</div>
<div style="min-height: 100px">
@@ -141,6 +150,7 @@
<!-- />-->
<el-table-column
width="50"
+ fixed
>
<template slot-scope="{row}">
<el-radio
@@ -347,7 +357,7 @@
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'SCDD',
components: {
Pagination
},
@@ -449,10 +459,10 @@
tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
}
- let tempDate = this.form.createdate
- if (tempDate.length > 0) {
- tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
- }
+ // let tempDate = this.form.createdate
+ // if (tempDate.length > 0) {
+ // tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ // }
const data = {
erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
@@ -462,7 +472,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, // 绗嚑椤�
@@ -628,7 +639,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