From f791db88d83a7ed851b9412d9797ed16b345fe79 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 07 七月 2022 18:39:18 +0800
Subject: [PATCH] 1.项目页面修改2.生产管理工单页面开发
---
src/views/scgl/scdd.vue | 191 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 144 insertions(+), 47 deletions(-)
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 0a366ff..0314c4e 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -39,30 +39,81 @@
<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="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
+ type="daterange"
+ range-separator="~"
+ size="mini"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
/>
+ <!-- :picker-options="expireTimeOption"-->
+
</el-form-item>
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
<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="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
+ type="daterange"
+ range-separator="~"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="mini"
/>
+ <!-- :picker-options="expireTimeOption"-->
+
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ <div style="min-height: 100px">
+ <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2;justify-content: end">
+ <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
+ </div>
+ <!-- <div v-if="!isFullscreen" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
+ <!-- <el-button-->
+ <!-- type="primary"-->
+ <!-- icon="el-icon-refresh-right"-->
+ <!-- @click="reset('update')"-->
+ <!-- >鍚屾ERP-->
+ <!-- </el-button>-->
+ <!-- <el-button-->
+ <!-- type="primary"-->
+ <!-- icon="el-icon-switch-button"-->
+ <!-- @click="orderClose"-->
+ <!-- >鍏抽棴璁㈠崟-->
+ <!-- </el-button>-->
+ <!-- </div>-->
+ <!-- <div v-if="isFullscreen" style="display: flex;flex-direction: column;align-items: end">-->
+ <!-- <el-button-->
+ <!-- type="primary"-->
+ <!-- icon="el-icon-refresh-right"-->
+ <!-- style="margin: 10px 0"-->
+ <!-- @click="reset('update')"-->
+ <!-- >鍚屾ERP-->
+ <!-- </el-button>-->
+ <!-- <el-button-->
+ <!-- type="primary"-->
+ <!-- icon="el-icon-switch-button"-->
+ <!-- @click="orderClose"-->
+ <!-- >鍏抽棴璁㈠崟-->
+ <!-- </el-button>-->
+ <!-- </div>-->
</div>
</el-form>
</div>
@@ -134,16 +185,19 @@
prop="wo"
label="璁㈠崟缂栧彿"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="partspec"
@@ -154,12 +208,14 @@
<el-table-column
prop="qty"
label="璁㈠崟鏁伴噺"
+ width="150"
sortable="custom"
/>
<el-table-column
prop="wkshp_name"
label="鐢熶骇杞﹂棿"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="paydate"
@@ -171,6 +227,7 @@
prop="createuser"
label="鍒涘缓浜哄憳"
sortable="custom"
+ width="150"
/>
<el-table-column
prop="createdate"
@@ -180,6 +237,7 @@
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -205,29 +263,29 @@
<el-dialog
:title="operation==='add'?'鏂板':'涓嬭揪'"
:visible.sync="dialogVisible"
- width="60%"
+ width="800px"
top="15vh"
:close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="璁㈠崟鐘舵��" prop="erporderstus">
- <el-select
- v-model="dialogForm.erporderstus"
- disabled
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in erporderstusArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item label="璁㈠崟鐘舵��" prop="erporderstus">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.erporderstus"-->
+ <!-- disabled-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in erporderstusArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item label="璁㈠崟缂栧彿" prop="erpordercode">
<el-input v-model="dialogForm.erpordercode" disabled style="width: 200px" />
</el-form-item>
@@ -237,9 +295,7 @@
<el-form-item label="浜у搧鍚嶇О" prop="partname">
<el-input v-model="dialogForm.partname" disabled style="width: 200px" />
</el-form-item>
- <el-form-item label="璁㈠崟鏁伴噺" prop="erpqty">
- <el-input v-model="dialogForm.erpqty" disabled style="width: 200px" />
- </el-form-item>
+
<el-form-item label="浜у搧瑙勬牸" prop="partspec">
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
@@ -248,6 +304,17 @@
</el-form-item>
<el-form-item label="鎵�灞炰粨搴�" prop="warehousename">
<el-input v-model="dialogForm.warehousename" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="璁㈠崟鏁伴噺" prop="erpqty">
+ <el-input v-model="dialogForm.erpqty" disabled style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宸蹭笅鍗曟暟" prop="relse_qty">
+ <el-input
+ v-model="dialogForm.relse_qty"
+ disabled
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="涓嬪崟鏁伴噺" prop="markqty">
<el-input
@@ -263,14 +330,7 @@
style="width: 200px"
/>
</el-form-item>
- <el-form-item label="宸蹭笅鍗曟暟" prop="relse_qty">
- <el-input
- v-model="dialogForm.relse_qty"
- disabled
- oninput="value=value.replace(/[^0-9.]/g,'')"
- style="width: 200px"
- />
- </el-form-item>
+
<!-- <el-form-item label="浜や粯鏃堕棿" prop="">-->
<!-- <el-date-picker-->
<!-- v-model="dialogForm.markqty"-->
@@ -295,7 +355,7 @@
<script>
import Pagination from '@/components/Pagination'
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
-import { handleDatatime } from '@/utils/global'
+import { handleDatatime, handleDatetime } from '@/utils/global'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -316,6 +376,7 @@
}
}
return {
+ isFullscreen: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -327,7 +388,7 @@
paydate: '', // 浜や粯鏃堕棿
creatuser: '', // 鍒涘缓浜哄憳
createdate: '', // 鍒涘缓鏃堕棿
- prop: 'partcode', // 鎺掑簭瀛楁
+ prop: 'createdate', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -376,6 +437,11 @@
]
}
+ // expireTimeOption: {
+ // disabledDate(time) {
+ // return time.getTime() > Date.now() - 8.64e6 // 濡傛灉娌℃湁鍚庨潰鐨�-8.64e6灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+ // }
+ // }
}
},
@@ -389,7 +455,34 @@
},
methods: {
async getErpOrderSearch() {
- const res = await ErpOrderSearch(this.form)
+ console.log(this.form, 1)
+ let tempDate2 = this.form.paydate
+ if (tempDate2.length > 0) {
+ tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
+ }
+
+ let tempDate = this.form.createdate
+ if (tempDate.length > 0) {
+ tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+ }
+
+ const data = {
+ erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
+ erpordercode: this.form.erpordercode, // 璁㈠崟缂栧彿
+ partcode: this.form.partcode, // 浜у搧缂栫爜
+ partname: this.form.partname, // 浜у搧鍚嶇О
+ partspec: this.form.partspec, // 浜у搧瑙勬牸
+ paydate: tempDate2, // 浜や粯鏃堕棿
+ creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
+ createdate: tempDate, // 鍒涘缓鏃堕棿
+ prop: this.form.prop, // 鎺掑簭瀛楁
+ order: this.form.order, // 鎺掑簭瀛楁
+ page: this.form.page, // 绗嚑椤�
+ rows: this.form.rows // 姣忛〉澶氬皯鏉�
+
+ }
+
+ const res = await ErpOrderSearch(data)
this.tableData = res.data
this.total = res.count
},
@@ -430,11 +523,11 @@
this.radioSelected = wo
},
// 璁㈠崟鍏抽棴
- async orderClose() {
+ async orderClose() {
if (this.radioSelected.length < 1) {
return this.$message.info('璇峰厛閫夋嫨璁㈠崟锛�')
}
- this.tableData.find(item => {
+ this.tableData.forEach(item => {
if (item.wo === this.radioSelected) {
if (item.status !== 'NEW') {
return this.$message.info('姝よ鍗曢潪鏂拌鍗曪紝鏃犳硶鍏抽棴锛�')
@@ -519,7 +612,7 @@
this.$refs.dialogForm.validate(valid => {
if (valid) {
const data = {
- 'erporderstus': this.dialogForm.erporderstus,
+ // 'erporderstus': this.dialogForm.erporderstus,
'erpordercode': this.dialogForm.erpordercode,
'partcode': this.dialogForm.partcode,
'wkshopcode': this.dialogForm.wkshopcode,
@@ -547,6 +640,10 @@
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 250
this.tableHeight = this.mainHeight - 100
+ this.isFullscreen = window.innerHeight < 800
+ if (this.isFullscreen) {
+ this.tableHeight = this.tableHeight - 50
+ }
})
}
}
@@ -717,8 +814,8 @@
border-color: $main_color;
}
-.elTableDiv{
- ::v-deep .el-radio__label{
+.elTableDiv {
+ ::v-deep .el-radio__label {
display: none;
}
}
--
Gitblit v1.9.3