From d6049cdf6566f6985b8c713217907c8710a50711 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 26 十一月 2024 15:39:38 +0800
Subject: [PATCH] -物料信息 工位信息 优化
---
billion-ui/src/views/main/bs/routeInfo/ProductSelector.vue | 115 +++++++++++++++++++++-
billion-ui/src/views/main/bs/routeInfo/index.vue | 23 ----
billion-ui/src/views/main/bs/materialInfo/index.vue | 150 ++++++++++++++++++------------
3 files changed, 200 insertions(+), 88 deletions(-)
diff --git a/billion-ui/src/views/main/bs/materialInfo/index.vue b/billion-ui/src/views/main/bs/materialInfo/index.vue
index b89ecc9..5317887 100644
--- a/billion-ui/src/views/main/bs/materialInfo/index.vue
+++ b/billion-ui/src/views/main/bs/materialInfo/index.vue
@@ -169,66 +169,96 @@
<!-- 娣诲姞鎴栦慨鏀圭墿鏂欎俊鎭璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form :inline="true" ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="鐗╂枡缂栧彿" prop="materialCode">
- <el-input v-model="form.materialCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" />
- </el-form-item>
- <el-form-item label="鐗╂枡鍚嶇О" prop="materialName">
- <el-input v-model="form.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
- </el-form-item>
- <el-form-item label="瑙嗗浘" prop="materialView">
- <el-input v-model="form.materialView" placeholder="璇疯緭鍏ヨ鍥�" />
- </el-form-item>
- <el-form-item label="绉嶇被" prop="typeZ">
- <el-select v-model="form.typeZ" placeholder="璇烽�夋嫨绉嶇被">
- <el-option
- v-for="dict in dict.type.type_z"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="绫诲瀷" prop="typeL">
- <el-select v-model="form.typeL" placeholder="璇烽�夋嫨绫诲瀷">
- <el-option
- v-for="dict in dict.type.type_l"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍗曚綅" prop="unit">
- <el-select v-model="form.unit" placeholder="璇烽�夋嫨鍗曚綅">
- <el-option
- v-for="dict in dict.type.unit"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鐗堟湰" prop="version">
- <el-input v-model="form.version" placeholder="璇疯緭鍏ョ増鏈�" />
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-radio-group v-model="form.status">
- <el-radio
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.value"
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鍘傚晢" prop="supplier">
- <el-input v-model="form.supplier" placeholder="璇疯緭鍏ュ巶鍟�" />
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
- <el-form-item label="鏁版嵁鏉ユ簮" prop="dataSource">
- <el-input v-model="form.dataSource" placeholder="璇疯緭鍏ユ暟鎹潵婧�" />
- </el-form-item>
+ <el-row :gutter="10">
+ <el-col span="8">
+ <el-form-item label="鐗╂枡缂栧彿" prop="materialCode">
+ <el-input v-model="form.materialCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col span="8">
+ <el-form-item label="鐗╂枡鍚嶇О" prop="materialName">
+ <el-input v-model="form.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
+ </el-form-item>
+ </el-col>
+ <el-col span="8">
+ <el-form-item label="瑙嗗浘" prop="materialView">
+ <el-input v-model="form.materialView" placeholder="璇疯緭鍏ヨ鍥�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col span="8">
+ <el-form-item label="绉嶇被" prop="typeZ">
+ <el-select style="width: 93%" v-model="form.typeZ" placeholder="璇烽�夋嫨绉嶇被">
+ <el-option
+ v-for="dict in dict.type.type_z"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col span="8">
+ <el-form-item label="绫诲瀷" prop="typeL">
+ <el-select style="width: 93%" v-model="form.typeL" placeholder="璇烽�夋嫨绫诲瀷">
+ <el-option
+ v-for="dict in dict.type.type_l"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col span="8">
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-select style="width: 93%" v-model="form.unit" placeholder="璇烽�夋嫨鍗曚綅">
+ <el-option
+ v-for="dict in dict.type.unit"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col span="8">
+ <el-form-item label="鐗堟湰" prop="version">
+ <el-input v-model="form.version" placeholder="璇疯緭鍏ョ増鏈�" />
+ </el-form-item>
+ </el-col>
+ <el-col span="8">
+ <el-form-item label="鏁版嵁鏉ユ簮" prop="dataSource">
+ <el-input v-model="form.dataSource" placeholder="璇疯緭鍏ユ暟鎹潵婧�" />
+ </el-form-item>
+ </el-col>
+ <el-col span="8">
+ <el-form-item label="鍘傚晢" prop="supplier">
+ <el-input v-model="form.supplier" placeholder="璇疯緭鍏ュ巶鍟�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col span="8">
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </el-form-item>
+ </el-col>
+ <el-col span="8">
+ <el-form-item label="鐘舵��" prop="status">
+ <el-radio-group v-model="form.status">
+ <el-radio
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
diff --git a/billion-ui/src/views/main/bs/routeInfo/ProductSelector.vue b/billion-ui/src/views/main/bs/routeInfo/ProductSelector.vue
index 35b07c5..36f5334 100644
--- a/billion-ui/src/views/main/bs/routeInfo/ProductSelector.vue
+++ b/billion-ui/src/views/main/bs/routeInfo/ProductSelector.vue
@@ -1,11 +1,70 @@
<template>
- <el-dialog :title="title" :visible.sync="visible" @close="handleClose">
- <el-table :data="gridData" selection="single" ref="multipleTable" @selection-change="productSelectionChange">
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column property="date" label="鏃ユ湡" width="150"></el-table-column>
- <el-table-column property="name" label="濮撳悕" width="200"></el-table-column>
- <el-table-column property="address" label="鍦板潃"></el-table-column>
+ <el-dialog :title="title" :visible.sync="visible" width="1000px" @close="handleClose">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="鐗╂枡缂栧彿" prop="materialCode">
+ <el-input
+ v-model="queryParams.materialCode"
+ placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О" prop="materialName">
+ <el-input
+ v-model="queryParams.materialName"
+ placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item style="float: right">
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ </el-form-item>
+ </el-form>
+ <el-table border ref="multipleTable" v-loading="loading" :data="materialInfoList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column :show-overflow-tooltip="true" label="鐗╂枡缂栧彿" align="center" prop="materialCode" />
+ <el-table-column :show-overflow-tooltip="true" label="鐗╂枡鍚嶇О" align="center" prop="materialName" />
+ <el-table-column :show-overflow-tooltip="true" label="瑙嗗浘" align="center" prop="materialView" />
+ <el-table-column label="绉嶇被" align="center" prop="typeZ">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.type_z" :value="scope.row.typeZ"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="绫诲瀷" align="center" prop="typeL">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.type_l" :value="scope.row.typeL"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍗曚綅" align="center" prop="unit">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
+ </template>
+ </el-table-column>
+ <el-table-column :show-overflow-tooltip="true" label="鐗堟湰" align="center" prop="version" />
+ <el-table-column label="鐘舵��" align="center" prop="status">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+ </template>
+ </el-table-column>
+ <el-table-column :show-overflow-tooltip="true" label="鍘傚晢" align="center" prop="supplier" />
+ <el-table-column :show-overflow-tooltip="true" label="澶囨敞" align="center" prop="remark" />
+ <el-table-column :show-overflow-tooltip="true" label="鏁版嵁鏉ユ簮" align="center" prop="dataSource" />
+ <el-table-column :show-overflow-tooltip="true" label="鍒涘缓鐢ㄦ埛" align="center" prop="createBy" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ </el-table-column>
+ <el-table-column :show-overflow-tooltip="true" label="鏇存敼鐢ㄦ埛" align="center" prop="updateBy" />
+ <el-table-column label="鏇存敼鏃堕棿" align="center" prop="updateTime" width="180">
+ </el-table-column>
</el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
<div slot="footer" class="dialog-footer">
<el-button @click="handleClose">鍙� 娑�</el-button>
<el-button type="primary" @click="confirmSelection">纭� 瀹�</el-button>
@@ -14,8 +73,11 @@
</template>
<script>
+import {listMaterialInfo} from "@/api/main/bs/materialInfo";
+
export default {
name: "ProductSelector",
+ dicts: ['sys_normal_disable', 'type_l', 'unit', 'type_z'],
props: {
visible: Boolean,
title: {
@@ -26,14 +88,50 @@
},
data() {
return {
- multipleSelection: []
+ // 鎬绘潯鏁�
+ total: 0,
+ // 鐗╂枡淇℃伅琛ㄦ牸鏁版嵁
+ materialInfoList: [],
+ // 閬僵灞�
+ loading: true,
+ showSearch: true,
+ multipleSelection: [],
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ materialCode: null,
+ materialName: null,
+ materialView: null,
+ typeZ: null,
+ typeL: null,
+ unit: null,
+ status: null,
+ },
};
},
+ created() {
+ this.getList();
+ },
methods: {
+ /** 鏌ヨ鐗╂枡淇℃伅鍒楄〃 */
+ getList() {
+ this.loading = true;
+ listMaterialInfo(this.queryParams).then(response => {
+ this.materialInfoList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
handleClose() {
this.$emit('update:visible', false);
},
- productSelectionChange(selection) {
+ handleSelectionChange(selection) {
if (selection.length > 1) {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleRowSelection(selection[selection.length - 1], true);
@@ -46,6 +144,7 @@
if (this.multipleSelection.length > 0) {
this.$emit('select-product', this.multipleSelection[0]);
this.handleClose();
+ this.$refs.multipleTable.clearSelection();
} else {
this.$message({
message: '璀﹀憡鍝︼紝鏈�夋嫨浠讳綍琛�',
diff --git a/billion-ui/src/views/main/bs/routeInfo/index.vue b/billion-ui/src/views/main/bs/routeInfo/index.vue
index 99a64f4..d8610f1 100644
--- a/billion-ui/src/views/main/bs/routeInfo/index.vue
+++ b/billion-ui/src/views/main/bs/routeInfo/index.vue
@@ -193,7 +193,6 @@
<!-- 浜у搧閫夋嫨鍣ㄧ粍浠� -->
<ProductSelector
:visible="dialogTableVisible"
- :gridData="gridData"
@select-product="handleSelectProduct"
@update:visible="dialogTableVisible = $event"
/>
@@ -212,23 +211,6 @@
data() {
return {
multipleSelection: [],
- gridData: [{
- date: '2016-05-02',
- name: '鐜嬩竴铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }, {
- date: '2016-05-04',
- name: '鐜嬩簩铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }, {
- date: '2016-05-01',
- name: '鐜嬩笁铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪洓铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }],
dialogTableVisible: false,
advancedSearchVisible: false,
// 閬僵灞�
@@ -281,8 +263,9 @@
},
methods: {
handleSelectProduct(selectedProduct) {
- this.form.productCode = selectedProduct.date; // 鍋囪浣犻渶瑕佺殑鏄棩鏈熷瓧娈�
- this.form.productName = selectedProduct.name; // 鍋囪浣犻渶瑕佺殑鏄鍚嶅瓧娈�
+ console.log(selectedProduct)
+ this.form.productCode = selectedProduct.materialCode; // 鍋囪浣犻渶瑕佺殑鏄棩鏈熷瓧娈�
+ this.form.productName = selectedProduct.materialName; // 鍋囪浣犻渶瑕佺殑鏄鍚嶅瓧娈�
},
toggleAdvancedSearch() {
this.advancedSearchVisible = !this.advancedSearchVisible;
--
Gitblit v1.9.3