Skip to content

M
mes-ui
Commit dcfd759a authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

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

parents a89f21ec 406a3cca
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1417 additions and 1389 deletions
components/page/dataGrid.vue
View file @ dcfd759a
......@@ -479,7 +479,7 @@ export default {
this.$api.post(`${systemUrl}/user/paged`, {
conditions: [],
pageIndex: 1,
pageSize: 1000,
pageSize: 100000,
})
.then((r) => {
if (r.success) {
......
components/page/inputIcon.vue
View file @ dcfd759a
This diff is collapsed.
pages/aps/supprotMain/index.vue
View file @ dcfd759a
<template>
<div class="h100">
<DataGrid :columns="columns" ref="grid" :action="action">
<div class="h100">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input placeholder="请输入申请单号或订单编号" v-model="easySearch.keys.value" v-width="240" />
</FormItem>
<FormItem>
<Dictionary code="accessory.status" placeholder="请选择配套状态" :multiple="true" v-model="easySearch.status.value"></Dictionary>
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
......@@ -15,8 +18,9 @@
<Modal v-model="modal" :title="title" width="1200" fullscreen footer-hide @on-cancel="ok">
<component :is="detail" :eid="curId" :row="entity" @on-close="cancel" @on-ok="ok" />
</Modal>
</div>
</div>
</template>
<script>
import Api from "./api";
export default {
......@@ -31,17 +35,21 @@ export default {
return {
action: Api.index,
easySearch: {
keys: { op: "orderCode,code", value: null },
keys: {
op: "orderCode,code",
value: null
},
status: {
op: "In",
value: [0, 1]
}
},
statuList: this.$store.getters.dictionaryByKey("accessory.status") || [],
statuList1: this.$store.getters.dictionaryByKey("outstore.status") || [],
modal: false,
title: "新增",
detail: null,
curId: 0,
entity: {},
columns: [
{
columns: [{
key: "code",
title: this.l("code"),
align: "left",
......@@ -52,7 +60,7 @@ export default {
title: this.l("finishDate"),
align: "center",
type: "date",
width:200,
width: 200,
},
{
key: "orderCode",
......@@ -65,25 +73,19 @@ export default {
title: this.l("creationTime"),
align: "center",
type: "date",
width:200,
width: 200,
},
{
key: "creator",
title: this.l("creator"),
align: "left"
},
{ key: "creator", title: this.l("creator"), align: "left" },
{
key: "status",
title: this.l("status"),
align: "center",
width:150,
render: (h, params) => {
return h(
"span",
{
style: {
color: this.setName(this.statuList,params.row.status).color,
},
},
this.setName(this.statuList,params.row.status).name
);
},
width: 150,
code: 'accessory.status'
},
{
title: "操作",
......@@ -91,21 +93,31 @@ export default {
width: 140,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
return h("div", {
class: "action"
}, [
h(
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.getAccessory(params.row) },
"op", {
attrs: {
oprate: "detail"
},
on: {
click: () => this.getAccessory(params.row)
},
},
"配套"
),
h(
"op",
{
attrs: { oprate: "edit" },
style:{color:params.row.status==0?"#bebebe":""},
on: { click: () => params.row.status!=0?this.getOutBound(params.row):null },
"op", {
attrs: {
oprate: "edit"
},
style: {
color: params.row.status == 0 ? "#bebebe" : ""
},
on: {
click: () => params.row.status != 0 ? this.getOutBound(params.row) : null
},
},
"出库单"
),
......@@ -118,7 +130,10 @@ export default {
mounted() {
this.search();
},
async fetch({ store, params }) {
async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
......@@ -179,5 +194,6 @@ export default {
},
};
</script>
<style lang="less">
</style>
pages/bug/component/detail.vue
View file @ dcfd759a
<template>
<div style="width:100%;overflow:auto">
<div style="width:100%;overflow:auto">
<div style="width:80%; border-right:1px solid #ccc;padding-right:30px;float:left">
<Form :model="bugForm" :label-width="5" ref="formValidate">
<Row>
......@@ -63,6 +63,9 @@
<p class="time" v-else>
<state code="Test.bug.statusHistory" :value="item.action" type="text"></state>
</p>
<Tooltip max-width="400" :content="item.remark" v-if="item.remark">
<a>查看</a>
</Tooltip>
<p class="content">{{item.actionName}}</p>
<p class="content">{{item.creationTime}}</p>
</TimelineItem>
......@@ -97,8 +100,9 @@
<Button @click="showInfo=false">关闭</Button>
</div>
</Modal>
</div>
</div>
</template>
<script>
export default {
name: 'detail',
......@@ -109,7 +113,7 @@ export default {
detailForm: {
remark: '',
actionName: '',
creationTime:'',
creationTime: '',
workHours: 0
},
divHeight: '200px',
......@@ -118,8 +122,7 @@ export default {
eid: null,
name: ''
},
postUrl:
fileUrl + '/?token=Bearer ' + window.sessionStorage.getItem('token'),
postUrl: fileUrl + '/?token=Bearer ' + window.sessionStorage.getItem('token'),
downUrl: fileUrlDown,
fileUrlPath: '',
bugForm: {
......@@ -143,7 +146,9 @@ export default {
detailInfo(value) {
this.nameList = []
this.parms.eid = value.id
this.$http.bug.get({ id: value.id }).then((res) => {
this.$http.bug.get({
id: value.id
}).then((res) => {
if (res.result) {
this.bugForm = res.result
//this.bugForm.statusNew=res.result.level
......@@ -155,7 +160,9 @@ export default {
let id = value.id
if (id != null) {
//增加确定
this.$http.bug.getallaction({ id: id }).then((res) => {
this.$http.bug.getallaction({
id: id
}).then((res) => {
if (res.result) {
this.timeLineLista = []
this.timeLineList = res.result
......@@ -180,7 +187,7 @@ export default {
this.detailForm = {
remark: value.remark,
actionName: value.actionName,
creationTime:value.creationTime,
creationTime: value.creationTime,
workHours: value.workHours
}
},
......@@ -201,18 +208,21 @@ export default {
}
}
</script>
<style scoped>
.time {
font-size: 14px;
font-weight: bold;
}
.content {
padding-left: 5px;
}
.rightDiv {
width: 18%;
float: left;
padding-left: 50px;
overflow: auto;
}
</style>
pages/handle/api.js
View file @ dcfd759a
......@@ -28,6 +28,6 @@ export default {
return Api.post(`${workflowUrl}/instance/terminate`, params);
},
listTable(params){
return Api.post(`${systemUrl}/custompropertydefinition/list`,params); //物料扩展属性
return Api.post(`${material}/custompropertydefinition/list`,params); //物料扩展属性
},
}
\ No newline at end of file
pages/produce/orderlist.vue
View file @ dcfd759a
<template>
<div class="aps-r">
<DataGrid
:columns="columns"
ref="grid"
:batch="false"
:type="typeInfo"
:span="6"
:lazy="true"
:conditions="easySearch"
:action="action"
:gutter="40"
>
<div class="aps-r">
<DataGrid :columns="columns" ref="grid" :batch="false" :type="typeInfo" :span="6" :lazy="true" :conditions="easySearch" :action="action" :gutter="40">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input
placeholder="请输入订单编号/产品名称/图号"
v-model="easySearch.keys.value"
v-width="260"
clearable
/>
<Input placeholder="请输入订单编号/产品名称/图号" v-model="easySearch.keys.value" v-width="260" clearable />
</FormItem>
<!--
<FormItem>
<Dictionary code="taskList.status" placeholder="请选择工单状态" :multiple="true" v-model="easySearch.status.value"></Dictionary>
</FormItem>
-->
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
......@@ -33,10 +23,7 @@
<Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
</template>
<template slot="card" slot-scope="{row}">
<div
class="body"
@click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status,row.mesCode,row.productName,row.drawnNumber)"
>
<div class="body" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status,row.mesCode,row.productName,row.drawnNumber)">
<Row class="title-i">
<Col :span="10" class="order-code">
<Ellipsis :text="row.productName" :lines="1" tooltip transfer />
......@@ -48,13 +35,7 @@
<div class="statuBg" :style="tdStyle(row.status)"></div>
<div class="boxTitle">
<div class="text">
<state
code="taskList.status"
ref="state"
:value="row.status"
type="text"
:color="false"
></state>
<state code="taskList.status" ref="state" :value="row.status" type="text" :color="false"></state>
</div>
</div>
</Col>
......@@ -92,33 +73,17 @@
<Row class="rowBottom">
<Col span="14">{{l("drawnNumber")}}：{{row.drawnNumber}}</Col>
<Col span="10" class="tr">
<Icon
type="md-alert"
size="18"
color="#FFA000"
v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0"
/>
<span
style="color:#FFA000"
v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0"
>预警</span>&nbsp;&nbsp;
<Icon
type="md-timer"
size="18"
color="#FE7777"
v-if="getStatus(row.status)&&compareTime(row.endTime)"
/>
<span
style="color:#FE7777"
v-if="getStatus(row.status)&&compareTime(row.endTime)"
>超期</span>
<Icon type="md-alert" size="18" color="#FFA000" v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0" />
<span style="color:#FFA000" v-if="getStatus(row.status)&&getTimes(row.endTime)<86400&&getTimes(row.endTime)>0">预警</span>&nbsp;&nbsp;
<Icon type="md-timer" size="18" color="#FE7777" v-if="getStatus(row.status)&&compareTime(row.endTime)" />
<span style="color:#FE7777" v-if="getStatus(row.status)&&compareTime(row.endTime)">超期</span>
</Col>
</Row>
</div>
</div>
</template>
</DataGrid>
</div>
</div>
</template>
<script>
......@@ -137,10 +102,13 @@ export default {
op: "mesCode,productName,drawnNumber",
value: null,
},
// status: {
// op: "In",
// value: [12, 14, 5, 7, -1]
// }
},
downUrl: fileUrlDown,
columns: [
{
columns: [{
title: this.l("mesCode"),
key: "mesCode",
width: 240,
......@@ -194,14 +162,12 @@ export default {
align: "center",
render: (h, params) => {
return h(
"div",
{
"div", {
class: "action",
},
[
h(
"op",
{
"op", {
attrs: {
oprate: "edit",
},
......@@ -238,7 +204,10 @@ export default {
let oldStr = localStorage.getItem("admin");
let userlist = this.$store.getters.getUser(2);
},
async fetch({ store, params }) {
async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
......@@ -390,16 +359,19 @@ export default {
.panel-text {
padding: 5px 8px;
.img-i {
width: 120px;
height: 120px;
overflow: hidden;
border: #cacbd0 dashed 1px;
img {
// width: 90px;
// height: 90px;
}
}
.row {
color: #666666;
padding-left: 10px;
......
pages/qc/certificate/endIssued/index.vue
View file @ dcfd759a
<template>
<div class="end-issued">
<DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
:high="false"
:height="tdHeight"
></DataGrid>
<Modal
v-model="detailModal"
title="查看合格证"
@on-cancel="reload"
footer-hide
width="1000"
:mask-closable="false"
>
<div class="end-issued">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false" :height="tdHeight"></DataGrid>
<Modal v-model="detailModal" title="查看合格证" @on-cancel="reload" footer-hide width="1000" :mask-closable="false">
<Detail @on-close="cancel" @on-ok="addOk" :eid="curId" ref="listDetail" />
</Modal>
</div>
</div>
</template>
<script>
......@@ -37,10 +23,18 @@ export default {
modalInfo: false,
tdHeight: "",
rules: {
approveUser: [{ required: true, message: "必填", trigger: "blur" }]
approveUser: [{
required: true,
message: "必填",
trigger: "blur"
}]
},
columns: [{
key: "id",
title: this.l("id"),
hide: true,
align: "left"
},
columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
// {
// type: 'selection',
// width: 60,
......@@ -98,9 +92,9 @@ export default {
render: (h, params) => {
return h(
"span",
params.row.actualFinishDate == "0001-01-01 00:00:00"
? ""
: params.row.actualFinishDate
params.row.actualFinishDate == "0001-01-01 00:00:00" ?
"" :
params.row.actualFinishDate
);
}
},
......@@ -121,17 +115,20 @@ export default {
},
{
title: "操作",
key: "id",
key: "action",
render: (h, params) => {
return h("div", { class: "action" }, [
return h("div", {
class: "action"
}, [
h(
"op",
{
"op", {
attrs: {
oprate: "detail",title: "查看合格证"
oprate: "detail",
title: "查看合格证"
},
on: { click: () => this.detail(params.row.id) }
on: {
click: () => this.detail(params.row.id)
}
},
"查看合格证"
)
......@@ -140,8 +137,15 @@ export default {
}
],
easySearch: {
keys: { op: "mesCode", value: "", default: true },
type: { op: "Equal", value: 2 }
keys: {
op: "mesCode",
value: "",
default: true
},
type: {
op: "Equal",
value: 2
}
}
};
},
......
pages/qc/certificate/waitOpened/index.vue
View file @ dcfd759a
<template>
<div class="wait-opened">
<DataGrid
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
:high="false"
:height="tdHeight"
></DataGrid>
<div class="wait-opened">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :high="false" :height="tdHeight"></DataGrid>
<Modal v-model="addModal" title="开合格证" fullscreen footer-hide :mask-closable="false">
<Add @on-close="cancel" @on-ok="addOk" :eid="curId" ref="addFile" />
</Modal>
</div>
</div>
</template>
<script>
......@@ -29,8 +22,12 @@ export default {
addModal: false,
curId: null,
tdHeight: "",
columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
columns: [{
key: "id",
title: this.l("id"),
hide: true,
align: "left"
},
{
key: "mesCode",
title: this.l("mesCode"),
......@@ -84,9 +81,9 @@ export default {
render: (h, params) => {
return h(
"span",
params.row.actualFinishDate == "0001-01-01 00:00:00"
? ""
: params.row.actualFinishDate
params.row.actualFinishDate == "0001-01-01 00:00:00" ?
"" :
params.row.actualFinishDate
);
}
},
......@@ -107,18 +104,21 @@ export default {
},
{
title: "操作",
key: "id",
key: "action",
// width: 250,
align: "center",
render: (h, params) => {
return h("div", { class: "action" }, [
return h("div", {
class: "action"
}, [
h(
"op",
{
"op", {
attrs: {
oprate: "add"
},
on: { click: () => this.add(params.row) }
on: {
click: () => this.add(params.row)
}
},
"开合格证"
)
......@@ -127,12 +127,22 @@ export default {
}
],
easySearch: {
keys: { op: "mesCode", value: null, default: true },
type: { op: "Equal", value: 1 }
keys: {
op: "mesCode",
value: null,
default: true
},
type: {
op: "Equal",
value: 1
}
}
};
},
async fetch({ store, params }) {
async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {},
......
pages/technology/add.vue
View file @ dcfd759a
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Row>
<!-- <Col :span="12">
<FormItem :label="l('classId')" prop="classId">
......@@ -151,10 +151,9 @@
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</Form>
</template>
<script>
import Api from "./api";
import ApiWorkflow from "../workflow/process/api";
......@@ -198,28 +197,22 @@ export default {
fileId: "",
},
rules: {
name: [
{
name: [{
required: true,
message: "必填",
trigger: "blur",
},
],
code: [
{
}, ],
code: [{
required: true,
message: "必填",
trigger: "blur",
},
],
routingType: [
{
}, ],
routingType: [{
required: true,
message: "请选择工艺类型",
trigger: "change",
type: "number",
},
],
}, ],
},
parms: {
app: "technology",
......@@ -272,6 +265,18 @@ export default {
if (r.success) {
this.$Message.success("保存成功");
this.$emit("on-ok");
//保存成功后直接打开主页面查看功能
let rowInfo = {
id: null, //????保存成功后需要返回id
code: this.entity.code,
name: this.entity.name,
routingType: this.entity.routingType,
version: this.entity.versionid,
departmentName: this.entity.departmentName,
approvalStatus: this.entity.approvalStatus,
productBomId: this.entity.productBomId
}
// this.$emit("on-goPage", rowInfo)
} else {
this.$Message.error("保存失败");
}
......
pages/technology/index.vue
View file @ dcfd759a
......@@ -52,7 +52,7 @@
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1120" footer-hide>
<component :is="detail" :eid="curId" :uid="uId" :title="title" :headid="hid" @on-close="cancel" @on-ok="ok" />
<component :is="detail" :eid="curId" :uid="uId" :title="title" :headid="hid" @on-close="cancel" @on-ok="ok" @on-goPage="view" />
</Modal>
<Modal v-model="documentShow" title="送审" :mask-closable="false" :scrollable="true" ok-text="确定" cancel-text="取消" fullscreen>
<sendAudit ref="sendAudit"></sendAudit>
......
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