Skip to content

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

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

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