Commit ee046a49 authored by 鲁鑫's avatar 鲁鑫

显示产品转正式的返回消息;系统样式调整

parent bfc8afc1
# 页面标题
VUE_APP_TITLE = MES生产执行管理系统
VUE_APP_TITLE = 宝绅系统
# 开发环境配置
ENV = 'development'
......
# 页面标题
VUE_APP_TITLE = MES生产执行管理系统
VUE_APP_TITLE = 宝绅系统
# 生产环境配置
ENV = 'production'
......
# 页面标题
VUE_APP_TITLE = MES生产执行管理系统
VUE_APP_TITLE = 宝绅系统
NODE_ENV = production
......
......@@ -6,7 +6,7 @@
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
</router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" />
<!-- <img v-if="logo" :src="logo" class="sidebar-logo" />-->
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
</router-link>
</transition>
......@@ -31,11 +31,23 @@ export default {
},
sideTheme() {
return this.$store.state.settings.sideTheme
},
title() {
const roles = this.$store.getters.roles;
if (roles.includes("EPRole")){
return "研发管理系统"
}
if (roles.includes("MESRole")){
return "生产执行管理系统"
}
if (roles.includes("OrderRole")){
return "订单管理系统"
}
return '宝绅系统';
}
},
data() {
return {
title: 'MES',
logo: logoImg
}
}
......
......@@ -9,7 +9,7 @@
</div>
<div class="index_from page-account-container from-wh">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">MES生产执行管理系统</h3>
<h3 class="title">宝绅系统</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
......@@ -68,7 +68,7 @@
<!-- 底部 -->
<div class="el-login-footer">
<span @click="toIPC">深ICP备2022002135号-1</span>
<!-- <span @click="toIPC">深ICP备2022002135号-1</span>-->
</div>
</div>
</template>
......
......@@ -42,7 +42,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="尺码组id" prop="sizeGroupId">
<el-form-item label="尺码组" prop="sizeGroupId">
<el-input
v-model="form.sizeGroupName"
disabled
......
......@@ -23,7 +23,7 @@
<el-form-item label="内容说明">
<el-input type="textarea" v-model="form.sopDescription" placeholder="请输入说明信息"></el-input>
</el-form-item>
<el-form-item label="所属工序" prop="processId">
<!-- <el-form-item label="所属工序" prop="processId">
<el-select v-model="form.processId" placeholder="请选择工序">
<el-option
v-for="item in processOptions"
......@@ -32,7 +32,7 @@
:value="item.processId"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="图片">
<ImageUpload :limit="1" :value="form.sopUrl" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload>
</el-form-item>
......
......@@ -161,6 +161,15 @@
>
</template>
</el-table-column>
<el-table-column
label="SAP物料编码"
min-width="120"
align="left"
key="sapItemCode"
prop="sapItemCode"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="物料名称"
min-width="120"
......@@ -297,7 +306,7 @@
/>
<el-input
v-model="form.itemCode"
placeholder="请输入物料编码"
placeholder="物料编码"
maxlength="64"
v-else
/>
......@@ -513,6 +522,27 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="SAP物料编码">
<el-input
v-model="form.sapItemCode"
readonly
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="SAP返回消息">
<el-input
v-model="form.message"
type="textarea"
readonly
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs type="border-card" v-model="activeName" @tab-click="onTabClick" v-if="form.itemId != null && form.itemOrProduct == 'PRODUCT'">
<el-tab-pane label="基本信息" name="BaseInfo">
......@@ -829,6 +859,8 @@ export default {
itemId: undefined,
itemTypeId: undefined,
itemCode: undefined,
sapItemCode: undefined,
message: undefined,
itemName: undefined,
specification: undefined,
unitOfMeasrue: undefined,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment