From fc06215c58fef8431e9574235680bffd840b507a Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 11 五月 2024 16:55:44 +0800
Subject: [PATCH] 1.生产工单新增预计开工日期、预计完工日期
---
src/views/workOrder/workOrderList.vue | 84 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index af688a1..f09761b 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -90,26 +90,14 @@
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鍒涘缓鏃堕棿" style=" display: flex;">
- <!-- <el-date-picker-->
- <!-- v-model="form.createdate"-->
- <!-- type="daterange"-->
- <!-- :clearable="false"-->
- <!-- range-separator="~"-->
- <!-- start-placeholder="寮�濮嬫棩鏈�"-->
- <!-- end-placeholder="缁撴潫鏃ユ湡"-->
- <!-- size="mini"-->
- <!-- />-->
- <el-date-picker
- v-model="form.createdate"
- type="date"
- size="mini"
- :clearable="false"
- class="dateMini"
- format="yyyy-MM-dd"
- placeholder="閫夋嫨鏃ユ湡"
- />
- </el-form-item>
+ <DateType
+ ref="DateTypeRef"
+ :is-expand-form="isExpandForm"
+ style="display:flex;justify-content: center;align-items: center;position: relative"
+ :datatype-list="datatypeList"
+ @DateTypeChange="DateTypeChange"
+ @cycleTimeChange="cycleTimeChange"
+ />
</div>
<div
@@ -283,6 +271,28 @@
>
<template slot-scope="{row}">
<div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="plan_startdate"
+ label="棰勮寮�宸ユ棩鏈�"
+ sortable="custom"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="plan_enddate"
+ label="棰勮瀹屽伐鏃ユ湡"
+ sortable="custom"
+ width="130"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.plan_enddate">{{ row.plan_enddate.substring(0, 11) }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -1990,11 +2000,11 @@
import Sortable from 'sortablejs'
import ElDragSelect from '@/components/DragSelect'
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
-
+import DateType from '@/components/DateType'
export default {
name: 'WorkOrderList',
components: {
- Pagination, ElDragSelect
+ Pagination, ElDragSelect, DateType
},
directives: { elDragDialog, waves },
data() {
@@ -2017,7 +2027,9 @@
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
- createdate: '', // 鍒涘缓鏃堕棿
+ // createdate: '', // 鍒涘缓鏃堕棿
+ datatype: 'ED', // 鏃ユ湡绫诲瀷(璁″垝寮�宸�(PS)銆佽鍒掑畬宸�(PE)銆侀璁′氦浠�(ED)銆佸垱寤烘棩鏈�(CT))
+ timeValue: [], // 鏌ヨ鏃ユ湡
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -2240,7 +2252,14 @@
stepSelectArr: [], // 宸ュ簭涓嬫媺鏁版嵁
stepSelectedValue: [], // 涓嬫媺閫変腑鍊�
- multipleSelection: []
+ multipleSelection: [],
+
+ datatypeList: [
+ { code: 'PS', name: '棰勮寮�宸ユ棩鏈�' },
+ { code: 'PE', name: '棰勮瀹屽伐鏃ユ湡' },
+ { code: 'ED', name: '棰勮浜や粯鏃ユ湡' },
+ { code: 'CT', name: '宸ュ崟鍒涘缓鏃ユ湡' }
+ ]
}
},
watch: {
@@ -2276,6 +2295,12 @@
// })
},
methods: {
+ DateTypeChange(value) {
+ this.form.datatype = value
+ },
+ cycleTimeChange(val) {
+ this.form.timeValue = val
+ },
setSort() {
const el = this.$refs.stepTableDataRef.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
this.sortable = Sortable.create(el, {
@@ -2328,7 +2353,9 @@
sourceorder: this.form.sourceorder, // 婧愬崟鍗曞彿
saleordercode: this.form.saleordercode, // 閿�鍞鍗�
ordertype: this.form.ordertype, // 鍗曟嵁绫诲瀷
- createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
+ datatype: this.form.datatype,
+ searchdate: this.form.timeValue.join('~'),
+ // createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -2400,7 +2427,12 @@
this.form.creatuser = ''
this.form.sourceorder = ''
this.form.ordertype = ''
- this.form.createdate = ''
+ // this.form.createdate = ''
+
+ this.form.timeValue = []
+ this.cycleTime = null
+ this.$refs.DateTypeRef.clearValue()
+
this.getMesOrderSearch()
},
// 鏂板鎸夐挳
--
Gitblit v1.9.3