From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/plan/manfacturingorderstatement/index.vue | 197 +++++++++++++++++++++++-------------------------
1 files changed, 95 insertions(+), 102 deletions(-)
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>
--
Gitblit v1.9.3