Skip to content

M
mes-ui
Commit 30379f72 authored by renjintao's avatar renjintao
Browse files
Options

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

parents 3baca635 8e7928dd
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 147 deletions
assets/css/base.less
View file @ 30379f72
...@@ -740,7 +740,7 @@ textarea::-webkit-input-placeholder { ...@@ -740,7 +740,7 @@ textarea::-webkit-input-placeholder {
// 纵横树的样式 // 纵横树的样式
.zh-tree { .zh-tree {
position: relative; // position: relative;
display: block; display: block;
width: 250px; width: 250px;
float: left; float: left;
...@@ -762,15 +762,15 @@ textarea::-webkit-input-placeholder { ...@@ -762,15 +762,15 @@ textarea::-webkit-input-placeholder {
} }
.zh-box { .zh-box {
height: 100%-210px;
width: 100%; width: 100%;
overflow-y: auto; height: 100%;
// overflow-y: auto;
padding: 15px; padding: 15px;
margin-bottom: -5000px; // margin-bottom: -5000px;
padding-bottom: 5000px; // padding-bottom: 5000px;
// .tree-content { // .tree-content {
// //color:#fff; // overflow-y: auto;
// } // }
} }
} }
......
layouts/default.vue
View file @ 30379f72
...@@ -24,7 +24,6 @@ export default { ...@@ -24,7 +24,6 @@ export default {
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
await store.dispatch("loadUsers");//加载缓存的用户
}, },
created() { created() {
// 处理路由 得到每一级的路由设置 // 处理路由 得到每一级的路由设置
......
package-lock.json
View file @ 30379f72
...@@ -8774,8 +8774,7 @@ ...@@ -8774,8 +8774,7 @@
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true, "dev": true
"optional": true
}, },
"figures": { "figures": {
"version": "2.0.0", "version": "2.0.0",
...@@ -8803,7 +8802,6 @@ ...@@ -8803,7 +8802,6 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^3.0.0" "ansi-regex": "^3.0.0"
} }
...@@ -9454,8 +9452,7 @@ ...@@ -9454,8 +9452,7 @@
"dependencies": { "dependencies": {
"deepmerge": { "deepmerge": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", "bundled": true
"integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
} }
} }
}, },
...@@ -15222,8 +15219,7 @@ ...@@ -15222,8 +15219,7 @@
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true, "dev": true
"optional": true
}, },
"rx-lite-aggregates": { "rx-lite-aggregates": {
"version": "4.0.8", "version": "4.0.8",
...@@ -18450,8 +18446,7 @@ ...@@ -18450,8 +18446,7 @@
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -18488,8 +18483,7 @@ ...@@ -18488,8 +18483,7 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
...@@ -18498,8 +18492,7 @@ ...@@ -18498,8 +18492,7 @@
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -18602,8 +18595,7 @@ ...@@ -18602,8 +18595,7 @@
}, },
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -18613,7 +18605,6 @@ ...@@ -18613,7 +18605,6 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -18626,20 +18617,17 @@ ...@@ -18626,20 +18617,17 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -18656,7 +18644,6 @@ ...@@ -18656,7 +18644,6 @@
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -18737,8 +18724,7 @@ ...@@ -18737,8 +18724,7 @@
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -18748,7 +18734,6 @@ ...@@ -18748,7 +18734,6 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -18824,8 +18809,7 @@ ...@@ -18824,8 +18809,7 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -18855,7 +18839,6 @@ ...@@ -18855,7 +18839,6 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -18873,7 +18856,6 @@ ...@@ -18873,7 +18856,6 @@
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -18912,13 +18894,11 @@ ...@@ -18912,13 +18894,11 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true
"optional": true
} }
} }
}, },
......
pages/aps/stream/index.vue
View file @ 30379f72
...@@ -172,6 +172,8 @@ export default { ...@@ -172,6 +172,8 @@ export default {
changeStatus(a) { changeStatus(a) {
this.status = a; this.status = a;
this.orderlist(this.status); this.orderlist(this.status);
this.orderId = 0;
this.isactive = null;
}, },
//排产池列表 //排产池列表
...@@ -353,7 +355,7 @@ export default { ...@@ -353,7 +355,7 @@ export default {
}); });
} }
} else { } else {
this.$Message.info("请先选择排产订单"); this.$Message.info("请先选择排产订单设置工序");
} }
}, },
closeOk() { closeOk() {
......
pages/handle/examine1/index.vue
View file @ 30379f72
...@@ -194,6 +194,7 @@ export default { ...@@ -194,6 +194,7 @@ export default {
props: {}, props: {},
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
// await store.dispatch("loadUsers");//加载缓存的用户
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId=this.$store.state.userInfo.userId
......
pages/index.vue
View file @ 30379f72
<template> <template>
<div class="container"> <div class="container">
<iview/> <iview />
</div> </div>
</template> </template>
<script> <script>
import iview from './crm/statistical/index.vue' import iview from "./crm/statistical/index.vue";
export default { export default {
components: { components: {
iview iview
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
await store.dispatch("loadUsers"); //加载缓存的用户
} }
} };
</script> </script>
\ No newline at end of file
pages/qc/check/waitReview/index.vue
View file @ 30379f72
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
"certificateUploadPath": this.setNumForm.imgName, "certificateUploadPath": this.setNumForm.imgName,
}; };
service.post(`${url}`,parmse).then((res) => { service.post(`${url}`,parmse).then((res) => {
if(res.status == 200){ if(res.success){
this.$Message.success('订单已复验。') this.$Message.success('订单已复验。')
this.detailModal = false; this.detailModal = false;
this.$refs.grid.load() this.$refs.grid.load()
......
pages/qc/dataTrace/components/reviewCount.vue
View file @ 30379f72
...@@ -9,15 +9,15 @@ ...@@ -9,15 +9,15 @@
<MenuItem name="2" replace> <MenuItem name="2" replace>
主工艺 主工艺
</MenuItem> </MenuItem>
<MenuItem name="3" replace> <!-- <MenuItem name="3" replace>
专业工艺 专业工艺
</MenuItem> </MenuItem> -->
</Menu> </Menu>
</Col> </Col>
<Col span="20" class="revieweBox"> <Col span="20" class="revieweBox">
<basicView ref="basicView" :baseData="basicData" v-show="basicmodal"/> <basicView ref="basicView" :baseData="basicData" v-show="basicmodal"/>
<mainView ref="mainView" :baseData="basicData" v-show="mainmodal" /> <mainView ref="mainView" :baseData="basicData" v-show="mainmodal" />
<dispatched ref="dispatched" :baseData="basicData" v-show="dispatchedmodal"/> <!-- <dispatched ref="dispatched" :baseData="basicData" v-show="dispatchedmodal"/> -->
</Col> </Col>
</Row> </Row>
</div> </div>
...@@ -66,7 +66,7 @@ export default { ...@@ -66,7 +66,7 @@ export default {
loaddata(pamasId){ loaddata(pamasId){
this.basicmodal=true; this.basicmodal=true;
this.mainmodal= false; this.mainmodal= false;
this.dispatchedmodal= false; // this.dispatchedmodal= false;
// console.warn(pamasId) 获取主工艺信息 10030 // console.warn(pamasId) 获取主工艺信息 10030
let url = `${designUrl}/orderrouting/getordersheaderinfo?orderId=` + pamasId; let url = `${designUrl}/orderrouting/getordersheaderinfo?orderId=` + pamasId;
if(pamasId){ if(pamasId){
...@@ -161,18 +161,19 @@ export default { ...@@ -161,18 +161,19 @@ export default {
if(v==2){ if(v==2){
this.basicmodal= false; this.basicmodal= false;
this.mainmodal= true; this.mainmodal= true;
this.dispatchedmodal= false; // this.dispatchedmodal= false;
this.$refs.mainView.getqc(this.mainexecuteid); this.$refs.mainView.getqc(this.mainexecuteid);
}else if(v==3){ }
this.basicmodal= false; // else if(v==3){
this.mainmodal= false; // this.basicmodal= false;
this.dispatchedmodal= true; // this.mainmodal= false;
 this.$refs.dispatched.getqc(this.disexecuteid); // // this.dispatchedmodal= true;
}else{ //  this.$refs.dispatched.getqc(this.disexecuteid);
// }
else{
this.basicmodal= true; this.basicmodal= true;
this.mainmodal= false; this.mainmodal= false;
this.dispatchedmodal= false; // this.dispatchedmodal= false;
} }
}, },
}, },
......
pages/resourceManagement/deviceManagementCP/index.vue
View file @ 30379f72
...@@ -5,7 +5,10 @@ ...@@ -5,7 +5,10 @@
<h3 class="zh-title">组织架构</h3> <h3 class="zh-title">组织架构</h3>
<div class="zh-box"> <div class="zh-box">
<Input search placeholder="请输入查询条件" clearable v-model="treeInputSearch" /> <Input search placeholder="请输入查询条件" clearable v-model="treeInputSearch" />
<Tree :data="searchList" class="tree-content" @on-select-change="selectTreeNode"></Tree> <Tree :data="searchList"
:style="{height:(treeHeight-115)+'px'}"
style="overflow-y:auto;overflow-x:hiden;width:215px;"
@on-select-change="selectTreeNode"></Tree>
</div> </div>
</div> </div>
<!-- 右侧内容 --> <!-- 右侧内容 -->
...@@ -572,8 +575,8 @@ export default { ...@@ -572,8 +575,8 @@ export default {
"op", "op",
{ {
attrs: { attrs: {
oprate: "detail", oprate: "edit",
class: "edit", // class: "edit",
title: "编辑" title: "编辑"
}, },
on: { on: {
...@@ -1068,11 +1071,9 @@ export default { ...@@ -1068,11 +1071,9 @@ export default {
this.formItemMain1.actual_finish = this.atimee; this.formItemMain1.actual_finish = this.atimee;
this.formItemMain1.failure_notes = this.failurenotes; this.formItemMain1.failure_notes = this.failurenotes;
} }
console.log(this.formItemMain1.plan_start); console.log(this.formItemMain1.plan_start);
}, },
saveOkBack() { saveOkBack() {
// console.log(str);
let url = `${systemUrl}/equipmaintainplan/createorupdate`; let url = `${systemUrl}/equipmaintainplan/createorupdate`;
let paramsdata = { let paramsdata = {
id: this.eid1, id: this.eid1,
......
store/index.js
View file @ 30379f72
import createVuexAlong from 'vuex-along' import createVuexAlong from 'vuex-along'
import Api from '@/plugins/request' import Api from '@/plugins/request'
export const state=()=>({ export const state = () => ({
counter:0, counter: 0,
dictionary: new Map(),//所有字典项 dictionary: new Map(), //所有字典项
userMap:new Map(),//所有用户缓存; userMap: new Map(), //所有用户缓存;
userInfo:{ userInfo: {
userId:0, userId: 0,
userName:"" userName: ""
}, },
cart:[], cart: [],
count: 0, count: 0,
countAps:0,//aps排产 countAps: 0, //aps排产
countAi:0,//智能排产 countAi: 0, //智能排产
countAll:0,//整机排产 countAll: 0, //整机排产
countRun:0,//流水排产 countRun: 0, //流水排产
}) })
export const getters={ export const getters = {
dictionaryByKey: (state) => (key) => { dictionaryByKey: (state) => (key) => {
let result = []; let result = [];
let items = state.dictionary.get(key); let items = state.dictionary.get(key);
...@@ -25,69 +25,83 @@ export const getters={ ...@@ -25,69 +25,83 @@ export const getters={
} }
return result; return result;
}, },
getUser:(state)=>key=>{ getUser: (state) => key => {
// debugger // debugger
if(state.userMap&&state.userMap.get){ if (state.userMap && state.userMap.get) {
return state.userMap.get(key); return state.userMap.get(key);
} }
} }
} }
export const mutations={ export const mutations = {
increment(state){ increment(state) {
state.counter++ state.counter++
}, },
setUserInfo(state, userInfo) { setUserInfo(state, userInfo) {
state.userInfo = userInfo; state.userInfo = userInfo;
// sessionStorage.setItem("userInfo", JSON.stringify(userInfo)); // sessionStorage.setItem("userInfo", JSON.stringify(userInfo));
// sessionStorage.setItem("token", userInfo.token); // sessionStorage.setItem("token", userInfo.token);
}, },
setUsers(state,users){ setUsers(state, users) {
state.userMap=users; state.userMap = users;
}, },
addUser(state,user){ addUser(state, user) {
state.userMap.push(user); state.userMap.push(user);
}, },
setDictionary(state, dictionary) { setDictionary(state, dictionary) {
state.dictionary = dictionary; state.dictionary = dictionary;
}, },
setCart(state, cart) { setCart(state, cart) {
state.cart = cart; state.cart = cart;
}, },
setCartCount(state, count) { setCartCount(state, count) {
state.count = count; state.count = count;
}, },
setCountAps(state, count) {//设置aps排产数量 setCountAps(state, count) { //设置aps排产数量
state.countAps = count; state.countAps = count;
}, },
setCountAi(state, count) {//设置智能排产数量 setCountAi(state, count) { //设置智能排产数量
state.countAi = count; state.countAi = count;
}, },
setCountAll(state, count) {//设置整机排产数量 setCountAll(state, count) { //设置整机排产数量
state.countAll = count; state.countAll = count;
}, },
setCountRun(state, count) {//设置流水排产数量 setCountRun(state, count) { //设置流水排产数量
state.countRun = count; state.countRun = count;
} }
} }
export const actions={ export const actions = {
async loadUser({commit},key){ async loadUser({
commit
let { result } = await Api.get(`${systemUrl}/user/getuser`,{id:key}); }, key) {
console.warn("result",result)
commit("addUser",result); let {
result
} = await Api.get(`${systemUrl}/user/getuser`, {
id: key
});
console.warn("result", result)
commit("addUser", result);
}, },
async loadUsers({commit}){ async loadUsers({
let { result } = await Api.get(`${systemUrl}/user/getuserlist`); commit
var map=new Map(); }) {
result.map(u=>{ let {
map.set(u.id,u); result
} = await Api.get(`${systemUrl}/user/getuserlist`);
var map = new Map();
result.map(u => {
map.set(u.id, u);
}); });
commit("setUsers",map) commit("setUsers", map)
}, },
async loadDictionary({ commit }) { async loadDictionary({
commit
}) {
let url = `${systemUrl}/Dictionary/GetAll` let url = `${systemUrl}/Dictionary/GetAll`
let { result } = await Api.get(url); let {
result
} = await Api.get(url);
var map = new Map(); var map = new Map();
...@@ -97,23 +111,30 @@ export const actions={ ...@@ -97,23 +111,30 @@ export const actions={
} }
} }
commit("setDictionary", map); commit("setDictionary", map);
let r = await Api.get(`${systemUrl}/user/getuserlist`);
var umap = new Map();
r.result.map(u => {
umap.set(u.id, u);
});
commit("setUsers", umap)
} }
} }
export const plugins= [ export const plugins = [
createVuexAlong({ createVuexAlong({
// 设置保存的集合名字，避免同站点下的多项目数据冲突 // 设置保存的集合名字，避免同站点下的多项目数据冲突
name: "hyhmes", name: "hyhmes",
local: { local: {
list: ["hyhmes"], list: ["hyhmes"],
// 过滤模块 ma 数据， 将其他的存入 localStorage // 过滤模块 ma 数据， 将其他的存入 localStorage
isFilter: true, isFilter: true,
}, },
session: { session: {
// 保存模块 ma 中的 a1 到 sessionStorage // 保存模块 ma 中的 a1 到 sessionStorage
list: ["hyhmes.session"], list: ["hyhmes.session"],
}, },
}), }),
] ]
//设置 strict 为不严格模式，即可在actions中修改state //设置 strict 为不严格模式，即可在actions中修改state
export const strict=false; export const strict = false;
\ No newline at end of file
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