From 0c88a6ccbf2beefe9c81cdbf2b28ac1438616292 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 13 十二月 2023 14:42:47 +0800
Subject: [PATCH] modified: src/const/crud/customerOrder/customerOrderForm.js modified: src/views/plan/manfacturingorderstatement/index.vue modified: src/views/plan/productionschedul/index.vue deleted: src/views/plan/productionschedul/template-form.vue
---
src/views/plan/productionschedul/index.vue | 6
/dev/null | 172 ------------------------
src/const/crud/customerOrder/customerOrderForm.js | 1
src/views/plan/manfacturingorderstatement/index.vue | 197 +++++++++++++--------------
4 files changed, 99 insertions(+), 277 deletions(-)
diff --git a/src/const/crud/customerOrder/customerOrderForm.js b/src/const/crud/customerOrder/customerOrderForm.js
index 89b9d30..f23b3cf 100644
--- a/src/const/crud/customerOrder/customerOrderForm.js
+++ b/src/const/crud/customerOrder/customerOrderForm.js
@@ -17,6 +17,7 @@
export const tableOption = {
border: true,
index: true,
+ indexFixed: false,
height: '292px',
indexLabel: '搴忓彿',
menuAlign: 'center',
diff --git a/src/views/plan/manfacturingorderstatement/index.vue b/src/views/plan/manfacturingorderstatement/index.vue
index 8a8d39f..776a906 100644
--- a/src/views/plan/manfacturingorderstatement/index.vue
+++ b/src/views/plan/manfacturingorderstatement/index.vue
@@ -1,107 +1,66 @@
<template>
<div class="mod-config">
<basic-container>
- <div class="avue-crud">
- <el-row>
- <el-col :span="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
- >
- <span>閿�鍞鍗�</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-input
- clearable
- @keyup.enter.native="getDataList"
- v-model="paramObject.customerOrderNo"
- placeholder="閿�鍞鍗�"
- @clear="getDataList"
- style="width: 100%"
- >
- </el-input>
- </div>
- </el-col>
- <el-col :span="1" offset="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
- >
- <span>涓昏鍒掑彿</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-input
- clearable
- @keyup.enter.native="getDataList"
- v-model="paramObject.mpsNo"
- placeholder="涓昏鍒掑彿"
- @clear="getDataList"
- style="width: 100%"
- >
- </el-input>
- </div>
- </el-col>
- <el-col :span="1" offset="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
- >
- <span>杞﹂棿璁㈠崟</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-input
- clearable
- @keyup.enter.native="getDataList"
- v-model="paramObject.moNo"
- placeholder="杞﹂棿璁㈠崟"
- @clear="getDataList"
- style="width: 100%"
- >
- </el-input>
- </div>
- </el-col>
- <el-col :span="1" offset="1">
- <div>
- <el-divider direction="vertical"></el-divider>
- <div
- style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
- >
- <span>闇�姹傛棩鏈�</span>
- </div>
- </div>
- </el-col>
- <el-col :span="3">
- <div>
- <el-date-picker
- clearable
- v-model="paramObject.requiredDate"
- type="datetimerange"
- start-placeholder="寮�濮�"
- end-placeholder="缁撴潫"
- value-format="yyyy-MM-dd HH:mm:ss"
- @change="feedDateChange($event)"
- size="mini"
- style="width:100px"
- >
- </el-date-picker>
- </div>
- </el-col>
- <el-col :span="2" offset="1">
- <el-button type="primary" @click="getDataList()">鎼滅储</el-button>
- </el-col>
- </el-row>
+ <div class="avue-crud" style="margin: 0px 10px">
+ <el-form :model="paramObject" label-width="100px" label-position="right">
+ <el-row>
+ <el-col :span="5">
+ <el-form-item label="閿�鍞鍗�">
+ <el-input
+ clearable
+ @keyup.enter.native="getDataList"
+ v-model="paramObject.customerOrderNo"
+ placeholder="閿�鍞鍗�"
+ @clear="getDataList"
+ style="width: 100%"
+ > </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="涓昏鍒掑彿">
+ <el-input
+ clearable
+ @keyup.enter.native="getDataList"
+ v-model="paramObject.mpsNo"
+ placeholder="涓昏鍒掑彿"
+ @clear="getDataList"
+ style="width: 100%"
+ > </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="杞﹂棿璁㈠崟">
+ <el-input
+ clearable
+ @keyup.enter.native="getDataList"
+ v-model="paramObject.moNo"
+ placeholder="杞﹂棿璁㈠崟"
+ @clear="getDataList"
+ style="width: 100%"
+ > </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="闇�姹傛棩鏈�">
+ <el-date-picker
+ style="width:100%"
+ clearable
+ v-model="paramObject.requiredDate"
+ type="datetimerange"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ @change="feedDateChange($event)"
+ size="mini"
+ > </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3" :offset="1">
+ <el-button type="primary" @click="getDataList()">鎼滅储</el-button>
+ </el-col>
+ </el-row>
+ </el-form>
+
<el-table
:data="dataList"
border
@@ -110,12 +69,14 @@
class="l-mes-table"
:height="screenHeight"
>
- <el-table-column type="index" label="搴忓彿" width="50">
+ <el-table-column type="index" label="搴忓彿" align="center" width="50">
</el-table-column>
<el-table-column
prop="customerName"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="瀹㈡埛鍚嶇О"
>
</el-table-column>
@@ -123,6 +84,8 @@
prop="customerOrderNo"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="閿�鍞鍗曞彿"
>
</el-table-column>
@@ -130,6 +93,8 @@
prop="mpsNo"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="涓昏鍒掑彿"
>
</el-table-column>
@@ -137,6 +102,8 @@
prop="partNo"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="闆朵欢鍙�"
>
</el-table-column>
@@ -144,6 +111,8 @@
prop="partName"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="闆朵欢鍚嶇О"
>
</el-table-column>
@@ -151,6 +120,8 @@
prop="qtyRequired"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="杞﹂棿璁㈠崟闇�姹傛暟閲�"
>
</el-table-column>
@@ -158,6 +129,8 @@
prop="unit"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="鍗曚綅"
>
</el-table-column>
@@ -165,6 +138,8 @@
prop="requiredDate"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="闇�姹傛棩鏈�"
>
</el-table-column>
@@ -172,6 +147,8 @@
prop="moNo"
header-align="center"
align="center"
+ min-width="120"
+ show-overflow-tooltip
label="杞﹂棿璁㈠崟鍙�"
>
</el-table-column>
@@ -180,6 +157,8 @@
prop="name"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭鍚嶇О"
>
</el-table-column>
@@ -187,6 +166,8 @@
prop="operationPartNo"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭闆朵欢鍙�"
>
</el-table-column>
@@ -194,6 +175,8 @@
prop="operationPartName"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭闆朵欢鍚嶇О"
>
</el-table-column>
@@ -201,6 +184,8 @@
prop="pda"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭闇�姹傛暟閲�"
>
</el-table-column>
@@ -208,6 +193,8 @@
prop="plannedQuantity"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ崟鐨勮鍒掓暟閲�"
>
</el-table-column>
@@ -215,6 +202,8 @@
prop="completedQuantity"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ崟鐨勫畬鎴愭暟閲�"
>
</el-table-column>
@@ -222,6 +211,8 @@
prop="units"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="鍗曚綅"
>
</el-table-column>
@@ -230,6 +221,8 @@
prop="count"
header-align="center"
align="center"
+ min-width="100"
+ show-overflow-tooltip
label="宸ュ簭瀹屾垚杩涘害"
>
</el-table-column>
diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index e19b0e5..d47995b 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -140,7 +140,6 @@
deleteSchedul,
updateSchedul
} from '@/api//plan/productionschedul'
-import TableForm from './template-form'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
export default {
@@ -298,7 +297,6 @@
},
components: {
ttable,
- TableForm,
},
computed: {
...mapGetters(['permissions']),
@@ -481,7 +479,6 @@
size: this.page.pageSize,
current: this.page.currentPage,
}
- console.log(this.page);
fetchScheduleList(param).then((res) => {
this.tableData = res.data.data.records
this.page.total = res.data.data.total
@@ -576,6 +573,9 @@
}
</script>
<style>
+.el-tag--small{
+ display: none;
+}
.basic-template-table .el-table__body .el-table__row td:first-child .cell {
padding-left: 0px;
padding-right: 0px;
diff --git a/src/views/plan/productionschedul/template-form.vue b/src/views/plan/productionschedul/template-form.vue
deleted file mode 100644
index d4a6707..0000000
--- a/src/views/plan/productionschedul/template-form.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
- <el-dialog
- v-diadrag
- :title="!dataForm.id ? '鏂板' : '淇敼'"
- :close-on-click-modal="false"
- :visible.sync="visible"
- >
- <el-form
- :model="dataForm"
- :rules="dataRule"
- ref="dataForm"
- label-width="100px"
- class="l-mes"
- >
- <el-form-item label="妯℃澘缂栧彿" prop="templateNo">
- <el-input
- v-model="dataForm.templateNo"
- placeholder="妯℃澘缂栧彿"
- ></el-input>
- </el-form-item>
- <el-form-item label="妯℃澘鍚嶇О" prop="templateName">
- <el-input
- v-model="dataForm.templateName"
- placeholder="妯℃澘鍚嶇О"
- ></el-input>
- </el-form-item>
- <el-form-item label="妯℃澘绫诲瀷" prop="templateType">
- <el-select
- v-model="dataForm.templateType"
- placeholder="妯℃澘绫诲瀷"
- filterable
- style="width: 100%"
- clearable
- @change="templateTypeChange"
- >
- <el-option
- v-for="item in templateTypeList"
- :key="item.id"
- :label="item.templateTypeName"
- :value="item.templateTypeName"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="dataForm.remark" placeholder="澶囨敞"></el-input>
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible = false">鍙栨秷</el-button>
- <el-button
- type="primary"
- :disabled="isSubmit"
- v-thinclick="`dataFormSubmit`"
- >纭畾</el-button
- >
- </span>
- </el-dialog>
-</template>
-
-<script>
-import { getObj, addObj, putObj, getTemplateTypes } from '@/api/basic/template'
-
-export default {
- data() {
- return {
- templateTypeList: [],
- visible: false,
- dataForm: {
- id: 0,
- templateName: '',
- templateNo: '',
- templateType: '',
- dataType: '',
- remark: ''
- },
- dataRule: {
- templateName: [
- { required: true, message: '妯℃澘鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }
- ],
- templateType: [
- { required: true, message: '妯℃澘绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }
- ]
- },
- isSubmit: false
- }
- },
- methods: {
- init(id) {
- this.dataForm.id = id || 0
- this.visible = true
- this.$nextTick(() => {
- this.$refs.dataForm.resetFields()
- Promise.all([this.getDict(), this.getDataForm(this.dataForm.id)]).then(
- (res) => {}
- )
- })
- },
- getDataForm(id) {
- return new Promise((resolve, reject) => {
- if (id) {
- getObj(id)
- .then((response) => {
- if (response.data.code === 0) {
- this.dataForm = response.data.data
- resolve()
- } else {
- this.dataForm = {}
- reject()
- }
- })
- .catch((error) => {
- reject(error)
- })
- }
- })
- },
- getDict() {
- return new Promise((resolve, reject) => {
- getTemplateTypes()
- .then((response) => {
- if (response.data.code === 0) {
- this.templateTypeList = response.data.data
- resolve()
- } else {
- this.templateTypeList = []
- reject()
- }
- })
- .catch((error) => {
- reject(error)
- })
- })
- },
- templateTypeChange() {
- const currOperationTemplateType = this.dataForm.templateType
- const templateType = this.templateTypeList.find(
- (item) => item.templateTypeName === currOperationTemplateType
- )
- if (templateType != undefined) {
- this.dataForm.dataType = templateType.dataType
- } else {
- this.dataForm.dataType = ''
- }
- },
- // 琛ㄥ崟鎻愪氦
- dataFormSubmit() {
- this.isSubmit = true
- this.$refs.dataForm.validate((valid) => {
- if (valid) {
- if (this.dataForm.id) {
- putObj(this.dataForm).then((data) => {
- this.$message.success('淇敼鎴愬姛')
- this.visible = false
- this.isSubmit = false
- this.$emit('refreshDataList')
- })
- } else {
- addObj(this.dataForm).then((data) => {
- this.$message.success('娣诲姞鎴愬姛')
- this.visible = false
- this.isSubmit = false
- this.$emit('refreshDataList')
- })
- }
- } else {
- this.isSubmit = false
- }
- })
- }
- }
-}
-</script>
--
Gitblit v1.9.3