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