Skip to content

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

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

parents 55fad3ef 5a219d90
Hide whitespace changes
Inline Side-by-side
Showing with 282 additions and 76 deletions
api/order.js
View file @ af027958
......@@ -4,8 +4,8 @@ export default {
addOrder(params) {
let model = {
productId: params.productId, //产品id
productName:params.productName,
drawnNumber:params.drawnNumber,
productName: params.productName,
drawnNumber: params.drawnNumber,
taskType: params.taskType, //任务类型
stage: params.stage, //阶段
materialId: params.materialId, //材料
......@@ -28,11 +28,14 @@ export default {
demandStartDate: params.demandStartDate, //开始时间
demandFinishDate: params.demandFinishDate, //完成时间
remark: params.remark, //备注
projectNumber: params.projectNumber, //项目号
batchNumber: params.batchNumber, //批次号
urgencyLevel: params.urgencyLevel, //紧急程度
};
return Api.post(`${PlanUrl}/mesorder/mesordercreate`, model, true);
},
//删除子订单前检测是否可删除 1：可删 0有非新建状态订单不能删：
sondeletecheck(params) {
//删除子订单前检测是否可删除 1：可删 0有非新建状态订单不能删：
sondeletecheck(params) {
return Api.post(`${PlanUrl}/mesorder/sondeletecheck`, params, true);
},
//删除订单：
......@@ -44,8 +47,8 @@ export default {
let model = {
id: params.id,
productId: params.productId, //产品id
productName:params.productName,
drawnNumber:params.drawnNumber,
productName: params.productName,
drawnNumber: params.drawnNumber,
taskType: params.taskType, //任务类型
stage: params.stage, //阶段
materialId: params.materialId, //材料
......@@ -68,6 +71,9 @@ export default {
demandStartDate: params.demandStartDate, //开始时间
demandFinishDate: params.demandFinishDate, //完成时间
remark: params.remark, //备注
projectNumber: params.projectNumber, //项目号
batchNumber: params.batchNumber, //批次号
urgencyLevel: params.urgencyLevel, //紧急程度
};
return Api.post(`${PlanUrl}/mesorder/mesorderupdate`, model, true);
},
......@@ -97,8 +103,8 @@ export default {
return Api.get(`${PlanUrl}/mesorder/getpagedmesorders`, model);
},
// orderSendView(params) {
// return Api.post(`${PlanUrl}/orderaudit/create`, params, true);
// },
// return Api.post(`${PlanUrl}/orderaudit/create`, params, true);
// },
//订单送审：
batchstart(params) {
return Api.post(`${workflowUrl}/instance/batchstart`, params, true);
......
components/customTable/customTable.vue
View file @ af027958
......@@ -9,13 +9,13 @@
<template v-slot:button>
<div style="float:right;" class="paddingbtn">
<!-- 其他 业务按钮 -->
<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>
<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>
<!-- 列设置 -->
<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="primary" @click="orderCreateOrderOk">确定</Button>
<Button type="success" @click="orderCreateOrderOk">确定</Button>
</div>
</Modal>
<!-- 订单送审 -->
......@@ -82,7 +82,7 @@
<OrderSendReview ref="orderSendReview"></OrderSendReview>
<div slot="footer">
<Button @click="ModalOrderSendReview = false">取消</Button>
<Button type="primary" @click="orderSendReviewOk">确定送审</Button>
<Button type="success" @click="orderSendReviewOk">确定送审</Button>
</div>
</Modal>
<!-- 订单派发 -->
......@@ -99,7 +99,7 @@
<OrderSend ref="orderSend"></OrderSend>
<div slot="footer">
<Button @click="ModalOrderSend = false">取消</Button>
<Button type="primary" @click="orderSendOk">确定派发</Button>
<Button type="success" @click="orderSendOk">确定派发</Button>
</div>
</Modal>
<!-- 订单分解 -->
......@@ -115,7 +115,7 @@
<OrderSplit ref="orderSplit"></OrderSplit>
<div slot="footer">
<Button @click="ModalOrderSplit = false">取消</Button>
<Button type="primary" @click="orderSplitOk">确定分解</Button>
<Button type="success" @click="orderSplitOk">确定分解</Button>
</div>
</Modal>
<!-- 信息提示 -->
......@@ -131,7 +131,7 @@
{{ metCodesStrTxt }}
<div slot="footer">
<Button @click="ModalInfo = false">取消</Button>
<Button type="primary" @click="modalInfoOk">确定</Button>
<Button type="success" @click="modalInfoOk">确定</Button>
</div></Modal
>
</div>
......@@ -278,17 +278,17 @@ export default {
//mes产品新增开始
{
title: '项目号',
key: '',
key: 'projectNumber',
width: 100,
},
{
title: '批次号',
key: '',
key: 'batchNumber',
width: 120,
},
{
title: '紧急程度',
key: '',
key: 'urgencyLevel',
width: 100,
},
// {
......
components/orderOperator/createOrder.vue
View file @ af027958
......@@ -116,19 +116,19 @@
</Col>-->
<Col span="8">
<FormItem label="项目号" style="width:100%">
<Input placeholder style="width:240px" />
<Input v-model="orderSearchForm.projectNumber" style="width:240px" />
</FormItem>
</Col>
</Row>
<Row>
<Col span="8">
<FormItem label="批次号" style="width:100%">
<Input placeholder style="width:240px" />
<Input v-model="orderSearchForm.batchNumber" style="width:240px" />
</FormItem>
</Col>
<Col span="8">
<FormItem label="紧急程度" style="width:100%">
<dictionary style="width:240px"></dictionary>
<dictionary style="width:240px" code="plan.order.urgencyLevel" v-model="orderSearchForm.urgencyLevel" ></dictionary>
</FormItem>
</Col>
<!-- <Col span="8">
......@@ -214,8 +214,16 @@
</template>
<script>
var myDate = new Date()
var dayTomorrow = new Date()
dayTomorrow.setTime(dayTomorrow.getTime() + 24 * 60 * 60 * 1000)
var nowDate =
myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate()
var tomorrowDate =
dayTomorrow.getFullYear() +
'-' +
(dayTomorrow.getMonth() + 1) +
'-' +
dayTomorrow.getDate()
export default {
name: 'createOrder',
data() {
......@@ -250,8 +258,11 @@ export default {
routing_Method: null, //工艺方法
outer_Envelope_Size: '', //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(nowDate), //完成时间
remark: '' //备注
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
remark: '', //备注
projectNumber:'',//项目号
batchNumber:'',//批次号
urgencyLevel:null,//紧急程度
},
ruleValidate: {
productId: [
......@@ -350,7 +361,7 @@ export default {
routing_Method: null, //工艺方法
outer_Envelope_Size: '', //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(nowDate), //完成时间
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
remark: '' //备注
})
},
......@@ -405,7 +416,7 @@ export default {
},
getFinishedDate(value) {
if (value == '') {
this.orderSearchForm.demandFinishDate = this.getFormatDate(nowDate)
this.orderSearchForm.demandFinishDate = this.getFormatDate(tomorrowDate)
} else {
this.orderSearchForm.demandFinishDate = this.getFormatDate(value)
}
......
components/orderOperator/orderInfos.vue
View file @ af027958
<template>
<div class="detail" >
<div class="detail">
<Row>
<Filed :span="6" :name="l('productName')">{{info.orderInfo.productName}}</Filed>
<Filed :span="6" :name="l('mesCode')">{{info.orderInfo.mesCode}}</Filed>
<Filed :span="6" :name="l('drawnNumber')">{{info.orderInfo.drawnNumber}}</Filed>
<Filed :span="6" :name="l('stage')"><state code="plan.order.stage" :value="info.orderInfo.stage+''" type="text"></state></Filed>
<Filed :span="6" :name="l('taskType')"><state code="plan.order.taskType" :value="info.orderInfo.taskType+''" type="text"></state></Filed>
<Filed :span="6" :name="l('batchNumber')">{{info.orderInfo.batchNumber}}</Filed>
<Filed :span="6" :name="l('projectNumber')">{{info.orderInfo.projectNumber}}</Filed>
<Filed :span="6" :name="l('urgencyLevel')">
<state code="plan.order.urgencyLevel" :value="info.orderInfo.urgencyLevel+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('stage')">
<state code="plan.order.stage" :value="info.orderInfo.stage+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('taskType')">
<state code="plan.order.taskType" :value="info.orderInfo.taskType+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('quantity')">{{info.orderInfo.quantity}}</Filed>
<Filed :span="6" :name="l('materialId')"><state code="plan.order.material" :value="info.orderInfo.materialId+''" type="text"></state></Filed>
<Filed :span="6" :name="l('routing_Method')"><state code="plan.order.routingMethod" :value="info.orderInfo.routing_Method+''" type="text"></state></Filed>
<Filed :span="6" :name="l('materialId')">
<state code="plan.order.material" :value="info.orderInfo.materialId+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('routing_Method')">
<state
code="plan.order.routingMethod"
:value="info.orderInfo.routing_Method+''"
type="text"
></state>
</Filed>
<Filed :span="6" :name="l('outer_Envelope_Size')">{{info.orderInfo.outer_Envelope_Size}}</Filed>
<Filed :span="6" :name="l('demandStartDate')">{{info.orderInfo.demandStartDate}}</Filed>
<Filed :span="6" :name="l('demandFinishDate')">{{info.orderInfo.demandFinishDate}}</Filed>
<Filed :span="6" :name="l('printSupply')"><state code="plan.order.printSupply" :value="info.orderInfo.printSupply+''" type="text"></state></Filed>
<Filed :span="6" :name="l('guestName')"><state code="plan.order.guestName" :value="info.orderInfo.guestName+''" type="text"></state></Filed>
<Filed :span="6" :name="l('printSupply')">
<state code="plan.order.printSupply" :value="info.orderInfo.printSupply+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('guestName')">
<state code="plan.order.guestName" :value="info.orderInfo.guestName+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('functionaryOffice')">>{{info.orderInfo.functionaryOffice}}</Filed>
<Filed :span="6" :name="l('taskRequire')">{{info.orderInfo.taskRequire}}</Filed>
<Filed :span="6" :name="l('taskInputDate')">{{info.orderInfo.taskInputDate}}</Filed>
<Filed :span="6" :name="l('mainDepartmentId')"><state code="plan.order.mainDepartment" :value="info.orderInfo.mainDepartmentId+''" type="text"></state></Filed>
<Filed :span="6" :name="l('mainDepartmentId')">
<state
code="plan.order.mainDepartment"
:value="info.orderInfo.mainDepartmentId+''"
type="text"
></state>
</Filed>
<Filed :span="6" :name="l('technologyDocmentCode')">{{info.orderInfo.technologyDocmentCode}}</Filed>
<Filed :span="6" :name="l('putintDocmentCode')">{{info.orderInfo.putintDocmentCode}}</Filed>
<Filed :span="6" :name="l('outerDrawnNumber')">{{info.orderInfo.outerDrawnNumber}}</Filed>
<Filed :span="6" :name="l('modelVersion')">{{info.orderInfo.modelVersion}}</Filed>
<Filed :span="6" :name="l('modelVersion')">{{info.orderInfo.modelVersion}}</Filed>
<Filed :span="6" :name="l('designer')">{{info.orderInfo.designer}}</Filed>
<Filed :span="6" :name="l('taskCode')">{{info.orderInfo.taskCode}}</Filed>
<Filed :span="6" :name="l('mainRoutingPeople')">{{info.orderInfo.mainRoutingPeople}}</Filed>
<Filed :span="6" :name="l('officeFunctionary')">{{info.orderInfo.officeFunctionary}}</Filed>
<Filed :span="24" :name="l('remark')">{{info.orderInfo.remark}}</Filed>
<Filed :span="24" :name="l('remark')">{{info.orderInfo.remark}}</Filed>
</Row>
</div>
</template>
......@@ -36,15 +63,14 @@
export default {
name: 'orderInfos',
props: ['info'],
async fetch({ store, params }) {
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
data(){
return{
}
data() {
return {}
},
methods: {
arry2Name(arryList, values) {
methods: {
arry2Name(arryList, values) {
//预警类别转换
var codes = arryList
var name = ''
......@@ -55,27 +81,27 @@ export default {
}
return name
},
l(key) {
l(key) {
key = 'orderInfo' + '.' + key
return this.$t(key)
}
}
}
}
</script>
<style lang="less">
.detail {
display: table;
border-collapse: collapse;
display: table;
border-collapse: collapse;
.ivu-row {
display: table-row;
display: table-row;
.filed-col {
display: table-cell;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
border: 1px solid #ddd;
margin: 0 0 -1px -1px;
line-height: 30px;
box-sizing:border-box;
box-sizing: border-box;
.label {
background: #E8EAF1;
background: #e8eaf1;
display: inline-block;
width: 120px;
text-align: right;
......
components/orderOperator/orderSend.vue
View file @ af027958
......@@ -20,7 +20,7 @@
<Row>
<Col span="8">
<FormItem label="主工艺人员" style="width:100%" prop="DistributeMainRouting">
<UserSelect ref="userSelected" v-model="orderForm.DistributeMainRouting" style="width:240px"/>
<UserSelect ref="userSelected" v-model="orderForm.DistributeMainRouting" style="width:240px" :roleTitle="roleTitle"/>
</FormItem>
</Col>
<Col span="8">
......@@ -107,6 +107,7 @@ export default {
status: true,
orderInfo: []
},
roleTitle:'工艺员',
orderForm: {
DistributeMainRouting: null, //主工艺人员
MainRoutingFinishDate: '', //主工艺人员完成时间
......
components/page/userSelect.vue
View file @ af027958
......@@ -59,6 +59,10 @@ export default {
departmentId: {
type: Number,
default: 0
},
roleTitle:{
type: String,
default: ''
}
},
methods: {
......@@ -73,7 +77,8 @@ export default {
.post(url, {
// pageIndex: 1,
departmentId: id,
type: this.type
type: this.type,
roleTitle:this.roleTitle,
// pageSize: 0
})
.then((r) => {
......
i18n/locale/zh-CN.js
View file @ af027958
......@@ -547,7 +547,11 @@ export default {
designer: '甲方设计人员',
officeFunctionary: '厂内机关负责人',
mainRoutingPeople: '厂内主工艺人员',
remark: '备注'
remark: '备注',
batchNumber: '批次号',
projectNumber: '项目号',
urgencyLevel: '紧急程度',
},
materialInfo: { //料单送审详情
id: '',
......@@ -935,20 +939,20 @@ export default {
deleterUserId: '删除人',
hostId: '服务器',
},
data_source:{
id:'',
hostId:'数据源ID',
port:'端口',
userName:'用户名',
password:'密码',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'更新时间',
lastModifierUserId:'更新人',
isDeleted:'是否删除',
deletionTime:'删除时间',
deleterUserId:'删除人',
},
data_source: {
id: '',
hostId: '数据源ID',
port: '端口',
userName: '用户名',
password: '密码',
creationTime: '创建时间',
creatorUserId: '创建人',
lastModificationTime: '更新时间',
lastModifierUserId: '更新人',
isDeleted: '是否删除',
deletionTime: '删除时间',
deleterUserId: '删除人',
},
mes_part_task_execute: { //排产方案的
pARTTASKPK: '',
cLASSID: '产品Id',
......@@ -1047,5 +1051,153 @@ export default {
routing_header_id: '',
comb_param: '',
rule_qty: '',
}
},
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: {
id: '',
creationTime: '创建时间',
creatorUserId: '创建人',
lastModificationTime: '修改时间',
lastModifierUserId: '修改人',
isDeleted: '是否删除',
deleterUserId: '删除人',
deletionTime: '删除时间',
classId: '',
routingHeaderId: '工艺ID',
name: '工序名',
taskSeq: '工序号',
description: '工序名称详细描述',
taskContent: '工序内容',
resourceId: '设备',
resourceType: '设备类型',
runtime: '单件排产工时',
setupTime: '工序准备工时',
transportTime: '转运工时',
checkTime: '检验工时',
checkFlag: '检验标识',
efficiencyValue: '效率系数',
singleOut: '单件产出',
isOutside: '是否外协',
departmentId: '工序的承制单位',
isImportant: '是否关键工序',
milestoneId: '里程碑',
phaseId: '阶段',
status: '状态',
remark: '备注',
extend: '扩展字段',
outsideTime: '外协工期',
},
RoutingSupporting: {
id: '',
routingHeaderId: '工艺规程ID',
routingHeaderId: '工艺规程ID',
routingDetailId: '工序ID',
routingStepId: '工步ID',
isDeleted: '删除人',
deletionTime: '删除时间',
deleterUserId: '删除人',
routingHeaderId: '工艺规程ID',
routingDetailId: '工序ID',
routingStepId: '工步ID',
quantity: '数量',
materialId: '物料id',
materialType: '物料类型',
materialNumber: '物料编号',
nameMaterial: '物料名称',
state: '状态',
extend: '扩展字段',
remark: '备注',
brand: '牌号',
specifications: '规格',
xhgg: '型号规格',
texture: '材质',
procurementStandards: '采购标准',
qualityGrade: '质量等级',
state: '状态',
extend: '扩展字段',
remark: '备注',
},
routing_step: {
id: '',
creationTime: '创建时间',
creatorUserId: '创建人',
lastModificationTime: '修改时间',
lastModifierUserId: '修改人',
isDeleted: '是否删除',
deleterUserId: '删除人',
deletionTime: '删除时间',
routingHeaderId: '工艺',
routingDetailId: '工序',
classId: '',
stepSeq: '工步号',
name: '名称',
description: '描述',
status: '状态',
remark: '备注',
stepContent: '工步内容',
extend: '扩展字段',
},
routing_qc_card:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'修改时间',
lastModifierUserId:'修改人',
isDeleted:'是否删除',
deleterUserId:'删除人',
deletionTime:'删除时间',
routingHeaderId:'工艺',
routingDetailId:'工序',
routingStepId:'工步',
checkContent:'检验内容',
checkType:'检验标记',
checkParams:'参数名称',
measurementUnit:'单位',
fillintype:'汇报类型',
qualityTemplate:'模板',
isphotograph:'是否拍照',
status:'状态',
extend:'扩展字段',
remark:'备注',
productionRequirement:'生产要求',
standard:'标准指标',
qualityTemplateName:'模板文件名称',
}
}
\ No newline at end of file
layouts/basic-layout/header-bug/index.vue
View file @ af027958
......@@ -2,7 +2,7 @@
<span class="i-layout-header-trigger i-layout-header-trigger-min">
<Dropdown transfer trigger="hover" @on-click="handleClickUserDropdown">
<span @click="openModelBugAdd">
<Badge :count="bugCount === 0 ? null : bugCount" :overflow-count="99" type="Warning" :offset="[20, 0]">
<Badge :count="bugCount === 0 ? null : bugCount" :overflow-count="99" :offset="[20, 0]">
<Icon type="ios-bug" size="18" />
</Badge>
</span>
......
pages/basicData/userManagent/userInfo.vue
View file @ af027958
......@@ -11,7 +11,7 @@
</p>
</div>
</Card>
<Card :style="{width:cardWidth}" style="float:left;margin-left:20px;">
<Card class="user_info_right">
<Tabs :animated="false">
<TabPane label="基本信息">
<div class="tabContent">
......@@ -298,4 +298,9 @@ export default {
.ivu-form-itemNo {
margin-bottom: 4px;
}
.user_info_right{
float:left;
margin-left:20px;
width: calc(78% - 20px);
}
</style>
\ 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