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