Skip to content

M
mes-ui
Commit 90462a65 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui into qin

parents e215613d 18c1339a
Show whitespace changes
Inline Side-by-side
Showing with 2054 additions and 965 deletions
assets/css/base.less
View file @ 90462a65
......@@ -1156,7 +1156,7 @@ html [type=button] {
}
}
.tree {
height: calc(100% - 100px);
height: calc(100% - 150px);
overflow: auto;
}
}
......
assets/images/login/bg1.png 0 → 100644
View file @ 90462a65
This image diff could not be displayed because it is too large. You can view the blob instead.
components/customTable/customTable.vue
View file @ 90462a65
......@@ -9,13 +9,13 @@
<template v-slot:button>
<div style="float:right;" class="paddingbtn">
<!-- 其他 业务按钮 -->
<Button type="success" @click="openCreate">创建</Button>
<Button type="success" @click="openOrderSendReview" v-if="false">订单送审</Button>
<Button type="success" @click="openOrderSend">订单派发</Button>
<Button type="success" @click="updateOrderOpenModal">修改</Button>
<Button type="success" @click="delOrder">删除</Button>
<Button type="success" @click="openOrderSplit">订单分解</Button>
<Button type="success" v-show="false">导出PDF</Button>
<Button type="primary" @click="openCreate">创建</Button>
<Button type="primary" @click="openOrderSendReview" v-if="false">订单送审</Button>
<Button type="primary" @click="openOrderSend">订单派发</Button>
<Button type="primary" @click="updateOrderOpenModal">修改</Button>
<Button type="primary" @click="delOrder">删除</Button>
<Button type="primary" @click="openOrderSplit">订单分解</Button>
<Button type="primary" v-show="false">导出PDF</Button>
<!-- 列设置 -->
<div @click="drawerShow = true" class="divIco">
<Icon type="ios-list" class="icoListInfo" />
......@@ -66,7 +66,7 @@
<CreateOrder ref="createOrder"></CreateOrder>
<div slot="footer">
<Button @click="createShow = false">取消</Button>
<Button type="success" @click="orderCreateOrderOk">确定</Button>
<Button type="primary" @click="orderCreateOrderOk">确定</Button>
</div>
</Modal>
<!-- 订单送审 -->
......@@ -82,7 +82,7 @@
<OrderSendReview ref="orderSendReview"></OrderSendReview>
<div slot="footer">
<Button @click="ModalOrderSendReview = false">取消</Button>
<Button type="success" @click="orderSendReviewOk">确定送审</Button>
<Button type="primary" @click="orderSendReviewOk">确定送审</Button>
</div>
</Modal>
<!-- 订单派发 -->
......@@ -99,7 +99,7 @@
<OrderSend ref="orderSend"></OrderSend>
<div slot="footer">
<Button @click="ModalOrderSend = false">取消</Button>
<Button type="success" @click="orderSendOk">确定派发</Button>
<Button type="primary" @click="orderSendOk">确定派发</Button>
</div>
</Modal>
<!-- 订单分解 -->
......@@ -115,7 +115,7 @@
<OrderSplit ref="orderSplit"></OrderSplit>
<div slot="footer">
<Button @click="ModalOrderSplit = false">取消</Button>
<Button type="success" @click="orderSplitOk">确定分解</Button>
<Button type="primary" @click="orderSplitOk">确定分解</Button>
</div>
</Modal>
<!-- 信息提示 -->
......@@ -131,7 +131,7 @@
{{ metCodesStrTxt }}
<div slot="footer">
<Button @click="ModalInfo = false">取消</Button>
<Button type="success" @click="modalInfoOk">确定</Button>
<Button type="primary" @click="modalInfoOk">确定</Button>
</div></Modal
>
</div>
......
components/modalTree/storeHouseLeft.vue
View file @ 90462a65
......@@ -16,7 +16,7 @@
</Button>
</ButtonGroup>
</h3>
<div class="tree">
<div class="tree" >
<Tree
ref="tree"
:data="tree"
......
layouts/default.vue
View file @ 90462a65
......@@ -33,6 +33,7 @@ export default {
},
mounted() {
this.getMenu();
this.initUserInfo();
},
watch: {
// 监听路由 控制侧边栏显示 标记当前顶栏菜单（如需要）
......@@ -77,19 +78,11 @@ export default {
res.result.avatarUrl != "" &&
res.result.avatarUrl != null
) {
this.userInfo.avatarUrl = res.result.avatarUrl;
this.$store.commit(
"setUserAvatar",
fileUrlDown + res.result.avatarUrl
);
} else {
this.userInfo.avatarUrl = "";
this.$store.commit("setUserAvatar", avatar);
res.result.avatarUrl = fileUrlDown + res.result.avatarUrl;
}
this.userName = res.result.userName;
localStorage.setItem("userName", this.userName);
this.$store.commit("admin/user/setUserAvatar", res.result);
} else {
this.$Message.error("查询失败!");
this.$Message.error("用户信息查询失败!");
}
});
},
......
pages/account/login/index.vue
View file @ 90462a65
<template>
<div class="page-account">
<div class="account">
<Carousel v-model="value1" autoplay autoplay-speed="5000" loop class="zmd">
<CarouselItem>
<div class="bg bg0">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg1">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg2">1</div>
</CarouselItem>
<CarouselItem>
<div class="bg bg3">1</div>
</CarouselItem>
</Carousel>
<div v-if="showI18n" class="page-account-header">
<i-header-i18n />
</div>
<div class="page-account-container">
<div class="main">
<div class="ad">
<img src="@/assets/images/login/ad.png" />
</div>
<div class="login">
<div class="page-account-top">
<div class="page-account-top-logo">
<div class="page-account-top-logo tc">
<img src="@/assets/images/logo.png" alt="logo" />
</div>
<div class="page-account-top-desc">SaaS MES 制造执行系统</div>
<div class="page-account-top-desc tc">SaaS MES 制造执行系统</div>
</div>
<h3 class="mb10">用户登陆</h3>
<Login @on-submit="oidc">
<UserName name="username" value="admin" />
<Password name="password" value="admin" enter-to-submit />
......@@ -19,15 +38,8 @@
</div>
<Submit>{{ $t('page.login.submit') }}</Submit>
</Login>
<div class="page-account-other">
<!-- <span>{{ $t('page.login.other') }}</span>
<img src="@/assets/svg/icon-social-wechat.svg" alt="wechat" />
<img src="@/assets/svg/icon-social-qq.svg" alt="qq" />
<img src="@/assets/svg/icon-social-weibo.svg" alt="weibo" /> -->
<!-- <router-link class="page-account-register" to="./register">{{ $t('page.login.signup') }}</router-link> -->
</div>
</div>
<!-- <i-copyright /> -->
</div>
</template>
<script>
......@@ -55,6 +67,7 @@ export default {
let that = this;
mgr.getUser().then(function(user) {
if (user) {
console.info("user",user)
that.msg = "该用户已经登录";
const userInfos = {
token: user.access_token,
......@@ -106,3 +119,56 @@ export default {
}
};
</script>
<style lang="less">
@jianju:50px;
.account {
position: fixed;
width: 100%;
top: 0;
bottom: 0;
.zmd {
z-index: 1;
position: absolute;
top: 0;
bottom: 0;
width: 100%;
}
.bg {
width: 100%;
height: 100vh;
background-size: 100% auto;
}
.bg0 {
background-image: url("../../../assets/images/login/bg0.png");
}
.bg1 {
background-image: url("../../../assets/images/login/bg1.png");
}
.bg2 {
background-image: url("../../../assets/images/login/bg2.jpg");
}
.bg3 {
background-image: url("../../../assets/images/login/bg3.png");
}
.main {
position: absolute;
z-index: 55;
top: @jianju;
left: @jianju;
right: @jianju;
bottom: @jianju;
background: rgba(0, 0, 0, 0.35);
display: flex;
.ad{
flex: 1;
text-align: center;
img{margin-top: 400px;}
}
.login {
background-color: white;
width: 600px;
padding: 100px 50px;
}
}
}
</style>
\ No newline at end of file
pages/handle/process.vue
View file @ 90462a65
......@@ -13,8 +13,14 @@
<span class="auditedTime">{{item.auditedTime}}</span>
</p>
<div class="content">
<div class="records" v-if="index==0">
<div class="records" v-if="index==cur">
<span>审批人：</span>
<User
v-for="(item3, index3) in item.records"
:key="index3"
:value="item3.operatorId"
class="mr5"
/>
</div>
<div v-else-if="index>cur">
<CheckboxGroup v-model="immutData">
......
pages/order/orderManager.vue
View file @ 90462a65
......@@ -5,7 +5,7 @@
<h3 class="zh-title">产品结构</h3>
<div class="zh-box" >
<Input search placeholder="请输入查询条件" v-model="treeInputSearch" />
<Tree :data="searchList" :style="{height:(treeHeight-95)+'px'}" style="overflow:auto;width:215px;" @on-select-change="selectTreeNode"></Tree>
<Tree :data="searchList" :style="{height:(treeHeight-115)+'px'}" style="overflow:auto;width:215px;" @on-select-change="selectTreeNode"></Tree>
</div>
</div>
</Sider>
......@@ -217,21 +217,21 @@ export default {
}
},
created() {
this.treeHeight = window.innerHeight - 100
this.treeHeight = window.innerHeight - 150
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
this.initTree()
this.tableHeight = window.innerHeight - 160
this.tableHeight = window.innerHeight - 220
this.$refs.CustomTable.getTableHeight(this.tableHeight)
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.treeHeight = window.screenHeight - 100
this.tableHeight = window.screenHeight - 160
this.treeHeight = window.screenHeight - 150
this.tableHeight = window.screenHeight - 220
this.$refs.CustomTable.getTableHeight(this.tableHeight)
})()
}
......
pages/processDesign/ChangeSingle/technicalcoordination/index.vue
View file @ 90462a65
<template>
<div class>
<div class="vtr">
<div class="contentRight">
<div class="form_title">
<Input v-model="value1" placeholder="请输入技术协调单编号" clearable style="width: 240px" />
......@@ -36,7 +36,13 @@
<Form :model="formdata" :label-width="150" :rules="ruleValidate" inline>
<Row>
<FormItem label="技术协调单编号">
<Input v-model="formdata.technical_coordination_code" placeholder size="large" style="width:240px" readonly></Input>
<Input
v-model="formdata.technical_coordination_code"
placeholder
size="large"
style="width:240px"
readonly
></Input>
</FormItem>
<FormItem label="任务号">
<Input v-model="formdata.taskCode" placeholder="输入任务号" size="large" style="width:240px"></Input>
......@@ -55,7 +61,12 @@
<Input v-model="formdata.drawing" placeholder="输入图号" size="large" style="width:240px"></Input>
</FormItem>
<FormItem label="产品名称">
<Input v-model="formdata.product_name" placeholder="输入产品名称" size="large" style="width:240px"></Input>
<Input
v-model="formdata.product_name"
placeholder="输入产品名称"
size="large"
style="width:240px"
></Input>
</FormItem>
</Row>
<!-- <Row>
......@@ -67,10 +78,15 @@
<FormItem label="在制品处理意见">
<textarea v-model="formdata.handling_suggestion" style="width: 600px"></textarea>
</FormItem>
</Row> -->
</Row>-->
<Row>
<FormItem label="产品标识">
<Input v-model="formdata.product_mark" placeholder="输入产品标识" size="large" style="width:240px"></Input>
<Input
v-model="formdata.product_mark"
placeholder="输入产品标识"
size="large"
style="width:240px"
></Input>
</FormItem>
</Row>
<Row>
......@@ -83,7 +99,7 @@
<Option value="是">是</Option>
<Option value="否">否</Option>
</Select>
</FormItem> -->
</FormItem>-->
<!-- <Row>
<FormItem label="是否更改工艺文件">
<Select v-model="formdata.change_process_file" placeholder="请选择" style="width:225px;">
......@@ -101,10 +117,16 @@
<Option value="否">否</Option>
</Select>
</FormItem>
</Row> -->
</Row>-->
<Row>
<FormItem label="检验员">
<Input v-model="formdata.inspection_person_name" placeholder size="large" style="width:240px" readonly></Input>
<Input
v-model="formdata.inspection_person_name"
placeholder
size="large"
style="width:240px"
readonly
></Input>
</FormItem>
<FormItem label="检验日期">
<DatePicker
......@@ -135,11 +157,11 @@
</div>
</template>
<script>
import service from '@/plugins/request'
import Department from '@/components/modalTree/department.vue'
import Process from '@/components/orderOperator/process'
import techSendReview from './techSendReview.vue'
import coordinate from './coordinate.vue'
import service from "@/plugins/request";
import Department from "@/components/modalTree/department.vue";
import Process from "@/components/orderOperator/process";
import techSendReview from "./techSendReview.vue";
import coordinate from "./coordinate.vue";
export default {
components: {
Department,
......@@ -154,20 +176,20 @@ export default {
modalInfo: false, //校验送审弹框
formExamine: {},
rules: {
approveUser: [{ required: true, message: '必填', trigger: 'blur' }]
approveUser: [{ required: true, message: "必填", trigger: "blur" }]
},
technical_coordination_code: '',
technical_coordination_code: "",
total: 0,
page: 1,
pageSize: 10,
flag: 0,
id: '',
id: "",
data1: [],
value1: '',
editId: '',
up_id: '',
value1: "",
editId: "",
up_id: "",
treeData: [], //下拉表格树数据
title: '新增设备类型',
title: "新增设备类型",
show: false,
// show2: false,
upweb: false,
......@@ -175,120 +197,120 @@ export default {
selectModel02: false,
isedit0: false,
showDeptTree: false,
tbHeight: '',
tbHeight: "",
seleId: 0,
cityList: [],
isShow: true,
seldata: [], //父权限菜单树
parent_name: '', //父权限名
parent_name: "", //父权限名
ruleValidate: {
equip_type_id: [
{
required: true,
message: '设备类型编号不能为空！',
trigger: 'blur'
message: "设备类型编号不能为空！",
trigger: "blur"
}
]
},
formdata: {
technical_coordination_code: '',
id:0,
taskCode: '',
technical_coordination_code: "",
id: 0,
taskCode: "",
quantity: 0,
phase: '',
drawing: '',
product_name: '',
product_mark: '',
coordinate_content: '',
coordinate_results: '',
handling_suggestion: '',
change_design_file: '',
change_process_file: '',
compilation_temporary_process: '',
inspection_date: '',
inspection_person_name: '',
phase: "",
drawing: "",
product_name: "",
product_mark: "",
coordinate_content: "",
coordinate_results: "",
handling_suggestion: "",
change_design_file: "",
change_process_file: "",
compilation_temporary_process: "",
inspection_date: "",
inspection_person_name: "",
status: 0,
note: '',
note: "",
dispatch_id: 0,
execute_id: 0,
order_id: ''
order_id: ""
},
sysdata: [
{
value: '1',
label: '粉末'
value: "1",
label: "粉末"
},
{
value: '2',
label: '基板'
value: "2",
label: "基板"
},
{
value: '3',
label: '刮刀'
value: "3",
label: "刮刀"
}
],
column2: [
{
type: 'index',
title: '序号',
width: '65',
align: 'center'
type: "index",
title: "序号",
width: "65",
align: "center"
},
{
title: '技术协调单编号',
key: 'technical_coordination_code',
align: 'center',
width: '200'
title: "技术协调单编号",
key: "technical_coordination_code",
align: "center",
width: "200"
},
{
title: '任务号',
key: 'taskCode',
align: 'center',
width: '200'
title: "任务号",
key: "taskCode",
align: "center",
width: "200"
},
{
title: '数量',
key: 'quantity',
align: 'center',
width: '200'
title: "数量",
key: "quantity",
align: "center",
width: "200"
},
{
title: '阶段',
key: 'phase',
align: 'center',
width: '110'
title: "阶段",
key: "phase",
align: "center",
width: "110"
},
{
title: '图号',
key: 'drawing',
align: 'center',
width: '110'
title: "图号",
key: "drawing",
align: "center",
width: "110"
},
{
title: '产品名称',
key: 'product_name',
align: 'center',
width: '110'
title: "产品名称",
key: "product_name",
align: "center",
width: "110"
},
{
title: '产品标识',
key: 'product_mark',
align: 'center',
width: '110'
title: "产品标识",
key: "product_mark",
align: "center",
width: "110"
},
{
title: '状态',
key: 'status',
align: 'center',
title: "状态",
key: "status",
align: "center",
width: 110,
render: (h,params) => {
return h('state', {
render: (h, params) => {
return h("state", {
props: {
code: 'unProduct.repairstatus',
type: 'text',
value: params.row.status + ''
code: "unProduct.repairstatus",
type: "text",
value: params.row.status + ""
}
})
});
// let statuse = params.row.status
// let text = statuse == 1 ? '待送审' : (statuse==2? '审核中':(statuse==3? '通过':(statuse==4? '驳回':(statuse==5? '终止':''))))
// return h('span',{},text)
......@@ -337,81 +359,82 @@ export default {
// width: '110'
// },
{
title: '操作',
key: 'id',
align: 'center',
width: '280',
title: "操作",
key: "id",
align: "center",
width: "280",
render: (h, params) => {
let actions = []
let actions = [];
if (params.row.status == 3) {
actions.push(
h(
'op',
"op",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: {
click: () => {
// e.stopPropagation()
this.editRow1(params)
this.editRow1(params);
}
}
},
'预览'
),
)}
if (params.row.status == 1 ||params.row.status == 4 ) {
"预览"
)
);
}
if (params.row.status == 1 || params.row.status == 4) {
actions.push(
h(
'op',
"op",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: {
click: () => {
// e.stopPropagation()
this.editRow(params)
this.editRow(params);
}
}
},
'编辑'
),
)}
return h('div', { class: 'action' }, actions)
"编辑"
)
);
}
return h("div", { class: "action" }, actions);
}
}
],
data2: [],
data3: [],
userlist: []
}
};
},
created() {
this.tbHeight = window.innerHeight - 175
this.tbHeight = window.innerHeight - 175;
},
methods: {
// 分页
pageChange(num) {
//console.log(num);
this.page = num
this.loadchangelist()
this.page = num;
this.loadchangelist();
},
pageSizeChange(limit) {
//console.log(limit)
this.pageSize = limit
this.loadchangelist()
this.pageSize = limit;
this.loadchangelist();
},
//查询
searchData() {
this.page = 1
this.pageSize = 10
this.loadchangelist()
this.page = 1;
this.pageSize = 10;
this.loadchangelist();
},
loadchangelist() {
let url = `${designUrl}/technicalcoordination/getpaged`
let url = `${designUrl}/technicalcoordination/getpaged`;
service
.get(`${url}`, {
......@@ -422,185 +445,190 @@ export default {
pageSize: this.pageSize
}
})
.then((res) => {
this.data2 = res.data.result.items
this.total = res.data.result.totalCount
})
.then(res => {
this.data2 = res.data.result.items;
this.total = res.data.result.totalCount;
});
},
//新增库位
addData() {
this.submitShow = true
this.title = '生产过程技术协调单'
this.show = true
if(this.formdata.dispatch_id==0)
{
this.formdata.taskCode = ''
this.formdata.drawing = ''
this.formdata.product_name = ''
}
this.formdata.technical_coordination_code = ''
this.formdata.id='';
this.formdata.quantity = 0
this.formdata.phase = ''
this.submitShow = true;
this.title = "生产过程技术协调单";
this.show = true;
if (this.formdata.dispatch_id == 0) {
this.formdata.taskCode = "";
this.formdata.drawing = "";
this.formdata.product_name = "";
}
this.formdata.technical_coordination_code = "";
this.formdata.id = "";
this.formdata.quantity = 0;
this.formdata.phase = "";
this.formdata.product_mark = ''
this.formdata.coordinate_content = ''
this.formdata.coordinate_results = ''
this.formdata.handling_suggestion = ''
this.formdata.change_design_file = ''
this.formdata.change_process_file = ''
this.formdata.compilation_temporary_process = ''
this.formdata.inspection_date = ''
this.formdata.inspection_person_name = localStorage.getItem('userName')
this.formdata.status = 1
this.formdata.note = ''
this.formdata.product_mark = "";
this.formdata.coordinate_content = "";
this.formdata.coordinate_results = "";
this.formdata.handling_suggestion = "";
this.formdata.change_design_file = "";
this.formdata.change_process_file = "";
this.formdata.compilation_temporary_process = "";
this.formdata.inspection_date = "";
this.formdata.inspection_person_name = localStorage.getItem("userName");
this.formdata.status = 1;
this.formdata.note = "";
var url1 = `${designUrl}/routingheader/GetCodeByType?code=JJXTD`
service.get(`${url1}`).then((response) => {
this.formdata.technical_coordination_code = response.data.result
})
var url1 = `${designUrl}/routingheader/GetCodeByType?code=JJXTD`;
service.get(`${url1}`).then(response => {
this.formdata.technical_coordination_code = response.data.result;
});
},
handleChange1(date) {
this.formdata.inspection_date = date
this.formdata.inspection_date = date;
},
// 添加/编辑 弹框的保存
saveOk() {
var url = `${designUrl}/technicalcoordination/createorupdate`
var url = `${designUrl}/technicalcoordination/createorupdate`;
service
.post(`${url}`, JSON.stringify({ technicalCoordination: this.formdata }))
.then((res) => {
.post(
`${url}`,
JSON.stringify({ technicalCoordination: this.formdata })
)
.then(res => {
if (res.data.success) {
this.loadchangelist()
this.$Message.success('保存成功')
this.show = false
if(this.checked == true){
let url = `${designUrl}/technicalcoordination/getpaged`
this.loadchangelist();
this.$Message.success("保存成功");
this.show = false;
if (this.checked == true) {
let url = `${designUrl}/technicalcoordination/getpaged`;
service
.get(`${url}`, { params: {technical_coordination_code: this.formdata.technical_coordination_code, pageindex:1,pageSize:10 } })
.then((res) => {
console.log(res)
this.$refs.techSendReview.info.changeInfo = res.data.result.items[0];
this.$refs.techSendReview.technical_coordination_code = this.formdata.technical_coordination_code;
.get(`${url}`, {
params: {
technical_coordination_code: this.formdata
.technical_coordination_code,
pageindex: 1,
pageSize: 10
}
})
this.$refs.techSendReview.modalInfo = true
.then(res => {
console.log(res);
this.$refs.techSendReview.info.changeInfo =
res.data.result.items[0];
this.$refs.techSendReview.technical_coordination_code = this.formdata.technical_coordination_code;
});
this.$refs.techSendReview.modalInfo = true;
}
}
})
});
},
changeOption(data) {},
selectDepart() {
this.showDeptTree = true
this.showDeptTree = true;
},
editRow(params) {
this.title = '生产过程技术协调单'
this.submitShow = true
this.flag = 1
var url2 = `${designUrl}/technicalcoordination/getforedit`
this.title = "生产过程技术协调单";
this.submitShow = true;
this.flag = 1;
var url2 = `${designUrl}/technicalcoordination/getforedit`;
service
.get(`${url2}`, { params: { Id: params.row.id } })
.then((response) => {
this.formdata = response.data.result.technicalCoordination
})
this.show = true
.then(response => {
this.formdata = response.data.result.technicalCoordination;
});
this.show = true;
},
editRow1(params) {
this.$refs.coordinate.formdata=[];
this.$refs.coordinate.formcontextdata=[];
this.$refs.coordinate.formcontextclosedata=[];
this.$refs.coordinate.auditedTime='';
this.$refs.coordinate.hqauditedTime='';
this.$refs.coordinate.name='';
this.$refs.coordinate.name1='';
this.flag=1;
var url2 = `${designUrl}/technicalcoordination/getbyid`
this.$refs.coordinate.formdata = [];
this.$refs.coordinate.formcontextdata = [];
this.$refs.coordinate.formcontextclosedata = [];
this.$refs.coordinate.auditedTime = "";
this.$refs.coordinate.hqauditedTime = "";
this.$refs.coordinate.name = "";
this.$refs.coordinate.name1 = "";
this.flag = 1;
var url2 = `${designUrl}/technicalcoordination/getbyid`;
service
.get(`${url2}`, { params: { Id: params.row.id } })
.then((response) => {
this.$refs.coordinate.formdata = response.data.result
})
var url3 = `${workflowUrl}/instance/getdetailbycode`
.then(response => {
this.$refs.coordinate.formdata = response.data.result;
});
var url3 = `${workflowUrl}/instance/getdetailbycode`;
service
.get(`${url3}`, { params: { code: params.row.technical_coordination_code } })
.then((response) => {
console.log(response)
.get(`${url3}`, {
params: { code: params.row.technical_coordination_code }
})
.then(response => {
console.log(response);
for (var i = 0; i < response.data.result.nodes.length; i++) {
var id= response.data.result.nodes[i].id
var status= response.data.result.nodes[i].status
if(id==163&&status==2)
{
var context=response.data.result.nodes[i].contextData
this.$refs.coordinate.formcontextdata=JSON.parse(context);
var id = response.data.result.nodes[i].id;
var status = response.data.result.nodes[i].status;
if (id == 163 && status == 2) {
var context = response.data.result.nodes[i].contextData;
this.$refs.coordinate.formcontextdata = JSON.parse(context);
}
if(id==164&&status==2)
{
this.$refs.coordinate.hqauditedTime=response.data.result.nodes[i].auditedTime
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
if (id == 164 && status == 2) {
this.$refs.coordinate.hqauditedTime =
response.data.result.nodes[i].auditedTime;
var nameid =
response.data.result.nodes[i].defaultUsers.immutable[0];
var url5 = `${systemUrl}/user/getuser`;
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.data.result.name
console.log(name)
this.$refs.coordinate.name1=name
})
.get(`${url5}`, { params: { id: nameid } })
.then(response => {
var name = response.data.result.name;
console.log(name);
this.$refs.coordinate.name1 = name;
});
// console.log(this.$refs.coordinate.hqauditedTime)
}
if(id==165&&status==2)
{
var context=response.data.result.nodes[i].contextData
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
this.$refs.coordinate.formcontextclosedata=JSON.parse(context);
this.$refs.coordinate.auditedTime=response.data.result.nodes[i].auditedTime
var url4 = `${systemUrl}/user/getuser`
if (id == 165 && status == 2) {
var context = response.data.result.nodes[i].contextData;
var nameid =
response.data.result.nodes[i].defaultUsers.immutable[0];
this.$refs.coordinate.formcontextclosedata = JSON.parse(context);
this.$refs.coordinate.auditedTime =
response.data.result.nodes[i].auditedTime;
var url4 = `${systemUrl}/user/getuser`;
service
.get(`${url4}`, { params: { id: nameid} })
.then((response) => {
var name=response.data.result.name
console.log(name)
this.$refs.coordinate.name=name
})
.get(`${url4}`, { params: { id: nameid } })
.then(response => {
var name = response.data.result.name;
console.log(name);
this.$refs.coordinate.name = name;
});
}
}
//this.$refs.coordinate.formdata = response.data.result
})
this.$refs.coordinate.modelChange1 = true
},
});
this.$refs.coordinate.modelChange1 = true;
}
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tbHeight = window.screenHeight - 175
})()
window.screenHeight = window.innerHeight;
this.tbHeight = window.screenHeight - 175;
})();
};
}
}
}
};
</script>
<style scoped>
/deep/.vertical-center-modal {
<style lang="less">
.vtr {
.vertical-center-modal {
display: flex;
align-items: center;
justify-content: center;
}
/deep/ .vertical-center-modal .ivu-modal {
}
.vertical-center-modal .ivu-modal {
top: 0;
}
/deep/.fontcolor {
}
.fontcolor {
color: #249e91;
margin: 0 6px;
}
.fr {
float: right;
}
.ml10 {
margin-left: 10px;
}
.mt10 {
margin-top: 10px;
}
}
</style>
pages/processDesign/ChangeSingle/unqualifiedorder/index.vue
View file @ 90462a65
<template>
<div class>
<div class="unq">
<div class="contentRight">
<div class="form_title">
<Input v-model="value1" placeholder="请输入不合格审理单编号" clearable style="width: 240px" />
......@@ -11,15 +11,18 @@
</div>
<div class="content_box mt10">
<Table
ref="table" border
ref="table"
border
:columns="column2"
:data="data2" highlight-row
:data="data2"
highlight-row
highlight-current-row
:height="this.tbHeight"
class="tableCommon">
class="tableCommon"
>
<!-- <template slot-scope="{ row,index }" slot="status"> @on-selection-change="selectFunction"
<state code="unProduct.repairstatus" type="text" class="bold" :value="row.status"></state>
</template> -->
</template>-->
</Table>
<Page
:total="this.total"
......@@ -38,26 +41,58 @@
<Form :model="formdata" :label-width="150" :rules="ruleValidate" inline>
<Row>
<FormItem label="审理单编号">
<Input v-model="formdata.unqualified_order_code" placeholder size="large" style="width:240px" readonly></Input>
<Input
v-model="formdata.unqualified_order_code"
placeholder
size="large"
style="width:240px"
readonly
></Input>
</FormItem>
<FormItem label="申请部门">
<Input v-model="formdata.department_name" placeholder size="large" style="width:240px" readonly></Input>
<Input
v-model="formdata.department_name"
placeholder
size="large"
style="width:240px"
readonly
></Input>
</FormItem>
</Row>
<Row>
<FormItem label="客户名称">
<Input v-model="formdata.customer_name" placeholder="输入客户名称" size="large" style="width:240px"></Input>
<Input
v-model="formdata.customer_name"
placeholder="输入客户名称"
size="large"
style="width:240px"
></Input>
</FormItem>
<FormItem label="外包供方名称">
<Input v-model="formdata.outsourcing_name" placeholder="输入外包供方名称" size="large" style="width:240px"></Input>
<Input
v-model="formdata.outsourcing_name"
placeholder="输入外包供方名称"
size="large"
style="width:240px"
></Input>
</FormItem>
</Row>
<Row>
<FormItem label="产品名称">
<Input v-model="formdata.product_name" placeholder="输入产品名称" size="large" style="width:240px"></Input>
<Input
v-model="formdata.product_name"
placeholder="输入产品名称"
size="large"
style="width:240px"
></Input>
</FormItem>
<FormItem label="材料牌号">
<Input v-model="formdata.material" placeholder="输入材料牌号" size="large" style="width:240px"></Input>
<Input
v-model="formdata.material"
placeholder="输入材料牌号"
size="large"
style="width:240px"
></Input>
</FormItem>
</Row>
<Row>
......@@ -70,13 +105,25 @@
</Row>
<Row>
<FormItem label="问题描述">
<Input type="textarea" :autosize="{minRows: 1,maxRows: 6}" v-model="formdata.problem_desc" size="large" style="width: 645px"/>
<Input
type="textarea"
:autosize="{minRows: 1,maxRows: 6}"
v-model="formdata.problem_desc"
size="large"
style="width: 645px"
/>
<!-- <textarea v-model="formdata.problem_desc" style="width: 600px"></textarea> -->
</FormItem>
</Row>
<Row>
<FormItem label="检验员">
<Input v-model="formdata.inspection_person_name" placeholder size="large" style="width:240px" readonly></Input>
<Input
v-model="formdata.inspection_person_name"
placeholder
size="large"
style="width:240px"
readonly
></Input>
</FormItem>
<FormItem label="检验日期">
<DatePicker
......@@ -89,7 +136,6 @@
></DatePicker>
</FormItem>
</Row>
</Form>
<div slot="footer">
<Button @click="show=false">取消</Button>
......@@ -111,7 +157,8 @@
width="800"
:mask-closable="false"
:scrollable="true"
fullscreen >
fullscreen
>
<OrderSendReview ref="orderSendReview"></OrderSendReview>
<div slot="footer">
<Button @click="canCelFn">取消</Button>
......@@ -122,11 +169,11 @@
</div>
</template>
<script>
import service from '@/plugins/request'
import Department from '@/components/modalTree/department.vue'
import Process from '@/components/orderOperator/process'
import OrderSendReview from '../components/orderSendReview'//送审页面
import trialOrder from './trialOrder'
import service from "@/plugins/request";
import Department from "@/components/modalTree/department.vue";
import Process from "@/components/orderOperator/process";
import OrderSendReview from "../components/orderSendReview"; //送审页面
import trialOrder from "./trialOrder";
export default {
components: {
Department,
......@@ -140,15 +187,15 @@ export default {
total: 0,
page: 1,
pageSize: 10,
unqualified_order_code: '',
id: '',
unqualified_order_code: "",
id: "",
flag: 0,
data1: [],
value1: '',
editId: '',
up_id: '',
value1: "",
editId: "",
up_id: "",
treeData: [], //下拉表格树数据
title: '新增设备类型',
title: "新增设备类型",
show: false,
// show2: false,
upweb: false,
......@@ -156,7 +203,7 @@ export default {
selectModel02: false,
isedit0: false,
showDeptTree: false,
tbHeight: '',
tbHeight: "",
seleId: 0,
cityList: [],
isShow: true,
......@@ -164,57 +211,59 @@ export default {
checked: true, //送审选择框
modalInfo: false, //校验送审弹框
dataListRetrunNew: {
schemaId: 'c2e09c9b-02a9-4188-97a6-cdb68d50a64a', //不合格品送审的schemaId
schemaId: "c2e09c9b-02a9-4188-97a6-cdb68d50a64a", //不合格品送审的schemaId
idList: [], //不合格品id List
code: '', //不合格品编号List
code: "", //不合格品编号List
operatorIdList: [] //操作员id
}, //确定保存后返回数据
footerModel: false,
formExamine: {},
rules: {
approveUser: [{ required: true, message: '必填', trigger: 'blur' }]
approveUser: [{ required: true, message: "必填", trigger: "blur" }]
},
seldata: [], //父权限菜单树
parent_name: '', //父权限名
parent_name: "", //父权限名
ruleValidate: {
equip_type_id: [
{
required: true,
message: '设备类型编号不能为空！',
trigger: 'blur'
message: "设备类型编号不能为空！",
trigger: "blur"
}
]
},
formdata: {
unqualified_order_code: '',
customer_name: '',
outsourcing_name: '',
product_name: '',
material: '',
unqualified_order_code: "",
customer_name: "",
outsourcing_name: "",
product_name: "",
material: "",
quantity: 0,
code: '',
problem_desc: '',
code: "",
problem_desc: "",
inspection_person: 0,
inspection_person_name: '',
inspection_date: '',
department_id: '', //部门ID
department_name: '', //部门名称
inspection_person_name: "",
inspection_date: "",
department_id: "", //部门ID
department_name: "", //部门名称
status: 0,
note: '',
note: "",
dispatch_id: 0,
execute_id: 0,
order_id: ''
order_id: ""
},
sysdata: [
{
value: '1',
label: '粉末'
},{
value: '2',
label: '基板'
},{
value: '3',
label: '刮刀'
value: "1",
label: "粉末"
},
{
value: "2",
label: "基板"
},
{
value: "3",
label: "刮刀"
}
],
column2: [
......@@ -224,146 +273,157 @@ export default {
// align: 'center',
// },
{
type: 'index',
title: '序号',
width: '65',
align: 'center'
},{
title: '不合格审理单编号',
key: 'unqualified_order_code',
align: 'center',
width: '200'
},{
title: '发起人',
key: 'inspection_person_name',
align: 'center',
width: '200'
},{
title: '客户名称',
key: 'customer_name',
align: 'center',
width: '200'
},{
title: '外包供方名称',
key: 'outsourcing_name',
align: 'center',
width: '200'
},{
title: '产品名称',
key: 'product_name',
align: 'center',
width: '110'
},{
title: '状态',
key: 'status',
align: 'center',
type: "index",
title: "序号",
width: "65",
align: "center"
},
{
title: "不合格审理单编号",
key: "unqualified_order_code",
align: "center",
width: "200"
},
{
title: "发起人",
key: "inspection_person_name",
align: "center",
width: "200"
},
{
title: "客户名称",
key: "customer_name",
align: "center",
width: "200"
},
{
title: "外包供方名称",
key: "outsourcing_name",
align: "center",
width: "200"
},
{
title: "产品名称",
key: "product_name",
align: "center",
width: "110"
},
{
title: "状态",
key: "status",
align: "center",
width: 110,
render: (h,params) => {
return h('state', {
render: (h, params) => {
return h("state", {
props: {
code: 'unProduct.repairstatus',
type: 'text',
value: params.row.status + ''
code: "unProduct.repairstatus",
type: "text",
value: params.row.status + ""
}
})
});
// let statuse = params.row.status
// let text = statuse == 1 ? '待送审' : (statuse==2? '审核中':(statuse==3? '通过':(statuse==4? '驳回':(statuse==5? '终止':''))))
// return h('span',{},text)
}
},{
title: '材料牌号',
key: 'material',
align: 'center',
width: '110'
},{
title: '数量',
key: 'quantity',
align: 'center',
width: '110'
},{
title: '代号',
key: 'code',
align: 'center',
width: '110'
},{
title: '操作',
key: 'id',
align: 'center',
width: '230',
},
{
title: "材料牌号",
key: "material",
align: "center",
width: "110"
},
{
title: "数量",
key: "quantity",
align: "center",
width: "110"
},
{
title: "代号",
key: "code",
align: "center",
width: "110"
},
{
title: "操作",
key: "id",
align: "center",
width: "230",
render: (h, params) => {
let actions = []
let actions = [];
if (params.row.status == 3) {
actions.push(
h(
'op',
"op",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: {
click: () => {
// e.stopPropagation()
this.editRow1(params)
this.editRow1(params);
}
}
},
'预览'
),
)}
if (params.row.status == 1 ||params.row.status == 4 ) {
"预览"
)
);
}
if (params.row.status == 1 || params.row.status == 4) {
actions.push(
h(
'op',
"op",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: {
click: () => {
// e.stopPropagation()
this.editRow(params)
this.editRow(params);
}
}
},
'编辑'
))
"编辑"
)
);
}
return h('div', { class: 'action' }, actions)
return h("div", { class: "action" }, actions);
}
}
],
data2: [],
data3: [],
userlist: []
}
};
},
created() {
this.tbHeight = window.innerHeight - 305
this.tbHeight = window.innerHeight - 305;
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
// 分页
pageChange(num) {
//console.log(num);
this.page = num
this.loadchangelist()
this.page = num;
this.loadchangelist();
},
pageSizeChange(limit) {
//console.log(limit)
this.pageSize = limit
this.loadchangelist()
this.pageSize = limit;
this.loadchangelist();
},
//查询
searchData() {
this.page = 1
this.pageSize = 10
this.loadchangelist()
this.page = 1;
this.pageSize = 10;
this.loadchangelist();
},
loadchangelist() {
let url = `${designUrl}/unqualifiedorder/getpaged`
let url = `${designUrl}/unqualifiedorder/getpaged`;
service
.get(`${url}`, {
params: {
......@@ -373,225 +433,223 @@ export default {
pageSize: this.pageSize
}
})
.then((res) => {
this.data2 = res.data.result.items
this.total = res.data.result.totalCount
})
.then(res => {
this.data2 = res.data.result.items;
this.total = res.data.result.totalCount;
});
},
handleChange1(date) {
this.formdata.inspection_date = date
this.formdata.inspection_date = date;
},
//新增不合格审理单
addData() {
this.title = '不合格审理单'
this.show = true
this.title = "不合格审理单";
this.show = true;
// this.submitShow = true
this.flag = 0
this.flag = 0;
this.formdata.unqualified_order_code = ''
this.formdata.customer_name = ''
this.formdata.outsourcing_name = ''
this.formdata.unqualified_order_code = "";
this.formdata.customer_name = "";
this.formdata.outsourcing_name = "";
if (this.formdata.dispatch_id == 0) {
this.formdata.product_name = ''
this.formdata.product_name = "";
}
this.formdata.material = ''
this.formdata.quantity = 0
this.formdata.code = ''
this.formdata.problem_desc = ''
this.formdata.inspection_person = 0
this.formdata.inspection_person_name = ''
this.formdata.inspection_date = ''
this.formdata.department_id = '' //部门ID
this.formdata.department_name = '' //部门名称departmentTitle
this.formdata.status = 1
this.formdata.note = ''
var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
this.formdata.material = "";
this.formdata.quantity = 0;
this.formdata.code = "";
this.formdata.problem_desc = "";
this.formdata.inspection_person = 0;
this.formdata.inspection_person_name = "";
this.formdata.inspection_date = "";
this.formdata.department_id = ""; //部门ID
this.formdata.department_name = ""; //部门名称departmentTitle
this.formdata.status = 1;
this.formdata.note = "";
var userId = JSON.parse(sessionStorage.getItem("userInfo")).userId;
let parma = {
Id: userId
}
this.$http.sysUser.getuserinfo(parma).then((res) => {
};
this.$http.sysUser.getuserinfo(parma).then(res => {
// console.log(res)
if (res.result) {
this.formdata.department_name= res.result.departmentTitle;
this.formdata.inspection_person_name= res.result.userName;
this.formdata.department_name = res.result.departmentTitle;
this.formdata.inspection_person_name = res.result.userName;
}
})
});
var url1 = `${designUrl}/routingheader/GetCodeByType?code=BHGSLD`
service.get(`${url1}`).then((response) => {
this.formdata.unqualified_order_code = response.data.result
})
var url1 = `${designUrl}/routingheader/GetCodeByType?code=BHGSLD`;
service.get(`${url1}`).then(response => {
this.formdata.unqualified_order_code = response.data.result;
});
},
// 添加/编辑 弹框的保存
saveOk() {
var url = `${designUrl}/unqualifiedorder/createorupdate`
service.post(`${url}`, JSON.stringify({ unqualifiedOrder: this.formdata }))
.then((res) => {
console.log(res)
var url = `${designUrl}/unqualifiedorder/createorupdate`;
service
.post(`${url}`, JSON.stringify({ unqualifiedOrder: this.formdata }))
.then(res => {
console.log(res);
if (res.data.success) {
let itemId = res.data.result.id
let itemId = res.data.result.id;
this.dataListRetrunNew.idList.push(itemId);
this.loadchangelist()
this.$Message.success('保存成功')
this.show = false
this.loadchangelist();
this.$Message.success("保存成功");
this.show = false;
}
})
});
// 如果选择送审，则打开送审页面
if (this.checked == true) {
this.$refs.orderSendReview.intData(this.formdata)
this.show = false
this.modalInfo = true
this.$refs.orderSendReview.intData(this.formdata);
this.show = false;
this.modalInfo = true;
// return //暂时先屏蔽保存
}
},
upSave() {
let operatorIdList = this.$refs.orderSendReview.returnDataList()
let itemCode = this.formdata.unqualified_order_code
this.dataListRetrunNew.code = itemCode
this.dataListRetrunNew.operatorIdList = operatorIdList
this.$http.order.batchOrderStart(this.dataListRetrunNew)
let operatorIdList = this.$refs.orderSendReview.returnDataList();
let itemCode = this.formdata.unqualified_order_code;
this.dataListRetrunNew.code = itemCode;
this.dataListRetrunNew.operatorIdList = operatorIdList;
this.$http.order
.batchOrderStart(this.dataListRetrunNew)
.then(response => {
if(response.success){
this.loadchangelist()
this.$Message.info("送审成功!")
this.dataListRetrunNew.idList = []
if (response.success) {
this.loadchangelist();
this.$Message.info("送审成功!");
this.dataListRetrunNew.idList = [];
} else {
this.$Message.error('送审失败!')
this.$Message.error("送审失败!");
}
this.modalInfo = false
})
this.modalInfo = false;
});
},
//多选处理--表格选择项变化方法
canCelFn(){
modalInfo = false
this.dataListRetrunNew.idList = []
canCelFn() {
modalInfo = false;
this.dataListRetrunNew.idList = [];
},
changeOption(data) {
console.log(data)
console.log(data);
},
selectDepart() {
this.showDeptTree = true
this.showDeptTree = true;
},
editRow(params) {
// this.submitShow = false
this.title = '不合格审理单'
this.flag = 1
var url2 = `${designUrl}/unqualifiedorder/getbyid`
this.title = "不合格审理单";
this.flag = 1;
var url2 = `${designUrl}/unqualifiedorder/getbyid`;
service
.get(`${url2}`, { params: { Id: params.row.id } })
.then((response) => {
this.formdata = response.data.result
})
this.show = true
.then(response => {
this.formdata = response.data.result;
});
this.show = true;
},
editRow1(params) {
this.$refs.trialOrder.formdata=[];
this.$refs.trialOrder.formcontextdata=[];
this.$refs.trialOrder.formcontextclosedata=[];
this.$refs.trialOrder.gyauditedTime='';
this.$refs.trialOrder.jyauditedTime='';
this.$refs.trialOrder.hqauditedTime='';
this.$refs.trialOrder.name1='';
this.$refs.trialOrder.name2='';
this.$refs.trialOrder.name3='';
this.flag=1;
var url2 = `${designUrl}/unqualifiedorder/getbyid`
this.$refs.trialOrder.formdata = [];
this.$refs.trialOrder.formcontextdata = [];
this.$refs.trialOrder.formcontextclosedata = [];
this.$refs.trialOrder.gyauditedTime = "";
this.$refs.trialOrder.jyauditedTime = "";
this.$refs.trialOrder.hqauditedTime = "";
this.$refs.trialOrder.name1 = "";
this.$refs.trialOrder.name2 = "";
this.$refs.trialOrder.name3 = "";
this.flag = 1;
var url2 = `${designUrl}/unqualifiedorder/getbyid`;
service
.get(`${url2}`, { params: { Id: params.row.id } })
.then((response) => {
this.$refs.trialOrder.formdata = response.data.result
})
var url3 = `${workflowUrl}/instance/getdetailbycode`
.then(response => {
this.$refs.trialOrder.formdata = response.data.result;
});
var url3 = `${workflowUrl}/instance/getdetailbycode`;
service
.get(`${url3}`, { params: { code: params.row.unqualified_order_code } })
.then((response) => {
console.log(response)
.then(response => {
console.log(response);
for (var i = 0; i < response.data.result.nodes.length; i++) {
var id= response.data.result.nodes[i].id
var status= response.data.result.nodes[i].status
if(id==157&&status==2)
{
var context=response.data.result.nodes[i].contextData
this.$refs.trialOrder.formcontextdata=JSON.parse(context);
this.$refs.trialOrder.gyauditedTime=response.data.result.nodes[i].auditedTime
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
console.log(nameid)
var url5 = `${systemUrl}/user/getuser`
var id = response.data.result.nodes[i].id;
var status = response.data.result.nodes[i].status;
if (id == 157 && status == 2) {
var context = response.data.result.nodes[i].contextData;
this.$refs.trialOrder.formcontextdata = JSON.parse(context);
this.$refs.trialOrder.gyauditedTime =
response.data.result.nodes[i].auditedTime;
var nameid =
response.data.result.nodes[i].defaultUsers.immutable[0];
console.log(nameid);
var url5 = `${systemUrl}/user/getuser`;
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.data.result.name
console.log(nameid)
this.$refs.trialOrder.name3=name
})
.get(`${url5}`, { params: { id: nameid } })
.then(response => {
var name = response.data.result.name;
console.log(nameid);
this.$refs.trialOrder.name3 = name;
});
}
if(id==158&&status==2)
{
this.$refs.trialOrder.hqauditedTime=response.data.result.nodes[i].auditedTime
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
if (id == 158 && status == 2) {
this.$refs.trialOrder.hqauditedTime =
response.data.result.nodes[i].auditedTime;
var nameid =
response.data.result.nodes[i].defaultUsers.immutable[0];
var url5 = `${systemUrl}/user/getuser`;
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.data.result.name
.get(`${url5}`, { params: { id: nameid } })
.then(response => {
var name = response.data.result.name;
//console.log(name)
this.$refs.trialOrder.name2=name
})
this.$refs.trialOrder.name2 = name;
});
}
if(id==159&&status==2)
{
var context=response.data.result.nodes[i].contextData
this.$refs.trialOrder.formcontextclosedata=JSON.parse(context);
this.$refs.trialOrder.jyauditedTime=response.data.result.nodes[i].auditedTime
var nameid=response.data.result.nodes[i].defaultUsers.immutable[0]
var url5 = `${systemUrl}/user/getuser`
if (id == 159 && status == 2) {
var context = response.data.result.nodes[i].contextData;
this.$refs.trialOrder.formcontextclosedata = JSON.parse(context);
this.$refs.trialOrder.jyauditedTime =
response.data.result.nodes[i].auditedTime;
var nameid =
response.data.result.nodes[i].defaultUsers.immutable[0];
var url5 = `${systemUrl}/user/getuser`;
service
.get(`${url5}`, { params: { id: nameid} })
.then((response) => {
var name=response.data.result.name
.get(`${url5}`, { params: { id: nameid } })
.then(response => {
var name = response.data.result.name;
//console.log(name)
this.$refs.trialOrder.name1=name
})
this.$refs.trialOrder.name1 = name;
});
}
}
//this.$refs.trialOrder.formdata = response.data.result
})
this.$refs.trialOrder.modelChange1 = true
},
});
this.$refs.trialOrder.modelChange1 = true;
}
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tbHeight = window.screenHeight - 175
})()
window.screenHeight = window.innerHeight;
this.tbHeight = window.screenHeight - 175;
})();
};
}
}
}
};
</script>
<style scoped>
/deep/.vertical-center-modal {
<style lang="less">
.unq {
.vertical-center-modal {
display: flex;
align-items: center;
justify-content: center;
}
/deep/ .vertical-center-modal .ivu-modal {
}
.vertical-center-modal .ivu-modal {
top: 0;
}
/deep/.fontcolor {
}
.fontcolor {
color: #249e91;
margin: 0 6px;
}
.fr {
float: right;
}
.ml10 {
margin-left: 10px;
}
.mt10 {
margin-top: 10px;
}
}
</style>
pages/resourceManagement/deviceType/index.vue
View file @ 90462a65
<template>
<div class="">
<div class="ctb">
<div class="contentRight">
<div class="form_title">
<Input v-model="value1" placeholder="请输入设备类型名称" clearable style="width: 240px" />
<Button type="primary" class="" @click="searchData">查询</Button>
<Button type="primary" class @click="searchData">查询</Button>
<div class="paddingbtn fr">
<Button type="primary" @click="addData">新增设备类型</Button>
</div>
......@@ -26,12 +26,14 @@
:title="title"
:width="500"
:mask-closable="false"
ok-text="保存" @on-ok="saveOk"
cancel-text="取消" >
ok-text="保存"
@on-ok="saveOk"
cancel-text="取消"
>
<Form :model="formItem" :label-width="150" :rules="ruleValidate">
<Row>
<Col span="20">
<FormItem label="设备类型编号" prop='equip_type_id'>
<FormItem label="设备类型编号" prop="equip_type_id">
<Input v-model="formItem.equip_type_id" placeholder="输入设备类型编号"></Input>
</FormItem>
</Col>
......@@ -61,273 +63,279 @@
</div>
</template>
<script>
import treeGrid from './components/treeGrid'
import service from '@/plugins/request'
import Department from '@/components/modalTree/department.vue'
import treeGrid from "./components/treeGrid";
import service from "@/plugins/request";
import Department from "@/components/modalTree/department.vue";
export default {
components: {
treeGrid, Department,
treeGrid,
Department
},
data() {
return {
data1: [],
value1:"",
editId:'',
up_id:'',
treeData:[],//下拉表格树数据
title:"新增设备类型",
value1: "",
editId: "",
up_id: "",
treeData: [], //下拉表格树数据
title: "新增设备类型",
show: false,
// show2: false,
upweb: false,
selectModel: true,
selectModel02: false,
isedit0:false,
isedit0: false,
showDeptTree: false,
tbHeight: '',
tbHeight: "",
seleId: 0,
cityList:[],
isShow:true,
seldata: [],//父权限菜单树
parent_name: '',//父权限名
cityList: [],
isShow: true,
seldata: [], //父权限菜单树
parent_name: "", //父权限名
ruleValidate: {
equip_type_id: [
{
required: true,
message: '设备类型编号不能为空！',
trigger: 'blur'
message: "设备类型编号不能为空！",
trigger: "blur"
}
]
},
formItem:{
equip_type_id: '',//设备类型编号
equip_type_name:'',//设备类型名称
notes: '',//备注
formItem: {
equip_type_id: "", //设备类型编号
equip_type_name: "", //设备类型名称
notes: "" //备注
},
sysdata: [
{
value: '1',
label: '粉末'
},{
value: '2',
label: '基板'
},{
value: '3',
label: '刮刀'
value: "1",
label: "粉末"
},
{
value: "2",
label: "基板"
},
{
value: "3",
label: "刮刀"
}
],
columns: [
{
title: '设备类型编号',
key: 'equip_type_id',
},{
title: '设备类型名称',
key: 'equip_type_name',
align:"left",
},{
title: '备注',
key: 'notes',
align:"left",
}, {
title: '操作',
key: 'action',
align: 'center',
width:400,
title: "设备类型编号",
key: "equip_type_id"
},
{
title: "设备类型名称",
key: "equip_type_name",
align: "left"
},
{
title: "备注",
key: "notes",
align: "left"
},
{
title: "操作",
key: "action",
align: "center",
width: 400,
render: (h, params) => {
return h('div',{ class: 'action' }, [
return h("div", { class: "action" }, [
h(
'op',
"op",
{
attrs:{
oprate:'detail',
class:'edit'
} ,
attrs: {
oprate: "detail",
class: "edit"
},
on: {
click: () => {
this.edit(params)
this.edit(params);
}
}
},
'编辑'
"编辑"
),
h(
'op',
"op",
{
attrs:{
oprate:'delete'
attrs: {
oprate: "delete"
},
style: {
color: 'red',
color: "red"
},
on: {
click: () => {
this.del(params)
this.del(params);
}
}
},
'删除'
"删除"
)
])
]);
}
},
],
}
]
};
},
created(){
created() {
this.laodaction();
this.tbHeight = window.innerHeight - 175
this.tbHeight = window.innerHeight - 175;
},
methods:{
methods: {
//查询
searchData(){
searchData() {
var name = this.value1;
this.laodaction(name)
this.laodaction(name);
},
laodaction(name){
laodaction(name) {
let url = `${systemUrl}/equiptype/getpaged`;
service.get(`${url}`, { params:{ equip_type_name:name }}).then(res => {
service.get(`${url}`, { params: { equip_type_name: name } }).then(res => {
// console.log(res)
this.data1 = res.data.result.items
this.data1 = res.data.result.items;
});
},
//新增库位
addData(){
this.title = '新增设备类型';
addData() {
this.title = "新增设备类型";
this.show = true;
this.upweb = false;
this.selectModel = false;
this.selectModel02 = true;
this.editId='';
this.editId = "";
this.formItem = {
equip_type_id: '',//设备类型编号
equip_type_name:'',//设备类型名称
notes: '',//备注
equip_type_id: "", //设备类型编号
equip_type_name: "", //设备类型名称
notes: "" //备注
};
},
// 添加/编辑 弹框的保存
saveOk(){
saveOk() {
if (!this.formItem.equip_type_id) {
this.$Message.error('设备类型编号不能为空!')
return
this.$Message.error("设备类型编号不能为空!");
return;
}
let saveId = this.editId,
url = `${systemUrl}/equiptype/createorupdate`;
if(!saveId){ saveId == "" }
if(this.title == '编辑设备类型'){
if (!saveId) {
saveId == "";
}
if (this.title == "编辑设备类型") {
// if(this.formItem.selectName){
var ar1 = this.data1.find((val) => {
if(val.id!=saveId)
return val.equip_type_id == this.formItem.equip_type_id
})
var ar1 = this.data1.find(val => {
if (val.id != saveId)
return val.equip_type_id == this.formItem.equip_type_id;
});
if (ar1) {
this.$Message.error('设备类型编号已存在！');
return
this.$Message.error("设备类型编号已存在！");
return;
}
let paramsdata = {
"id": saveId,
"equip_type_id": this.formItem.equip_type_id,
"equip_type_name": this.formItem.equip_type_name,
"notes": this.formItem.notes,
id: saveId,
equip_type_id: this.formItem.equip_type_id,
equip_type_name: this.formItem.equip_type_name,
notes: this.formItem.notes
};
service.post(`${url}`, JSON.stringify({equipType: paramsdata})).then(res=>{
if(res.data.success) {
service
.post(`${url}`, JSON.stringify({ equipType: paramsdata }))
.then(res => {
if (res.data.success) {
this.laodaction();
this.$Message.success('编辑成功')
this.$Message.success("编辑成功");
}
});
// }
}
if(this.title == '新增设备类型'){
if (this.title == "新增设备类型") {
// console.log('第一个：' + saveId + '第二个：' + this.formItem.selectName)
var ar = this.data1.find((val) => {
return val.equip_type_id == this.formItem.equip_type_id
})
var ar = this.data1.find(val => {
return val.equip_type_id == this.formItem.equip_type_id;
});
if (ar) {
this.$Message.error('设备类型编号已存在！');
return
this.$Message.error("设备类型编号已存在！");
return;
}
let paramsdata = {
"id": saveId,
"equip_type_id": this.formItem.equip_type_id,
"equip_type_name": this.formItem.equip_type_name,
"notes": this.formItem.notes,
id: saveId,
equip_type_id: this.formItem.equip_type_id,
equip_type_name: this.formItem.equip_type_name,
notes: this.formItem.notes
};
service.post(`${url}`, JSON.stringify({equipType: paramsdata})).then(res=>{
if(res.data.success) {
service
.post(`${url}`, JSON.stringify({ equipType: paramsdata }))
.then(res => {
if (res.data.success) {
this.laodaction();
this.$Message.success('新增成功')
this.$Message.success("新增成功");
}
});
} else {
return;
}
else{ return }
},
changeOption(data){
console.log(data)
changeOption(data) {
console.log(data);
},
selectDepart() {
this.showDeptTree = true
this.showDeptTree = true;
},
edit(data){
this.title = '编辑设备类型';
edit(data) {
this.title = "编辑设备类型";
//console.log(data)
this.isedit0 = true;
this.show = true;
this.upweb = true;
this.formItem = {
equip_type_id: data.row.equip_type_id,//设备类型编号
equip_type_name:data.row.equip_type_name,//设备类型名称
notes: data.row.notes,//备注
equip_type_id: data.row.equip_type_id, //设备类型编号
equip_type_name: data.row.equip_type_name, //设备类型名称
notes: data.row.notes //备注
};
this.editId = data.row.id;
},
del(data){
del(data) {
this.seleId = data.row.id;
let url = `${systemUrl}/equiptype/delete`,
uId = this.seleId;
service.delete(`${systemUrl}/equiptype/delete?id=${uId}`).then(res=>{
console.log(res)
if(res.data.result==1) {
service.delete(`${systemUrl}/equiptype/delete?id=${uId}`).then(res => {
console.log(res);
if (res.data.result == 1) {
this.laodaction();
this.$Message.success('删除成功')
}
else{
this.$Message.error('该类型有设备使用，不可删除。')
this.$Message.success("删除成功");
} else {
this.$Message.error("该类型有设备使用，不可删除。");
}
});
},
}
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tbHeight = window.screenHeight - 175
})()
}
window.screenHeight = window.innerHeight;
this.tbHeight = window.screenHeight - 175;
})();
};
}
}
};
</script>
<style scoped>
/deep/.vertical-center-modal{
<style lang="less">
.ctb {
.vertical-center-modal {
display: flex;
align-items: center;
justify-content: center;
}
/deep/ .vertical-center-modal .ivu-modal{
.vertical-center-modal .ivu-modal {
top: 0;
}
/deep/.fontcolor { color:#249e91;margin: 0 6px}
.fr{
float: right;
}
.ml10{
margin-left: 10px;
}
.mt10{
margin-top: 10px;
.fontcolor {
color: #249e91;
margin: 0 6px;
}
}
</style>
src/assets/css/base.css 0 → 100644
View file @ 90462a65
html body {
min-width: 1240px;
}
.__nuxt-error-page .title {
font-size: 16px;
}
#__nuxt,
#__layout {
height: 100%;
}
/*字体*/
.ib {
display: inline;
}
.f14 {
font-size: 14px;
}
.f16 {
font-size: 16px;
}
.f18 {
font-size: 18px;
}
.f20 {
font-size: 20px;
}
.f24 {
font-size: 24px;
}
.fw5 {
font-weight: 500;
}
.fwBold {
font-weight: bold;
}
.ico:hover {
color: #f23a3a;
cursor: pointer;
}
.lh10 {
line-height: 10px;
}
.lh15 {
line-height: 15px;
}
.lh20 {
line-height: 20px;
}
.lh25 {
line-height: 25px;
}
.lh30 {
line-height: 30px;
}
.lh40 {
line-height: 40px;
}
/*边距*/
.m10 {
margin: 10px;
}
.mt4 {
margin-top: 4px;
}
.mt5 {
margin-top: 5px;
}
.mt10 {
margin-top: 10px;
}
.mt15 {
margin-top: 15px;
}
.mt20 {
margin-top: 20px;
}
.mt30 {
margin-top: 30px;
}
.mt50 {
margin-top: 50px;
}
.mb0 {
margin-bottom: 0px;
}
.mb10 {
margin-bottom: 10px;
}
.mb15 {
margin-bottom: 15px;
}
.mb20 {
margin-bottom: 20px;
}
.ml0 {
margin-left: 0;
}
.ml5 {
margin-left: 5px;
}
.ml10 {
margin-left: 10px;
}
.ml15 {
margin-left: 15px;
}
.ml20 {
margin-left: 20px;
}
.ml30 {
margin-left: 30px;
}
.ml110 {
margin-left: 110px;
}
.mr0 {
margin-right: 0px;
}
.mr5 {
margin-right: 5px;
}
.mr10 {
margin-right: 10px;
}
.mr15 {
margin-right: 15px;
}
.mr20 {
margin-right: 20px;
}
.mr30 {
margin-right: 30px;
}
.mtb10 {
margin: 10px 0;
}
.m15 {
margin: 15px;
}
/*内边距*/
.ptb10 {
padding: 10px 0px;
}
.pd5 {
padding: 5px;
}
.pt10 {
padding: 10px 0px 0;
}
.ptb5 {
padding-top: 5px;
padding-bottom: 5px;
}
.pd10 {
padding: 10px;
}
.p10 {
padding: 10px;
}
.p20 {
padding: 20px;
}
.pl30 {
padding-left: 30px;
}
.pl5 {
padding-left: 5px;
}
.pl10 {
padding-left: 10px;
}
.pl20 {
padding-left: 20px;
}
.bnone {
border: none;
}
.marnone {
margin: 0;
}
.hide {
display: none;
}
.show {
display: block;
}
.hidden {
overflow: hidden;
}
.zh-scroll-y {
overflow-y: scroll;
}
.h-stack {
overflow: visible;
}
.zh-ellip {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.ver-m {
vertical-align: middle;
}
/*栅格化*/
.col-xs6 .col-4 {
width: 25%;
display: inline-block;
}
.col-3 {
width: 33.33333%;
display: inline-block;
}
/*宽度*/
.w50 {
width: 50px;
}
.w80 {
width: 80px;
}
.w100 {
width: 100px;
}
.w120 {
width: 120px;
}
.w160 {
width: 160px;
}
.w180 {
width: 180px;
}
.w200 {
width: 200px;
}
.w240 {
width: 240px;
}
.w270 {
width: 270px;
}
.w300 {
width: 300px;
}
.w800 {
width: 800px;
}
/*高度*/
.h17 {
height: 17px;
line-height: 17px;
}
.h28 {
height: 28px;
}
.h36 {
height: 36px;
}
.h50 {
height: 50px;
}
.h200 {
height: 200px;
}
.h400 {
height: 400px;
overflow: auto;
}
/*最小高度*/
.minh300 {
min-height: 300px;
}
.minh100 {
min-height: 100px;
}
.minh200 {
min-height: 200px;
}
/*最小宽度*/
.minW100 {
min-width: 100px;
}
.minW140 {
min-width: 140px;
}
.minW200 {
min-width: 200px;
}
/*最大宽度*/
.maxW50 {
max-width: 50px;
}
.maxW80 {
max-width: 80px;
}
/*按钮*/
.button-box {
display: inline-block;
text-align: center;
}
.button-box-block {
display: block;
text-align: center;
}
.button-box-block .layui-btn,
.button-box .layui-btn {
min-width: 80px;
}
.d-button {
min-width: 55px;
height: 28px;
padding: 0 10px;
line-height: 30px;
text-align: center;
display: inline-block;
border-radius: 2px;
font-size: 14px;
background: #e6e6e6;
color: #333;
margin: 0 5px;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
cursor: pointer;
-webkit-transition: all 0.2s;
-ms-transition: all 0.2s;
transition: all 0.2s;
}
.d-button:active {
transform: scale(0.96);
}
/*按钮颜色*/
.bluebg {
background: #237bdf;
color: #fff;
}
.bluebg:hover {
background: #0c79b1;
}
.redbg {
background: #e2440a;
}
.red {
color: #f23a3a;
}
.redbg:hover {
background: #d7342e;
}
.qingbg {
background: #169bd5;
color: #fff;
}
.white {
color: #fff;
}
.qingbg:hover {
background: #2f93bf;
}
.blue-tab {
color: #1e9fff;
}
.blue-modal-text {
color: #358deb;
}
.blue-dark {
color: #0e2b55;
}
.blue-shadow {
color: #7eccfc;
}
.orangetext {
color: #fca509;
}
.orangebg {
background: #ff9900;
}
.orangebg:hover {
background: #e0690c;
}
.greenbg {
background: #4f9536;
}
.green {
color: #4f9536;
}
.greenbg:hover {
background: #4aaa4a;
}
.darkblue {
background: #5eb95e;
}
.redbd {
border: 1px dashed #f23a3a;
color: #f23a3a;
cursor: pointer;
}
.greenbd {
border: 1px dashed #5eb95e;
color: #5eb95e;
}
.new-blue {
color: #2786f2;
}
.new-green {
color: #5eae36;
}
.new-red {
color: #fe4b04;
}
.new-orange {
color: #ff9900;
}
/*图标*/
i.iconfont {
cursor: pointer;
display: inline-block;
vertical-align: middle;
}
i.iconfont:active {
-webkit-transform: scale(0.96);
-ms-transform: scale(0.96);
-o-transform: scale(0.96);
transform: scale(0.96);
}
/*蓝色图标*/
i.icon-start,
i.icon-yundown,
i.icon-save {
color: #1E9FFF;
}
/*红色图标*/
i.icon-tingzhi,
i.icon-lajitong {
color: #FF5722;
}
/*青色图标*/
i.icon-edit {
color: #518dd8;
}
i.icon-huanvar {
color: #4470a7;
font-size: 20px;
}
i.icon-fault {
color: #f71a4b;
}
i.icon-yujing {
color: #ff9906;
}
i.icon-dian {
opacity: 0.5;
}
/*刷新按钮*/
.ico-ratate {
animation-name: repRotate;
}
i.icon-gengxin {
animation: linear 0.8s infinite;
}
/*浮动*/
.fl {
float: left;
}
.fr {
float: right;
}
.fn {
float: none;
}
.tl {
text-align: left;
}
.tr {
text-align: right;
}
.tc {
text-align: center;
}
/*清除浮动*/
.clear {
clear: both;
}
/*块*/
.block {
display: block;
}
.inline {
display: inline-block;
}
.cursor {
cursor: pointer;
}
/* 定位 */
.pr {
position: relative;
}
.pa {
position: absolute;
}
/* 展示框title */
.show-title {
background: #031019;
letter-spacing: 2px;
color: #b6dff8;
text-align: center;
}
input::-webkit-input-placeholder,
select input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
color: #7dbbfb;
}
[v-cloak] {
display: none;
}
.zh-tree {
position: relative;
display: block;
width: 250px;
float: left;
transform: translateX(0);
transition: all 0.2s;
box-sizing: border-box;
border: #E4E6ED solid 1px;
background: #fff;
padding: 0px 10px 20px 10px;
margin-top: 10px;
}
.zh-tree .zh-title {
font-size: 14px;
padding: 0 5px;
line-height: 45px;
text-align: left;
font-weight: 600;
border-bottom: #e4e6ed solid 1px;
}
.zh-tree .zh-box {
height: -110%;
width: 100%;
overflow-y: auto;
padding: 15px;
margin-bottom: -5000px;
padding-bottom: 5000px;
}
.content-right {
margin-left: 10px;
width: calc(100% - 260px);
height: 100%;
float: left;
box-sizing: border-box;
transition: all 0.2s;
background: #fff;
padding: 0px 10px 10px 0px;
margin-top: 10px;
}
.contentRight {
width: calc(100%);
height: 100%;
float: left;
box-sizing: border-box;
transition: all 0.2s;
background: #fff;
padding: 0px 10px 10px 0px;
margin-top: 10px;
}
.topTitle {
height: 32px;
text-align: right;
}
.tableCommon tr th {
line-height: 30px;
font-size: 14px;
background: #f5f6fa;
}
.tableCommon .tableCommon tr th {
line-height: 30px;
font-size: 14px;
background: #EEEDF0;
}
.tableCommon .tableCommon tr td {
padding: 0 2px;
background: #D5E6FB;
}
.tableCommon tr td {
line-height: 25px;
font-size: 14px;
padding: 0 2px;
}
.tableCommon tr td .ivu-table-cell {
padding: 0 2px;
}
.cellInfoTitle {
padding: 0 10px;
text-align: right;
border: #E4E6ED solid 1px;
background: #F5F6FA;
color: #515A6E;
font-weight: bold;
height: 35px;
line-height: 34px;
margin: -1px;
}
.cellInfoContent {
padding: 0 10px;
text-align: left;
border-top: #E4E6ED solid 1px;
border-bottom: #E4E6ED solid 1px;
border-right: #E4E6ED solid 1px;
height: 34px;
line-height: 34px;
margin: -1px;
}
/* 三列合并内容 */
.cellInfoContent1 {
padding: 0 10px;
text-align: left;
border-top: #E4E6ED solid 1px;
border-bottom: #E4E6ED solid 1px;
border-right: #E4E6ED solid 1px;
height: 34px;
line-height: 34px;
margin: -1px -5px;
}
/* 右侧设置自定义显示列ico */
.divIco {
border: #D0D2D9 solid 1px;
border-radius: 4px;
height: 28px;
line-height: 24px;
width: 40px;
float: right;
text-align: center;
margin-left: 5px;
}
.divIco:hover {
background: #F5F6FA;
}
.icoListInfo {
font-weight: bold;
color: #515A6E;
font-size: 24px;
}
[type=reset],
[type=submit],
button,
html [type=button] {
-webkit-appearance: button;
}
.waitTask {
/*flex 布局*/
display: flex;
align-items: center;
width: 200px;
height: 100px;
float: left;
margin-right: 10px;
word-break: break-word;
}
.leftIco {
width: 60px;
float: left;
text-align: center;
}
.bold {
font-weight: bold;
}
.action a {
margin: 0 5px;
color: #1890FF;
}
.action a.detail {
color: #1890FF;
}
.action a.add {
color: #249E91;
}
.action a.add:hover {
color: #27AB9D;
}
.action a.edit {
color: #0693d4;
}
.action a.edit:hover {
color: #35BD90;
}
.action a.remove,
.action a.delete {
color: #FF7A8B;
}
.action a.delete {
color: #FF7A8B;
}
.action a.empower {
color: #FFBD59;
}
.action a.disable {
color: #CAD1D9;
}
.action a.icon {
display: inline-block;
width: 28px;
height: 28px;
line-height: 28px;
margin: 0px 0 0 -4px;
border-radius: 50%;
color: #515A6E;
background: #F5F6FA;
}
.action a.icon .ivu-icon {
font-weight: bold;
font-size: 18px;
}
.action a.icon:hover {
background: #27AB9D;
color: #fff;
}
.action a.icon:active {
background: #229185;
color: #fff;
}
.icon_box a.icon {
display: inline-grid;
width: 28px;
height: 28px;
line-height: 28px;
margin: 0;
}
.icon_box a.icon .ivu-icon-ios-eye {
font-weight: bold;
font-size: 24px;
color: #249e91;
}
.body-box .bj-box {
position: relative;
height: 45px;
}
.body-box .bj-box .dan-hao,
.body-box .bj-box .ri-qi,
.body-box .bj-box .dao-chu {
position: absolute;
right: 10px;
width: 235px;
font-size: 14px;
color: #333;
font-weight: bold;
text-align: right;
}
.body-box .bj-box .dao-chu {
top: 0px;
text-align: right;
}
.body-box .bj-box .dan-hao {
top: 60px;
}
.body-box .bj-box .ri-qi {
top: 95px;
}
.body-box .title-name {
text-align: center;
font-size: 28px;
margin-bottom: 10px;
}
.body-box .js-title {
text-align: center;
font-size: 20px;
font-weight: bold;
margin-bottom: 10px;
}
.body-box .box-title {
height: 45px;
line-height: 45px;
padding: 0 10px;
font-size: 14px;
color: #333;
border: 1px solid #d3d1d1;
}
.body-box .box-dz {
height: 40px;
line-height: 40px;
padding: 0 10px;
border-right: 1px solid #d3d1d1;
border-left: 1px solid #d3d1d1;
font-size: 14px;
font-weight: bold;
color: #333;
}
.zong-ji {
height: 45px;
line-height: 45px;
padding: 0 10px;
font-size: 14px;
color: #333;
border: 1px solid #d3d1d1;
border-top: none;
display: flex;
}
.zong-ji .xiao-ji {
width: 202px;
border-right: 1px solid #d3d1d1;
}
.zong-ji .da-xie {
width: 70%;
padding-left: 15px;
font-weight: bold;
}
.zong-ji .xiao-xie {
padding-left: 15px;
font-weight: bold;
}
.bei-zhu {
font-size: 14px;
color: #333;
font-weight: bold;
margin-top: 10px;
}
.zhi-dan {
margin-top: 18px;
font-size: 14px;
color: #333;
font-weight: bold;
}
.selectBox div.ivu-select-dropdown {
height: auto;
}
.footers {
width: 100%;
position: fixed;
bottom: 0;
left: 0;
text-align: center;
padding: 20px 0;
background: #d0d2d9;
}
.footers div {
height: 25px;
font-size: 14px;
color: #333;
line-height: 28px;
}
.outPdf table,
.outPdf table tr th,
.outPdf table tr td {
border: 1px solid #d3d1d1;
padding: 0 3px;
}
.outPdf table {
width: 100%;
line-height: 25px;
text-align: center;
border-collapse: collapse;
padding: 2px;
}
.outPdf table thead tr th {
line-height: 40px;
}
.outP table,
.outP table tr th,
.outP table tr td {
border: 1px solid #000000;
padding: 0 3px;
}
.outP table {
width: 100%;
line-height: 25px;
text-align: center;
border-collapse: collapse;
padding: 2px;
}
.outP table thead tr th {
line-height: 25px;
}
.full {
height: 100%;
background: white;
margin-top: 45px;
}
.full .menu {
border: 1px solid #ddd;
padding: 0 5px;
overflow: auto;
}
.full .menu .title {
line-height: 45px;
font-size: 14px;
padding: 0 5px;
border-bottom: #e4e6ed solid 1px;
}
.full .menu .title .fr {
float: right;
margin-top: 10px;
cursor: pointer;
}
.full .menu .title .fr:hover {
color: #249e91;
}
.full .menu .tree {
height: calc(100% - 150px);
overflow: auto;
}
.full .content {
background: white;
padding: 0 0 0 10px;
left: 250px;
right: 10px;
}
.full .content .auto {
flex: 1;
overflow: auto;
position: relative;
min-height: 600px;
}
.full .content .fly {
position: relative;
overflow: inherit;
}
.full .content .ivu-btn-small {
padding: 0;
background: red;
}
.time {
font-size: 14px;
font-weight: bold;
}
.content {
padding-left: 5px;
}
store/admin/user.js
View file @ 90462a65
......@@ -7,6 +7,12 @@ export const mutations={
},
setUser(state,info){
state.info=info;
},
setUserAvatar(state,user){
let info=state.info;
info.name=user.userName;
info.avatar=user.avatarUrl;
state.info=info;
}
}
export const actions={
......
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