Skip to content

M
mes-ui
Commit 295002b2 authored by 周远喜's avatar 周远喜
Browse files
Options

Merge branch 'product'

parent e39c6288
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 1635 deletions
i18n/locale/zh-CN.js
View file @ 295002b2
...@@ -1211,44 +1211,6 @@ export default { ...@@ -1211,44 +1211,6 @@ export default {
lastModificationTime: '最近修改时间', lastModificationTime: '最近修改时间',
lastModifierUserId: '最近修改人', lastModifierUserId: '最近修改人',
}, },
routing_header:{
id:'',
creationTime:'',
creatorUserId:'',
lastModificationTime:'',
lastModifierUserId:'',
deleterUserId:'',
deletionTime:'',
classId:'类id',
unicode:'unicode',
name:'工艺名称',
code:'工艺编号',
productId:'产品id',
productName:'产品名称',
productCode:'产品图号',
version:'工艺文件版本',
author:'编制人',
departmentId:'',
isMain:'',
upId:'',
upDetailId:'',
routingType:'工艺类型',
status:'',
approvalStatus:'状态',
remark:'工艺说明',
roufile:'多媒体附件',
approvalStatusRemark:'',
auditUserId1:'审核人',
auditUserId2:'审批人',
isDeleted:'',
platesnum:'',
isEffect:'',
developmentMode:'研制方式',
changeOrderCode:'更改单编号',
changeOrderDate:'更改单日期',
changeMethod:'更改办法',
taskType:'任务类型',
},
routing_detail: { routing_detail: {
id: '', id: '',
creationTime: '创建时间', creationTime: '创建时间',
......
pages/aps/aps/index.vue
View file @ 295002b2
<template> <template>
<div class="aps-activ"> <div>
<DataGrid <DataGrid
:columns="columns" :columns="columns"
ref="grid" ref="grid"
......
pages/aps/dispatch/index.vue
View file @ 295002b2
...@@ -229,10 +229,6 @@ ...@@ -229,10 +229,6 @@
<UserSelect <UserSelect
ref="userSelected" ref="userSelected"
v-model="entity.userIds" v-model="entity.userIds"
<<<<<<< HEAD
:type="3"
=======
>>>>>>> product
:multiple="true" :multiple="true"
style="width: 500px" style="width: 500px"
/><!-- :type="3" --> /><!-- :type="3" -->
......
pages/aps/results/index.vue
View file @ 295002b2
...@@ -68,84 +68,6 @@ export default { ...@@ -68,84 +68,6 @@ export default {
detail: null, detail: null,
isactive: null, isactive: null,
list: [], list: [],
<<<<<<< HEAD
id: "",
columns: [
{
type: "expand",
width: 50,
render: (h, params) => {
return h(expandRow, {
props: {
row: params.row
}
});
}
},
{
title: "超期预警",
key: "id",
align: "center",
render: (h, params) => {
return h("div", [
h("Icon", {
props: {
type:
params.row.id == 1
? "ios-information-circle-outline"
: "ios-remove-circle-outline"
},
style: {
marginRight: "5px",
fontSize: "18px",
fontWeight: "bold",
color: params.row.id == 1 ? "#FE7777" : "#0DD78D"
}
})
]);
}
},
{
title: "零件图号",
key: "part_id",
align: "center"
},
{
title: "零件名称",
key: "part_name",
align: "center"
},
{
title: "计划开始时间",
key: "plan_start",
width: 200,
align: "center"
},
{
title: "计划结束时间",
key: "plan_start",
width: 200,
align: "center"
},
{
title: "投料时间",
key: "demand_start",
width: 200,
align: "center"
},
{
title: "节点时间",
key: "demand_finish",
width: 200,
align: "center"
},
{
title: "计划数量",
key: "plan_qty",
align: "center"
}
]
=======
name: "name1", name: "name1",
id: null, id: null,
contrastList: [], contrastList: [],
...@@ -157,7 +79,6 @@ export default { ...@@ -157,7 +79,6 @@ export default {
gant: false, gant: false,
gantt: null, gantt: null,
curPage: null curPage: null
>>>>>>> product
}; };
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
...@@ -188,19 +109,7 @@ export default { ...@@ -188,19 +109,7 @@ export default {
this.detail = () => import("./result"); this.detail = () => import("./result");
this.isactive = index; this.isactive = index;
this.id = id; this.id = id;
<<<<<<< HEAD
Api.paged({ scheduleId: id })
.then(r => {
if (r.success) {
this.data = r.result;
}
})
.catch(error => {
this.$$Message.error("请求失败");
});
=======
this.title = "排产方案结果"; this.title = "排产方案结果";
>>>>>>> product
}, },
clear() { clear() {
if (this.list.length > 0) { if (this.list.length > 0) {
...@@ -223,36 +132,6 @@ export default { ...@@ -223,36 +132,6 @@ export default {
}); });
} }
}, },
<<<<<<< HEAD
parameter() {
Api.processschemedispatch({
id: this.id
}).then(r => {
if (r.result) {
this.$Message.success(r.result.retmsg);
this.orderlist();
} else {
this.$Message.success("下发失败");
}
});
},
comeBlck() {
this.$router.push({ path: "/aps/aps" });
Api.moveintoaps().then(res => {
if (res.success) {
if (res.result.res) {
this.$router.push({
name: "aps-aps"
});
} else {
this.$router.push({
name: "aps-plan"
});
}
}
});
=======
clearS() { clearS() {
this.id = 0; this.id = 0;
Api.clearall().then(r => { Api.clearall().then(r => {
...@@ -297,7 +176,6 @@ export default { ...@@ -297,7 +176,6 @@ export default {
}, },
cancel() { cancel() {
this.showFooter = false; this.showFooter = false;
>>>>>>> product
} }
}, },
computed: { computed: {
......
pages/basicData/userManagent/index.vue
View file @ 295002b2
...@@ -781,11 +781,7 @@ export default { ...@@ -781,11 +781,7 @@ export default {
var url = `${systemUrl}/MyUserRole/CreateOrUpdate` var url = `${systemUrl}/MyUserRole/CreateOrUpdate`
service service
.post( .post(
<<<<<<< HEAD
`${url}`,{
=======
`${url}`, { `${url}`, {
>>>>>>> product
myUserRole: { myUserRole: {
userId: this.selectedRow.id, userId: this.selectedRow.id,
RoleIds: this.allChecked.join(',') RoleIds: this.allChecked.join(',')
......
pages/basicData/userManagent/userInfo.vue
View file @ 295002b2
...@@ -278,20 +278,9 @@ export default { ...@@ -278,20 +278,9 @@ export default {
}; };
</script> </script>
<style lang="less" > <style lang="less" >
<<<<<<< HEAD
.img_top01{
width:350px;
float:left;
.ivu-card-body {
padding: 0px;
}
}
.user_info_right{
=======
.img_top01 { .img_top01 {
width: 350px; width: 350px;
float: left; float: left;
>>>>>>> product
.ivu-card-body { .ivu-card-body {
padding: 0px; padding: 0px;
} }
......
pages/bug/index.vue
View file @ 295002b2
...@@ -414,232 +414,6 @@ export default { ...@@ -414,232 +414,6 @@ export default {
} else { } else {
this.modalInfo = true; this.modalInfo = true;
} }
<<<<<<< HEAD
}
},
'编辑'
)
])
}
],
statusList: [
{ name: '确认', value: '1' },
{ name: '解决', value: '2' },
{ name: '冻结', value: '4' },
{ name: '关闭', value: '3' }
],
modalEdit: false,
modalDetail: false,
searchForm: {
Status: 0,
PageSize: 20,
Current: 1
},
listBatch: {
ids: [],
statusNew: 0,
auditUser: '',
workHours: 0,
remark: '',
alloter: '',
alloterId:null
},
selectBatch: 100,
auditUser: null,
alloter: {},
formMyCheck: {
selectAlloter: null
},
ruleValidate: {
selectAlloter: [
{
required: true,
message: '请选择驳指派人',
type: 'number',
trigger: 'change'
}
]
}
}
},
computed: {},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
methods: {
//选项卡切换
tab(data) {
if (data == '0') {
this.easySearch.creatorUserId.value = this.$store.state.userInfo.userId
} else {
this.easySearch.creatorUserId.value = null
}
this.search()
},
search() {
this.$refs.grid.easySearch(this.easySearch)
},
//打开修改窗口
editInfo(value) {
this.modalEdit = true
this.$refs.edit.editeInfo(value)
},
//修改事件
addSave() {
let param = this.$refs.edit.addBugInfo()
param.auditUser = this.$store.state.userInfo.userName
if (param.id != null) {
//增加确定
this.$http.bug.createorupdate(param).then((res) => {
if (res.result.status) {
this.$Message.success('修改成功!')
this.search()
} else {
this.$Message.error('修改失败!')
}
this.modalEdit = false
})
} else {
this.$Message.error('修改失败!')
}
},
//打开确定/操作窗口
detailInfo(value) {
this.modalDetail = true
this.$refs.detail.detailInfo(value)
},
//确定/关闭操作
detailSave() {
let param = this.$refs.detail.addBugInfo()
param.auditUser = this.$store.state.userInfo.userName
param.ids = [param.id]
if (param.id != null) {
//增加确定
this.$http.bug.doaction(param).then((res) => {
if (res.result) {
this.$Message.success('操作成功!')
this.search()
} else {
this.$Message.error('操作失败!')
}
this.modalDetail = false
})
} else {
this.$Message.error('操作失败!')
}
},
//取消窗口，查看状态
canselModal(type) {
let param
if (type == 1) {
param = this.$refs.edit.addBugInfo()
} else {
param = this.$refs.detail.addBugInfo()
}
param.auditUser = this.$store.state.userInfo.userName
param.ids = [param.id]
param.statusNew = 5
if (param.id != null) {
//增加改变状态为5/查看
this.$http.bug.doaction(param).then((res) => {
if (res.result) {
//this.search(this.searchForm)
} else {
this.$Message.error('操作失败!')
}
})
} else {
this.$Message.error('操作失败!')
}
this.modalDetail = false
this.modalEdit = false
},
selectInfo(value) {
this.selectList = []
this.selectList = value
let statueArry = []
value.forEach((data) => {
var that = this
statueArry.push(data.id)
})
this.results = []
this.results = statueArry
this.getListId(statueArry)
},
//得到需要批量操作的ids
getListId(value) {
this.listBatch.ids = value
if (this.listBatch.ids.length > 0) {
this.footerBar = true
//this.showBt = false
this.selectBatch = 100
} else {
this.footerBar = false
//this.showBt = false
this.selectBatch = 100
}
this.listBatch.auditUser = this.$store.state.userInfo.userName
},
//批量操作
statuChange(value) {
this.listBatch.statusNew = value
},
upChange() {
if (this.selectBatch != 100) {
if (this.listBatch.ids.length != 0) {
if (this.selectBatch == 5) {
this.$refs['formValidate'].validate((valid) => {
if (valid) {
let alloterInfo = this.$refs['userSelected'].getSelectItems()
this.listBatch.alloter = alloterInfo[0].userName
this.listBatch.alloterId=alloterInfo[0].id
this.modalInfo = true
}
})
} else {
this.modalInfo = true
}
} else {
this.$Message.error('请选择操作列表!')
this.selectBatch = 100
}
} else {
this.$Message.error('请选择操作!')
}
},
changeUserSelect(val) {
if (val != undefined&&val.length !=''&&val.length != 0) {
this.formMyCheck.selectAlloter = 1
} else {
this.formMyCheck.selectAlloter = null
this.listBatch.alloter = ''
this.listBatch.alloterId=null
}
},
upSave() {
//增加确定
this.$http.bug.doaction(this.listBatch).then((res) => {
if (res.result) {
this.$Message.success('操作成功!')
this.search()
this.footerBar = false
this.showBt = false
this.modalInfo = false
this.selectBatch = 100
} else {
this.$Message.error('操作失败!')
}
})
},
arry2Name(arryList, values) {
//预警类别转换
var codes = arryList
var name = ''
for (let i in codes) {
if (values == codes[i].value) {
name = codes[i].name
=======
} else { } else {
this.$Message.error("请选择操作列表!"); this.$Message.error("请选择操作列表!");
this.selectBatch = 100; this.selectBatch = 100;
...@@ -690,7 +464,6 @@ export default { ...@@ -690,7 +464,6 @@ export default {
l(key) { l(key) {
let vkey = "bug" + "." + key; let vkey = "bug" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
>>>>>>> product
} }
}, },
created() { created() {
......
pages/crm/contract/add.vue
View file @ 295002b2
...@@ -49,14 +49,8 @@ export default { ...@@ -49,14 +49,8 @@ export default {
name: "Add", name: "Add",
data() { data() {
return { return {
<<<<<<< HEAD
disabled: false,
entity: {
projectId:1
=======
entity: { entity: {
projectId: 1, projectId: 1,
>>>>>>> product
}, },
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{ required: true, message: "必填", trigger: "blur" }],
......
pages/crm/sales/detail.vue
View file @ 295002b2
...@@ -19,42 +19,42 @@ ...@@ -19,42 +19,42 @@
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from './api'
export default { export default {
name: "Add", name: 'Add',
data() { data() {
return { return {
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{ required: true, message: '必填', trigger: 'blur' }],
code: [{ required: true, message: "必填", trigger: "blur" }] code: [{ required: true, message: '必填', trigger: 'blur' }]
} }
}; }
}, },
props: { props: {
eid: Number eid: Number
}, },
methods: { methods: {
load(v) { load(v) {
Api.get({ id: v }).then(r => { Api.get({ id: v }).then((r) => {
this.entity = r.result; this.entity = r.result
this.$emit("on-load"); this.$emit('on-load')
}); })
}, },
handleClose() { handleClose() {
this.$emit("on-close"); this.$emit('on-close')
}, },
l(key) { l(key) {
key = "Follow" + "." + key; key = 'Follow' + '.' + key
return this.$t(key); return this.$t(key)
} }
}, },
watch: { watch: {
eid(v) { eid(v) {
if (v != 0) { if (v != 0) {
this.load(v); this.load(v)
} }
} }
} }
}; }
</script> </script>
\ No newline at end of file
pages/crm/sales/projectList.vue
View file @ 295002b2
...@@ -108,11 +108,7 @@ ...@@ -108,11 +108,7 @@
<Modal v-model="editModal" title="编辑" footer-hide> <Modal v-model="editModal" title="编辑" footer-hide>
<Edit :eid="curId" @on-close="cancel" @on-ok="addOk" /> <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<<<<<<< HEAD
<Modal v-model="detailModal" title="详情" footer-hide width="1100">
=======
<Modal v-model="detailModal" title="详情" footer-hide width="1000"> <Modal v-model="detailModal" title="详情" footer-hide width="1000">
>>>>>>> product
<Detail :eid="curId" /> <Detail :eid="curId" />
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
......
pages/home/api.js
View file @ 295002b2
import Api from '@/plugins/request' import Api from '@/plugins/request'
export default { export default {
<<<<<<< HEAD
getUserInfo(params) {
return Api.get(`${systemUrl}/user/getuserinfo`, params);
=======
index: `${systemUrl}/usermessage/paged`, index: `${systemUrl}/usermessage/paged`,
paged(params) { paged(params) {
return Api.get(`${systemUrl}/usermessage/paged`, params); //消息历史记录列表 return Api.get(`${systemUrl}/usermessage/paged`, params); //消息历史记录列表
...@@ -16,14 +12,11 @@ export default { ...@@ -16,14 +12,11 @@ export default {
}, },
sendmessagetousers(params) { //给指定用户发送消息 sendmessagetousers(params) { //给指定用户发送消息
return Api.post(`${systemUrl}/usermessage/sendmessagetousers`, params); return Api.post(`${systemUrl}/usermessage/sendmessagetousers`, params);
>>>>>>> product
}, },
// 获取打你审批数据 // 获取打你审批数据
getpaged(params) { getpaged(params) {
return Api.post(`${workflowUrl}/instance/getpaged`, params); return Api.post(`${workflowUrl}/instance/getpaged`, params);
}, },
<<<<<<< HEAD
=======
planorderstatuscount(params) { planorderstatuscount(params) {
return Api.post(`${PlanUrl}/mesplan/planorderstatuscount`, params);//年度计划各产品类型总数量和各状态数量 return Api.post(`${PlanUrl}/mesplan/planorderstatuscount`, params);//年度计划各产品类型总数量和各状态数量
}, },
...@@ -39,5 +32,4 @@ export default { ...@@ -39,5 +32,4 @@ export default {
list(params) { list(params) {
return Api.post(`${systemUrl}/newmessage/list`, params); //获取列表信息 return Api.post(`${systemUrl}/newmessage/list`, params); //获取列表信息
}, },
>>>>>>> product
} }
\ No newline at end of file
pages/home/component/approval.vue
View file @ 295002b2
<template> <template>
<<<<<<< HEAD
<div>
<Card class="todolist">
=======
<div class="approval"> <div class="approval">
<div class="todolist"> <div class="todolist">
>>>>>>> product
<p class="row_head"> <p class="row_head">
<Icon type="md-contact" class="f20" /> <Icon type="md-contact" class="f20" />
<span class="ml10">待审批</span> <span class="ml10">待审批</span>
<a class="row_more fr" @click="toivew">更多</a> <a class="row_more fr" @click="toivew">更多</a>
</p> </p>
<<<<<<< HEAD
<div class="row_card_body">
<Table border :columns="columns1" :data="data1" height="230"></Table>
</div>
</Card>
<Modal v-model="viewModal" width="800" title="详情">
<Row class="mo_cont">
<Col span="12" class="label">
<span class="title">编号：</span>
{{viewData.code}}
</Col>
<Col span="12" class="label">
<span class="title">审批类型：</span>
{{viewData.schemaName}}
</Col>
<Col span="12" class="label">
<span class="title">当前环节：</span>
{{viewData.currentNodeName}}
</Col>
<Col span="12" class="label">
<span class="title">下一环节：</span>
{{viewData.nextNodeName}}
</Col>
<Col span="12" class="label">
<span class="title">创建人：</span>
{{viewData.creator}}
</Col>
<Col span="12" class="label">
<span class="title">创建时间：</span>
{{viewData.creationTime}}
</Col>
</Row>
=======
<!-- <div class="row_card_body"> --> <!-- <div class="row_card_body"> -->
<!-- <Table :row-class-name="rowClassName" :columns="columns1" :data="data1" height="250" :disabled-hover='true'></Table> --> <!-- <Table :row-class-name="rowClassName" :columns="columns1" :data="data1" height="250" :disabled-hover='true'></Table> -->
<div class="msg"> <div class="msg">
...@@ -105,7 +67,6 @@ ...@@ -105,7 +67,6 @@
<Filed :span="12" name="创建时间：">{{viewData.creationTime}}</Filed> <Filed :span="12" name="创建时间：">{{viewData.creationTime}}</Filed>
</Row> </Row>
</div> </div>
>>>>>>> product
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -118,40 +79,6 @@ export default { ...@@ -118,40 +79,6 @@ export default {
imgUrl: iconImg, imgUrl: iconImg,
viewModal: false, //详情弹框 viewModal: false, //详情弹框
viewData: {}, //详情数据 viewData: {}, //详情数据
<<<<<<< HEAD
columns1: [
{ type: "index", title: "序号", width: 70, align: "center" },
{ key: "schemaName", title: "类别", align: "center", width: 150 },
{ key: "currentNodeName", title: "环节", align: "center" },
{ key: "nextNodeName", title: "下一环节", align: "center" },
{ key: "creationTime", title: "创建时间", align: "center", width: 170 },
{
key: "id",
title: "操作",
align: "center",
width: 90,
render: (h, parmse) => {
return h("div", { class: "action" }, [
h(
"op",
{
attrs: {
oprate: "add"
},
on: {
click: () => {
this.viewRow(parmse.row);
}
}
},
"查看"
)
]);
}
}
],
data1: []
=======
// columns1: [ // columns1: [
// { type: "index", title: "序号", width: 70, align: "center" }, // { type: "index", title: "序号", width: 70, align: "center" },
// { key: "schemaName", title: "类别", align: "center" }, // { key: "schemaName", title: "类别", align: "center" },
...@@ -185,7 +112,6 @@ export default { ...@@ -185,7 +112,6 @@ export default {
// }, // },
// ], // ],
data1: [], data1: [],
>>>>>>> product
}; };
}, },
created() { created() {
...@@ -195,8 +121,6 @@ export default { ...@@ -195,8 +121,6 @@ export default {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
<<<<<<< HEAD
=======
rowClassName(row, index) { rowClassName(row, index) {
if (index % 2 == 0) { if (index % 2 == 0) {
return "demo-table-info-row"; return "demo-table-info-row";
...@@ -205,23 +129,15 @@ export default { ...@@ -205,23 +129,15 @@ export default {
} }
return ""; return "";
}, },
>>>>>>> product
getlaoed() { getlaoed() {
let parme = { let parme = {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
conditions: [ conditions: [
<<<<<<< HEAD
{ fieldName: "type", fieldValue: 2, conditionalType: "Equal" }
]
};
Api.getpaged(parme).then(res => {
=======
{ fieldName: "type", fieldValue: 2, conditionalType: "Equal" }, { fieldName: "type", fieldValue: 2, conditionalType: "Equal" },
], ],
}; };
Api.getpaged(parme).then((res) => { Api.getpaged(parme).then((res) => {
>>>>>>> product
let arry = res.result.items; let arry = res.result.items;
let arr = arry.slice(0, 4); let arr = arry.slice(0, 4);
this.data1 = arr; this.data1 = arr;
...@@ -235,40 +151,6 @@ export default { ...@@ -235,40 +151,6 @@ export default {
var info = { id: "123", message: "成功" }; var info = { id: "123", message: "成功" };
this.$router.push({ name: "handle", params: info }); this.$router.push({ name: "handle", params: info });
// tab(1) // tab(1)
<<<<<<< HEAD
}
},
mounted() {}
};
</script>
<style lang="less" scoped>
.row_head {
height: 30px;
color: #249e91;
a {
color: #249e91;
}
}
.mo_cont {
border-top: 1px solid #ddd;
border-left: 1px solid #ddd;
.label {
display: table-cell;
border-bottom: 1px solid #ddd;
border-right: 1px solid #ddd;
// margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing: border-box;
.title {
background: #e8eaf1;
display: inline-block;
width: 100px;
text-align: right;
padding: 0 5px;
}
}
}
=======
}, },
}, },
mounted() {}, mounted() {},
...@@ -349,5 +231,4 @@ export default { ...@@ -349,5 +231,4 @@ export default {
// background-color: #292a4e; // background-color: #292a4e;
// color: #fff; // color: #fff;
// } // }
>>>>>>> product
</style> </style>
\ No newline at end of file
pages/home/component/unreadMessage.vue
View file @ 295002b2
<<<<<<< HEAD
<template>
<Card class="todolist">
<p class="row_head">
<Icon type="ios-chatbubbles" class="f20" />
<Badge :count="3" :offset="[9,-5]">
<span class="ml10">未读消息</span>
</Badge>
<a href class="row_more fr">更多</a>
</p>
<div class="msg">
<Row v-for="(item,index) in listTask" :key="index" class="row-text">
<Col :span="2">
<div></div>
</Col>
<Col :span="6">{{index+1}}&nbsp&nbsp {{item.name}}</Col>
<Col :span="8">
{{item.data}}
<Icon type="md-link" />
</Col>
<Col :span="8">{{item.Date}}</Col>
</Row>
</div>
</Card>
</template>
<script>
=======
<template> <template>
<div class="todolist-u"> <div class="todolist-u">
<p class="row_head"> <p class="row_head">
...@@ -61,70 +32,11 @@ ...@@ -61,70 +32,11 @@
<script> <script>
import Api from "../api"; import Api from "../api";
import { mapState } from "vuex"; import { mapState } from "vuex";
>>>>>>> product
export default { export default {
name: "UnreadMessage", name: "UnreadMessage",
data() { data() {
return { return {
imgUrl: iconImg, imgUrl: iconImg,
<<<<<<< HEAD
listTask: [
{
name: "张飞",
data: "生产订单缺料",
Date: "2020-03-12 11.30"
},
{
name: "张飞",
data: "送审订单待审批",
Date: "2020-03-12 11.30"
},
{
name: "张飞",
data: "排产未完成",
Date: "2020-03-12 11.30"
},
{
name: "张飞",
data: "物料补料中",
Date: "2020-03-12 11.30"
},
{
name: "张飞",
data: "物料补料中",
Date: "2020-03-12 11.30"
},
{
name: "张飞",
data: "物料补料中",
Date: "2020-03-12 11.30"
}
]
};
},
methods: {
link() {
console.log("路径");
}
}
};
</script>
<style lang="less" scoped>
.row_head {
height: 35px;
line-height: 30px;
color: #0099ff;
}
.msg {
height: 225px;
overflow-y: auto;
.row-text {
height: 40px;
line-height: 40px;
border-top: 1px solid #eee;
}
}
=======
// listTask: [], // listTask: [],
messageList: [], messageList: [],
title: "消息", title: "消息",
...@@ -231,5 +143,4 @@ export default { ...@@ -231,5 +143,4 @@ export default {
// .msg .row-text:nth-child(even){ // .msg .row-text:nth-child(even){
// } // }
>>>>>>> product
</style> </style>
\ No newline at end of file
pages/home/index.vue
View file @ 295002b2
<template> <template>
<<<<<<< HEAD
<div class="home">
<Card class="card-user">
<div class="img-header">
<img src="@/assets/images/home/user.png" />
</div>
<div class="user-text">
<p>你好：张飞，欢迎登陆MES系统!</p>
<p>
<span>xx公司/xx车间xx班组</span> &nbsp &nbsp
<span>工艺技术员</span>
</p>
</div>
<div class="incon-carousel">
<div class="bg-b">
<Icon type="ios-arrow-back" />
</div>
<div class="bg bg0">
<Icon type="ios-cube" />
<p>电子对账单</p>
</div>
<div class="bg bg1">
<Icon type="md-mail" />
<p>站内邮件</p>
</div>
<div class="bg bg2">
<Icon type="md-map" />
<p>站内邮件</p>
</div>
<div class="bg bg3">
<Icon type="ios-cube" />
<p>电子对账单</p>
</div>
<div class="bg bg0">
<Icon type="ios-cube" />
<p>电子对账单</p>
</div>
<div class="bg bg1">
<Icon type="md-mail" />
<p>站内邮件</p>
</div>
<div class="bg bg2">
<Icon type="md-mail" />
<p>站内邮件</p>
</div>
<div class="bg-l">
<Icon type="ios-arrow-forward" />
</div>
</div>
</Card>
<div class="card-list">
<div class="bg-b">
<Icon type="ios-arrow-back" />
</div>
<Card
v-for="(item,index) in listTask"
:key="index"
:class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))"
@click.native="goPage(item)"
>
<div class="leftIco">
<img class="img_icon" src="@/assets/imgicon/u1640.png" alt />
</div>
<div class="text-p">
<p>{{item.totalUrl}}</p>
<p>{{item.name}}</p>
</div>
</Card>
<div class="bg-l">
<Icon type="ios-arrow-forward" />
</div>
</div>
<Row class="table" :gutter="16">
<Col :span="12">
<Approval ref="approval" />
</Col>
<Col :span="12">
<UnreadMessage />
</Col>
</Row>
<div class="url-img"></div>
</div>
</template>
=======
<div class="home"> <div class="home">
<div class="card-user"> <div class="card-user">
<div class="img-header"> <div class="img-header">
...@@ -227,180 +143,10 @@ ...@@ -227,180 +143,10 @@
</div> </div>
</template> </template>
>>>>>>> product
<script> <script>
import Api from "./api"; import Api from "./api";
import Approval from "./component/approval"; import Approval from "./component/approval";
import UnreadMessage from "./component/unreadMessage"; import UnreadMessage from "./component/unreadMessage";
<<<<<<< HEAD
export default {
components: {
Approval,
UnreadMessage
},
data() {
return {
listTask: [],
imgUrl: iconImg
};
},
created() {
this.get();
},
methods: {
get() {
let list = [];
let url = `${systemUrl}/backlog/get`;
this.$api.get(url).then(r => {
list = r.result;
list.forEach(data => {
// console.log(data.totalUrl)
let ulrt = `http://${address}:` + data.totalUrl;
data.totalUrl = 0;
this.$api.get(ulrt).then(r => {
return (data.totalUrl = r.result);
});
});
console.log(list);
this.listTask = list;
});
},
goPage(u) {
// alert(u.menuUrl)
this.$router.push(u.menuUrl);
}
}
};
</script>
<style lang="less" scoped>
.home {
padding: 10px 0;
.card-user {
height: 100px;
.img-header {
margin-top: -8px;
float: left;
}
.user-text {
float: left;
p {
margin: 10px;
}
}
.incon-carousel {
float: right;
// margin-top: 8px;
width: 800px;
.bg-b {
float: left;
margin-top: 10px;
font-size: 30px;
color: #dcdfe6;
}
.bg-l {
float: right;
margin-top: 10px;
font-size: 30px;
color: #dcdfe6;
}
.bg {
text-align: center;
width: 100px;
float: left;
.ivu-icon {
font-size: 35px;
}
p {
margin-top: 8px;
}
}
.bg0 {
.ivu-icon {
color: #ffc300;
}
}
.bg1 {
.ivu-icon {
color: #0099ff;
}
}
.bg2 {
.ivu-icon {
color: #ff7a8b;
}
}
.bg3 {
.ivu-icon {
color: #ffc300;
}
}
}
}
.card-list {
display: flex;
display: -webkit-flex;
margin-top: 15px;
justify-content: space-around;
.bg-b {
margin-top: 18px;
font-size: 30px;
color: #dcdfe6;
width: 35px;
}
.bg-l {
margin-top: 18px;
font-size: 30px;
color: #dcdfe6;
width: 35px;
}
.img_bg01 {
background-color: #ff9100;
width: 200px;
cursor: pointer;
background: linear-gradient(to left, #ff9100, #ffcf87);
}
.img_bg02 {
width: 200px;
cursor: pointer;
background: linear-gradient(to left, #003fd4, #8ac7fc);
}
.img_bg03 {
cursor: pointer;
width: 200px;
background: linear-gradient(to left, #fe1b1b, #fc9c92);
}
.img_bg04 {
cursor: pointer;
width: 200px;
background: linear-gradient(to left, #249e91, #79ece0);
}
.img_icon {
width: 24px;
margin: 23% 0 0 0;
}
.text-p {
text-align: center;
color: #fff;
p:first-child {
font-size: 20px;
font-weight: bold;
margin-bottom: 5px;
}
}
}
.url-img {
width: 100%;
height: 370px;
background: url("../../assets/images/home/echars.png") no-repeat;
background-size: 100% 100%;
}
.table {
margin-top: 15px;
}
}
</style>
=======
import StaChart from "./component/staChart"; import StaChart from "./component/staChart";
import UnqualifiedEcharts from "./component/unqualifiedEcharts"; import UnqualifiedEcharts from "./component/unqualifiedEcharts";
import WorkChart from "./component/workChart"; import WorkChart from "./component/workChart";
...@@ -900,4 +646,3 @@ export default { ...@@ -900,4 +646,3 @@ export default {
} }
} }
</style> </style>
>>>>>>> product
pages/implement/components/sendCheck.vue
View file @ 295002b2
...@@ -225,20 +225,6 @@ export default { ...@@ -225,20 +225,6 @@ export default {
} }
} }
} }
<<<<<<< HEAD
},
getCurrentUser(e) {
if (e) {
let userInfo = this.$store.state.admin.user.info;
this.user.cardno = userInfo.login_id
this.user.user_name =userInfo.name
this.user.user_id = userInfo.userId
} else {
this.user.cardno = ''
}
=======
>>>>>>> product
} }
} }
......
pages/implement/components/usercard.vue
View file @ 295002b2
...@@ -232,20 +232,12 @@ export default { ...@@ -232,20 +232,12 @@ export default {
}, },
getCurrentUser(e) { getCurrentUser(e) {
if (e) { if (e) {
<<<<<<< HEAD
let userInfo = this.$store.state.admin.user.info;
this.user.cardno = userInfo.login_id
this.user.user_name = userInfo.name
this.user.user_id = userInfo.userId
=======
console.log(this.$store.state.admin.user.info); console.log(this.$store.state.admin.user.info);
let userInfo = this.$store.state.admin.user.info; let userInfo = this.$store.state.admin.user.info;
this.user.cardno = userInfo.cardNo; this.user.cardno = userInfo.cardNo;
this.user.user_name = userInfo.name; this.user.user_name = userInfo.name;
this.user.user_id = userInfo.id; this.user.user_id = userInfo.id;
>>>>>>> product
} else { } else {
this.user.cardno = ""; this.user.cardno = "";
} }
......
pages/mordent/dispose/index.vue
View file @ 295002b2
...@@ -383,16 +383,10 @@ export default { ...@@ -383,16 +383,10 @@ export default {
service service
.post( .post(
<<<<<<< HEAD
`${url}`,{
routingQcCard: this.cardModeldata
})
=======
`${url}`,{ `${url}`,{
routingQcCard: this.cardModeldata routingQcCard: this.cardModeldata
} }
) )
>>>>>>> product
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
this.$Message.success('保存成功') this.$Message.success('保存成功')
......
pages/processDesign/ChangeSingle/technicalcoordination/index.vue
View file @ 295002b2
...@@ -473,11 +473,7 @@ export default { ...@@ -473,11 +473,7 @@ export default {
this.formdata.compilation_temporary_process = ""; this.formdata.compilation_temporary_process = "";
this.formdata.inspection_date = ""; this.formdata.inspection_date = "";
this.formdata.inspection_person_name = this.$store.state.userInfo.userName; this.formdata.inspection_person_name = this.$store.state.userInfo.userName;
<<<<<<< HEAD
this.formdata.status = 1;
=======
this.formdata.status = this.wfstatu; this.formdata.status = this.wfstatu;
>>>>>>> product
this.formdata.note = ""; this.formdata.note = "";
var url1 = `${designUrl}/routingheader/GetCodeByType?code=JJXTD`; var url1 = `${designUrl}/routingheader/GetCodeByType?code=JJXTD`;
......
pages/processDesign/ChangeSingle/unqualifiedorder/index.vue
View file @ 295002b2
...@@ -488,20 +488,6 @@ export default { ...@@ -488,20 +488,6 @@ export default {
// 添加/编辑 弹框的保存 // 添加/编辑 弹框的保存
saveOk() { saveOk() {
var url = `${designUrl}/unqualifiedorder/createorupdate`; var url = `${designUrl}/unqualifiedorder/createorupdate`;
<<<<<<< HEAD
service
.post(`${url}`, { unqualifiedOrder: this.formdata })
.then(res => {
console.log(res);
if (res.success) {
let itemId = res.result.id;
this.dataListRetrunNew.idList.push(itemId);
this.loadchangelist();
this.$Message.success("保存成功");
this.show = false;
}
});
=======
service.post(`${url}`, { unqualifiedOrder: this.formdata }).then(res => { service.post(`${url}`, { unqualifiedOrder: this.formdata }).then(res => {
console.log(res); console.log(res);
if (res.success) { if (res.success) {
...@@ -512,7 +498,6 @@ export default { ...@@ -512,7 +498,6 @@ export default {
this.show = false; this.show = false;
} }
}); });
>>>>>>> product
// 如果选择送审，则打开送审页面 // 如果选择送审，则打开送审页面
if (this.submitShow&&this.checked == true) { if (this.submitShow&&this.checked == true) {
this.$refs.orderSendReview.intData(this.formdata); this.$refs.orderSendReview.intData(this.formdata);
......
pages/processDesign/Process/index.vue
View file @ 295002b2
...@@ -677,22 +677,12 @@ export default { ...@@ -677,22 +677,12 @@ export default {
return; return;
} }
if (a.formValidate.code != null) { if (a.formValidate.code != null) {
<<<<<<< HEAD
var url = `${designUrl}/routingheader/createorupdate`
service
.post(
`${url}`,{
routingHeaderEntity: a.formValidate,
FileList: filelist
})
=======
var url = `${designUrl}/routingheader/createorupdate`; var url = `${designUrl}/routingheader/createorupdate`;
service service
.post(`${url}`, { .post(`${url}`, {
routingHeaderEntity: a.formValidate, routingHeaderEntity: a.formValidate,
FileList: filelist, FileList: filelist,
}) })
>>>>>>> product
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
if (!next) { if (!next) {
......
pages/processDesign/Process/routingchangeorder.vue
View file @ 295002b2
...@@ -361,165 +361,6 @@ export default { ...@@ -361,165 +361,6 @@ export default {
previousStep() { previousStep() {
this.modalShow = false; this.modalShow = false;
}, },
<<<<<<< HEAD
modalOk() {
// let url = `${designUrl}/routingheaderchangeorder/getpaged1`
// service
// .get(`${url}`, {changeorder_code: "JSWJGGD_20200219_15", pageindex:1,pageSize:10 })
// .then((res) => {
// console.log(res)
// this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
// this.$refs.changeSendReview.changeorder_code = "JSWJGGD_20200219_15";
// })
// this.$refs.changeSendReview.modalInfo = true;
var url = `${designUrl}/routingheaderchangeorder/createorupdate`;
if(this.flag==0)
{
let paramsdata = {
"id": "",
"changeorder_code": this.changeorder_code,
"routing_header_Id":this.routing_header_Id,
"propose_user_name": this.formValidate.propose_user_name,
"department_name":this.formValidate.department_name,
"technical_name":this.formValidate.technical_name,
"technical_code":this.formValidate.technical_code,
"changed_version":this.formValidate.changed_version,
"quantity":this.formValidate.quantity,
"print_data":this.formValidate.print_data,
"executive_branch":this.formValidate.executive_branch,
"handling_opinions":this.formValidate.handling_opinions,
"before_change_content":this.formValidate.before_change_content,
"after_change_content":this.formValidate.after_change_content,
"change_reason":this.formValidate.change_reason,
"effective_date":this.formValidate.effective_date,
// "class_id": 0,
// "propose_user_id": 0,
// "department_id": 0,
// "executive_branch_id": 0,
// "handling_opinions_id": 0,
};
console.log(paramsdata);
service.post(`${url}`, {routingHeaderChangeorder: paramsdata}).then(res=>{
if(res.success) {
this.$Message.success('新增成功')
this.modelChange = false;
if(this.checked == true){
let url = `${designUrl}/routingheaderchangeorder/getpaged1`
service
.get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 })
.then((res) => {
console.log(res)
this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
})
this.$refs.changeSendReview.modalInfo = true;
}
}
});
}
else{
let paramsdata = {
"id": this.formValidate.id,
"changeorder_code": this.changeorder_code,
"routing_header_Id":this.routing_header_Id,
"propose_user_name": this.formValidate.propose_user_name,
"department_name":this.formValidate.department_name,
"technical_name":this.formValidate.technical_name,
"technical_code":this.formValidate.technical_code,
"changed_version":this.formValidate.changed_version,
"quantity":this.formValidate.quantity,
"print_data":this.formValidate.print_data,
"executive_branch":this.formValidate.executive_branch,
"handling_opinions":this.formValidate.handling_opinions,
"before_change_content":this.formValidate.before_change_content,
"after_change_content":this.formValidate.after_change_content,
"change_reason":this.formValidate.change_reason,
"effective_date":this.formValidate.effective_date,
"status":this.formValidate.status,
"note":this.formValidate.note,
// "class_id": 0,
// "propose_user_id": 0,
// "department_id": 0,
// "executive_branch_id": 0,
// "handling_opinions_id": 0,
};
console.log(paramsdata);
service.post(`${url}`, {routingHeaderChangeorder: paramsdata}).then(res=>{
if(res.success) {
this.$Message.success('编辑成功')
this.modelChange = false;
this.$emit('getMessage');
if(this.checked == true){
let url = `${designUrl}/routingheaderchangeorder/getpaged1`
service
.get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 })
.then((res) => {
console.log(res)
this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
this.$refs.changeSendReview.changeorder_code = this.changeorder_code;
})
this.$refs.changeSendReview.modalInfo = true;
}
// let url = `${designUrl}/routingheaderchangeorder/getpaged1`
// service
// .get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 })
// .then((res) => {
// console.log(res)
// this.data3 = res.result.items
// console.log(this.data3[0].id)
// let url = `${workflowUrl}/instance/start`
// service
// .post(
// `${url}`,
// {
// idList: [this.data3[0].id],
// schemaId: 'd0cdafe3-2341-4499-a4f5-278ef0f30740',
// operatorIdList: this.userlist,
// data: {},
// userId: 0
// }
// )
// .then((response) => {
// if (response.success) {
// console.log(response)
// }
// })
// })
}
});
}
},
upSave() {
// Api.start(this.formExamine.approveUser).then((r) => {
// // this.results = r.result
// })
// let url = `${designUrl}/routingheaderchangeorder/getpaged1`
// service
// .get(`${url}`, {changeorder_code: this.changeorder_code, pageindex:1,pageSize:10 })
// .then((res) => {
// console.log(res)
// this.data3 = res.result.items
// console.log(this.data3[0].id)
// let url = `${workflowUrl}/instance/start`
// service
// .post(
// `${url}`,
// {
// idList: [this.data3[0].id],
// schemaId: 'd0cdafe3-2341-4499-a4f5-278ef0f30740',
// operatorIdList: this.userlist,
// data: {},
// userId: 0
// }
// )
// .then((response) => {
// if (response.success) {
// console.log(response)
// }
// })
// })
=======
modalOk() { modalOk() {
// let url = `${designUrl}/routingheaderchangeorder/getpaged1` // let url = `${designUrl}/routingheaderchangeorder/getpaged1`
// service // service
...@@ -688,7 +529,6 @@ export default { ...@@ -688,7 +529,6 @@ export default {
// } // }
// }) // })
// }) // })
>>>>>>> product
}, },
saveCancelModel() { saveCancelModel() {
this.modelChange = false; this.modelChange = false;
......
pages/processManage/Process/index.vue
View file @ 295002b2
...@@ -662,11 +662,7 @@ export default { ...@@ -662,11 +662,7 @@ export default {
return; return;
} }
if (a.formValidate.code != null) { if (a.formValidate.code != null) {
<<<<<<< HEAD
var url = `${designUrl}/routingheader/createorupdate`
=======
var url = `${designUrl}/routingheader/createorupdate`; var url = `${designUrl}/routingheader/createorupdate`;
>>>>>>> product
service service
.post(`${url}`, { .post(`${url}`, {
routingHeaderEntity: a.formValidate, routingHeaderEntity: a.formValidate,
......
pages/processManage/setProcess/components/orderMaterial.vue
View file @ 295002b2
...@@ -546,23 +546,12 @@ export default { ...@@ -546,23 +546,12 @@ export default {
this.formValidate.ordercodes = mesCodes.toString(","); this.formValidate.ordercodes = mesCodes.toString(",");
service service
<<<<<<< HEAD
.post(
`${url}`,{
orderMaterial: this.formValidate,
orderMaterialList: this.formValidate1
}
)
.then((response) => {
let itemId = response.result.orderMaterial.id
=======
.post(`${url}`, { .post(`${url}`, {
orderMaterial: this.formValidate, orderMaterial: this.formValidate,
orderMaterialList: this.formValidate1 orderMaterialList: this.formValidate1
}) })
.then(response => { .then(response => {
let itemId = response.result.orderMaterial.id; let itemId = response.result.orderMaterial.id;
>>>>>>> product
// let idIteme = this.$parent.$parent.dataListRetrunNew.idList // let idIteme = this.$parent.$parent.dataListRetrunNew.idList
// if(idIteme == []){ // if(idIteme == []){
// idIteme.push(itemId) // idIteme.push(itemId)
......
pages/processManage/setProcess/index.vue
View file @ 295002b2
...@@ -1093,13 +1093,8 @@ export default { ...@@ -1093,13 +1093,8 @@ export default {
} }
if (a.formValidate.code != null) { if (a.formValidate.code != null) {
<<<<<<< HEAD
let orders = a.dataTop
var url = `${designUrl}/routingheader/createorupdate`
=======
let orders = a.dataTop; let orders = a.dataTop;
var url = `${designUrl}/routingheader/createorupdate`; var url = `${designUrl}/routingheader/createorupdate`;
>>>>>>> product
service service
.post(`${url}`, { .post(`${url}`, {
routingHeaderEntity: a.formValidate, routingHeaderEntity: a.formValidate,
...@@ -1215,11 +1210,7 @@ export default { ...@@ -1215,11 +1210,7 @@ export default {
platesnum: this.addpdefm.formValidate.platesnum, platesnum: this.addpdefm.formValidate.platesnum,
}; };
<<<<<<< HEAD
var url = `${designUrl}/orderrouting/createorupdate`
=======
var url = `${designUrl}/orderrouting/createorupdate`; var url = `${designUrl}/orderrouting/createorupdate`;
>>>>>>> product
service service
.post(`${url}`, { .post(`${url}`, {
orderRouting: orderRoutingobj, orderRouting: orderRoutingobj,
...@@ -1287,11 +1278,7 @@ export default { ...@@ -1287,11 +1278,7 @@ export default {
}, },
saveOK() { saveOK() {
<<<<<<< HEAD
var url = `${PlanUrl}/OrderMaterial/createorupdate`
=======
var url = `${PlanUrl}/OrderMaterial/createorupdate`; var url = `${PlanUrl}/OrderMaterial/createorupdate`;
>>>>>>> product
service service
.post(`${url}`, { orderMaterial: this.formValidate }) .post(`${url}`, { orderMaterial: this.formValidate })
.then((response) => { .then((response) => {
......
pages/qcimplement/components/backCheck.vue
View file @ 295002b2
...@@ -118,17 +118,6 @@ export default { ...@@ -118,17 +118,6 @@ export default {
this.mod.routingHeaderId = entryModel.routingHeaderId; this.mod.routingHeaderId = entryModel.routingHeaderId;
this.mod.routingDetailId = entryModel.routingDetailId; this.mod.routingDetailId = entryModel.routingDetailId;
<<<<<<< HEAD
this.mod.checkName = this.$store.state.userInfo.userName
this.mod.check_Status = 3
this.product_code = ''
this.board_code = ''
this.isCurrentUser = false
this.isMain = entryModel.isMain
this.product_ID = []
this.board_ID = []
this.productisabled = fillModel.productisabled
=======
this.mod.checkName = this.$store.state.userInfo.userName; this.mod.checkName = this.$store.state.userInfo.userName;
this.mod.check_Status = 3; this.mod.check_Status = 3;
this.product_code = ""; this.product_code = "";
...@@ -138,7 +127,6 @@ export default { ...@@ -138,7 +127,6 @@ export default {
this.product_ID = []; this.product_ID = [];
this.board_ID = []; this.board_ID = [];
this.productisabled = fillModel.productisabled; this.productisabled = fillModel.productisabled;
>>>>>>> product
this.product_ID.push(fillModel.product_ID); this.product_ID.push(fillModel.product_ID);
this.board_ID.push(fillModel.board_ID); this.board_ID.push(fillModel.board_ID);
......
pages/resource/Store/add.vue
View file @ 295002b2
...@@ -88,20 +88,6 @@ export default { ...@@ -88,20 +88,6 @@ export default {
description: this.entity.description02, //位置 description: this.entity.description02, //位置
levels: 0, levels: 0,
user_name: userNam, //库管员 user_name: userNam, //库管员
<<<<<<< HEAD
user_ids: this.entity.user_ids.join(',') //库管员id
}
console.log(paramsdata)
Api.create({ storeroomLocation: paramsdata }).then(
(r) => {
this.disabled = false
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
}
=======
user_ids: this.entity.user_ids.join(","), //库管员id user_ids: this.entity.user_ids.join(","), //库管员id
}; };
console.log(paramsdata); console.log(paramsdata);
...@@ -111,7 +97,6 @@ export default { ...@@ -111,7 +97,6 @@ export default {
this.$emit("on-ok"); this.$emit("on-ok");
} else { } else {
this.$Message.error("保存失败"); this.$Message.error("保存失败");
>>>>>>> product
} }
}); });
}, },
......
pages/resource/resource/return.vue
View file @ 295002b2
...@@ -119,10 +119,6 @@ export default { ...@@ -119,10 +119,6 @@ export default {
}, },
resource: [], resource: [],
selectList: [], selectList: [],
<<<<<<< HEAD
libraryTube: this.$store.state.userInfo.userName //库管员
}
=======
libraryTube: this.$store.state.userInfo.userName, //库管员 libraryTube: this.$store.state.userInfo.userName, //库管员
}; };
}, },
...@@ -132,7 +128,6 @@ export default { ...@@ -132,7 +128,6 @@ export default {
}, },
mounted() { mounted() {
this.get(); this.get();
>>>>>>> product
}, },
methods: { methods: {
get(name) { get(name) {
......
pages/resourceManagement/EquipmentCalendar/components/newEquipment.vue
View file @ 295002b2
...@@ -38,11 +38,7 @@ ...@@ -38,11 +38,7 @@
<div slot="footer"> <div slot="footer">
<!-- class="footers" --> <!-- class="footers" -->
<Button @click="close">取消</Button> <Button @click="close">取消</Button>
<<<<<<< HEAD
<Button @click="saveOk" type="primary">保存</Button>
=======
<Button @click="saveOk" type="primary" v-noClick>保存</Button> <Button @click="saveOk" type="primary" v-noClick>保存</Button>
>>>>>>> product
</div> </div>
</Modal> </Modal>
<Department <Department
...@@ -139,15 +135,9 @@ export default { ...@@ -139,15 +135,9 @@ export default {
// 添加/编辑 弹框的保存 // 添加/编辑 弹框的保存
saveOk() { saveOk() {
var url = `${systemUrl}/equipcalendarwork/createorupdate` var url = `${systemUrl}/equipcalendarwork/createorupdate`
<<<<<<< HEAD
console.log(this.formItem1)
console.log(this.formItem2)
console.log(this.editId)
=======
// console.log(this.formItem1) // console.log(this.formItem1)
// console.log(this.formItem2) // console.log(this.formItem2)
// console.log(this.editId) // console.log(this.editId)
>>>>>>> product
service.post(`${url}`,{ equipCalendarWork: this.formItem1,equipCalendarOverTime: this.formItem2 }) service.post(`${url}`,{ equipCalendarWork: this.formItem1,equipCalendarOverTime: this.formItem2 })
.then((res) => { .then((res) => {
......
pages/resourceManagement/deviceManagement/components/newEquipment.vue
View file @ 295002b2
...@@ -154,90 +154,6 @@ export default { ...@@ -154,90 +154,6 @@ export default {
close() { close() {
this.modalShow = false; this.modalShow = false;
}, },
<<<<<<< HEAD
// 添加/编辑 弹框的保存
saveOk(){
if (!this.formItem.equip_id) {
this.$Message.error('设备编号不能为空!')
return
}
if (!this.formItem.shop_name) {
this.$Message.error('所属部门不能为空!')
return
}
let saveId = this.editId,
url = `${systemUrl}/equipinfo/createorupdate`;
// console.log(saveId);
if(!saveId){ saveId == "" }
if(this.title == '编辑设备'){
//this.$Message.success(saveId);
// if(this.formItem.selectName){
let arr=this.formItem.equip_type;
let str=arr.join(',');
let url = `${systemUrl}/equipinfo/createorupdate`;
var ar1 = this.data1.find((val) => {
if(val.id!=saveId)
return val.equip_id == this.formItem.equip_id
})
if (ar1) {
this.$Message.error('设备编号已存在！');
return
}
let paramsdata = {
"id": saveId,
"equip_id": this.formItem.equip_id,
"equip_name": this.formItem.equip_name,
"equip_status": this.formItem.equip_status,
"equip_pic": this.formItem.equip_pic,
"equip_ip": this.formItem.equip_ip,
"shop_id": this.formItem.shop_id,
"eqstyle": str,
};
// console.log(paramsdata);
service.post(`${url}`, {equipInfo: paramsdata}).then(res=>{
if(res.success) {
this.$emit('getMessage');
this.modalShow=false;
this.$Message.success('编辑成功');
}
});
// }
}
if(this.title == '新增设备'){
let arr=this.formItem.equip_type;
let str=arr.join(',');
//console.log(str);
let url = `${systemUrl}/equipinfo/createorupdate`;
var ar = this.data1.find((val) => {
return val.equip_id == this.formItem.equip_id
})
if (ar ) {
this.$Message.error('设备编号已存在！');
return
}
let paramsdata = {
"id": this.saveId,
"equip_id": this.formItem.equip_id,
"equip_name": this.formItem.equip_name,
"equip_status": this.formItem.equip_status,
"equip_pic": this.formItem.equip_pic,
"equip_ip": this.formItem.equip_ip,
"shop_id": this.formItem.shop_id,
"eqstyle": str,
};
//console.log(this.formItem.equip_type);
service.post(`${url}`, {equipInfo: paramsdata}).then(res=>{
if(res.success) {
this.$emit('getMessage');
this.modalShow=false;
this.$Message.success('新增成功')
}
});
}
},
}
}
=======
// 添加/编辑 弹框的保存 // 添加/编辑 弹框的保存
saveOk() { saveOk() {
if (!this.formItem.equip_id) { if (!this.formItem.equip_id) {
...@@ -321,7 +237,6 @@ export default { ...@@ -321,7 +237,6 @@ export default {
}, },
}, },
}; };
>>>>>>> product
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
pages/resourceManagement/deviceManagementCP/components/newEquipment.vue
View file @ 295002b2
...@@ -77,11 +77,7 @@ ...@@ -77,11 +77,7 @@
<div slot="footer"> <div slot="footer">
<!-- class="footers" --> <!-- class="footers" -->
<Button @click="close">取消</Button> <Button @click="close">取消</Button>
<<<<<<< HEAD
<Button @click="saveOk" type="primary">保存</Button>
=======
<Button @click="saveOk" type="primary" v-noClick>保存</Button> <Button @click="saveOk" type="primary" v-noClick>保存</Button>
>>>>>>> product
</div> </div>
</Modal> </Modal>
<Department <Department
...@@ -186,97 +182,6 @@ export default { ...@@ -186,97 +182,6 @@ export default {
close() { close() {
this.modalShow = false; this.modalShow = false;
}, },
<<<<<<< HEAD
// 添加/编辑 弹框的保存
saveOk(){
if (!this.formItem.equip_id) {
this.$Message.error('设备编号不能为空!')
return
}
if (!this.formItem.shop_name) {
this.$Message.error('所属部门不能为空!')
return
}
let saveId = this.editId,
url = `${systemUrl}/equipinfo/createorupdate`;
// console.log(saveId);
if(!saveId){ saveId == "" }
if(this.title == '编辑设备'){
//this.$Message.success(saveId);
// if(this.formItem.selectName){
let arr=this.formItem.equip_type;
let str=arr.join(',');
let url = `${systemUrl}/equipinfo/createorupdate`;
var ar1 = this.data1.find((val) => {
if(val.id!=saveId)
return val.equip_id == this.formItem.equip_id
})
if (ar1) {
this.$Message.error('设备编号已存在！');
return
}
let paramsdata = {
"id": saveId,
"equip_id": this.formItem.equip_id,
"equip_name": this.formItem.equip_name,
"equip_status": this.formItem.equip_status,
"equip_pic": this.formItem.equip_pic,
"equip_ip": this.formItem.equip_ip,
"shop_id": this.formItem.shop_id,
"eqstyle": str,
"isimportant":this.isimportant,
"location":this.formItem.location,
"capability_value":this.formItem.capability_value,
};
// console.log(paramsdata);
service.post(`${url}`, {equipInfo: paramsdata}).then(res=>{
if(res.success) {
this.$emit('getMessage');
this.modalShow=false;
this.$Message.success('编辑成功');
}
});
// }
}
if(this.title == '新增设备'){
let arr=this.formItem.equip_type;
let str=arr.join(',');
//console.log(str);
let url = `${systemUrl}/equipinfo/createorupdate`;
var ar = this.data1.find((val) => {
return val.equip_id == this.formItem.equip_id
})
if (ar ) {
this.$Message.error('设备编号已存在！');
return
}
let paramsdata = {
"id": this.saveId,
"equip_id": this.formItem.equip_id,
"equip_name": this.formItem.equip_name,
"equip_status": this.formItem.equip_status,
"equip_pic": this.formItem.equip_pic,
"equip_ip": this.formItem.equip_ip,
"shop_id": this.formItem.shop_id,
"eqstyle": str,
"isimportant":this.isimportant,
"location":this.formItem.location,
"capability_value":this.formItem.capability_value,
};
//console.log(this.formItem.equip_type);
service.post(`${url}`, {equipInfo: paramsdata}).then(res=>{
if(res.success) {
this.$emit('getMessage');
this.modalShow=false;
this.$Message.success('新增成功')
}
});
}
},
}
}
=======
// 添加/编辑 弹框的保存 // 添加/编辑 弹框的保存
saveOk() { saveOk() {
if (!this.formItem.equip_id) { if (!this.formItem.equip_id) {
...@@ -395,7 +300,6 @@ export default { ...@@ -395,7 +300,6 @@ export default {
}, },
}, },
}; };
>>>>>>> product
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
pages/resourceManagement/deviceManagementCP/index.vue
View file @ 295002b2
...@@ -904,23 +904,6 @@ export default { ...@@ -904,23 +904,6 @@ export default {
equip_down_type: this.formItemMain.equip_down_type, equip_down_type: this.formItemMain.equip_down_type,
plan_start: this.formItemMain.plan_start, plan_start: this.formItemMain.plan_start,
plan_finish: this.formItemMain.plan_finish, plan_finish: this.formItemMain.plan_finish,
<<<<<<< HEAD
maintain_type: '1'
}
console.log(paramsdata)
service
.post(`${url}`, { equipMaintainPlan: paramsdata })
.then((res) => {
if (res.success) {
this.changestatus(this.eid)
this.show = false
setTimeout(() => {
this.laodaction()
}, 1000)
this.$Message.success('新增成功')
}
})
=======
maintain_type: "1", maintain_type: "1",
}; };
console.log(paramsdata); console.log(paramsdata);
...@@ -934,7 +917,6 @@ export default { ...@@ -934,7 +917,6 @@ export default {
this.$Message.success("新增成功"); this.$Message.success("新增成功");
} }
}); });
>>>>>>> product
}, },
downFile(path) { downFile(path) {
console.log(path); console.log(path);
...@@ -961,24 +943,6 @@ export default { ...@@ -961,24 +943,6 @@ export default {
equip_pk: this.eid, equip_pk: this.eid,
notes: this.formItemMain.notes, notes: this.formItemMain.notes,
input_time: this.formItemMain.input_time, input_time: this.formItemMain.input_time,
<<<<<<< HEAD
equip_down_type: '设备故障',
maintain_type: '2'
}
console.log(paramsdata)
service
.post(`${url}`, { equipMaintainPlan: paramsdata })
.then((res) => {
if (res.success) {
this.changestatus(this.eid)
this.show = false
setTimeout(() => {
this.laodaction()
}, 1000)
this.$Message.success('新增成功')
}
})
=======
equip_down_type: "设备故障", equip_down_type: "设备故障",
maintain_type: "2", maintain_type: "2",
}; };
...@@ -993,7 +957,6 @@ export default { ...@@ -993,7 +957,6 @@ export default {
this.$Message.success("新增成功"); this.$Message.success("新增成功");
} }
}); });
>>>>>>> product
}, },
edit(data) { edit(data) {
// this.$refs.equipment.$refs.refqcFile.newName = data.row.equip_pic; // this.$refs.equipment.$refs.refqcFile.newName = data.row.equip_pic;
...@@ -1128,25 +1091,6 @@ export default { ...@@ -1128,25 +1091,6 @@ export default {
failure_notes: this.formItemMain1.failure_notes, failure_notes: this.formItemMain1.failure_notes,
input_time: this.inputtime, input_time: this.inputtime,
maintain_type: this.borw, maintain_type: this.borw,
<<<<<<< HEAD
status: this.formItemMain1.status
}
console.log(paramsdata)
service
.post(`${url}`, { equipMaintainPlan: paramsdata })
.then((res) => {
if (res.success) {
this.changestatus(this.eid)
this.loadmain(this.eid)
setTimeout(() => {
this.laodaction()
}, 1000)
this.eid1 = ''
this.show4 = false
this.$Message.success('更新成功')
}
})
=======
status: this.formItemMain1.status, status: this.formItemMain1.status,
}; };
console.log(paramsdata); console.log(paramsdata);
...@@ -1162,7 +1106,6 @@ export default { ...@@ -1162,7 +1106,6 @@ export default {
this.$Message.success("更新成功"); this.$Message.success("更新成功");
} }
}); });
>>>>>>> product
}, },
selectTreeNode(value) { selectTreeNode(value) {
if (value != "") { if (value != "") {
......
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