Skip to content

M
mes-ui
Commit 8930155a authored by renjintao's avatar renjintao
Browse files
Options

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

parents 198fcd9e a69e7fd5
Show whitespace changes
Inline Side-by-side
Showing with 227 additions and 299 deletions
pages/basicData/code/index.vue
View file @ 8930155a
......@@ -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/project/detail.vue
View file @ 8930155a
......@@ -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 @ 8930155a
......@@ -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 @ 8930155a
......@@ -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 @ 8930155a
......@@ -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 @ 8930155a
......@@ -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/processManage/Process/detailfiles.vue
View file @ 8930155a
......@@ -103,9 +103,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingFile: dataValidate
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/index.vue
View file @ 8930155a
......@@ -226,7 +226,7 @@ export default {
doUpload: '/api/up/file',
tableHeight: '',
myloading: true,
gymodaltitle: '创建主工艺',
gymodaltitle: '创建工艺',
processviewModal: false,
isview: false,
issendAudit: false,
......@@ -672,10 +672,10 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingHeaderEntity: a.formValidate,
FileList: filelist
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/processNew.vue
View file @ 8930155a
......@@ -544,9 +544,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingDetail: this.formprocessValidate
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/stepModel.vue
View file @ 8930155a
......@@ -171,9 +171,9 @@ let isvalidate = false;
service
.post(
`${url}`,
JSON.stringify({
{
routingStep: this.newModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/Process/supporting.vue
View file @ 8930155a
......@@ -304,7 +304,7 @@ export default {
var url = `${designUrl}/routingsupporting/createorupdate`
service
.post(`${url}`, JSON.stringify(this.formprocessValidate))
.post(`${url}`, this.formprocessValidate)
.then((response) => {
if (response.success) {
this.$Message.success('保存成功')
......
pages/processManage/Process/testingModel.vue
View file @ 8930155a
......@@ -353,9 +353,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingQcCard: this.cardModeldata
})
}
)
.then((response) => {
if (response.success) {
......
pages/processManage/setProcess/index.vue
View file @ 8930155a
......@@ -389,7 +389,7 @@ export default {
list: [],
data2: [],
tabstatus: '1', //暂存tab状态（）主工艺||专业工艺
gymodaltitle: '创建主工艺',
gymodaltitle: '创建工艺',
selectdata: [],
value1: false,
drawerShow: false,
......@@ -1076,9 +1076,7 @@ export default {
saveHeader(next) {
var a = this.$refs.processMain
if (a.formValidate.routingType == 1) {
this.savebill()
}
var filelist = a.getfile()
let isvalidate = false
......@@ -1107,10 +1105,10 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
routingHeaderEntity: a.formValidate,
FileList: filelist
})
}
)
.then((response) => {
if (response.success) {
......@@ -1209,9 +1207,7 @@ export default {
this.$refs.processNew.formprocessValidate.routing_header_id = this.headerid
this.$refs.processNew.loaddata()
} else {
if (this.addpdefm.formValidate.routingType == 1) {
this.savebill()
}
var a = this.addpdefm
this.headerid = this.addpdefm.formValidate.id
......@@ -1231,9 +1227,9 @@ export default {
service
.post(
`${url}`,
JSON.stringify({
{
orderRouting: orderRoutingobj
})
}
)
.then((response) => {
if (response.success) {
......@@ -1296,15 +1292,12 @@ export default {
modalShowCancel() {
this.modalShow = false
},
savebill() {
this.$refs.modelTable.$refs.quotationBox2.saveData()
this.$refs.modelTable.$refs.quotationBox3.saveData()
},
saveOK() {
var url = `${PlanUrl}/OrderMaterial/createorupdate`
// JSON.stringify({Process:this.formValidate})
service
.post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate }))
.post(`${url}`, { orderMaterial: this.formValidate })
.then((response) => {
if (response.success) {
this.$Message.success('保存成功')
......@@ -1334,7 +1327,7 @@ export default {
let ordercombid = 0
this.createtype = 1
if (routingType == 1) {
this.gymodaltitle = '设置主工艺规程'
this.gymodaltitle = '设置工艺规程'
for (let i = 0; i < this.data1.length; i++) {
let obj1 = this.data1[i]
......@@ -1346,24 +1339,14 @@ export default {
}
}
this.$refs.modelTable.issetProcess1 = true
this.$refs.modelTable.selectFault = 'greateArt'
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
} else {
this.$refs.modelTable.issetProcess1 = false
this.gymodaltitle = '设置专业工艺规程'
ordercombid = params.row.specialtyOrderCombID
if (ordercombid != 0) {
this.$refs.modelTable.issetProcess1 = false
this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i]
......@@ -1450,16 +1433,9 @@ export default {
let orderids = new Array()
let orderlist = new Array()
if (routingType == 1) {
// ordercombid = params.row.orderCombID
this.$refs.modelTable.issetProcess1 = true
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
} else {
// ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
ordercombid = params.row.orderCombID
this.addpdefm.formValidate.ordercombid = ordercombid
if (orders == null) {
for (let i = 0; i < this.data1.length; i++) {
......@@ -1493,13 +1469,8 @@ export default {
this.addpdefm.dataTop = orderlist
if (routingType == 1) {
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.selectFault = 'greateArt'
}
if (routingType == 1) {
this.gymodaltitle = '设置工艺规程'
......@@ -1539,13 +1510,9 @@ export default {
let orderids = new Array()
let orderlist = new Array()
let ordercombid = 0
if (routingType == 1) {
ordercombid = params.row.orderCombID
this.$refs.modelTable.issetProcess1 = true
} else {
ordercombid = params.row.specialtyOrderCombID
this.$refs.modelTable.issetProcess1 = false
}
this.addpdefm.formValidate.ordercombid = ordercombid
for (let i = 0; i < this.data1.length; i++) {
let obj = this.data1[i]
......@@ -1568,22 +1535,10 @@ export default {
}
this.addpdefm.dataTop = orderlist
if (routingType == 1) {
this.$refs.modelTable.$refs.quotationBox2.loadData(
orderids.toString(',')
)
this.$refs.modelTable.$refs.quotationBox3.loadData(
orderids.toString(',')
)
this.$refs.modelTable.selectFault = 'greateArt'
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
}
if (routingType == 1) {
this.gymodaltitle = '查看工艺规程'
} else {
this.gymodaltitle = '查看工艺规程'
}
var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
service.get(`${url}`).then((response) => {
this.addpdefm.formValidate = response.result
......@@ -1613,8 +1568,6 @@ export default {
this.addpdefm.formValidate = this.headerInfo
this.addpdefm.isview = this.isview
this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
this.addpdefm.ProductName = this.headerInfo.productName
this.addpdefm.ProductCode = this.headerInfo.productCode
......
pages/processManage/setProcess/processMain.vue
View file @ 8930155a
......@@ -445,36 +445,7 @@ export default {
this.$refs.refFile.routing_header_id = 0;
this.$refs.refFile.intFiles();
},
LoadprocessList() {
this.processList = [];
let url = `${designUrl}/routingheader/getlistbyids?` + this.Mianids,
that = this;
service.get(`${url}`).then(res => {
let selectdata = res.result;
selectdata.forEach(item => {
this.processList.push({
value: item.id,
name: item.code,
ver: item.version
});
});
this.formValidate.up_id = this.processList[0].value;
this.MianVer = this.processList[0].ver;
this.MianCode = this.processList[0].name;
});
},
MainProcess_selected(val) {
//这里的val默认拿到的是：value绑定的那个
this.formValidate.up_id = val;
this.processList.forEach(item => {
if (val == item.value) {
this.MianVer = item.ver;
}
});
},
quotationBox() {
this.$refs.generateQuotation.modalShow = true;
},
......@@ -559,8 +530,9 @@ export default {
},
setparentcreatetype(type, headerid) {
this.$parent.$parent.$parent.createtype = type;
this.$parent.$parent.$parent.headerid = headerid;
this.$parent.$parent.createtype = type
this.$parent.$parent.headerid = headerid
},
......@@ -575,11 +547,9 @@ export default {
});
},
setshow() {
if (this.formValidate.routingType == 2) {
this.isshow = true;
} else {
this.isshow = false;
}
if (this.formValidate.id != 0) {
this.isedit = true;
......@@ -590,14 +560,11 @@ export default {
this.Loadfile(0);
}
if (this.Mianids != "") {
this.LoadprocessList();
}
this.createtype = "1";
this.selectpdefmid = 0;
this.RoutingList = [];
this.calcplatesnum();
// this.calcplatesnum();
}
}
};
......
pages/produce/components/expend.vue
View file @ 8930155a
......@@ -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 @ 8930155a
......@@ -360,7 +360,6 @@ export default {
},
// 分页查询数据列表
laoedPage() {
let params = this.orderSearchForm
params.SkipCount = params.SkipCount || 0
params.MaxResultCount = params.MaxResultCount || 10
......
pages/qc/taskList/index.vue
View file @ 8930155a
......@@ -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 @ 8930155a
......@@ -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" />
......
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