Skip to content

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

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

parents d6048a1a 40912b67
Show whitespace changes
Inline Side-by-side
Showing with 1056 additions and 1064 deletions
pages/bug/index.vue
View file @ f12229c9
<template> <template>
<div class="myBug"> <div class="myBug">
<Tabs :animated="false" @on-click="tab"> <Tabs :animated="false" @on-click="tab">
<TabPane label="我的"></TabPane> <TabPane label="我的"></TabPane>
<TabPane label="所有"></TabPane> <TabPane label="所有"></TabPane>
</Tabs> </Tabs>
<DataGrid <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" @on-selection-change="selectInfo" :height="gridHeight">
:columns="columns"
ref="grid"
:action="action"
:conditions="easySearch"
@on-selection-change="selectInfo"
:height="gridHeight"
>
<template slot="easySearch"> <template slot="easySearch">
<Form inline > <Form inline>
<FormItem> <FormItem>
<dictionary <dictionary code="Test.bug.status" v-model="easySearch.status.value" style="width:400px;" multiple></dictionary>
code="Test.bug.status"
v-model="easySearch.status.value"
style="width:400px;"
multiple
></dictionary>
</FormItem> </FormItem>
<FormItem> <FormItem>
<Input <Input search enter-button placeholder="请输入bug标题或地址" @on-search="search" v-model="easySearch.keys.value" />
search
enter-button
placeholder="请输入bug标题或地址"
@on-search="search"
v-model="easySearch.keys.value"
/>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
...@@ -39,13 +21,7 @@ ...@@ -39,13 +21,7 @@
<template slot="batch"> <template slot="batch">
<Form :model="formMyCheck" :label-width="5" :rules="ruleValidate" inline ref="formValidate"> <Form :model="formMyCheck" :label-width="5" :rules="ruleValidate" inline ref="formValidate">
<FormItem> <FormItem>
<dictionary <dictionary code="Test.but.statusOper" v-model="selectBatch" type="radio" @on-change="statuChange" ref="dicradio"></dictionary>
code="Test.but.statusOper"
v-model="selectBatch"
type="radio"
@on-change="statuChange"
ref="dicradio"
></dictionary>
</FormItem> </FormItem>
<FormItem v-if="selectBatch == 5" label prop="selectAlloter"> <FormItem v-if="selectBatch == 5" label prop="selectAlloter">
<UserSelect ref="userSelected" v-model="alloter" @on-change="changeUserSelect" /> <UserSelect ref="userSelected" v-model="alloter" @on-change="changeUserSelect" />
...@@ -78,8 +54,9 @@ ...@@ -78,8 +54,9 @@
<Button type="primary" @click="upSave">确定</Button> <Button type="primary" @click="upSave">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from "@/libs/bug"; import Api from "@/libs/bug";
import edit from "./component/add"; import edit from "./component/add";
...@@ -97,8 +74,14 @@ export default { ...@@ -97,8 +74,14 @@ export default {
return { return {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "title,pagePath", value: "" }, keys: {
status: { op: "In", value: [1,5,0] }, op: "title,pagePath",
value: ""
},
status: {
op: "In",
value: [1, 5, 0]
},
creatorUserId: { creatorUserId: {
op: "Equal", op: "Equal",
value: userInfo.userId value: userInfo.userId
...@@ -113,8 +96,7 @@ export default { ...@@ -113,8 +96,7 @@ export default {
pageSizeOpts: [20, 50, 100], pageSizeOpts: [20, 50, 100],
pageSize: 20, pageSize: 20,
tabIndex: 1, tabIndex: 1,
columns: [ columns: [{
{
type: "selection", type: "selection",
width: 60, width: 60,
align: "center" align: "center"
...@@ -136,8 +118,7 @@ export default { ...@@ -136,8 +118,7 @@ export default {
tooltip: true, tooltip: true,
render: (h, params) => render: (h, params) =>
h( h(
"a", "a", {
{
style: {}, style: {},
on: { on: {
click: () => { click: () => {
...@@ -154,8 +135,7 @@ export default { ...@@ -154,8 +135,7 @@ export default {
tooltip: true, tooltip: true,
render: (h, params) => render: (h, params) =>
h( h(
"a", "a", {
{
style: {}, style: {},
on: { on: {
click: () => { click: () => {
...@@ -170,15 +150,7 @@ export default { ...@@ -170,15 +150,7 @@ export default {
title: this.l("status"), title: this.l("status"),
key: "status", key: "status",
width: 100, width: 100,
render: (h, params) => { code: 'Test.bug.status',
return h("state", {
props: {
code: "Test.bug.status",
type: "text",
value: params.row.status + ""
}
});
}
}, },
{ {
title: this.l("creationTime"), title: this.l("creationTime"),
...@@ -209,15 +181,14 @@ export default { ...@@ -209,15 +181,14 @@ export default {
width: 120 width: 120
}, },
{ {
key:"action", key: "action",
title: "操作", title: "操作",
align: "center", align: "center",
width: 180, width: 180,
render: (h, params) => render: (h, params) =>
h("div", [ h("div", [
h( h(
"Button", "Button", {
{
props: { props: {
type: "text", type: "text",
size: "small" size: "small"
...@@ -234,8 +205,7 @@ export default { ...@@ -234,8 +205,7 @@ export default {
"解决" "解决"
), ),
h( h(
"Button", "Button", {
{
props: { props: {
type: "text", type: "text",
size: "small" size: "small"
...@@ -255,11 +225,22 @@ export default { ...@@ -255,11 +225,22 @@ export default {
} }
], ],
statusList: [ statusList: [{
{ name: "确认", value: "1" }, name: "确认",
{ name: "解决", value: "2" }, value: "1"
{ name: "冻结", value: "4" }, },
{ name: "关闭", value: "3" } {
name: "解决",
value: "2"
},
{
name: "冻结",
value: "4"
},
{
name: "关闭",
value: "3"
}
], ],
modalEdit: false, modalEdit: false,
modalDetail: false, modalDetail: false,
...@@ -284,19 +265,20 @@ export default { ...@@ -284,19 +265,20 @@ export default {
selectAlloter: null selectAlloter: null
}, },
ruleValidate: { ruleValidate: {
selectAlloter: [ selectAlloter: [{
{
required: true, required: true,
message: "请选择驳指派人", message: "请选择驳指派人",
type: "number", type: "number",
trigger: "change" trigger: "change"
} }]
]
} }
}; };
}, },
computed: {}, computed: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
......
pages/import/index.vue
View file @ f12229c9
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<Button type="primary" @click="add">新增</Button> <Button type="primary" @click="add">新增</Button>
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="modal" :title="title" width="1200" :fullscreen="full" footer-hide> <Modal v-model="modal" :title="title" width="1200" :fullscreen="full" :footer-hide="initBtn">
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" /> <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal> </Modal>
</div> </div>
...@@ -48,6 +48,7 @@ export default { ...@@ -48,6 +48,7 @@ export default {
}, },
modal: false, modal: false,
full: false, full: false,
initBtn: true,
title: "新增", title: "新增",
detail: null, detail: null,
curId: 0, curId: 0,
...@@ -213,6 +214,7 @@ export default { ...@@ -213,6 +214,7 @@ export default {
add() { add() {
this.curId = 0; this.curId = 0;
this.full = false; this.full = false;
this.initBtn = true;
this.title = "新增"; this.title = "新增";
this.detail = () => import("./add"); this.detail = () => import("./add");
this.modal = true; this.modal = true;
...@@ -227,6 +229,7 @@ export default { ...@@ -227,6 +229,7 @@ export default {
this.curId = id; this.curId = id;
this.title = "详情"; this.title = "详情";
this.full = false; this.full = false;
this.initBtn = false;
this.detail = () => import("./detail"); this.detail = () => import("./detail");
this.modal = true; this.modal = true;
}, },
...@@ -234,6 +237,7 @@ export default { ...@@ -234,6 +237,7 @@ export default {
this.curId = id; this.curId = id;
this.title = "编辑"; this.title = "编辑";
this.full = false; this.full = false;
this.initBtn = true;
this.detail = () => import("./edit"); this.detail = () => import("./edit");
this.modal = true; this.modal = true;
}, },
...@@ -241,6 +245,7 @@ export default { ...@@ -241,6 +245,7 @@ export default {
this.curId = row.id; this.curId = row.id;
this.title = "处理文件：" + row.name; this.title = "处理文件：" + row.name;
this.full = true; this.full = true;
this.initBtn = true;
this.detail = () => import("./process"); this.detail = () => import("./process");
this.modal = true; this.modal = true;
}, },
......
pages/order/monitoring/index.vue
View file @ f12229c9
<template> <template>
<div class="monitoring h100"> <div class="monitoring h100">
<DataGrid :columns="columns" ref="grid" :action="action"> <DataGrid :columns="columns" ref="grid" :action="action">
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline style="margin-top:5px;"> <Form ref="formInline" :model="easySearch" inline style="margin-top:5px;">
...@@ -25,13 +25,7 @@ ...@@ -25,13 +25,7 @@
<Record :eid="recordId" /> <Record :eid="recordId" />
</Modal> </Modal>
<Modal v-model="SpeedModal" title="工单信息" fullscreen footer-hide class="recordM"> <Modal v-model="SpeedModal" title="工单信息" fullscreen footer-hide class="recordM">
<Speed <Speed :result="result" :load="loading" @on-close="clsoeSpeedModal" :executeId="dispatchExecuteId" :orderId="orderId" />
:result="result"
:load="loading"
@on-close="clsoeSpeedModal"
:executeId="dispatchExecuteId"
:orderId="orderId"
/>
</Modal> </Modal>
<Modal v-model="recycleModal" title="确定回收订单" width="600" class="suspend"> <Modal v-model="recycleModal" title="确定回收订单" width="600" class="suspend">
<Form ref="form" :model="recovery" :rules="rulesRecycle" :label-width="120"> <Form ref="form" :model="recovery" :rules="rulesRecycle" :label-width="120">
...@@ -41,12 +35,7 @@ ...@@ -41,12 +35,7 @@
</Col> </Col>
<Col :span="24"> <Col :span="24">
<FormItem :label="l('demandFinishDate')" prop="demandFinishDate"> <FormItem :label="l('demandFinishDate')" prop="demandFinishDate">
<DatePicker <DatePicker type="date" placeholder="请选择日期" style="width:240px" v-model="recovery.demandFinishDate"></DatePicker>
type="date"
placeholder="请选择日期"
style="width:240px"
v-model="recovery.demandFinishDate"
></DatePicker>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -56,8 +45,9 @@ ...@@ -56,8 +45,9 @@
<Button type="primary" @click="changeFinishiDate">确定</Button> <Button type="primary" @click="changeFinishiDate">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
import Suspend from "./suspend"; import Suspend from "./suspend";
...@@ -84,16 +74,26 @@ export default { ...@@ -84,16 +74,26 @@ export default {
laster: 0, laster: 0,
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "mesCode", value: null }, keys: {
productingpreparationpeople: { op: "Equal", value: null }, op: "mesCode",
value: null
},
productingpreparationpeople: {
op: "Equal",
value: null
},
}, },
suspendModal: false, suspendModal: false,
recordModal: false, recordModal: false,
deletelModal: false, deletelModal: false,
recycleModal: false, recycleModal: false,
curId: 0, curId: 0,
columns: [ columns: [{
{ key: "id", title: this.l("id"), hide: true, align: "left" }, key: "id",
title: this.l("id"),
hide: true,
align: "left"
},
{ {
title: "序号", title: "序号",
type: "index", type: "index",
...@@ -118,8 +118,7 @@ export default { ...@@ -118,8 +118,7 @@ export default {
params.row.mesCode, params.row.mesCode,
[ [
h( h(
"Poptip", "Poptip", {
{
props: { props: {
content: "开工预警：" + params.row.startWarning + "条", content: "开工预警：" + params.row.startWarning + "条",
trigger: "hover", trigger: "hover",
...@@ -130,8 +129,7 @@ export default { ...@@ -130,8 +129,7 @@ export default {
}, },
[ [
h( h(
params.row.startWarning > 0 ? "Badge" : "", params.row.startWarning > 0 ? "Badge" : "", {
{
props: { props: {
type: "warning", type: "warning",
// count: 2, // count: 2,
...@@ -157,8 +155,7 @@ export default { ...@@ -157,8 +155,7 @@ export default {
] ]
), ),
h( h(
"Poptip", "Poptip", {
{
props: { props: {
content: "完工预警：" + params.row.finishWarning + "条", content: "完工预警：" + params.row.finishWarning + "条",
trigger: "hover", trigger: "hover",
...@@ -166,8 +163,7 @@ export default { ...@@ -166,8 +163,7 @@ export default {
}, },
[ [
h( h(
params.row.finishWarning > 0 ? "Badge" : "", params.row.finishWarning > 0 ? "Badge" : "", {
{
props: { props: {
type: "info", type: "info",
// count: 2, // count: 2,
...@@ -243,9 +239,9 @@ export default { ...@@ -243,9 +239,9 @@ export default {
return h( return h(
"span", "span",
// this.sliceStr(params.row.actualStartDate + ' ', 0, 10), // this.sliceStr(params.row.actualStartDate + ' ', 0, 10),
params.row.actualStartDate == "0001-01-01 00:00:00" params.row.actualStartDate == "0001-01-01 00:00:00" ?
? "" "" :
: params.row.actualStartDate params.row.actualStartDate
); );
}, },
}, },
...@@ -259,16 +255,16 @@ export default { ...@@ -259,16 +255,16 @@ export default {
return h( return h(
"span", "span",
// this.sliceStr(params.row.actualFinishDate + ' ', 0, 10), // this.sliceStr(params.row.actualFinishDate + ' ', 0, 10),
params.row.actualFinishDate == "0001-01-01 00:00:00" params.row.actualFinishDate == "0001-01-01 00:00:00" ?
? "" "" :
: params.row.actualFinishDate params.row.actualFinishDate
); );
}, },
}, },
{ {
key: "routingType", key: "routingType",
title: this.l("routingType"), title: this.l("routingType"),
align: "left", align: "center",
code: "mes_xingchi_plan.order_material.routingType", code: "mes_xingchi_plan.order_material.routingType",
easy: true, easy: true,
high: true, high: true,
...@@ -282,16 +278,14 @@ export default { ...@@ -282,16 +278,14 @@ export default {
render: (h, params) => { render: (h, params) => {
return h("div", [ return h("div", [
h( h(
"ButtonGroup", "ButtonGroup", {
{
props: { props: {
shape: "circle", shape: "circle",
}, },
}, },
[ [
h( h(
"Button", "Button", {
{
style: { style: {
background: "#e4e6ed ", background: "#e4e6ed ",
borderColor: "#e4e6ed ", borderColor: "#e4e6ed ",
...@@ -305,8 +299,7 @@ export default { ...@@ -305,8 +299,7 @@ export default {
params.row.unstartCount //未开工数 params.row.unstartCount //未开工数
), ),
h( h(
"Button", "Button", {
{
style: { style: {
background: "#ffc000", background: "#ffc000",
borderColor: "#ffc000", borderColor: "#ffc000",
...@@ -337,8 +330,7 @@ export default { ...@@ -337,8 +330,7 @@ export default {
params.row.stopCount //暂停数 params.row.stopCount //暂停数
), ),
h( h(
"Button", "Button", {
{
style: { style: {
background: "#27c149", background: "#27c149",
borderColor: "#27c149", borderColor: "#27c149",
...@@ -369,12 +361,18 @@ export default { ...@@ -369,12 +361,18 @@ export default {
width: 100, width: 100,
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", {
class: "action"
}, [
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "record", class: "edit" }, oprate: "record",
on: { click: () => this.record(params.row.id) }, class: "edit"
},
on: {
click: () => this.record(params.row.id)
},
}, },
"暂停记录" "暂停记录"
), ),
...@@ -387,14 +385,16 @@ export default { ...@@ -387,14 +385,16 @@ export default {
width: 100, width: 100,
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", {
class: "action"
}, [
h( h(
(params.row.status == 5 && params.row.upSplitId == 0) || (params.row.status == 5 && params.row.upSplitId == 0) ||
(params.row.status == 5 && (params.row.status == 5 &&
params.row.upSplitId > 0 && params.row.upSplitId > 0 &&
params.row.splitCardStatus == 1) params.row.splitCardStatus == 1) ?
? "Button" "Button" :
: "", //订单状态暂停，启动 "", //订单状态暂停，启动
{ {
props: { props: {
type: "error", type: "error",
...@@ -441,9 +441,9 @@ export default { ...@@ -441,9 +441,9 @@ export default {
"" ""
), ),
h( h(
params.row.status == 5 && params.row.splitCardStatus == 0 params.row.status == 5 && params.row.splitCardStatus == 0 ?
? "op" "op" :
: "", //订单状态执行中，暂停 "", //订单状态执行中，暂停
{ {
attrs: { attrs: {
icon: "md-sync", icon: "md-sync",
...@@ -470,19 +470,20 @@ export default { ...@@ -470,19 +470,20 @@ export default {
}, },
mesCode: "", mesCode: "",
rulesRecycle: { rulesRecycle: {
demandFinishDate: [ demandFinishDate: [{
{
required: true, required: true,
message: "请选择计划完成时间", message: "请选择计划完成时间",
trigger: "change", trigger: "change",
type: "date", type: "date",
}, }, ],
],
}, },
}; };
}, },
mounted() {}, mounted() {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
...@@ -562,7 +563,9 @@ export default { ...@@ -562,7 +563,9 @@ export default {
}, },
removeOk() { removeOk() {
Api.delete({ id: this.curId }).then((r) => { Api.delete({
id: this.curId
}).then((r) => {
if (r.success) { if (r.success) {
this.$refs.grid.load(); this.$refs.grid.load();
this.deletelModal = false; this.deletelModal = false;
...@@ -635,10 +638,12 @@ export default { ...@@ -635,10 +638,12 @@ export default {
}, },
}; };
</script> </script>
<style lang="less"> <style lang="less">
.ivu-btn-group > .ivu-btn { .ivu-btn-group>.ivu-btn {
height: 21px !important; height: 21px !important;
} }
.ivu-btn-group { .ivu-btn-group {
height: 21px !important; height: 21px !important;
} }
......
pages/produce/orderlist.vue
View file @ f12229c9
...@@ -102,10 +102,10 @@ export default { ...@@ -102,10 +102,10 @@ export default {
op: "mesCode,productName,drawnNumber", op: "mesCode,productName,drawnNumber",
value: null, value: null,
}, },
// status: { DispatchStatus: {
// op: "In", op: "In",
// value: [12, 14, 5, 7, -1] value: [12, 14, 5, 7, -1]
// } }
}, },
downUrl: fileUrlDown, downUrl: fileUrlDown,
columns: [{ columns: [{
......
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