Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

assets/css/base.less

@@ -866,7 +866,7 @@ html [type=button] {
 }
 
 .waitTask {/*flex 布局*/    
-    display: flex;
+    display: flex!important;
     align-items: center;
     width: 200px;
     height: 100px;

layouts/basic-layout/header-breadcrumb/index.vue

@@ -45,7 +45,7 @@
             },
             items () {
                 let items = [...this.openNames];
-                console.log("items",items)
+                // console.log("items",items)
                 let newItems = [];
                 items.forEach(i => {
                     newItems.push(this.siderMenuObject[i]);

layouts/default.vue

@@ -68,8 +68,9 @@ export default {
   methods: {
     //获取用户基本信息
     initUserInfo() {
+      let userInfo = this.$store.state.admin.user.info;
       let parma = {
-        Id: JSON.parse(sessionStorage.getItem("userInfo")).userId
+        Id: userInfo.userId
       };
       this.$http.sysUser.getuserinfo(parma).then(res => {
         if (res.result) {
@@ -98,10 +99,12 @@ export default {
           this.$store.commit("admin/page/init", this.menus);
           const filterMenuSider = getMenuSider(this.menus, headerName);
           this.$store.commit("admin/menu/setSider", filterMenuSider);
-          this.$store.commit("admin/menu/setActivePath", to.path);
+          // if (to) {
+          //   this.$store.commit("admin/menu/setActivePath", to.path);
+          // }
 
-          const openNames = getSiderSubmenu(path, menuSider);
-          this.$store.commit("admin/menu/setOpenNames", openNames);
+          // const openNames = getSiderSubmenu(path, menuSider);
+          // this.$store.commit("admin/menu/setOpenNames", openNames);
         } else {
           this.$Message.error("加载产品树失败!");
         }

pages/bug/index.vue

@@ -121,6 +121,7 @@ export default {
     Search
   },
   data() {
+    let userInfo=this.$store.state.admin.user.info;
     return {
       action: Api.index,
       easySearch: {
@@ -128,7 +129,7 @@ export default {
         status: { op: 'Equal', value: null },
         creatorUserId: {
           op: 'Equal',
-          value: JSON.parse(sessionStorage.getItem('userInfo')).userId
+          value: userInfo.userId
         }
       },
       selectList: [],

pages/implement/components/processRecord.vue

@@ -4,10 +4,10 @@
     <Form
       ref="cardModeldata"
       :model="cardModeldata"
-      :rules="ruleValidate"
       :label-width="120"
       inline
     >
+    <!-- :rules="ruleValidate" -->
       <Row>
         <Col span="12">
           <FormItem label="设备编号">

pages/implement/components/sendCheck.vue

@@ -73,7 +73,7 @@ export default {
         checker: 0,
         check_time: null
       },
-
+      isall:[],
       isMain: 1,
       productisabled: false,
       product_ID: [],
@@ -172,7 +172,7 @@ export default {
         for (let i = 0; i < roles.length; i++) {
           roleids.push(roles[i].id)
         }
-        let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+        let userInfo = this.$store.admin.user.info;
         // var url =
         //   `${systemUrl}/myuserrole/GetUsersByRoleAndorgan?ids=` +
         //   roleids.join(',') +
@@ -227,9 +227,9 @@ export default {
     },
     getCurrentUser(e) {
       if (e) {
-        let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+        let userInfo = this.$store.admin.user.info;
         this.user.cardno = userInfo.login_id
-        this.user.user_name = localStorage.getItem('userName')
+        this.user.user_name =userInfo.userName
         this.user.user_id = userInfo.userId
       } else {
         this.user.cardno = ''

pages/implement/components/usercard.vue

@@ -238,7 +238,7 @@ export default {
     },
     getCurrentUser(e) {
       if (e) {
-        let userInfo = JSON.parse(sessionStorage.getItem('userInfo'))
+        let userInfo = this.$store.admin.user.info;
         this.user.cardno = userInfo.login_id
         this.user.user_name = localStorage.getItem('userName')
         this.user.user_id = userInfo.userId

pages/implement/index.vue

@@ -48,6 +48,10 @@
             </div>
           </div>
         </div>
+        <div class="dd" v-if="!entryData">
+          <!-- .length=0 -->
+          暂无数据
+        </div>
         <div
           @click="groupClick(item,index)"
           :class="item.id==currentID?'hover':'card_box'"
@@ -369,6 +373,7 @@ export default {
       this.currententry = null
       var url = `${PlanUrl}/orderexecute/getentrylist?ExecuteId=` + ExecuteId
       service.get(`${url}`).then((response) => {
+        console.log("数据",response)
         this.entryData = response.result.entryList
         this.entryHistoryData = this.entryData
         let data = []
@@ -450,7 +455,9 @@ export default {
         }
       })
     },
-
+    detailOk(){
+      console.log("配套")
+    },
     loadBill() {
       var url =
         `${designUrl}/orderbillrel/getorderbilllistbyorders?orderids=` +

pages/implement/table.less

@@ -24,7 +24,8 @@
     float       : left;
     width       : 310px;
     margin-right: 15px;
-    height      : calc(100% - 16px);
+    // height      : calc(100% - 16px);
+    height: 500px;
     border      : 1px solid #e4e6ed;
     overflow-y  : auto;
     overflow-x  : hidden;

pages/mordent/Sluggish/placode/add.vue

@@ -119,11 +119,10 @@ export default {
     StoreHouse
   },
   data() {
+    let userInfo=this.$store.admin.user.info;
     return {
       entity: {
-        creator: parseInt(
-          JSON.parse(sessionStorage.getItem('userInfo')).userId
-        ),
+        creator: userInfo.userId,
         thickness: null,
         inventory: null
       },

pages/mordent/Sluggish/powder/add.vue

@@ -127,11 +127,12 @@ export default {
     StoreHouse
   },
   data() {
+    let userInfo=this.$store.state.admin.user.info;
     return {
       entity: {
         totalInventory: null,
         unitPrice: null,
-        creator: parseInt(JSON.parse(sessionStorage.getItem('userInfo')).userId)
+        creator: userInfo.userId
       },
       rules: {
         storeTitle: [

pages/mordent/Sluggish/scraper/add.vue

@@ -103,11 +103,10 @@ export default {
     StoreHouse
   },
   data() {
+     let userInfo=this.$store.state.admin.user.info;
     return {
       entity: {
-        creator: parseInt(
-          JSON.parse(sessionStorage.getItem('userInfo')).userId
-        ),
+        creator:userInfo.userId,
         inCount: null,
         quantityCount: null,
         price: null

pages/resource/resource/cart.vue

@@ -39,6 +39,7 @@ import Api from './api'
 export default {
   name: 'Add',
   data() {
+     let userInfo=this.$store.state.admin.user.info;
     return {
       columns: [
         {
@@ -101,8 +102,8 @@ export default {
         }
       ],
       resource: {
-        libraryTube: localStorage.getItem('userName'), //库管员
-        libraryTubeId: JSON.parse(sessionStorage.getItem('userInfo')).userId, //库管员ID
+        libraryTube: userInfo.userName, //库管员
+        libraryTubeId: userInfo.userId, //库管员ID
         customer: '', //领料人
         customerId: null, //领料人ID
         category: 0, //类别
@@ -119,7 +120,9 @@ export default {
   props: {
     cartList: {
       type: [Array],
-      default: []
+      default: ()=>{
+        return []
+      }
     }
   },
   methods: {

pages/workflow/process/index.vue

@@ -71,13 +71,14 @@ export default {
     Search
   },
   data() {
+    let userInfo=this.$store.state.admin.user.info;
     return {
       action: Api.index,
       easySearch: {
         keys: { op: 'name', value: null, default: true }
         // creatorUserId: {
         //   op: 'Equal',
-        //   value: JSON.parse(sessionStorage.getItem('userInfo')).userId
+        //   value: userInfo.userId
         // }
       },
       addModal: false,

plugins/iview.js

@@ -177,5 +177,5 @@ export default ({
       })
     }
   })
-  console.warn("this:",app.i18n.locale,app)
+  // console.warn("this:",app.i18n.locale,app)
 }
\ No newline at end of file

store/index.js

@@ -4,6 +4,10 @@ export const state=()=>({
     counter:0,
     dictionary: new Map(),//所有字典项
     userMap:[],//所有用户缓存;
+    userInfo:{
+      userId:0,
+      userName:""
+    }
 })
 export const getters={
   dictionaryByKey: (state) => (key) => {