Skip to content

M
mes-ui
Commit 179b1f0c authored by renjintao's avatar renjintao
Browse files
Options

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

parents f5c6af41 b1264ca8
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 118 deletions
npm-shrinkwrap.json
View file @ 179b1f0c
......@@ -4938,7 +4938,7 @@
"dependencies": {
"commander": {
"version": "2.14.1",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
"resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz",
"integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
}
}
......@@ -5467,7 +5467,7 @@
},
"crc-32": {
"version": "1.2.0",
"resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
"resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz",
"integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
"requires": {
"exit-on-epipe": "~1.0.1",
......@@ -7364,7 +7364,7 @@
},
"exit-on-epipe": {
"version": "1.0.1",
"resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
"resolved": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
"integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
},
"expand-brackets": {
......@@ -8015,7 +8015,7 @@
},
"frac": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
"resolved": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz",
"integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
},
"fragment-cache": {
......@@ -15087,7 +15087,7 @@
},
"printj": {
"version": "1.1.2",
"resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz",
"resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz",
"integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
},
"private": {
......@@ -20540,7 +20540,7 @@
},
"script-loader": {
"version": "0.7.2",
"resolved": "https://registry.npm.taobao.org/script-loader/download/script-loader-0.7.2.tgz",
"resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz",
"integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
"dev": true,
"requires": {
......@@ -21128,7 +21128,7 @@
},
"ssf": {
"version": "0.10.3",
"resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
"resolved": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz",
"integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
"requires": {
"frac": "~1.1.2"
......@@ -23778,7 +23778,7 @@
},
"wmf": {
"version": "1.0.2",
"resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
"resolved": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz",
"integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
},
"word-wrap": {
......@@ -23933,7 +23933,7 @@
},
"xlsx": {
"version": "0.15.6",
"resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1597272342311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
"resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz",
"integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
"requires": {
"adler-32": "~1.2.0",
......@@ -23948,7 +23948,7 @@
"dependencies": {
"commander": {
"version": "2.17.1",
"resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
"resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz",
"integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
}
}
......
pages/produce/execute/ProcessCase/index.vue
View file @ 179b1f0c
......@@ -116,6 +116,14 @@ export default {
easySearch: {
keys: { op: "title", value: null },
type: { op: "Equal", value: 1 },
routingHeaderId: {
op: "Equal",
value: this.$route.query.routid.toString(),
},
routingDetailId: {
op: "Equal",
value: this.$route.query.headid.toString(),
},
},
modal: false,
deletelModal: false,
......
pages/produce/execute/ProcessCheck/guidance/index.vue
View file @ 179b1f0c
......@@ -7,10 +7,10 @@
:action="action"
:conditions="easySearch"
type="card"
:span="6"
:span="6"
:high="false"
>
<template slot="easySearch">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys">
<Input placeholder="请输入关键字名称" v-model="easySearch.keys.value" />
......@@ -20,39 +20,44 @@
</FormItem>
</Form>
</template>
<template slot="buttons">
<!-- <template slot="buttons">
<Button type="primary" @click="add">新增</Button>
</template>
</template>-->
<template slot="card" slot-scope="{row}">
<div class="card_body">
<Row class="title_i">
<Col :span="21">工艺名称：{{row.title}}</Col>
<Col :span="3" class="btn_click">
<!-- <a @click="edit(row.id)">
<Row class="title_i">
<Col :span="21">工艺名称：{{row.title}}</Col>
<Col :span="3" class="btn_click">
<!-- <a @click="edit(row.id)">
<Icon type="ios-create" @click="edit(row.id)" />
</a> -->
<a @click="view(row.id)">
</a>-->
<!-- <a @click="view(row.id)">
<Icon type="ios-paper" />
</a>
<a @click="remove(row.id)">
<Icon type="ios-trash" />
</a>
</a>-->
</Col>
</Row>
<div class="down_text">
<Row :gutter="16">
<Col span="6">
<div class="file">
<Icon type="ios-paper" v-if="row.filePaths" />
<Icon type="md-film" v-else />
</div>
</Col>
<Col span="18">
<p>创建时间：{{row.creationTime}}</p>
<p>创建人：{{row.creator}}</p>
<p>内容：{{row.content}}</p>
<p>
状态：
<state code="processCase.status" :value="row.status+''" type="text" />
</p>
</Col>
</Row>
<div class="down_text">
<Row :gutter="16">
<Col span="6">
<div class="file">
<Icon type="ios-paper" v-if="row.filePaths" />
<Icon type="md-film" v-else />
</div>
</Col>
<Col span="18">
<p>{{row.creationTime}}</p>
<p>{{row.id}}{{row.creator}}</p>
</Col>
</Row>
</div>
</div>
</div>
<!-- <div class="card_box" @click="changeCards(row)">
<Row :gutter="16">
......@@ -70,15 +75,15 @@
<p>{{row.id}}{{row.creator}}</p>
</Col>
</Row>
</div> -->
</div>-->
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="800" footer-hide :mask-closable="false">
<!-- <Modal v-model="modal" :title="title" width="800" footer-hide :mask-closable="false">
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
</Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel" :mask-closable="false">
<p>确定删除？</p>
</Modal>
</Modal>-->
</div>
</template>
<script>
......@@ -87,7 +92,7 @@ import Search from "./search";
export default {
name: "list",
components: {
Search
Search,
},
head: {
title: "工艺提醒",
......@@ -99,7 +104,15 @@ export default {
action: Api.index,
easySearch: {
keys: { op: "title", value: null },
type: { op: "Equal", value: 2 }
type: { op: "Equal", value: 2 },
routingHeaderId: {
op: "Equal",
value: this.$route.query.routid.toString(),
},
routingDetailId: {
op: "Equal",
value: this.$route.query.headid.toString(),
},
},
modal: false,
deletelModal: false,
......@@ -112,89 +125,54 @@ export default {
title: this.$t("id"),
hide: true,
align: "left",
high: true
},
{
key: "creationTime",
title: this.l("creationTime"),
align: "left",
high: true
high: true,
},
{
key: "creatorUserId",
title: this.l("creatorUserId"),
key: "routingDetail",
title: this.l("routingDetail"),
align: "left",
high: true
},
{
key: "lastModificationTime",
title: this.l("lastModificationTime"),
align: "left",
high: true
},
{
key: "lastModifierUserId",
title: this.l("lastModifierUserId"),
align: "left",
high: true
},
{
key: "isDeleted",
title: this.l("isDeleted"),
align: "left",
high: true
},
{
key: "deletionTime",
title: this.l("deletionTime"),
align: "left",
high: true
},
{
key: "deleterUserId",
title: this.l("deleterUserId"),
align: "left",
high: true
high: true,
tooltip: true,
},
{
key: "title",
title: this.l("title"),
align: "left",
easy: true,
high: true
},
{ key: "creator", title: this.l("creator"), align: "left", high: true },
{
key: "filePath",
title: this.l("filePath"),
key: "creator",
title: this.l("creator"),
align: "left",
high: true
type: "user",
},
{
key: "filePaths",
title: this.l("filePaths"),
key: "content",
title: this.l("content"),
align: "left",
high: true
},
{
key: "dispatchId",
title: this.l("dispatchId"),
align: "left",
high: true
},
{
key: "routingDetailId",
title: this.l("routingDetailId"),
key: "filePaths",
title: this.l("filePath"),
align: "left",
high: true
easy: true,
render: (h, params) => {
return h(
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.view(params.row.id) },
},
"查看"
);
},
},
{
key: "routingHeaderId",
title: this.l("routingHeaderId"),
key: "status",
title: this.l("status"),
align: "left",
high: true
easy: true,
code: "process.status",
},
{ key: "type", title: this.l("type"), align: "left", high: true },
{
title: "操作",
key: "action",
......@@ -206,7 +184,7 @@ export default {
"op",
{
attrs: { oprate: "detail" },
on: { click: () => this.view(params.row.id) }
on: { click: () => this.view(params.row.id) },
},
"查看"
),
......@@ -215,7 +193,7 @@ export default {
"op",
{
attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) }
on: { click: () => this.edit(params.row.id) },
},
"编辑"
),
......@@ -223,14 +201,14 @@ export default {
"op",
{
attrs: { oprate: "delete" },
on: { click: () => this.remove(params.row.id) }
on: { click: () => this.remove(params.row.id) },
},
"删除"
)
),
]);
}
}
]
},
},
],
};
},
mounted() {
......@@ -277,11 +255,11 @@ export default {
},
remove(id) {
this.deletelModal = true;
this.curId = id;
this.curId = id;
},
removeOk(){
removeOk() {
let id = this.curId;
Api.delete(id).then(r => {
Api.delete(id).then((r) => {
if (r.success) {
this.$refs.grid.load();
this.$Message.success("删除成功");
......@@ -314,10 +292,10 @@ export default {
type:'类型（工艺案例还是工艺提醒）',
}
*/
let vkey = "process_case" + "." + key;
let vkey = "remind" + "." + key;
return this.$t(vkey) || key;
}
}
},
},
};
</script>
<style lang="less">
......
plugins/route.js
View file @ 179b1f0c
......@@ -27,7 +27,7 @@ export default ({
next({
name: 'login',
query: {
redirect: to.fullPath
redirect: "/account/login?tenant="+util.cookies.get('tenantCode')
}
});
}
......
store/admin/account.js
View file @ 179b1f0c
......@@ -40,9 +40,10 @@ export const actions = {
if (res.result) {
util.cookies.set('uuid', res.result.userId);
util.cookies.set('tenantCode', res.result.tenantCode );
util.cookies.set('tenantCode', res.result.tenantCode||res.result.tanantCode);
util.cookies.set('token', res.result.accessToken);
sessionStorage.setItem('token', res.result.accessToken)
// // 设置 vuex 用户信息
// await dispatch('admin/user/set', res.info, {
// root: true
......@@ -83,7 +84,8 @@ export const actions = {
});
sessionStorage.clear();
localStorage.clear();
$nuxt.$router.push("/account/login");
//util.cookies.set('tenantCode', res.result.tenantCode );
$nuxt.$router.push("/account/login?tenant="+util.cookies.get('tenantCode'));
}
if (confirm) {
......
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