From 8043f5f0d90a652e90532421aaf5c5145e03305c Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 03 一月 2024 08:06:57 +0800
Subject: [PATCH] 代码更新
---
jcdm-ui/src/views/main/da/passingStationCollection/index.vue | 56 +++++-------------
jcdm-ui/src/views/main/em/equipmentArchives/index.vue | 61 +++++++++++++++++++-
jcdm-ui/src/views/main/bs/ProductBomChild/index.vue | 11 +++
jcdm-ui/src/views/main/bs/material/index.vue | 14 ++--
jcdm-ui/src/views/main/da/collectionParamConf/index.vue | 2
5 files changed, 93 insertions(+), 51 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/ProductBomChild/index.vue b/jcdm-ui/src/views/main/bs/ProductBomChild/index.vue
index d10269c..65eba98 100644
--- a/jcdm-ui/src/views/main/bs/ProductBomChild/index.vue
+++ b/jcdm-ui/src/views/main/bs/ProductBomChild/index.vue
@@ -70,6 +70,15 @@
v-hasPermi="['bs:ProductBomChild:export']"
>瀵煎嚭</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-close"
+ size="mini"
+ @click="handleClose"
+ >鍏抽棴</el-button>
+ </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -319,7 +328,7 @@
},
/** 杩斿洖鎸夐挳鎿嶄綔 */
handleClose() {
- const obj = { path: "/main/ProductBom" };
+ const obj = { path: "/main/pm/ProductBom" };
this.$tab.closeOpenPage(obj);
},
/** 鏌ヨ鍩虹BOM瀛愪俊鎭垪琛� */
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index 8b6edab..1f73879 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -108,16 +108,10 @@
<dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
<el-table-column label="ERP瑙勬牸" align="center" prop="erpSpec">
</el-table-column>
<el-table-column label="鏁版嵁鏉ユ簮" align="center" prop="dataSource">
</el-table-column>
-
<el-table-column label="鐘舵��" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
@@ -126,6 +120,11 @@
<el-table-column label="鍘傚晢" align="center" prop="supplier">
</el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remarks">
+ </el-table-column>
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+ </template>
</el-table-column>
<el-table-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -287,6 +286,9 @@
typeL: [
{ required: true, message: "绫诲瀷涓嶈兘涓虹┖", trigger: "blur" }
],
+ unit: [
+ { required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }
+ ],
}
};
},
diff --git a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
index 1608096..647f1e4 100644
--- a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
+++ b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -204,7 +204,7 @@
<i class="el-icon-s-order"></i>
{{titleName}}
</span>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
<el-input v-model="form.processesCode" placeholder="璇疯緭鍏ュ伐搴忕紪鍙�" />
</el-form-item>
diff --git a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
index 45658e5..facae08 100644
--- a/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
+++ b/jcdm-ui/src/views/main/da/passingStationCollection/index.vue
@@ -1,5 +1,6 @@
<template>
<div class="app-container">
+ <el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="鍏ョ珯鏃堕棿" prop="inboundTime">
<el-date-picker clearable
@@ -17,12 +18,13 @@
placeholder="璇烽�夋嫨鍑虹珯鏃堕棿">
</el-date-picker>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
-
+ </el-card>
+ <el-card style="margin-top: 10px" class="box-card">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -69,38 +71,19 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="passingStationCollectionList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="passingStationCollectionList" @selection-change="handleSelectionChange" v-if="passingStationCollectionList.length > 0">
<el-table-column type="selection" width="55" align="center" />
-<!-- <el-table-column label="涓婚敭id" align="center" prop="id" />-->
<el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.workOrderNo"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鎬绘垚搴忓垪鍙�" align="center" prop="sfcCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.sfcCode"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="浜у搧缂栧彿" align="center" prop="productCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productCode"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="浜х嚎缂栧彿" align="center" prop="productionLine">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productionLine"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="宸ヤ綅缂栧彿" align="center" prop="locationCode">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.locationCode"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="璁惧缂栧彿" align="center" prop="equipmentNo">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.equipmentNo"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍏ョ珯鏃堕棿" align="center" prop="inboundTime" width="100">
<template slot-scope="scope">
@@ -113,24 +96,12 @@
</template>
</el-table-column>
<el-table-column label="鍏ョ珯鏄惁鍚堟牸" align="center" prop="inRsSign">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.inRsSign"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍏ョ珯NG鍘熷洜" align="center" prop="inMsgSign">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.inMsgSign"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍑虹珯鏄惁鍚堟牸" align="center" prop="outRsSign">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.outRsSign"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="鍑虹珯NG鍘熷洜" align="center" prop="outMsgSign">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.outMsgSign"/>-->
-<!-- </template>-->
</el-table-column>
<el-table-column label="閲囬泦鏃堕棿" align="center" prop="collectionTime" width="180">
<template slot-scope="scope">
@@ -138,22 +109,23 @@
</template>
</el-table-column>
<el-table-column label="鑺傛媿鏃堕棿" align="center" prop="beatTime">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.beatTime"/>-->
-<!-- </template>-->
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
- type="text"
+ type="success"
+ plain
+ style="width: 72px"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['da:passingStationCollection:edit']"
>淇敼</el-button>
<el-button
size="mini"
- type="text"
+ type="danger"
+ plain
+ style="width: 72px"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['da:passingStationCollection:remove']"
@@ -161,6 +133,10 @@
</template>
</el-table-column>
</el-table>
+ <el-empty v-else>
+ <span slot="description">鏆傛棤鏁版嵁</span>
+ </el-empty>
+ </el-card>
<pagination
v-show="total>0"
diff --git a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
index d1b5bf3..359620f 100644
--- a/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
+++ b/jcdm-ui/src/views/main/em/equipmentArchives/index.vue
@@ -79,6 +79,7 @@
<el-table-column label="鍝佺墝" align="center" prop="equipmentBrand"/>
<el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="equipmentSpec"/>
<el-table-column label="杞﹂棿缂栫爜" align="center" prop="workshopCode"/>
+ <el-table-column label="浜х嚎缂栫爜" align="center" prop="lineCode"/>
<el-table-column label="璁惧鐘舵��" align="center" prop="status"/>
<el-table-column label="鍒涘缓鏃堕棿" width="160" align="center" prop="createTime"/>
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -130,14 +131,34 @@
<el-form-item label="鍝佺墝" prop="equipmentBrand">
<el-input v-model="form.equipmentBrand" placeholder="璇疯緭鍏ュ搧鐗�" />
</el-form-item>
- <el-form-item label="璁惧绫诲瀷鍚嶇О" prop="equipmentTypeName">
+ <el-form-item label="璁惧绫诲瀷" prop="equipmentTypeName">
<el-input v-model="form.equipmentTypeName" placeholder="璇疯緭鍏ヨ澶囩被鍨嬪悕绉�" />
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" prop="equipmentSpec">
<el-input v-model="form.equipmentSpec" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</el-form-item>
- <el-form-item label="杞﹂棿缂栫爜" prop="workshopCode">
- <el-input v-model="form.workshopCode" placeholder="璇疯緭鍏ヨ溅闂寸紪鐮�" />
+ <el-form-item label="杞﹂棿缂栧彿" prop="workshopCode">
+ <el-select style="width: 100%" @change="handleSelectChange(form.processesCode)" v-model="form.workshopCode" placeholder="璇烽�夋嫨杞﹂棿缂栧彿">
+ <el-option
+ v-for="item in options"
+ :key="item.workshopCode"
+ :label="item.workshopCode"
+ :value="item.workshopCode">
+ </el-option>
+ </el-select>
+ </el-form-item>
+<!-- <el-form-item label="浜х嚎缂栫爜" prop="lineCode">-->
+<!-- <el-input v-model="form.lineCode" placeholder="璇疯緭鍏ヤ骇绾跨紪鐮�" />-->
+<!-- </el-form-item>-->
+ <el-form-item label="浜х嚎缂栫爜" prop="lineCode">
+ <el-select style="width: 100%" @change="handleSelectChangelineCode(form.processesCode)" v-model="form.lineCode" placeholder="璇疯緭鍏ヤ骇绾跨紪鐮�">
+ <el-option
+ v-for="item in options"
+ :key="item.lineCode"
+ :label="item.lineCode"
+ :value="item.lineCode">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
@@ -186,6 +207,8 @@
<script>
import { listEquipmentArchives, getEquipmentArchives, delEquipmentArchives, addEquipmentArchives, updateEquipmentArchives } from "@/api/main/em/equipmentArchives/equipmentArchives";
+import {listWorkshop} from "@/api/main/bs/workshop/workshop";
+import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo";
export default {
name: "EquipmentArchives",
@@ -196,6 +219,7 @@
titleName: "",
// 閫変腑鏁扮粍
ids: [],
+ options: [],
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -232,6 +256,12 @@
spareField3: null,
spareField4: null
},
+ equipmentArchivesQueryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ workshopCode: null,
+ lineCode: null,
+ },
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
@@ -253,9 +283,34 @@
},
created() {
this.getList();
+ this.initWorkshop();
+ this.initLineInfo();
},
methods: {
/** 鏌ヨ璁惧妗ｆ鍒楄〃 */
+ handleSelectChange(selectedOption) {
+ this.equipmentArchivesQueryParams.workshopCode = selectedOption;
+ listWorkshop(this.equipmentArchivesQueryParams).then(response => {
+ this.form.workshopName = response.rows[0].workshopName;
+ });
+ },
+ handleSelectChangelineCode(selectedOption) {
+ this.equipmentArchivesQueryParams.lineCode = selectedOption;
+ listLineInfo(this.equipmentArchivesQueryParams).then(response => {
+ this.form.lineCode = response.rows[0].lineCode;
+ });
+ },
+
+ initWorkshop(){
+ listWorkshop(this.queryParams).then(response => {
+ this.options = response.rows;
+ });
+ },
+ initLineInfo(){
+ listLineInfo(this.queryParams).then(response => {
+ this.options = response.rows;
+ });
+ },
getList() {
this.loading = true;
listEquipmentArchives(this.queryParams).then(response => {
--
Gitblit v1.9.3