From d1c021fb4ebce99ca36ad877ae6633de995b91b5 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期六, 07 十月 2023 17:34:19 +0800
Subject: [PATCH] 工厂模型修改
---
src/views/eam/SiteAreaLineManager.vue | 2
src/views/eam/modules/site/AreaModel.vue | 32 ++++++++++++----
src/views/eam/modules/site/ProductionLineModel.vue | 12 +++---
src/views/eam/modules/site/ProductionLineList.vue | 14 +++---
src/views/eam/modules/site/AreaList.vue | 31 ++++++++++++---
src/views/eam/modules/site/SiteAreaLineManagerLeft.vue | 8 ++--
6 files changed, 66 insertions(+), 33 deletions(-)
diff --git a/src/views/eam/SiteAreaLineManager.vue b/src/views/eam/SiteAreaLineManager.vue
index 201c387..4c89cad 100644
--- a/src/views/eam/SiteAreaLineManager.vue
+++ b/src/views/eam/SiteAreaLineManager.vue
@@ -26,7 +26,7 @@
components: { SiteAreaLineManagerLeft, SiteAreaLineManagerRight },
data() {
return {
- description: '宸ュ巶/杞﹂棿/寤烘ā寤烘ā'
+ description: '宸ュ巶/宸ュ尯/宸ユ寤烘ā'
}
},
methods: {}
diff --git a/src/views/eam/modules/site/AreaList.vue b/src/views/eam/modules/site/AreaList.vue
index 3382b7a..ef83e73 100644
--- a/src/views/eam/modules/site/AreaList.vue
+++ b/src/views/eam/modules/site/AreaList.vue
@@ -8,7 +8,7 @@
class="action-jeecg actionarea1"
style="font-size: 18px;"
/>
- 杞﹂棿
+ 宸ュ尯
</template>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -23,12 +23,12 @@
:sm="8"
>
<a-form-item
- label="杞﹂棿缂栧彿"
+ label="宸ュ尯缂栧彿"
:labelCol="{span: 5}"
:wrapperCol="{span: 18, offset: 1}"
>
<j-input
- placeholder="璇疯緭鍏ヨ溅闂寸紪鍙锋煡璇�"
+ placeholder="璇疯緭鍏ュ伐鍖虹紪鍙锋煡璇�"
v-model="queryParam.num"
></j-input>
</a-form-item>
@@ -38,12 +38,12 @@
:sm="8"
>
<a-form-item
- label="杞﹂棿鍚嶇О"
+ label="宸ュ尯鍚嶇О"
:labelCol="{span: 5}"
:wrapperCol="{span: 18, offset: 1}"
>
<j-input
- placeholder="璇疯緭鍏ヨ溅闂村悕绉版煡璇�"
+ placeholder="璇疯緭鍏ュ伐鍖哄悕绉版煡璇�"
v-model="queryParam.name"
></j-input>
</a-form-item>
@@ -160,6 +160,16 @@
:length="15"
/>
</span>
+ <span
+ slot="teamNames"
+ slot-scope="text"
+ >
+ <j-ellipsis
+ :value="text"
+ :length="15"
+ />
+ </span>
+
<!--鐘舵�佹爮涓�у睍绀�-->
<span
slot="status"
@@ -282,17 +292,24 @@
}
},
{
- title: '杞﹂棿缂栧彿',
+ title: '宸ュ尯缂栧彿',
align: "center",
dataIndex: 'num',
sorter: true,
},
{
- title: '杞﹂棿鍚嶇О',
+ title: '宸ュ尯鍚嶇О',
dataIndex: 'name',
align: "center",
sorter: true,
},
+ {
+ title: '缁翠慨鐝粍',
+ dataIndex: 'teamNames',
+ align: "center",
+ sorter: true,
+ scopedSlots: { customRender: 'teamNames' },
+ },
// {
// title: '閮ㄩ棬',
// align: 'center',
diff --git a/src/views/eam/modules/site/AreaModel.vue b/src/views/eam/modules/site/AreaModel.vue
index 29c7aca..597032d 100644
--- a/src/views/eam/modules/site/AreaModel.vue
+++ b/src/views/eam/modules/site/AreaModel.vue
@@ -16,14 +16,14 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
- label="杞﹂棿缂栧彿"
+ label="宸ュ尯缂栧彿"
:labelCol="{span:4}"
:wrapperCol="{span:18}"
>
<a-input
:readOnly="disableSubmit"
allow-clear
- placeholder="璇疯緭鍏ヨ溅闂寸紪鍙�"
+ placeholder="璇疯緭鍏ュ伐鍖虹紪鍙�"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
@@ -33,20 +33,36 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
- label="杞﹂棿鍚嶇О"
+ label="宸ュ尯鍚嶇О"
:labelCol="{span:4}"
:wrapperCol="{span:18}"
>
<a-input
:readOnly="disableSubmit"
allow-clear
- placeholder="璇疯緭鍏ヨ溅闂村悕绉�"
+ placeholder="璇疯緭鍏ュ伐鍖哄悕绉�"
v-decorator="['name', validatorRules.name ]"
/>
</a-form-item>
</a-col>
</a-row>
-
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-item
+ label="缁翠慨鐝粍"
+ :labelCol="{span:4}"
+ :wrapperCol="{span:18}"
+ >
+ <j-multi-select-tag
+ :disabled="disableSubmit"
+ placeholder="璇烽�夋嫨缁翠慨鐝粍"
+ v-decorator="['teamId', validatorRules.teamId ]"
+ dictCode="mom_base_team,name,id,status!='0' and del_flag!='1' order by num asc"
+ >
+ </j-multi-select-tag>
+ </a-form-item>
+ </a-col>
+ </a-row>
<!-- <a-row :gutter="24">
<a-col :span="24">
<a-form-item
@@ -118,14 +134,14 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ溅闂寸紪鍙�!' },
+ { required: true, message: '璇疯緭鍏ュ伐鍖虹紪鍙�!' },
{ min: 0, max: 30, message: '闀垮害涓嶈秴杩� 30 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateNum },
]
},
name: {
rules: [
- { required: true, message: '璇疯緭鍏ヨ溅闂村悕绉�!' },
+ { required: true, message: '璇疯緭鍏ュ伐鍖哄悕绉�!' },
{ min: 0, max: 64, message: '闀垮害涓嶈秴杩� 64 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateName },
]
@@ -162,7 +178,7 @@
this.visible = true;
this.disableSubmit = false;
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'num', 'name', 'deptId', 'remark'))
+ this.form.setFieldsValue(pick(this.model, 'num', 'name', 'teamId', 'deptId', 'remark'))
});
},
close() {
diff --git a/src/views/eam/modules/site/ProductionLineList.vue b/src/views/eam/modules/site/ProductionLineList.vue
index 6fd0051..0ef0155 100644
--- a/src/views/eam/modules/site/ProductionLineList.vue
+++ b/src/views/eam/modules/site/ProductionLineList.vue
@@ -8,7 +8,7 @@
class="action-jeecg actionline1"
style="font-size: 18px;"
/>
- 浜х嚎
+ 宸ユ
</template>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -23,12 +23,12 @@
:sm="8"
>
<a-form-item
- label="浜х嚎缂栧彿"
+ label="宸ユ缂栧彿"
:labelCol="{span: 5}"
:wrapperCol="{span: 18, offset: 1}"
>
<j-input
- placeholder="璇疯緭鍏ヤ骇绾跨紪鍙锋煡璇�"
+ placeholder="璇疯緭鍏ュ伐娈电紪鍙锋煡璇�"
v-model="queryParam.num"
></j-input>
</a-form-item>
@@ -38,12 +38,12 @@
:sm="8"
>
<a-form-item
- label="浜х嚎鍚嶇О"
+ label="宸ユ鍚嶇О"
:labelCol="{span: 5}"
:wrapperCol="{span: 18, offset: 1}"
>
<j-input
- placeholder="璇疯緭鍏ヤ骇绾垮悕绉版煡璇�"
+ placeholder="璇疯緭鍏ュ伐娈靛悕绉版煡璇�"
v-model="queryParam.name"
></j-input>
</a-form-item>
@@ -238,13 +238,13 @@
}
},
{
- title: '浜х嚎缂栧彿',
+ title: '宸ユ缂栧彿',
align: "center",
dataIndex: 'num',
sorter: true,
},
{
- title: '浜х嚎鍚嶇О',
+ title: '宸ユ鍚嶇О',
dataIndex: 'name',
align: "center",
key: 'name',
diff --git a/src/views/eam/modules/site/ProductionLineModel.vue b/src/views/eam/modules/site/ProductionLineModel.vue
index dbb596b..9c9e33e 100644
--- a/src/views/eam/modules/site/ProductionLineModel.vue
+++ b/src/views/eam/modules/site/ProductionLineModel.vue
@@ -16,14 +16,14 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
- label="浜х嚎缂栧彿"
+ label="宸ユ缂栧彿"
:labelCol="{span:4}"
:wrapperCol="{span:18}"
>
<a-input
:readOnly="disableSubmit"
allow-clear
- placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�"
+ placeholder="璇疯緭鍏ュ伐娈电紪鍙�"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
@@ -33,14 +33,14 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
- label="浜х嚎鍚嶇О"
+ label="宸ユ鍚嶇О"
:labelCol="{span:4}"
:wrapperCol="{span:18}"
>
<a-input
:readOnly="disableSubmit"
allow-clear
- placeholder="璇疯緭鍏ヤ骇绾垮悕绉�"
+ placeholder="璇疯緭鍏ュ伐娈靛悕绉�"
v-decorator="['name', validatorRules.name ]"
/>
</a-form-item>
@@ -118,14 +118,14 @@
validatorRules: {
num: {
rules: [
- { required: true, message: '璇疯緭鍏ヤ骇绾跨紪鍙�!' },
+ { required: true, message: '璇疯緭鍏ュ伐娈电紪鍙�!' },
{ min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateNum },
]
},
name: {
rules: [
- { required: true, message: '璇疯緭鍏ヤ骇绾垮悕绉�!' },
+ { required: true, message: '璇疯緭鍏ュ伐娈靛悕绉�!' },
{ min: 0, max: 30, message: '闀垮害涓嶈秴杩� 30 涓瓧绗�', trigger: 'blur' },
{ validator: this.validateName },
]
diff --git a/src/views/eam/modules/site/SiteAreaLineManagerLeft.vue b/src/views/eam/modules/site/SiteAreaLineManagerLeft.vue
index 4640628..6da1fec 100644
--- a/src/views/eam/modules/site/SiteAreaLineManagerLeft.vue
+++ b/src/views/eam/modules/site/SiteAreaLineManagerLeft.vue
@@ -2,7 +2,7 @@
<a-card
:loading="cardLoading"
:bordered="false"
- title="宸ュ巶/杞﹂棿/浜х嚎妯″瀷"
+ title="宸ュ巶/宸ュ尯/宸ユ妯″瀷"
style="height: 100%;"
>
<a-spin :spinning="loading">
@@ -48,7 +48,7 @@
<a-input-search
@search="handleSearch"
style="width:100%;margin-top: 10px"
- placeholder="妫�绱㈠伐鍘�/杞﹂棿/浜х嚎"
+ placeholder="妫�绱㈠伐鍘�/宸ュ尯/宸ユ"
allowClear
v-model="searchInput"
@change="handleChange"
@@ -90,7 +90,7 @@
</Tooltip>
<Tooltip
placement="top"
- title="杞﹂棿"
+ title="宸ュ尯"
>
<i
v-if="type == 2"
@@ -100,7 +100,7 @@
</Tooltip>
<Tooltip
placement="top"
- title="浜х嚎"
+ title="宸ユ"
>
<i
v-if="type == 3"
--
Gitblit v1.9.3