Commit 1aae9ab6 authored by zhangyichen's avatar zhangyichen

原型更近

parent b15a9088
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<!-- <i class="el-icon-message-solid" />--> <!-- <i class="el-icon-message-solid" />-->
<!-- </el-badge>--> <!-- </el-badge>-->
<span class="username-text"> <span class="username-text">
[您好,{{ userName }}] [您好,诺兰特移动通信配件{{ $store.getters.contract }}有限公司 {{ userName }}]
</span> </span>
<el-dropdown class="avatar-container" trigger="click"> <el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper"> <div class="avatar-wrapper">
......
...@@ -8,6 +8,7 @@ const user = { ...@@ -8,6 +8,7 @@ const user = {
token: getToken(), token: getToken(),
name: '', name: '',
avatar: '', avatar: '',
contract: '',
roles: [], roles: [],
permissions: [], permissions: [],
specialTag: '' specialTag: ''
...@@ -21,6 +22,9 @@ const user = { ...@@ -21,6 +22,9 @@ const user = {
SET_NAME: (state, name) => { SET_NAME: (state, name) => {
state.name = name state.name = name
}, },
SET_CONTRACT: (state, contract) => {
state.contract = contract
},
SET_SPECIALTAG: (state, specialTag) => { SET_SPECIALTAG: (state, specialTag) => {
state.specialTag = specialTag state.specialTag = specialTag
}, },
...@@ -68,6 +72,7 @@ const user = { ...@@ -68,6 +72,7 @@ const user = {
commit('SET_PERMISSIONS', res.data.permissions) commit('SET_PERMISSIONS', res.data.permissions)
} }
commit('SET_NAME', user.username) commit('SET_NAME', user.username)
commit('SET_CONTRACT', user.contract)
commit('SET_SPECIALTAG', user.specialTag) commit('SET_SPECIALTAG', user.specialTag)
commit('SET_AVATAR', avatar) commit('SET_AVATAR', avatar)
resolve(res) resolve(res)
......
...@@ -2,6 +2,26 @@ ...@@ -2,6 +2,26 @@
<div class="model_details"> <div class="model_details">
<div class="detailsSearch" style="border-bottom: 14px solid #f4f4f4"> <div class="detailsSearch" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="form" :model="form" :rules="rules" style="padding: 0 0 0 20px" class="formClass" :inline="true"> <el-form ref="form" :model="form" :rules="rules" style="padding: 0 0 0 20px" class="formClass" :inline="true">
<el-form-item class="labelHeight" label="区域" style="margin-left: 20px">
<div slot="label" class="">
<div class="labelName" style="text-align: right">区域</div>
<div class="labelName">Factory</div>
</div>
<div style="width: 200px">
{{ factory }}
</div>
</el-form-item>
<el-form-item class="labelHeight" label="成品料号" prop="modelCode" style="margin-left: 20px">
<div slot="label" class="labelClassRequired">
<div class="labelName">成品料号</div>
<div class="labelName">Part No.</div>
</div>
<el-input v-model="form.modelCode" v-show="false"></el-input>
<div style="width: 200px">
{{ form.modelCode }}
<el-link type="primary" style="margin-left: 10px" @click="choice()" :disabled="htmlType === '2'">选择</el-link>
</div>
</el-form-item>
<el-form-item class="labelHeight" label="模型类型" prop="modelType"> <el-form-item class="labelHeight" label="模型类型" prop="modelType">
<div slot="label" class="labelClassRequired"> <div slot="label" class="labelClassRequired">
<div class="labelName">模型类型</div> <div class="labelName">模型类型</div>
...@@ -16,17 +36,6 @@ ...@@ -16,17 +36,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="labelHeight" label="成品料号" prop="modelCode" style="margin-left: 20px">
<div slot="label" class="labelClassRequired">
<div class="labelName">成品料号</div>
<div class="labelName">Part No.</div>
</div>
<el-input v-model="form.modelCode" v-show="false"></el-input>
<div style="width: 200px">
{{ form.modelCode }}
<el-link type="primary" style="margin-left: 10px" @click="choice()" :disabled="htmlType === '2'">选择</el-link>
</div>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div> <div>
...@@ -368,6 +377,8 @@ export default { ...@@ -368,6 +377,8 @@ export default {
name: 'ModelDetails', name: 'ModelDetails',
data() { data() {
return { return {
// 区域
factory: this.$store.getters.contract,
// 判断类型 是否是生产1 或者工单2 或者新增 3 查看 4 // 判断类型 是否是生产1 或者工单2 或者新增 3 查看 4
htmlType: '', htmlType: '',
// 配置工站遮罩 // 配置工站遮罩
...@@ -1209,8 +1220,8 @@ export default { ...@@ -1209,8 +1220,8 @@ export default {
line-height: 17px; line-height: 17px;
} }
.labelName{ .labelName{
display: flex; /*display: flex;*/
justify-content: center; /*justify-content: center;*/
} }
.labelClass{ .labelClass{
position: relative; position: relative;
......
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