Skip to content

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

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

parents 15e31e54 2ff4ca74
Hide whitespace changes
Inline Side-by-side
Showing with 187 additions and 184 deletions
components/customTable/customTable.vue
View file @ a69e7fd5
......@@ -290,12 +290,6 @@ export default {
title: '紧急程度',
key: 'urgencyLevel',
width: 100,
filters: this.getArry(
this.$store.getters.dictionaryByKey('plan.order.urgencyLevel')
),
filterMethod(value, row) {
return row.urgencyLevel.indexOf(value) > -1
},
render: (h, params) => {
return h('state', {
props: {
......
pages/aps/plan/index.vue
View file @ a69e7fd5
......@@ -158,7 +158,8 @@ export default {
title: this.l("urgencyLevel"),
align: "left",
easy: true,
high: true
high: true,
code: "plan.order.urgencyLevel",
},
{
......
pages/basicData/code/index.vue
View file @ a69e7fd5
......@@ -17,7 +17,7 @@
<template slot="buttons">
<Button type="primary" @click="addModal=true">新增</Button>
</template>
</DataGrid>
</DataGrid>
<Modal v-model="addModal" title="新增" width="800" footer-hide>
<Add @on-close="cancel" @on-ok="addOk" />
</Modal>
......@@ -33,14 +33,14 @@
</div>
</template>
<script>
import Api from './api'
import Add from './add'
import Edit from './edit'
import Detail from './detail'
import Search from './search'
import Set from './set'
import Api from "./api";
import Add from "./add";
import Edit from "./edit";
import Detail from "./detail";
import Search from "./search";
import Set from "./set";
export default {
name: 'list',
name: "list",
components: {
Add,
Edit,
......@@ -52,7 +52,7 @@ export default {
return {
action: Api.index,
easySearch: {
keys: { op: 'businessName', value: null }
keys: { op: "businessName", value: null }
},
addModal: false,
editModal: false,
......@@ -61,200 +61,204 @@ export default {
deletelModal: false,
curId: 0,
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: 'businessName',
title: this.l('businessName'),
align: 'left',
title: "序号",
type: "index",
width: 60,
align: "center"
},
{
key: "businessName",
title: this.l("businessName"),
align: "left",
easy: true,
high: true
},
{
key: 'businessCode',
title: this.l('businessCode'),
align: 'left',
key: "businessCode",
title: this.l("businessCode"),
align: "left",
easy: true,
high: true
},
{
key: 'prefix',
title: this.l('prefix'),
align: 'left',
key: "prefix",
title: this.l("prefix"),
align: "left",
easy: true,
high: true
},
{
key: 'maxSerial',
title: this.l('maxSerial'),
align: 'left',
key: "maxSerial",
title: this.l("maxSerial"),
align: "left",
high: true
},
{
key: 'day',
title: this.l('day'),
align: 'left',
key: "day",
title: this.l("day"),
align: "left",
high: true,
code: 'mes_xingchi_system.business_code_config.day'
code: "mes_xingchi_system.business_code_config.day"
},
{
key: 'remark',
title: this.l('remark'),
align: 'left',
key: "remark",
title: this.l("remark"),
align: "left",
easy: true,
high: true
},
{
key: 'creationTime',
title: this.l('creationTime'),
key: "creationTime",
title: this.l("creationTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'creatorUserId',
title: this.l('creatorUserId'),
key: "creatorUserId",
title: this.l("creatorUserId"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
key: "lastModificationTime",
title: this.l("lastModificationTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'lastModifierUserId',
title: this.l('lastModifierUserId'),
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'isDeleted',
title: this.l('isDeleted'),
key: "isDeleted",
title: this.l("isDeleted"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'deletionTime',
title: this.l('deletionTime'),
key: "deletionTime",
title: this.l("deletionTime"),
hide: true,
align: 'left'
align: "left"
},
{
key: 'deleterUserId',
title: this.l('deleterUserId'),
key: "deleterUserId",
title: this.l("deleterUserId"),
hide: true,
align: 'left'
align: "left"
},
{
title: '操作',
key: 'id',
title: "操作",
key: "id",
width: 220,
align: 'center',
align: "center",
render: (h, params) => {
return h('div', { class: 'action' }, [
return h("div", { class: "action" }, [
h(
'op',
"op",
{
attrs: {
oprate: 'set'
oprate: "set"
},
on: { click: () => this.set(params.row.id) }
},
'设置'
"设置"
),
h(
'op',
"op",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: { click: () => this.detail(params.row.id) }
},
'查看'
"查看"
),
h(
'op',
"op",
{
attrs: {
oprate: 'detail',
class: 'edit'
oprate: "detail",
class: "edit"
},
on: { click: () => this.edit(params.row.id) }
},
'编辑'
"编辑"
),
h(
'op',
"op",
{
attrs: {
oprate: 'delete',
class: 'remove'
oprate: "delete",
class: "remove"
},
on: { click: () => this.remove(params.row.id) }
},
'删除'
"删除"
)
])
]);
}
}
]
}
},
mounted() {
};
},
mounted() {},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
addOk() {
this.$refs.grid.load()
this.addModal = false
this.detailModal = false
this.editModal = false
this.setModal = false
this.curId = 0
this.$refs.grid.load();
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.setModal = false;
this.curId = 0;
},
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;
},
set(id) {
this.setModal = true
this.curId = id
this.setModal = 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.setModal = false
this.curId = 0;
this.addModal = false;
this.detailModal = false;
this.editModal = false;
this.deletedlModal = false;
this.setModal = false;
},
l(key) {
/*
......@@ -278,11 +282,11 @@ export default {
deleterUserId:'',
}
*/
let vkey = 'business_code_config' + '.' + key
return this.$t(vkey) || key
let vkey = "business_code_config" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang="less">
</style>
\ No newline at end of file
pages/crm/contract/detail.vue
View file @ a69e7fd5
......@@ -5,7 +5,7 @@
<Filed :span="12" :name="l('name')">{{entity.name}} </Filed>
<Filed :span="12" :name="l('userId')"><User :value="entity.userId" /></Filed>
<Filed :span="12" :name="l('proceeds')">{{entity.proceeds}}</Filed>
<Filed :span="12" :name="l('status')"><state code="crm.contract.status" :value="entity.status" type="text"></state></Filed>
<Filed :span="24" :name="l('status')"><state code="crm.contract.status" :value="entity.status" type="text"></state></Filed>
<Filed :span="24" :name="l('accessory')"><files ref="refFile" :parms="parms" unClosable style="display:inline" /></Filed>
<Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed>
</Row>
......
pages/crm/project/detail.vue
View file @ a69e7fd5
......@@ -14,7 +14,7 @@
<Filed :span="12" :name="l('status')">
<state code="crm.project.status" :value="entity.status" />
</Filed>
<Filed :span="12" :name="l('budget')">{{entity.budget}}</Filed>
<Filed :span="24" :name="l('budget')">{{entity.budget}}</Filed>
<Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed>
</Row>
</div>
......
pages/crm/project/index.vue
View file @ a69e7fd5
......@@ -98,7 +98,7 @@
<Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="detailModal" title="详情">
<Modal v-model="detailModal" title="详情" footer-hide>
<Detail :eid="curId" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......
pages/crm/sales/projectList.vue
View file @ a69e7fd5
......@@ -108,7 +108,7 @@
<Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
<Modal v-model="detailModal" title="详情">
<Modal v-model="detailModal" title="详情" footer-hide>
<Detail :eid="curId" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......
pages/order/monitoring/index.vue
View file @ a69e7fd5
......@@ -65,6 +65,12 @@ export default {
curId: 0,
columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
title: "序号",
type: "index",
width: 40,
align: "center"
},
{
key: "status",
title: this.l("status"),
......@@ -329,14 +335,12 @@ export default {
{
key: "remark",
title: this.l("remark"),
align: "left",
easy: true,
high: true
align: "center"
},
{
title: "暂停记录",
key: "id",
width: 140,
key: "zanting",
width: 100,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
......@@ -353,7 +357,7 @@ export default {
},
{
title: "操作",
key: "id",
key: "caozuo",
width: 100,
align: "center",
render: (h, params) => {
......
pages/order/monitoring/record.vue
View file @ a69e7fd5
......@@ -7,10 +7,10 @@
</div>
</template>
<script>
import Api from './api'
import Detail from './detail'
import Api from "./api";
import Detail from "./detail";
export default {
name: 'record',
name: "record",
components: {
Detail
},
......@@ -19,24 +19,30 @@ export default {
detailModal: false,
action: Api.record,
condition: {
orderId: { op: 'Equal', value: this.eid },
keys: { op: 'pauseCause,', value: null }
orderId: { op: "Equal", value: this.eid },
keys: { op: "pauseCause,", value: null }
},
data: [],
curId: 0,
columns: [
{ key: 'id', title: this.l('id'), hide: true, align: 'left' },
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{
key: 'mesCode',
title: this.l('mesCode'),
align: 'left',
title: "序号",
type: "index",
width: 60,
align: "center"
},
{
key: "mesCode",
title: this.l("mesCode"),
align: "left",
render: (h, params) =>
h(
'a',
"a",
{
attrs: {
oprate: 'detail'
oprate: "detail"
},
on: { click: () => this.detail(params.row.id) }
},
......@@ -44,9 +50,9 @@ export default {
)
},
{
key: 'productName',
title: this.l('productName'),
align: 'left'
key: "productName",
title: this.l("productName"),
align: "left"
},
// {
// key: 'orderId',
......@@ -55,92 +61,86 @@ export default {
// hide: false
// },
{
key: 'pauseCause',
title: this.l('pauseCause'),
align: 'left',
code: 'mes_xingchi_plan.order_material.pauseCause'
key: "pauseCause",
title: this.l("pauseCause"),
align: "left",
code: "mes_xingchi_plan.order_material.pauseCause"
},
{
key: 'creationTime',
title: this.l('creationTime'),
key: "creationTime",
title: this.l("creationTime"),
easy: true,
high: true,
align: 'left'
align: "left"
},
{
key: 'creator',
title: this.l('creator'),
key: "creator",
title: this.l("creator"),
easy: true,
high: true,
align: 'left'
align: "left"
},
{
key: 'laster',
title: this.l('laster'),
key: "laster",
title: this.l("laster"),
easy: true,
high: true,
align: 'left'
align: "left"
},
{
key: 'lastModificationTime',
title: this.l('lastModificationTime'),
key: "lastModificationTime",
title: this.l("lastModificationTime"),
easy: true,
high: true,
align: 'left',
align: "left",
render: (h, params) => {
return h(
'span',
params.row.lastModificationTime == '0001-01-01 00:00:00'
? ''
"span",
params.row.lastModificationTime == "0001-01-01 00:00:00"
? ""
: params.row.lastModificationTime
)
);
}
},
// {
// key: 'path',
// title: this.l('path'),
// easy: true,
// high: true,
// align: 'left'
// },
{
key: 'relatedPerson',
type: 'user',
title: this.l('relatedPerson'),
align: 'left',
key: "relatedPerson",
type: "user",
title: this.l("relatedPerson"),
align: "left",
high: true
}
]
}
};
},
props: {
eid: Number
},
created() {},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
search() {
this.$refs.grid.reload(this.easySearch)
this.$refs.grid.reload(this.easySearch);
},
l(key) {
let vkey = 'order_pause' + '.' + key
return this.$t(vkey) || key
let vkey = "order_pause" + "." + key;
return this.$t(vkey) || key;
},
detail(id) {
this.detailModal = true
this.curId = id
this.detailModal = true;
this.curId = id;
}
},
watch: {
eid(v) {
this.condition.orderId.value = v
this.$refs.grid.reload(this.condition)
this.condition.orderId.value = v;
this.$refs.grid.reload(this.condition);
}
}
}
};
</script>
<style lang='less'>
</style>
\ No newline at end of file
pages/produce/components/expend.vue
View file @ a69e7fd5
......@@ -145,7 +145,7 @@ export default {
<style lang='less' scoped>
.material_row{
.material_label{
color: #249E91
color: #2d8cf0
}
.material_line {
display: inline-block;
......
pages/produce/ordermaterial.vue
View file @ a69e7fd5
......@@ -360,8 +360,7 @@ export default {
},
// 分页查询数据列表
laoedPage() {
let params = this.orderSearchForm
let params = this.orderSearchForm
params.SkipCount = params.SkipCount || 0
params.MaxResultCount = params.MaxResultCount || 10
......
pages/qc/taskList/index.vue
View file @ a69e7fd5
......@@ -8,7 +8,7 @@
v-model="searchIterms" placeholder="请输入查询条件"
@on-search="tableSearch" ></Input>
</div>
<Button type="primary" class="title_btn" @click='searchModel'>高级查询</Button>
<Button type="primary" class="title_btn" v-show="false" @click='searchModel'>高级查询</Button>
</div>
<div class="table">
<Table
......@@ -333,6 +333,7 @@ export default {
searchlaode(parmes){
let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`;
service.post(`${url}`,parmes).then(res => {
console.warn(res)
this.mDatas = res.result.items
this.search.total = res.result.totalCount
});
......@@ -415,7 +416,7 @@ export default {
<style scoped>
.table_title{
width: 320px;
float: left;
/* float: left; */
}
.table{
margin: 10px 0 0 0;
......
pages/qcimplement/index.vue
View file @ a69e7fd5
......@@ -30,7 +30,7 @@
</div>
<div class="transmit_content">
<div class="wuliao_left">
<div class="card_title" style="height:32px">
<div class="card_title" style="height:46px">
<a href="#" class="state" @click="showList">
状态：
<Icon type="ios-arrow-down" v-if="iconModel" />
......
static/config.js
View file @ a69e7fd5
......@@ -47,14 +47,14 @@ const systemApi = {
window.certificateUrl = `http://${address}:10090/api/services/app`; //Process-api
window.crmUrl = `http://${address}:10100/api/services/app`; //crm客户、合同、项目管理
window.iconImg = `http://${hostAddress}:3000/imgicon/`; //待办任务图标路径
window.apsUrl = `http://${apsAdress}:10110/api/services/app`;//aps排产
window.apsManualUrl = `http://${apsAdress}:10091/api/services/app`;//aps手工排产
window.apsUrl = `http://${apsAdress}:10110/api/services/app`;//aps排产
//oidc配置：
window.authConfig = {
authority: `http://${address}:10010`,
client_id: 'js',
redirect_uri: `http://${hostAddress}:3006/callback`,
response_type: 'code',
scope: 'openid profile system process plan resource qms bug workflow crm',
scope: 'openid profile system process plan resource qms bug workflow crm aps',
post_logout_redirect_uri: `http://${hostAddress}:3006/`
};
\ No newline at end of file
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