Skip to content

M
mes-ui
Commit d9e5fe4c authored by 佟礼's avatar 佟礼
Browse files
Options

Merge branch 'master' of 39.98.128.195:zhouyx/mes-ui

parents 5e101264 031cff90
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6587 additions and 2521 deletions
assets/css/base.less
View file @ d9e5fe4c
......@@ -1156,7 +1156,7 @@ html [type=button] {
}
}
.tree {
height: calc(100% - 100px);
height: calc(100% - 150px);
overflow: auto;
}
}
......
assets/images/login/bg0.png 0 → 100644
View file @ d9e5fe4c
This diff is collapsed.
assets/images/login/bg1.png 0 → 100644
View file @ d9e5fe4c
This image diff could not be displayed because it is too large. You can view the blob instead.
assets/images/login/bg2.jpg 0 → 100644
View file @ d9e5fe4c
This diff is collapsed.
assets/images/login/bg3.jpg 0 → 100644
View file @ d9e5fe4c
This diff is collapsed.
components/customTable/customTable.vue
View file @ d9e5fe4c
......@@ -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 @ d9e5fe4c
......@@ -16,7 +16,7 @@
</Button>
</ButtonGroup>
</h3>
<div class="tree">
<div class="tree" :style="{height:divHeight}">
<Tree
ref="tree"
:data="tree"
......@@ -33,7 +33,8 @@ export default {
return {
expand: false,
ids: [],
tree: []
tree: [],
divHeight:''
}
},
props: {
......@@ -45,6 +46,8 @@ export default {
mounted() {},
created() {
this.loadTree()
var theight = window.innerHeight - 180 + 'px'
this.divHeight = theight
},
methods: {
toggle() {
......
components/orderOperator/process.vue
View file @ d9e5fe4c
......@@ -43,7 +43,7 @@ export default {
components: {},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
processTitle: '审批流程',
dataImmut: [],
dataMut: [],
......@@ -60,6 +60,7 @@ export default {
}
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.load(this.schemaIdVal)
},
methods: {
......
layouts/default.vue
View file @ d9e5fe4c
......@@ -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 @ d9e5fe4c
<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="page-account-top">
<div class="page-account-top-logo">
<img src="@/assets/images/logo.png" alt="logo" />
</div>
<div class="page-account-top-desc">SaaS MES 制造执行系统</div>
<div class="main">
<div class="ad">
<img src="@/assets/images/login/ad.png" />
</div>
<Login @on-submit="oidc">
<UserName name="username" value="admin" />
<Password name="password" value="admin" enter-to-submit />
<div class="page-account-auto-login">
<Checkbox v-model="autoLogin" size="large">{{ $t('page.login.remember') }}</Checkbox>
<a href>{{ $t('page.login.forgot') }}</a>
<div class="login">
<div class="page-account-top">
<div class="page-account-top-logo tc">
<img src="@/assets/images/logo.png" alt="logo" />
</div>
<!-- <div class="page-account-top-desc tc">SaaS MES 制造执行系统</div> -->
</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> -->
<h3 class="mb20">用户登陆</h3>
<Login @on-submit="oidc">
<UserName name="username" value="admin" />
<Password name="password" value="admin" enter-to-submit />
<div class="page-account-auto-login mb20">
<Checkbox v-model="autoLogin" >{{ $t('page.login.remember') }}</Checkbox>
<a href>{{ $t('page.login.forgot') }}</a>
</div>
<div class="mt20">
<Submit class="shadown">{{ $t('page.login.submit') }}</Submit>
</div>
</Login>
</div>
</div>
<!-- <i-copyright /> -->
</div>
</template>
<script>
......@@ -55,6 +70,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 +122,72 @@ export default {
}
};
</script>
<style lang="less">
@jianju:40px;
.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.jpg");
}
.main {
position: absolute;
z-index: 55;
top: @jianju;
left: @jianju;
right: @jianju;
bottom: @jianju;
background: rgba(38,128,235, 0.3);
display: flex;
.ad{
flex: 1;
text-align: center;
img{margin-top: 400px;}
}
.login {
background-color: white;
width: 600px;
padding: 150px 90px;
// background-image: url("../../../assets/images/login/33.png");
// background-repeat: no-repeat;
// background-position-y: 525px;
.ivu-input-wrapper {
margin-bottom: 5px;
}
.mt20{
margin-top: 50px;
.shadown{
box-shadow: 1px 5px 15px #2680EB;
}
.ivu-btn-large{
height: 50px !important;
}
}
}
}
}
</style>
\ No newline at end of file
pages/aps/aps/components/edit.vue
View file @ d9e5fe4c
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row>
<Col :span="12">
<FormItem :label="l('tASKSEQ')" prop="tASKSEQ">
......@@ -13,17 +13,33 @@
</Col>
<Col :span="12">
<FormItem :label="l('sHOPID')" prop="sHOPID">
<Input></Input>
<!-- v-model="orderSearchForm.orderCat" -->
<Select >
<Option value="" class="option-text">请选择</Option>
<Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option>
</Select>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('eQUIPID')" prop="eQUIPID">
<Input></Input>
<Select >
<Option value="" class="option-text">请选择</Option>
<Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option>
</Select>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="关重资源名称" prop="rUNTIME">
<Select >
<Option value="" class="option-text">请选择</Option>
<Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option>
</Select>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('rUNTIME')" prop="rUNTIME">
<Input></Input>
<!-- v-model="value1" -->
<InputNumber :max="100" :min="1"></InputNumber>
</FormItem>
</Col>
</Row>
......@@ -41,6 +57,9 @@ export default {
return {
disabled: false,
entity: {},
orderCatList:[
],
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }]
}
......
pages/aps/dispatch/dispatch.less
View file @ d9e5fe4c
......@@ -39,19 +39,19 @@
}
}
.ivu-card-head{
background: #62b8af!important;
background: #2d8cf0!important;
}
}
.g_title{
color: #249e91;
color: #2d8cf0;
}
}
.dispatch_card02{
margin: 10px 0;
padding-left: 0!important;
padding-right: 0!important;
// padding-left: 0!important;
// padding-right: 0!important;
.man_body{
max-width: 187px;
max-width: 185px;
label{
border-radius: 24px;
width: 100%;
......@@ -86,9 +86,9 @@
.drawer_center{
text-align: center;
padding: 10px;
color: #249e91;
color: #2d8cf0;
.color{
color: #2680EB;
color: #2d8cf0;
}
}
}
......@@ -106,9 +106,9 @@
.drawer_center{
text-align: center;
padding: 10px;
color: #249e91;
color: #2d8cf0;
.color{
color: #2680EB;
color: #2d8cf0;
}
}
}
......
pages/aps/dispatch/index.vue
View file @ d9e5fe4c
......@@ -73,7 +73,7 @@
<Icon
type="ios-disc"
size="18"
:color="item.id==shebeiId?'#249e91':'#fff'"
:color="item.id==shebeiId?'#2d8cf0':'#fff'"
/>
<input
name="shebei"
......@@ -96,7 +96,7 @@
</div>
<div class="man" v-if="button2 == '人员'">
<!-- {{peploeId}} @on-change="setpepoleid" @on-change="setpepoleids"-->
<Row>
<Row :gutter="15">
<Col span="8" class="dispatch_card02" v-for="(item,index) in listMan" :key="index">
<CheckboxGroup class="man_body">
<Checkbox v-model="item.checked" border class>
......@@ -283,10 +283,10 @@ export default {
},
created() {
this.getUserInfoFn()
this.byheight = window.innerHeight - 150 + 'px'
this.byheight = window.innerHeight - 208 + 'px'
},
mounted() {
this.byheight = window.innerHeight - 150 + 'px'
this.byheight = window.innerHeight - 208 + 'px'
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
......
pages/aps/results/index.vue
View file @ d9e5fe4c
......@@ -40,8 +40,8 @@
</div>
</template>
<script>
import Api from './api'
import expandRow from './table-expand.vue'
import Api from "./api";
import expandRow from "./table-expand.vue";
export default {
components: { expandRow },
......@@ -53,142 +53,144 @@ export default {
list: [],
columns: [
{
type: 'expand',
type: "expand",
width: 50,
render: (h, params) => {
return h(expandRow, {
props: {
row: params.row
}
})
});
}
},
{
title: '超期预警',
key: 'id',
align: 'center',
title: "超期预警",
key: "id",
align: "center",
render: (h, params) => {
return h('div', [
h('Icon', {
return h("div", [
h("Icon", {
props: {
type:
params.row.id == 1
? 'ios-information-circle-outline'
: 'ios-remove-circle-outline'
? "ios-information-circle-outline"
: "ios-remove-circle-outline"
},
style: {
marginRight: '5px',
fontSize: '18px',
fontWeight: 'bold',
color: params.row.id == 1 ? '#FE7777' : '#0DD78D'
marginRight: "5px",
fontSize: "18px",
fontWeight: "bold",
color: params.row.id == 1 ? "#FE7777" : "#0DD78D"
}
})
])
]);
}
},
{
title: '零件图号',
key: 'part_id',
align: 'center'
title: "零件图号",
key: "part_id",
align: "center"
},
{
title: '零件名称',
key: 'part_name',
align: 'center'
title: "零件名称",
key: "part_name",
align: "center"
},
{
title: '计划开始时间',
key: 'plan_start',
title: "计划开始时间",
key: "plan_start",
width: 220,
align: 'center'
align: "center"
},
{
title: '计划结束时间',
key: 'plan_start',
title: "计划结束时间",
key: "plan_start",
width: 220,
align: 'center'
align: "center"
},
{
title: '投料时间',
key: 'demand_start',
title: "投料时间",
key: "demand_start",
width: 220,
align: 'center'
align: "center"
},
{
title: '节点时间',
key: 'demand_finish',
title: "节点时间",
key: "demand_finish",
width: 220,
align: 'center'
align: "center"
},
{
title: '计划数量',
key: 'plan_qty',
align: 'center'
title: "计划数量",
key: "plan_qty",
align: "center"
}
]
}
};
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
created() {
this.orderlist()
this.orderlist();
},
methods: {
orderlist() {
Api.getall()
.then((r) => {
.then(r => {
if (r.success) {
this.list = r.result
this.list = r.result;
if (r.result) {
this.listData(r.result[0].schedule_Id, 0)
this.listData(r.result[0].schedule_Id, 0);
} else {
this.listData(0, null)
this.listData(0, null);
}
}
})
.catch((error) => {
this.$$Message.error('请求失败')
})
.catch(error => {
this.$$Message.error("请求失败");
});
},
listData(id, index) {
this.isactive = index
this.isactive = index;
Api.paged({ scheduleId: id })
.then((r) => {
.then(r => {
if (r.success) {
this.data = r.result
this.data = r.result;
}
})
.catch((error) => {
this.$$Message.error('请求失败')
})
.catch(error => {
this.$$Message.error("请求失败");
});
},
clear() {
this.$Modal.confirm({
title: '清空列表',
content: '您确定要清空列表吗',
onOk: () => {
Api.clearall().then((r) => {
if (r.success) {
this.$Message.success('清空列表成功')
this.orderlist()
}
})
},
onCancel: () => {
this.$Message.info('已取消')
}
})
if (this.list.length > 0) {
this.$Modal.confirm({
title: "清空列表",
content: "您确定要清空列表吗",
onOk: () => {
Api.clearall().then(r => {
if (r.success) {
this.$Message.success("清空列表成功");
this.orderlist();
}
});
},
onCancel: () => {
this.$Message.info("已取消");
}
});
}
},
parameter() {},
addOk() {},
cancel() {},
comeBlck() {
this.$router.push({ path: '/aps/aps' })
this.$router.push({ path: "/aps/aps" });
}
}
}
};
</script>
<style lang="less" scoped>
.results {
......
pages/basicData/calendar/class/index.vue
View file @ d9e5fe4c
......@@ -172,13 +172,13 @@ export default {
}
},
created(){
this.tableHeight = window.innerHeight - 170
this.tableHeight = window.innerHeight - 230
},
mounted() {
window.onresize = () => {///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tableHeight = window.screenHeight - 150
this.tableHeight = window.screenHeight - 230
})()
}
},
......
pages/basicData/calendar/holiday/index.vue
View file @ d9e5fe4c
......@@ -171,14 +171,14 @@ export default {
}
},
created(){
this.tableHeight = window.innerHeight - 170
this.tableHeight = window.innerHeight - 230
},
mounted() {
// console.log(this)
window.onresize = () => {///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tableHeight = window.screenHeight - 150
this.tableHeight = window.screenHeight - 230
})()
}
},
......
pages/basicData/calendar/overtime/index.vue
View file @ d9e5fe4c
......@@ -196,14 +196,14 @@ export default {
},
created() {
this.getWeekTypeListFn()
this.tableHeight = window.innerHeight - 170
this.tableHeight = window.innerHeight - 230
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tableHeight = window.screenHeight - 150
this.tableHeight = window.screenHeight - 230
})()
}
},
......
pages/basicData/calendar/work/index.vue
View file @ d9e5fe4c
......@@ -69,7 +69,7 @@ export default {
deletelMore: false,
curId: 0,
columns: [
{ type: 'selection', width: 70, align: 'center'},
// { type: 'selection', width: 70, align: 'center'},
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{
key: 'creationTime',
......@@ -184,13 +184,13 @@ export default {
}
},
created(){
this.tableHeight = window.innerHeight - 170
this.tableHeight = window.innerHeight - 230
},
mounted() {
window.onresize = () => {///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tableHeight = window.screenHeight - 150
this.tableHeight = window.screenHeight - 230
})()
}
},
......
pages/basicData/dic/components/edit.vue
View file @ d9e5fe4c
......@@ -84,8 +84,8 @@ export default {
}
},
watch: {
"v.id"() {
this.entity = this.$clone(this.v)
v(v) {
this.entity = this.v
console.info(this.entity)
}
}
......
pages/basicData/user/index.vue
View file @ d9e5fe4c
This diff is collapsed.
pages/basicData/userManagent/userInfo.vue
View file @ d9e5fe4c
......@@ -7,7 +7,7 @@
<Avatar :src="avatorPath" size="150" />
</p>
<p style="text-align:center;padding:10px;">
<Button @click="openModalAvatar">修改头像</Button>
<Button @click="openModalAvatar">修改头像</Button>
</p>
</div>
</Card>
......@@ -92,106 +92,106 @@
</div>
</template>
<script>
import Api from '../user/api'
import avatar from '@/assets/images/avatar.png'
import inputFiles from '@/components/page/inputFile.vue'
var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
import Api from "../user/api";
import avatar from "@/assets/images/avatar.png";
import inputFiles from "@/components/page/inputFile.vue";
export default {
components: {
inputFiles
},
data() {
return {
parms: 'app=user&eid=23&name=avatarUrl',
cardWidth: '600px',
parms: "app=user&eid=23&name=avatarUrl",
cardWidth: "600px",
userId: 0,
pwdModel: {
id: null,
oldPwd: '',
newPwd: '',
confirmPwd: ''
oldPwd: "",
newPwd: "",
confirmPwd: ""
},
modalAvatar: false,
mid: '',
mid: "",
userInfo: {
id: 0,
cardNo: '',
userName: '',
cardNo: "",
userName: "",
gender: 0,
birthday: '',
birthday: "",
degreeId: 0,
titile: 0,
workLicense: 0,
employeeNo: '',
jobName: '',
phone: '',
email: '',
employeeNo: "",
jobName: "",
phone: "",
email: "",
departmentId: 0,
departmentTitle: '',
departmentTitle: "",
status: 0,
remark: '',
avatarUrl: ''
remark: "",
avatarUrl: ""
},
userInfos:{},
imageModel: {
id: null,
avatar_Url: '',
name: ''
avatar_Url: "",
name: ""
},
imgName: '',
avatorPath: '',
oldImgName: ''
}
imgName: "",
avatorPath: "",
oldImgName: ""
};
},
created() {
this.cardWidth = window.innerWidth - 620 + 'px'
this.userId = this.$store.state.userInfo.userId;
this.cardWidth = window.innerWidth - 620 + "px";
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
pwdOk() {
if (!this.pwdModel.oldPwd) {
this.$Message.warning('请输入初始密码!')
return
this.$Message.warning("请输入初始密码!");
return;
}
if (!this.pwdModel.newPwd) {
this.$Message.warning('请输入新密码!')
return
this.$Message.warning("请输入新密码!");
return;
}
if (this.pwdModel.newPwd !== this.pwdModel.confirmPwd) {
this.$Message.warning('两次密码不一致!')
return
this.$Message.warning("两次密码不一致!");
return;
}
if (this.pwdModel.newPwd === this.pwdModel.oldPwd) {
this.$Message.warning('新旧密码相同!')
return
this.$Message.warning("新旧密码相同!");
return;
}
this.pwdModel.id = userId
this.pwdModel.id = this.userId;
let params = {
accountId: this.userInfo.accountId,
userId: this.userInfo.id,
newPassword: this.pwdModel.newPwd,
oldPassword: this.pwdModel.oldPwd
}
};
Api.authChangepassword(params).then((res) => {
Api.authChangepassword(params).then(res => {
if (res.success) {
this.$Message.success('修改成功!')
}
else
{
this.$Message.error('修改失败!')
this.$Message.success("修改成功!");
} else {
this.$Message.error("修改失败!");
}
})
});
},
pwdModelReset() {
this.pwdModel = {
oldPwd: '',
newPwd: '',
confirmPwd: ''
}
oldPwd: "",
newPwd: "",
confirmPwd: ""
};
},
openModalAvatar() {
this.modalAvatar = true
this.modalAvatar = true;
},
//单个文件选择后赋值方法
// inputChangedFile(val) {
......@@ -202,71 +202,69 @@ export default {
//获取用户基本信息
initUserInfo() {
let parma = {
Id: userId
}
this.$http.sysUser.getuserinfo(parma).then((res) => {
Id: this.userId
};
this.$http.sysUser.getuserinfo(parma).then(res => {
if (res.result) {
this.userInfo = res.result
this.imageModel.id = this.userInfo.id
this.userInfo = res.result;
this.userInfos=res.result;
this.imageModel.id = this.userInfo.id;
if (
res.result.avatarUrl &&
res.result.avatarUrl != '' &&
res.result.avatarUrl != "" &&
res.result.avatarUrl != null
) {
this.userInfo.avatarUrl = res.result.avatarUrl
this.avatorPath = fileUrlDown + res.result.avatarUrl
this.oldImgName = fileUrlDown + res.result.avatarUrl
this.userInfo.avatarUrl = res.result.avatarUrl;
this.avatorPath = fileUrlDown + res.result.avatarUrl;
this.oldImgName = fileUrlDown + res.result.avatarUrl;
} else {
this.userInfo.avatarUrl = avatar
this.userInfo.avatarUrl = avatar;
}
} else {
this.$Message.error('查询失败!')
this.$Message.error("查询失败!");
}
})
});
},
cancelAvatar() {
this.modalAvatar = false
this.avatorPath = this.oldImgName
this.modalAvatar = false;
this.avatorPath = this.oldImgName;
},
upAvatar() {
if (this.imageModel.avatar_Url != '') {
this.$http.sysUser.changeavatar(this.imageModel).then((res) => {
alert(JSON.stringify(res))
if (this.imageModel.avatar_Url != "") {
this.$http.sysUser.changeavatar(this.imageModel).then(res => {
if (res.success) {
this.$Message.success('修改成功!')
this.modalAvatar = false
this.$store.commit(
'setUserAvatar',
fileUrlDown + this.imageModel.avatar_Url
)
this.$Message.success("修改成功!");
this.modalAvatar = false;
this.userInfos.avatarUrl = fileUrlDown + this.imageModel.avatar_Url;
this.$store.commit("admin/user/setUserAvatar", this.userInfos);
} else {
this.$Message.error('修改失败!')
this.$Message.error("修改失败!");
}
})
});
} else {
this.$Message.warning('请选择上传图片!')
this.$Message.warning("请选择上传图片!");
}
},
reload() {
this.isRouterAlive = false //先关闭，
this.isRouterAlive = false; //先关闭，
this.$nextTick(function() {
this.isRouterAlive = true //再打开
})
this.isRouterAlive = true; //再打开
});
}
},
computed: {},
mounted() {
this.initUserInfo()
this.initUserInfo();
},
watch: {
imgName(newName, oldName) {
const imgPathsArr = JSON.parse(newName)
this.userInfo.avatarUrl = imgPathsArr[0].filePath
this.imageModel.avatar_Url = imgPathsArr[0].filePath
this.avatorPath = fileUrlDown + imgPathsArr[0].filePath
const imgPathsArr = JSON.parse(newName);
this.userInfo.avatarUrl = imgPathsArr[0].filePath;
this.imageModel.avatar_Url = imgPathsArr[0].filePath;
this.avatorPath = fileUrlDown + imgPathsArr[0].filePath;
}
}
}
};
</script>
<style lang="less" >
.ivu-card-body {
......@@ -299,9 +297,9 @@ export default {
.ivu-form-itemNo {
margin-bottom: 4px;
}
.user_info_right{
float:left;
margin-left:20px;
.user_info_right {
float: left;
margin-left: 20px;
width: calc(78% - 20px);
}
</style>
\ No newline at end of file
pages/bug/index.vue
View file @ d9e5fe4c
......@@ -514,14 +514,14 @@ export default {
},
created() {
window.screenHeight = window.innerHeight
this.gridHeight = window.screenHeight - 240
this.gridHeight = window.screenHeight - 250
},
mounted() {
// this.search(this.searchForm)
window.onresize = () => {
return (() => {
window.screenHeight = window.innerHeight
this.gridHeight = window.screenHeight - 240
this.gridHeight = window.screenHeight - 250
})()
}
}
......
pages/crm/project/index.vue
View file @ d9e5fe4c
......@@ -107,13 +107,13 @@
</div>
</template>
<script>
import Api from './api'
import Add from './add'
import Edit from './edit'
import Detail from './detail'
import Api from "./api";
import Add from "./add";
import Edit from "./edit";
import Detail from "./detail";
export default {
name: 'list',
name: "list",
components: {
Add,
Edit,
......@@ -124,14 +124,14 @@ export default {
action: Api.index,
list: [
{
name: 'jjk'
name: "jjk"
}
],
isactive: null,
keys: '',
keys: "",
easySearch: {
keys: { op: 'name', value: null },
customerId: { op: 'Equal', value: null }
keys: { op: "name", value: null },
customerId: { op: "Equal", value: null }
},
addModal: false,
editModal: false,
......@@ -139,110 +139,110 @@ export default {
deletelModal: false,
curId: 0,
customerId: 0,
columns: [{ key: 'id', title: this.l('id'), hide: true, align: 'left' }],
name: '',
columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }],
name: "",
getlists: {
conditions: [
{
fieldName: '',
fieldValue: '',
conditionalType: 'Equal'
fieldName: "",
fieldValue: "",
conditionalType: "Equal"
}
],
pageSize: 1000
}
}
};
},
computed: {
projectList() {
return this.list.filter((u) => {
return u.name.indexOf(this.keys) > -1
})
return this.list.filter(u => {
return u.name.indexOf(this.keys) > -1;
});
}
},
mounted() {
this.getList()
this.getList();
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
clickSearch() {
this.getlists.conditions[0].fieldName = 'name'
this.getlists.conditions[0].fieldValue = this.name
this.getList()
this.getlists.conditions[0].fieldName = "name";
this.getlists.conditions[0].fieldValue = this.name;
this.getList();
},
listData(li, index) {
this.easySearch.customerId.value = li.id
this.isactive = index
this.customerId = li.id
this.search()
this.easySearch.customerId.value = li.id;
this.isactive = index;
this.customerId = li.id;
this.search();
},
getList() {
Api.list(this.getlists).then((r) => {
Api.list(this.getlists).then(r => {
if (r.success) {
this.list = r.result
this.list = r.result;
// this.easySearch.customerId.value = r.result[0].id
this.search()
this.search();
}
})
});
},
easySearchs() {},
addOk() {
this.$refs.grid.load()
this.addModal = false
this.detailModal = false
this.editModal = false
this.curId = 0
this.$refs.grid.load();
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.curId = 0;
},
add() {
if (this.isactive !== null) {
this.addModal = true
this.addModal = true;
} else {
this.$Message.info('请选择企业')
this.$Message.info("请选择企业");
}
},
search() {
this.$refs.grid.reload(this.easySearch)
this.$refs.grid.reload(this.easySearch);
},
detail(id) {
this.detailModal = true
this.curId = id
this.detailModal = true;
this.curId = id;
},
edit(id) {
this.editModal = true
this.curId = id
this.editModal = true;
this.curId = id;
},
remove(id) {
this.deletelModal = true
this.curId = id
this.deletelModal = true;
this.curId = id;
},
removeOk() {
Api.delete({ id: this.curId }).then((r) => {
Api.delete({ id: this.curId }).then(r => {
if (r.success) {
this.$refs.grid.load()
this.deletelModal = false
this.$Message.success('删除成功')
this.$refs.grid.load();
this.deletelModal = false;
this.$Message.success("删除成功");
}
})
});
},
removeCancel() {
this.deletelModal = false
this.deletelModal = false;
},
cancel() {
this.curId = 0
this.addModal = false
this.detailModal = false
this.editModal = false
this.deletedlModal = false
this.curId = 0;
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
},
l(key) {
let vkey = 'Project' + '.' + key
return this.$t(vkey) || key
let vkey = "Project" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang="less">
.addclass {
......@@ -254,7 +254,8 @@ export default {
.project-steps {
display: flex;
display: -webkit-flex;
height: 100%;
height: 85vh;
overflow: hidden;
border-top: 1px solid #e4e6ed;
h4 {
margin-bottom: 5px;
......
pages/crm/sales/index.vue
View file @ d9e5fe4c
......@@ -12,7 +12,7 @@
</div>
</template>
<script>
import ProjectList from './projectList.vue'
import ProjectList from "./projectList.vue";
export default {
components: {
ProjectList
......@@ -21,30 +21,31 @@ export default {
return {
current: 0,
stage: 1
}
};
},
methods: {
next(name) {
if (name == 1) {
this.current = 0
this.stage = 1
this.current = 0;
this.stage = 1;
} else if (name == 2) {
this.current = 1
this.stage = 2
this.current = 1;
this.stage = 2;
} else if (name == 3) {
this.current = 2
this.stage = 3
this.current = 2;
this.stage = 3;
} else if (name == 4) {
this.current = 3
this.stage = 4
this.current = 3;
this.stage = 4;
}
}
}
}
};
</script>
<style lang='less' scoped>
.sales {
height: 90%;
padding-top: 8px;
.steps-k {
margin: 10px 30px;
.title-c {
......
pages/crm/sales/projectList.vue
View file @ d9e5fe4c
......@@ -117,13 +117,13 @@
</div>
</template>
<script>
import Api from './api'
import Add from './add'
import Edit from './edit'
import Detail from './detail'
import Search from './search'
import Api from "./api";
import Add from "./add";
import Edit from "./edit";
import Detail from "./detail";
import Search from "./search";
export default {
name: 'ProjectList',
name: "ProjectList",
components: {
Add,
Edit,
......@@ -134,20 +134,20 @@ export default {
stage: Number
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
data() {
return {
action: Api.index,
activeindex: 0,
list: [],
keys: '',
name: '',
status: '', //为空是全部排产，0为未排产；13为已排查；
partTaskPk: '', //车间
keys: "",
name: "",
status: "", //为空是全部排产，0为未排产；13为已排查；
partTaskPk: "", //车间
result: [],
isactive: null,
selectName: 'all',
selectName: "all",
rowResult: {},
addId: {
projectId: 0,
......@@ -157,148 +157,148 @@ export default {
getSearch: {
conditions: [
{
fieldName: 'stage',
fieldValue: '1',
conditionalType: 'Equal'
fieldName: "stage",
fieldValue: "1",
conditionalType: "Equal"
},
{
fieldName: '',
fieldValue: '',
conditionalType: 'Equal'
fieldName: "",
fieldValue: "",
conditionalType: "Equal"
}
],
pageSize: 1000
},
listOperation: [],
easySearch: {
keys: { op: 'deliverable', value: null },
stage: { op: 'Equal', value: null },
projectId: { op: 'Equal', value: null }
keys: { op: "deliverable", value: null },
stage: { op: "Equal", value: null },
projectId: { op: "Equal", value: null }
},
addModal: false,
editModal: false,
detailModal: false,
deletelModal: false,
curId: 0,
columns: [{ key: 'id', title: this.l('id'), hide: true, align: 'left' }]
}
columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }]
};
},
filters: {
filterFun: function(value) {
if (value && value.length > 8) {
value = value.substring(0, 8) + '...'
value = value.substring(0, 8) + "...";
}
return value
return value;
},
filterFun2: function(value) {
if (value && value.length > 15) {
value = value.substring(0, 15) + '...'
value = value.substring(0, 15) + "...";
}
return value
return value;
}
},
created() {
this.getList(1)
this.getList(1);
},
computed: {
productList() {
return this.list.filter((u) => {
return u.name.indexOf(this.keys) > -1
})
return this.list.filter(u => {
return u.name.indexOf(this.keys) > -1;
});
}
},
methods: {
clickSearch() {
this.getSearch.conditions[1].fieldName = 'name'
this.getSearch.conditions[1].fieldValue = this.name
this.getList(this.getSearch.conditions[0].fieldValue)
this.getSearch.conditions[1].fieldName = "name";
this.getSearch.conditions[1].fieldValue = this.name;
this.getList(this.getSearch.conditions[0].fieldValue);
},
getList(v) {
this.getSearch.conditions[0].fieldValue = v + ''
Api.pagedList(this.getSearch).then((r) => {
this.getSearch.conditions[0].fieldValue = v + "";
Api.pagedList(this.getSearch).then(r => {
if (r.success) {
this.list = r.result
this.search()
this.list = r.result;
this.search();
}
})
});
},
listData(li, index) {
this.easySearch.projectId.value = li.id
this.easySearch.stage.value = li.stage
this.$refs.add.entity.stage = li.stage
this.addId.projectId = li.id
this.addId.customerId = li.customerId
this.addId.principal = li.principal
this.isactive = index
this.search()
this.easySearch.projectId.value = li.id;
this.easySearch.stage.value = li.stage;
this.$refs.add.entity.stage = li.stage;
this.addId.projectId = li.id;
this.addId.customerId = li.customerId;
this.addId.principal = li.principal;
this.isactive = index;
this.search();
},
search() {
this.$refs.grid.reload(this.easySearch)
this.$refs.grid.reload(this.easySearch);
},
addOk() {
this.$refs.grid.load()
this.addModal = false
this.detailModal = false
this.editModal = false
this.curId = 0
this.$refs.grid.load();
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.curId = 0;
},
add() {
if (this.isactive !== null) {
this.addModal = true
this.addModal = true;
} else {
this.$Message.info('请选择项目')
this.$Message.info("请选择项目");
}
},
detail(id) {
this.detailModal = true
this.curId = id
this.detailModal = true;
this.curId = id;
},
edit(id) {
this.editModal = true
this.curId = id
this.editModal = true;
this.curId = id;
},
remove(id) {
this.deletelModal = true
this.curId = id
this.deletelModal = true;
this.curId = id;
},
removeOk() {
Api.delete({ id: this.curId }).then((r) => {
Api.delete({ id: this.curId }).then(r => {
if (r.success) {
this.$refs.grid.load()
this.deletelModal = false
this.$Message.success('删除成功')
this.$refs.grid.load();
this.deletelModal = false;
this.$Message.success("删除成功");
}
})
});
},
removeCancel() {
this.deletelModal = false
this.deletelModal = false;
},
cancel() {
this.curId = 0
this.addModal = false
this.detailModal = false
this.editModal = false
this.deletedlModal = false
this.curId = 0;
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
},
l(key) {
let vkey = 'Follow' + '.' + key
return this.$t(vkey) || key
let vkey = "Follow" + "." + key;
return this.$t(vkey) || key;
}
},
watch: {
stage(v) {
this.getList(v)
this.getList(v);
},
'easySearch.projectId.value'(v) {
"easySearch.projectId.value"(v) {
if (v) {
this.search()
this.search();
}
}
}
}
};
</script>
<style lang="less" scoped>
.addclass {
......@@ -310,7 +310,8 @@ export default {
.steps {
display: flex;
display: -webkit-flex;
height: 100%;
height: 80vh;
overflow: hidden;
border-top: 1px solid #e4e6ed;
h4 {
margin-bottom: 5px;
......
pages/crm/statistical/card.less
View file @ d9e5fe4c
......@@ -51,23 +51,50 @@
width: 100%;
overflow: hidden;
.main_card{
width: 32%;
width: calc(33% - 6px);
cursor: pointer;
float: left;
// display: inline-block;
margin: 10px 5px;
margin: 10px 4px;
.leftIcon {
width: 40px;
height: 40px;
border-radius: 50%;
background: #249e91;
// background: #249e91;
float: left;
margin: 12px 10px 0 5px;
.img_bg01 {
display: inline-block;
width: 40px;
height: 40px;
border-radius: 50%;
background: #249e91;
}
.img_bg02 {
display: inline-block;
width: 40px;
height: 40px;
border-radius: 50%;
background: #0099FF;
}
.img_bg03 {
display: inline-block;
width: 40px;
height: 40px;
border-radius: 50%;
background: #FF7A8B;
}
.img_bg04 {
display: inline-block;
width: 40px;
height: 40px;
border-radius: 50%;
background: #FFC300;
}
.Icon_bg {
text-align: center;
padding: 10px 0 0;
img.Icon_icon {
width: 18px;
width: 20px;
}
}
}
......
pages/crm/statistical/costomer/todolist.vue
View file @ d9e5fe4c
......@@ -18,8 +18,10 @@
:key="index"
>
<div class="leftIcon">
<div class="Icon_bg">
<img class="Icon_icon" :src="imgUrl + item.image" alt />
<div class="Icon_bg" :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))" >
<!-- <div > -->
<img class="Icon_icon" src="@/assets/imgicon/u1640.png" alt="">
<!-- <img class="Icon_icon" :src="imgUrl + item.image" alt /> -->
</div>
</div>
<div class="h60">
......
pages/handle/examine1/index.vue
View file @ d9e5fe4c
......@@ -145,7 +145,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -196,6 +196,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId)
......
pages/handle/examine10/index.vue
View file @ d9e5fe4c
......@@ -84,7 +84,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -134,6 +134,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId)
......
pages/handle/examine11/index.vue
View file @ d9e5fe4c
......@@ -84,7 +84,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -134,6 +134,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId)
......
pages/handle/examine12/index.vue
View file @ d9e5fe4c
......@@ -84,7 +84,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -134,6 +134,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId)
......
pages/handle/examine2/index.vue
View file @ d9e5fe4c
......@@ -98,7 +98,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -146,6 +146,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId)
......
pages/handle/examine3/index.vue
View file @ d9e5fe4c
......@@ -97,7 +97,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -145,6 +145,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId)
......
pages/handle/examine4/index.vue
View file @ d9e5fe4c
......@@ -84,7 +84,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId:0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -116,6 +116,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId)
......
pages/handle/examine6/index.vue
View file @ d9e5fe4c
......@@ -131,7 +131,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -181,6 +181,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
console.log(this.detailId)
......
pages/handle/examine7/index.vue
View file @ d9e5fe4c
......@@ -155,7 +155,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId:0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -205,6 +205,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId)
......
pages/handle/examine8/index.vue
View file @ d9e5fe4c
......@@ -156,7 +156,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -214,6 +214,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
console.log(this.footerStatu)
......
pages/handle/examine9/index.vue
View file @ d9e5fe4c
......@@ -83,7 +83,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -133,6 +133,7 @@ export default {
await store.dispatch('loadDictionary') // 加载数据字典
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId)
......
pages/handle/footer.vue
View file @ d9e5fe4c
......@@ -96,7 +96,7 @@ export default {
},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
formMyCheck: {
radioSp: '通过',
comment: '',
......@@ -132,6 +132,7 @@ export default {
},
created() {
this.getDetailInfos(this.idVal)
this.currentUserId=this.$store.state.userInfo.userId
},
methods: {
nextCheckOk() {
......
pages/handle/index.vue
View file @ d9e5fe4c
......@@ -209,7 +209,7 @@ export default {
created() {
window.screenHeight = window.innerHeight
this.iframeHeight = window.screenHeight - 58
this.gridHeight = window.screenHeight - 240
this.gridHeight = window.screenHeight - 260
},
mounted() {
window.onresize = () => {
......@@ -217,7 +217,7 @@ export default {
return (() => {
window.screenHeight = window.innerHeight
this.iframeHeight = window.screenHeight - 58
this.gridHeight = window.screenHeight - 240
this.gridHeight = window.screenHeight - 260
})()
}
this.getSchema()
......
pages/handle/process.vue
View file @ d9e5fe4c
......@@ -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">
......@@ -53,7 +59,7 @@ export default {
components: {},
data() {
return {
currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
currentUserId: 0,
processTitle: '审批流程',
currentNodeId: null,
dataImmut: [],
......@@ -123,6 +129,7 @@ export default {
}
},
created() {
this.currentUserId=this.$store.state.userInfo.userId
this.dataImmut = []
this.dataMut = []
......
pages/handle/task.vue
View file @ d9e5fe4c
<style>
/* @font-face {
font-family: 'iconfont';
src: url('./iconfont/iconfont.eot');
src: url('./iconfont/iconfont.eot?#iefix') format('embedded-opentype'),
url('./iconfont/iconfont.woff2') format('woff2'),
url('./iconfont/iconfont.woff') format('woff'),
url('./iconfont/iconfont.ttf') format('truetype'),
url('./iconfont/iconfont.svg#iconfont') format('svg');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 32px;
font-weight: bold;
/* font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color:#249e91;
} */
.img_bg {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #249e91;
}
.img_icon {
width: 24px;
margin: 23% 0 0 0;
}
</style>
<template>
<div style="width:100%">
<Card
......@@ -41,9 +11,9 @@
<div class="leftIco">
<!-- color:rgba(36, 158, 145, 1) -->
<!-- <span class="iconfont">&#xe607;</span> -->
<div class="img_bg">
<img class="img_icon" :src="imgUrl + item.image" alt />
<!-- <img class="img_icon" src="@/assets/imgicon/u1650.png" alt=""> -->
<div :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))" >
<!-- <img class="img_icon" :src="imgUrl + item.image" alt /> -->
<img class="img_icon" src="@/assets/imgicon/u1640.png" alt="">
</div>
<!-- <command icon="@/assets/imgicon/u1638.png"> -->
<!-- <Icon type="md-analytics" size="36" color="#249e91" /> -->
......@@ -82,6 +52,7 @@ export default {
return (data.totalUrl = r.result)
})
})
console.log(list)
this.listTask = list
})
},
......@@ -93,6 +64,38 @@ export default {
}
</script>
<style lang="less" scoped>
.img_bg01 {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #249e91;
}
.img_bg02 {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #0099FF;
}
.img_bg03 {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #FF7A8B;
}
.img_bg04 {
display: inline-block;
width: 48px;
height: 48px;
border-radius: 50%;
background: #FFC300;
}
.img_icon {
width: 24px;
margin: 23% 0 0 0;
}
.waitTask {
cursor: pointer;
margin-bottom: 10px;
......
pages/mordent/Sluggish/placode/inventory.vue
View file @ d9e5fe4c
......@@ -66,10 +66,8 @@ export default {
data() {
return {
entity: {
creator: parseInt(
JSON.parse(sessionStorage.getItem('userInfo')).userId
),
creatorUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId
creator:"",
creatorUserId:0
},
rules: {
storeTitle: [{ required: true, message: '请选择库位', trigger: 'blur' }]
......@@ -174,6 +172,10 @@ export default {
}
}
},
created() {
this.creator = this.$store.state.userInfo.name
this.creatorUserId = this.$store.state.userInfo.userId
},
methods: {
handleSubmit() {
let listTemp = []
......
pages/mordent/Sluggish/powder/inventory.vue
View file @ d9e5fe4c
......@@ -66,10 +66,8 @@ export default {
data() {
return {
entity: {
creator: parseInt(
JSON.parse(sessionStorage.getItem('userInfo')).userId
),
creatorUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId
creator:"",
creatorUserId: 0
},
conditions: {
storeId: { op: 'Equal', value: null },
......@@ -166,6 +164,10 @@ export default {
}
}
},
created() {
this.creator = this.$store.state.userInfo.name
this.creatorUserId = this.$store.state.userInfo.userId
},
methods: {
handleSubmit() {
let listTemp = []
......
pages/mordent/Sluggish/scraper/inventory.vue
View file @ d9e5fe4c
......@@ -66,10 +66,8 @@ export default {
data() {
return {
entity: {
creator: parseInt(
JSON.parse(sessionStorage.getItem('userInfo')).userId
),
creatorUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId
creator: '',
creatorUserId: 0
},
conditions: {
storeId: { op: 'Equal', value: null },
......@@ -167,6 +165,10 @@ export default {
}
}
},
created() {
this.creator = this.$store.state.userInfo.name
this.creatorUserId = this.$store.state.userInfo.userId
},
methods: {
handleSubmit() {
let listTemp = []
......
pages/order/monitoring/index.vue
View file @ d9e5fe4c
This diff is collapsed.
pages/order/orderManager.vue
View file @ d9e5fe4c
......@@ -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/order/quotation/index.vue
View file @ d9e5fe4c
This diff is collapsed.
pages/processDesign/ChangeSingle/processchangesingle/index.vue
View file @ d9e5fe4c
......@@ -15,7 +15,7 @@
:data="data2"
highlight-row
highlight-current-row
:height="this.tbHeight"
:height="tbHeight"
border
class="tableCommon"
></Table>
......@@ -335,7 +335,7 @@ export default {
},
created(){
this.loadchangelist();
this.tbHeight = window.innerHeight - 175
this.tbHeight = window.innerHeight - 300
},
methods:{
// 分页
......
pages/processDesign/Process/index.vue
View file @ d9e5fe4c
......@@ -8,7 +8,7 @@
<Tree
:data="searchList"
:style="{height:(treeHeight-95)+'px'}"
:style="{height:(treeHeight-115)+'px'}"
style="overflow:auto;width:215px;"
@on-select-change="selectTreeNode"
></Tree>
......@@ -422,8 +422,8 @@ export default {
}
},
created() {
this.treeHeight = window.innerHeight - 100
this.tableHeight = window.innerHeight - 190
this.treeHeight = window.innerHeight - 150
this.tableHeight = window.innerHeight - 220
this.loaddata()
this.getapprovalStatusdata()
},
......@@ -435,8 +435,8 @@ export default {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 100
this.tableHeight = window.innerHeight - 190
this.treeHeight = window.innerHeight - 150
this.tableHeight = window.innerHeight - 220
})()
}
},
......@@ -974,7 +974,7 @@ export default {
}
this.$refs.routingchangeorder.flag = 0
this.$refs.routingchangeorder.routing_header_Id = this.headerSelected.id
var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
var userId = this.$store.state.userInfo.userId
let parma = {
Id: userId
}
......
pages/processDesign/ProcessRecord/index.vue
View file @ d9e5fe4c
......@@ -6,7 +6,7 @@
<div class="zh-box">
<Input search placeholder="请输入查询条件" clearable v-model="treeInputSearch" />
<Tree :data="searchList" @on-select-change="selectTreeNode"
:style="{height:(treeHeight-95)+'px'}"
:style="{height:(treeHeight-115)+'px'}"
style="overflow:auto;width:215px;"
></Tree>
</div>
......@@ -240,8 +240,8 @@ export default {
created() {
this.laodaction()
this.laodactiontype()
this.tbHeight = window.innerHeight - 185
this.treeHeight = window.innerHeight - 100
this.tbHeight = window.innerHeight - 220
this.treeHeight = window.innerHeight - 140
},
methods: {
......
pages/processDesign/productTree/index.vue
View file @ d9e5fe4c
......@@ -611,12 +611,12 @@ export default {
},
created(){
this.loadProduct()
this.divHeihgt= window.innerHeight - 100+"px";
this.divHeihgt= window.innerHeight - 130+"px";
},
mounted() {
window.onresize = () => {
return (() => {
this.divHeihgt = window.innerHeight - 100+"px";
this.divHeihgt = window.innerHeight - 130+"px";
})()
}
},
......
pages/processManage/Process/index.vue
View file @ d9e5fe4c
......@@ -8,7 +8,7 @@
<Tree
:data="searchList"
:style="{height:(treeHeight-95)+'px'}"
:style="{height:(treeHeight-115)+'px'}"
style="overflow:auto;width:215px;"
@on-select-change="selectTreeNode"
></Tree>
......@@ -21,7 +21,8 @@
<Input
search
enter-button
class="w240 mr10 fl"
class=" mr10 fl"
style="width:240px"
v-model="searchIterms"
placeholder="请输入编号、名称"
@on-search="easySearch"
......@@ -407,8 +408,8 @@ export default {
}
},
created() {
this.treeHeight = window.innerHeight - 100
this.tableHeight = window.innerHeight - 190
this.treeHeight = window.innerHeight - 140
this.tableHeight = window.innerHeight - 230
this.loaddata()
this.getapprovalStatusdata()
},
......@@ -420,8 +421,8 @@ export default {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 100
this.tableHeight = window.innerHeight - 190
this.treeHeight = window.innerHeight - 140
this.tableHeight = window.innerHeight - 230
})()
}
},
......@@ -934,7 +935,7 @@ export default {
}
this.$refs.routingchangeorder.flag = 0
this.$refs.routingchangeorder.routing_header_Id = this.headerSelected.id
var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
var userId =this.$store.state.userInfo.userId
let parma = {
Id: userId
}
......
pages/processManage/setProcess/index.vue
View file @ d9e5fe4c
......@@ -8,7 +8,7 @@
<Tree
:data="searchList"
:style="{height:(treeHeight-95)+'px'}"
:style="{height:(treeHeight-115)+'px'}"
style="overflow:auto;width:215px;"
@on-select-change="selectTreeNode"
></Tree>
......@@ -30,7 +30,8 @@
<Input
search
enter-button
class="w240 mr10 fl"
class=" mr10 fl"
style="width:240px"
v-model="searchIterms"
placeholder="请输入订单编号"
@on-search="easySearch"
......@@ -692,9 +693,15 @@ export default {
}
},
created() {
<<<<<<< HEAD
this.treeHeight = window.innerHeight - 100
this.tableHeight = window.innerHeight - 240
this.newColumn = this.historycolumn;
=======
this.treeHeight = window.innerHeight - 140
this.tableHeight = window.innerHeight - 230
this.newColumn = this.historycolumn
>>>>>>> 031cff9011a771c8d2267c38bbf2503998d55b60
this.column = this.newColumn
this.loaddata('')
},
......@@ -707,8 +714,8 @@ export default {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.treeHeight = window.screenHeight - 100
this.tableHeight = window.screenHeight - 240
this.treeHeight = window.screenHeight - 140
this.tableHeight = window.screenHeight - 230
})()
}
},
......@@ -1796,7 +1803,7 @@ export default {
</script>
<style lang="less" scoped>
.order-quotation {
height: 100vh !important;
// height: 100vh !important;
}
.table {
margin-top: 15px;
......
pages/produce/ordermaterial.vue
View file @ d9e5fe4c
......@@ -259,7 +259,7 @@ export default {
},
created() {
this.laoedPage()
this.tbHeight = window.innerHeight - 210
this.tbHeight = window.innerHeight - 280
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
......@@ -365,12 +365,10 @@ export default {
params.SkipCount = params.SkipCount || 0
params.MaxResultCount = params.MaxResultCount || 10
let url =
`${designUrl}/orderrouting/getwaitmaterialorderlist?` +QS.stringify(params)
let url =`${designUrl}/orderrouting/getwaitmaterialorderlist?` + QS.stringify(params)
service.get(`${url}`).then((res) => {
this.mDatas = res.data.result.items
this.search.total = res.data.result.totalCount
this.mDatas = res.result.items
this.search.total = res.result.totalCount
})
},
columnChange(item, i) {
......@@ -396,6 +394,7 @@ export default {
let id = data.materialbillId
let url02 = `${designUrl}/ordermaterial/getbyid?id=` + id
service.get(`${url02}`).then((res) => {
console.log(res)
this.orderMaterial = res.data.result.orderMaterialList
this.rowData = res.data
})
......@@ -419,7 +418,7 @@ export default {
// 高级查询
complexSearch() {
this.orderSearchForm.SkipCount=0;
this.laoedPage()
this.laoedPage()
this.close()
}
},
......@@ -428,7 +427,7 @@ this.laoedPage()
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.tbHeight = window.innerHeight - 210
this.tbHeight = window.innerHeight - 280
})()
}
}
......
pages/produce/orderscheduling.vue
View file @ d9e5fe4c
......@@ -261,7 +261,7 @@ export default {
},
created() {
this.laoed()
this.tbHeight = window.innerHeight - 210
this.tbHeight = window.innerHeight - 280
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
......@@ -369,8 +369,12 @@ export default {
'&MaxResultCount=' +
pageData.MaxResultCount
service.get(`${url}`).then((res) => {
this.mDatas = res.data.result.items
this.search.total = res.data.result.totalCount
if(res.success){
this.mDatas = res.result.items
this.search.total = res.result.totalCount
}else{
this.$Message.error("查询失败")
}
})
},
columnChange(item, i) {
......@@ -438,7 +442,7 @@ export default {
///浏览器窗口大小变化
return (() => {
// window.screenHeight = window.innerHeight
this.tbHeight = window.innerHeight - 210
this.tbHeight = window.innerHeight - 280
})()
}
}
......
pages/produce/scheduling.vue
View file @ d9e5fe4c
......@@ -20,7 +20,7 @@ export default {
}
},
created() {
this.tabHeight = window.innerHeight - 150
this.tabHeight = window.innerHeight - 260
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
......@@ -30,7 +30,7 @@ export default {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.tabHeight = window.innerHeight - 150
this.tabHeight = window.innerHeight - 260
})()
}
},
......
pages/produce/taskList.vue
View file @ d9e5fe4c
......@@ -296,7 +296,7 @@ content="查看";
},
created(){
this.laode();
this.tbHeight = window.innerHeight - 160
this.tbHeight = window.innerHeight - 190
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
......@@ -406,7 +406,7 @@ content="查看";
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tbHeight = window.screenHeight - 160
this.tbHeight = window.screenHeight - 190
})()
}
},
......
pages/qc/certificate/endIssued/index.vue
View file @ d9e5fe4c
<template>
<div class="end-issued">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false"></DataGrid>
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false" :height="tdHeight"></DataGrid>
<Modal v-model="detailModal" title="查看合格证" footer-hide width="1000" :mask-closable="false">
<Detail @on-close="cancel" @on-ok="addOk" :eid="curId" />
</Modal>
......@@ -21,6 +21,7 @@ export default {
detailModal: false,
curId: 0,
modalInfo: false,
tdHeight:'',
rules: {
approveUser: [{ required: true, message: '必填', trigger: 'blur' }]
},
......@@ -130,8 +131,9 @@ export default {
}
}
},
mounted() {
console.log(this)
mounted() {},
created() {
this.tdHeight = window.innerHeight - 260
},
methods: {
addOk() {
......
pages/qc/certificate/waitOpened/index.vue
View file @ d9e5fe4c
<template>
<div class="wait-opened">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false"></DataGrid>
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false" :height="tdHeight" ></DataGrid>
<Modal v-model="addModal" title="开合格证" fullscreen footer-hide :mask-closable="false">
<Add @on-close="cancel" @on-ok="addOk" :eid="curId" ref="addFile" />
</Modal>
......@@ -21,6 +21,7 @@ export default {
checkLists: [],
addModal: false,
curId: null,
tdHeight:'',
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{
......@@ -127,8 +128,9 @@ export default {
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
console.log(this)
mounted() {},
created() {
this.tdHeight = window.innerHeight - 260
},
methods: {
addOk() {
......
pages/qc/dataTrace/components/reviewCount.vue
View file @ d9e5fe4c
......@@ -193,13 +193,13 @@ export default {
<style scoped>
.menuBg{
background: none;
height: 550px;
height: 630px;
}
.menuBg .ivu-menu-item{
color: #000;
}
.revieweBox{
padding: 0 0 0 60px;
height: 550px;
height: 630px;
}
</style>
\ No newline at end of file
pages/qc/dataTrace/index.vue
View file @ d9e5fe4c
......@@ -10,9 +10,9 @@
</div>
<Button type="primary" class="title_btn" @click='searchModel'>高级查询</Button>
</div>
<div class="tableBox mb10">
<!-- :height="tbHeight" -->
<div class="tableBox mb10" :style="{height:tbHeight}">
<div class="table">
<div v-if="listTask.length==0" class="wu_data">暂无数据</div>
<Card class="card" v-for="(item,index) in listTask"
:key="index">
<h3 slot="title">
......@@ -227,6 +227,7 @@ export default {
data1: [],
noData: false,
selectdata: [],
tbHeight:"550px",
itemData:{},//追溯传的数据
actValue:1,//追溯传的选中meniu
orderSearchForm: { //高级搜索字段内容
......@@ -264,7 +265,7 @@ export default {
},
created(){
this.laode();
// this.tbHeight = window.innerHeight - 500
this.tbHeight = window.innerHeight - 208 + 'px'
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
......@@ -277,8 +278,9 @@ export default {
"MaxResultCount": 20,
"SkipCount": 1,
}).then(res => {
this.listTask = res.data.result.items
this.search.total = res.data.result.totalCount
// console.log(res)
this.listTask = res.result.items
this.search.total = res.result.totalCount
});
},
reviewFn(item){ //追溯
......@@ -381,9 +383,9 @@ export default {
let url = `${PlanUrl}/orderexecute/pageddatamesorders`;
// console.log(parmes)
service.post(`${url}`,parmes).then(res => {
console.log(res)
this.listTask = res.data.result.items
this.search.total = res.data.result.totalCount
// console.log(res)
this.listTask = res.result.items
this.search.total = res.result.totalCount
if(this.search.total == 0){
this.noData = true
}else{
......@@ -405,16 +407,14 @@ export default {
return arry
},
},
// mounted() {
// window.onresize = () => {
// ///浏览器窗口大小变化
// return (() => {
// window.screenHeight = window.innerHeight
// this.tbHeight = window.screenHeight - 500
// console.log(this.tbHeight)
// })()
// }
// },
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.tbHeight = window.innerHeight - 208 + 'px'
})()
}
},
}
</script>
<style scoped>
......@@ -434,7 +434,7 @@ ul,li{
}
.tableBox{
/* height: 582px; 笔记本高度*/
height: 778px;
/* height: 778px; */
border: #ddd solid 1px;
overflow-y: scroll;
overflow-x: hidden;
......@@ -451,9 +451,13 @@ ul,li{
line-height: 800px;
}
.card{
width: 388px;
width: 375px;
margin: 10px 0 10px 20px;
}
.wu_data{
margin: 200px auto;
font-size: 18px;
}
/* .card_body01{
margin: 0 0 10px 0;
} */
......@@ -468,6 +472,6 @@ ul,li{
border-top: 1px solid #ccc;
display: block;
padding: 10px 0 0 0;
color: #249E91;
color: #0099FF;
}
</style>
\ No newline at end of file
pages/qc/taskList/index.vue
View file @ d9e5fe4c
......@@ -278,7 +278,7 @@ export default {
},
created(){
this.laode();
this.tbHeight = window.innerHeight - 160
this.tbHeight = window.innerHeight - 200
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
......@@ -292,8 +292,8 @@ export default {
"skipCount":0,
"maxResultCount": 10
}).then(res => {
this.mDatas = res.data.result.items
this.search.total = res.data.result.totalCount
this.mDatas = res.result.items
this.search.total = res.result.totalCount
});
},
// 分页
......@@ -389,7 +389,7 @@ export default {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight
this.tbHeight = window.screenHeight - 160
this.tbHeight = window.screenHeight - 200
})()
}
},
......
pages/resource/material/placode/add.vue
View file @ d9e5fe4c
......@@ -121,9 +121,7 @@ export default {
data() {
return {
entity: {
creator: parseInt(
JSON.parse(sessionStorage.getItem('userInfo')).userId
),
creator:this.$store.state.userInfo.userId,
thickness: null,
inventory: null
},
......
pages/resource/material/placode/index.vue
View file @ d9e5fe4c
......@@ -4,7 +4,7 @@
<StoreHouseLeft @storeIds="storeIds" :type='1'></StoreHouseLeft>
</Sider>
<Content class="content">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :height="tdHeight">
<template slot="searchForm">
<Search />
</template>
......@@ -82,6 +82,7 @@ export default {
deletelModal: false,
setNumModal: false,
inventoryModal: false,
tdHeight: "",
curId: 0,
easySearch: {
keys: { op: 'code,name', value: '', default: true },
......@@ -256,7 +257,7 @@ export default {
},
mounted() {},
created() {
this.tdHeight = window.innerHeight - 260
},
methods: {
addOk() {
......
pages/resource/material/placode/inventory.vue
View file @ d9e5fe4c
......@@ -66,10 +66,8 @@ export default {
data() {
return {
entity: {
creator: parseInt(
JSON.parse(sessionStorage.getItem('userInfo')).userId
),
creatorUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId
creator: '',
creatorUserId: 0
},
rules: {
storeTitle: [{ required: true, message: '请选择库位', trigger: 'blur' }]
......@@ -174,6 +172,10 @@ export default {
}
}
},
created() {
this.creator = this.$store.state.userInfo.name
this.creatorUserId = this.$store.state.userInfo.userId
},
methods: {
handleSubmit() {
let listTemp = []
......
pages/resource/material/powder/add.vue
View file @ d9e5fe4c
......@@ -131,7 +131,7 @@ export default {
entity: {
totalInventory: null,
unitPrice: null,
creator: parseInt(JSON.parse(sessionStorage.getItem('userInfo')).userId)
creator:this.$store.state.userInfo.userId,
},
rules: {
storeTitle: [
......
pages/resource/material/powder/index.vue
View file @ d9e5fe4c
This diff is collapsed.
pages/resource/material/powder/inventory.vue
View file @ d9e5fe4c
......@@ -66,10 +66,8 @@ export default {
data() {
return {
entity: {
creator: parseInt(
JSON.parse(sessionStorage.getItem('userInfo')).userId
),
creatorUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId
creator:'',
creatorUserId: 0
},
conditions: {
storeId: { op: 'Equal', value: null },
......@@ -166,6 +164,10 @@ export default {
}
}
},
created() {
this.creator = this.$store.state.userInfo.name
this.creatorUserId = this.$store.state.userInfo.userId
},
methods: {
handleSubmit() {
let listTemp = []
......
pages/resource/material/scraper/add.vue
View file @ d9e5fe4c
......@@ -105,9 +105,7 @@ export default {
data() {
return {
entity: {
creator: parseInt(
JSON.parse(sessionStorage.getItem('userInfo')).userId
),
creator:this.$store.state.userInfo.userId,
inCount: null,
quantityCount: null,
price: null
......
pages/resource/material/scraper/index.vue
View file @ d9e5fe4c
This diff is collapsed.
pages/resource/resource/index.vue
View file @ d9e5fe4c
This diff is collapsed.
pages/resourceManagement/EquipmentCalendar/index.vue 0 → 100644
View file @ d9e5fe4c
This diff is collapsed.
pages/resourceManagement/deviceManagementCP/index.vue 0 → 100644
View file @ d9e5fe4c
This diff is collapsed.
router/routes.js
View file @ d9e5fe4c
This diff is collapsed.
src/assets/css/base.css 0 → 100644
View file @ d9e5fe4c
This diff is collapsed.
static/config.js
View file @ d9e5fe4c
This diff is collapsed.
store/admin/user.js
View file @ d9e5fe4c
This diff is collapsed.
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