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

components/modalTree/storeHouseLeft.vue

@@ -16,7 +16,7 @@
         </Button>
       </ButtonGroup>
     </h3>
-    <div class="tree" >
+    <div class="tree" :style="{height:divHeight}">
       <Tree
         ref="tree"
         :data="tree"
@@ -33,7 +33,8 @@ export default {
     return {
       expand: false,
       ids: [],
-      tree: []
+      tree: [],
+      divHeight:''
     }
   },
   props: {
@@ -45,6 +46,8 @@ export default {
   mounted() {},
   created() {
     this.loadTree()
+     var theight = window.innerHeight - 180 + 'px'
+    this.divHeight = theight
   },
   methods: {
     toggle() {

components/orderOperator/process.vue

@@ -43,7 +43,7 @@ export default {
   components: {},
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       processTitle: '审批流程',
       dataImmut: [],
       dataMut: [],
@@ -60,6 +60,7 @@ export default {
     }
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.load(this.schemaIdVal)
   },
   methods: {

pages/aps/aps/components/edit.vue

 <template>
-  <Form ref="form" :model="entity" :rules="rules" :label-width="90">
+  <Form ref="form" :model="entity" :rules="rules" :label-width="100">
     <Row>
       <Col :span="12">
         <FormItem :label="l('tASKSEQ')" prop="tASKSEQ">
@@ -39,7 +39,7 @@
       <Col :span="12">
         <FormItem :label="l('rUNTIME')" prop="rUNTIME">
            <!-- v-model="value1" -->
-          <InputNumber :max="10" :min="1"></InputNumber>
+          <InputNumber :max="100" :min="1"></InputNumber>
         </FormItem>
       </Col>
     </Row>

pages/aps/dispatch/dispatch.less

@@ -39,11 +39,11 @@
                     }
                 }
                 .ivu-card-head{
-                    background: #62b8af!important;
+                    background: #2d8cf0!important;
                 }
             }
             .g_title{
-                color: #249e91;
+                color: #2d8cf0;
             }
         }
         .dispatch_card02{
@@ -86,9 +86,9 @@
     .drawer_center{
         text-align: center;
         padding: 10px;
-        color: #249e91;
+        color: #2d8cf0;
         .color{
-            color: #2680EB;
+            color: #2d8cf0;
         }
     }
 }
@@ -106,9 +106,9 @@
         .drawer_center{
             text-align: center;
             padding: 10px;
-            color: #249e91;
+            color: #2d8cf0;
             .color{
-                color: #2680EB;
+                color: #2d8cf0;
             }
         }
     }

pages/aps/dispatch/index.vue

@@ -73,7 +73,7 @@
                         <Icon
                           type="ios-disc"
                           size="18"
-                          :color="item.id==shebeiId?'#249e91':'#fff'"
+                          :color="item.id==shebeiId?'#2d8cf0':'#fff'"
                         />
                         <input
                           name="shebei"

pages/aps/results/index.vue

@@ -164,7 +164,7 @@ export default {
         });
     },
     clear() {
-      if (this.list.lenght > 0) {
+      if (this.list.length > 0) {
         this.$Modal.confirm({
           title: "清空列表",
           content: "您确定要清空列表吗",

pages/basicData/calendar/class/index.vue

@@ -172,13 +172,13 @@ export default {
     }
   },
   created(){
-    this.tableHeight = window.innerHeight - 220
+    this.tableHeight = window.innerHeight - 230
   },
   mounted() {
     window.onresize = () => {///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - 220
+          this.tableHeight = window.screenHeight - 230
         })()
       }
   },

pages/basicData/calendar/holiday/index.vue

@@ -171,14 +171,14 @@ export default {
     }
   },
   created(){
-    this.tableHeight = window.innerHeight - 220
+    this.tableHeight = window.innerHeight - 230
   },
   mounted() {
     // console.log(this)
     window.onresize = () => {///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - 220
+          this.tableHeight = window.screenHeight - 230
         })()
       }
   },

pages/basicData/calendar/overtime/index.vue

@@ -196,14 +196,14 @@ export default {
   },
   created() {
     this.getWeekTypeListFn()
-    this.tableHeight = window.innerHeight - 220
+    this.tableHeight = window.innerHeight - 230
   },
   mounted() {
     window.onresize = () => {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight
-        this.tableHeight = window.screenHeight - 220
+        this.tableHeight = window.screenHeight - 230
       })()
     }
   },

pages/basicData/calendar/work/index.vue

@@ -69,7 +69,7 @@ export default {
       deletelMore: false,
       curId: 0,
       columns: [
-        { type: 'selection', width: 70, align: 'center'},
+        // { type: 'selection', width: 70, align: 'center'},
         { key: 'id', title: this.l('id'), hide: true, align: 'left' },
         {
           key: 'creationTime',
@@ -184,13 +184,13 @@ export default {
     }
   },
   created(){
-    this.tableHeight = window.innerHeight - 220
+    this.tableHeight = window.innerHeight - 230
   },
   mounted() {
     window.onresize = () => {///浏览器窗口大小变化
         return (() => {
           window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - 220
+          this.tableHeight = window.screenHeight - 230
         })()
       }
   },

pages/basicData/dataDictionary/components/add.vue

-<template>
-  <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :show-message="false"	 :label-width="90">
-    <Row>
-       <FormItem label="类型" prop="typeid">
-        <Select v-model="formValidate.typeid" placeholder="请选择" style="width:240px;">
-            <Option v-for="(item,index) in alltype " :key="item.index" :value="item.value">{{item.label}}</Option>
-        </Select>
-    </FormItem>
-    </Row>
-    <Row>
-       <FormItem label="名称" prop="name">
-        <Input v-model="formValidate.name" style="width:240px;"></Input>
-    </FormItem>
-    </Row>
-    <Row>
-      <FormItem label="描述" prop="description">
-        <Input v-model="formValidate.description"  style="width:240px;"></Input>
-    </FormItem>
-    </Row>
-    <!-- <FormItem label="编号" prop="number">
-        <Input v-model="formValidate.number" number></Input>
-    </FormItem> -->
-  </Form>
-</template>
-<script>
-export default {
-  name:'addDictionary',
-  props:['alltype'],
-  data(){
-    return {
-      formValidate:{typeid:'',name:'',description:''},
-      ruleValidate:{
-        name:[{required: true}],
-        // number:[{required: true,type:'number'}],
-        typeid:[{required: true}]
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-.ivu-form-item {width:48%;display:inline-block;}
-  .ivu-form-item:nth-child(odd) {
-     margin-left: 10px
-}
-</style>
\ No newline at end of file

pages/basicData/dataDictionary/index.vue

-<template>
-  <div>
-     <div  class="contentRight">
-    <label>类型：</label>
-    <Select v-model="model1" @on-change="change" placeholder="请选择" style="width: 200px">
-      <Option v-for="(item,index) in selectdata" :key="item.index" :value="item.value">{{item.label}}</Option>
-    </Select>
-    <div style="float:right" class="paddingbtn">
-      <Button type="primary" @click="add('formValidate')">新增</Button>
-      <!-- <Button type="primary" @click="edit">编辑</Button>
-      <Button type="primary" @click="del">删除</Button> -->
-    </div>
-    <tb :tbPro="tbPro" ref="table" v-on:rowclick="rowclick" class="margin-top-10"></tb>
-     </div>
-
-    <Modal v-model="modal1"  title="新增字典数据" :width="440"  :mask-closable="false"
-     :loading="myloading"
-      ok-text="保存" cancel-text="取消" @on-ok="ok('formValidate')" @on-cancel='cancel'
-    >
-      <add-dictionary ref="datadictionary" :alltype="selectdata"></add-dictionary>
-      <!-- <div slot="footer" style="text-align:center">
-        <Button type="primary" @click="ok('formValidate')">保存</Button>
-        <Button
-          type="primary"
-          style="border-color: rgb(204, 204, 204);background-color:white;color:black"
-          @click="cancel"
-        >取消</Button>
-      </div> -->
-    </Modal>
-    <myconfirm ref="mysel" v-on:confirmok="okmysel" v-on:confirmcancel="cancelmysel"></myconfirm>
-  </div>
-</template>
-<script>
-import tb from '../roleManagent/components/tb'
-import addDictionary from './components/add'
-import myconfirm from '../../processDesign/productTree/components/myconfirm'
-import service from '@/plugins/request'
-export default {
-  components:{tb,addDictionary,myconfirm},
-  data(){
-    return {
-      myloading:true,
-      model1:'',
-      modal1:false,
-      isEdit:false,
-      formValidate1:{},
-      keyid:0,
-      clickdata:{},
-      //xia la
-      selectdata:[
-        {
-          value:'产品类型',
-          label:'产品类型'
-        },
-        {
-          value:'产品分类',
-          label:'产品分类'
-        },
-        {
-          value:'工艺类型',
-          label:'工艺类型'
-        },
-        {
-          value:'工艺阶段',
-          label:'工艺阶段'
-        },
-        {
-          value:'产品型号',
-          label:'产品型号'
-        },
-      ],
-      //表格数据和属性
-      tbPro:{
-        height:"",
-        isBorder: true,
-        stripe: true,//斑马纹
-        highlight:true,//高亮显示
-        columns: [
-          {
-            type: 'index',
-            width: 60,
-            align: 'center'
-          },
-          
-          {
-            title: '名称',
-            key: 'name'
-          },
-          {
-            title: '描述',
-            key: 'description'
-          },
-          {
-            title: '编码',
-            key: 'code'
-          },
-          {
-            title: '操作',
-            key: 'action',
-            align: 'center',
-            width:400,
-            render: (h, params) => {
-            return h('div', [
-                  h(
-                    'span',
-                    {
-                      props: {
-                        type: 'text',
-                        ghost:true
-                      },
-                      style: {
-                        color: '#249E91',
-                         marginRight:"5px",
-                         cursor:"pointer"
-                      },
-                      on: {
-                        click: () => {
-                          this.edit(params)
-                        }
-                      }
-                    },
-                    '编辑'
-                  ),
-                  h(
-                    'span',
-                    {
-                      props: {
-                        type: 'text',
-                        ghost:true
-                      },
-                      style: {
-                        color: '#F56C6C',
-                         marginRight:"5px",
-                        cursor:"pointer"
-                      },
-                      on: {
-                        click: () => {
-                          this.del(params)
-                        }
-                      }
-                    },
-                    '删除'
-                  )
-                ])
-            }
-          }
-        ],
-        data: [
-          
-        ]
-      }
-    }
-  },
-  created(){
-    var url=`${systemUrl}/DictionaryType/GetPaged`
-    service.get(`${url}`).then(response=>{
-      //console.log(response.data.result.items)
-      this.selectdata=response.data.result.items
-      this.model1=this.selectdata[0].value
-      this.loaddata(this.model1)
-    });
-     this.tbPro.height = window.innerHeight - 180;
-  },
-  mounted(){
-    window.onresize = () => {
-            return (() => {
-               this.tbPro.height = window.innerHeight - 180;
-            })()
-        }
-  },
-  computed:{
-    alldata:function(){
-      return this.tbPro.data
-    }
-  },
-  methods:{
-    loaddata(id){
-      var url=`${systemUrl}/Dictionary/GetPaged`
-      service.get(`${url}`,{params:{TypeId:id}}).then(response=>{
-        this.tbPro.data=response.data.result.items
-      })
-    },
-    change(data){
-     // console.log(data);
-      this.loaddata(data)
-    },
-    add:function(name){
-      this.isEdit=false;
-      var a = this.$refs.datadictionary;
-      a.$refs[name].resetFields();
-       this.modal1=true;
-      this.$refs.datadictionary.formValidate={typeid:'',description:'',name:''}
-    },
-    edit(params){
-      var a = this.$refs.datadictionary;
-      a.$refs['formValidate'].resetFields();
-        this.modal1=true;
-        this.isEdit=true;
-        let {typeId,name,description,id,code}=params.row;
-       // console.log(typeId)
-       // console.log(number);
-        this.$refs.datadictionary.formValidate={typeid:typeId,name:name,description:description,id:id,code:code}
-    },
-      
-    
-    del(params){
-      console.log(params)
-      this.keyid=params.row.id
-      console.log(this.keyid)
-      this.$refs.mysel.confirmmodal=true;
-     
-    },
-    okmysel(bl){
-      var url=`${systemUrl}/Dictionary/Delete?id=${this.keyid}`
-      service.delete(`${url}`).then(response=>{
-        if(response.data.success)
-        {
-          this.$Message.success('删除成功')
-          this.loaddata(this.model1)
-        }
-       
-      }).catch(error=>{
-        this.$Message.error('删除失败')
-      })
-       this.$refs.mysel.confirmmodal=bl
-
-    },
-    cancelmysel(bl){
-      this.$refs.mysel.confirmmodal=bl
-    },
-    //保存增加修改
-    ok(name){
-      var a = this.$refs.datadictionary;
-      var url=`${systemUrl}/Dictionary/CreateOrUpdate`
-      var ar=this.alldata.find((val)=>{
-        return (val.name==this.$refs.datadictionary.formValidate.name)
-      })
-      if(ar){
-         this.$Message.error('已存在字典项的名字');
-         setTimeout(() => {
-            this.myloading = false
-            this.$nextTick(() => {
-              this.myloading = true
-            })
-          }, 500)
-         return;
-      }
-      a.$refs[name].validate((valid) => {
-        if (valid) {
-          this.formValidate1 = this.$refs.datadictionary.formValidate
-          if (this.isedit) 
-          {
-            //this.formValidate1.id=
-          } 
-          service.post(`${url}`,JSON.stringify({Dictionary:this.formValidate1})).then(response=>{
-            if(response.data.success){
-              this.$Message.success('保存成功')
-              this.loaddata(this.model1)
-              this.modal1 = false
-            }
-            
-          }).catch(error=>{
-            //console.log(123)
-           // console.log(error)
-            this.$Message.error('保存失败')
-          })
-          
-          
-        } else {
-          setTimeout(() => {
-            this.myloading = false
-            this.$nextTick(() => {
-              this.myloading = true
-            })
-          }, 500)
-          this.$Message.error('请输入必填项')
-        }
-      })
-    },
-    cancel(){
-      this.modal1=false;
-    },
-    rowclick(data,index){
-      console.log(typeof(data));
-      this.clickdata=data;
-     // console.log(this.clickdata);
-    }
-  }
-}
-</script>
-<style scoped>
-
-</style>

pages/basicData/privilegeManagent/components/add.vue

-<template id="addPRi">
-  <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :show-message="false"	 :label-width="80" >
-    <FormItem label="父权限" prop="up_id">
-        <Select v-model="formValidate.up_id"  style="width:240px;">
-          <Option v-for="(item,index) in list " :key="index" :value="item.value" style="display:none">{{item.label}} </Option>
-          <Tree v-show="isShow" :data="seldata"   @on-select-change="handleSelect"></Tree>
-        </Select>
-    </FormItem>
-    <FormItem label="权限名称" prop="name">
-        <Input v-model="formValidate.name"  style="width:240px;"></Input>
-    </FormItem>
-    <FormItem label="系统" prop="from_system">
-        <Select v-model="formValidate.from_system" @on-change="selectSys" style="width:240px;">
-            <Option v-for="(item,index) in allsystem " :key="index+1" :value="item.value">{{item.label}}</Option>
-            
-        </Select>
-    </FormItem>
-    <FormItem label="操作类型" prop="type">
-        <Select v-model="formValidate.type" placeholder="请选择" style="width:240px;">
-            <Option value=1>菜单</Option>
-            <Option value=2>系统</Option>
-            <Option value=3>页面</Option>
-        </Select>
-    </FormItem>
-    <FormItem label="地址" prop="url">
-      <Input v-model="formValidate.url"  style="width:240px;"></Input>
-        <!-- <Select v-model="formValidate.url" placeholder="请选择">
-            <Option v-for="(item,index) in allpages " :key="item.value" :value="item.value">{{item.label}}</Option>
-           
-        </Select> -->
-    </FormItem>
-    <!-- <FormItem label="密级" prop="secret_class">
-        <Select v-model="formValidate.secret_class" placeholder="请选择" style="width:240px;">
-            <Option v-for="(item,index) in mijis " :key="item.value" :value="item.value">{{item.label}}</Option>
-           
-        </Select>
-    </FormItem> -->
-    <FormItem label="状态" prop="status">
-        <Select v-model="formValidate.status" placeholder="请选择" style="width:240px;">
-            <Option value=0>启用</Option>
-            <Option value=1>禁用</Option>
-        </Select>
-    </FormItem>
-    <!-- <FormItem label="打开方式" prop="target">
-        <Select v-model="formValidate.target" placeholder="请选择" style="width:240px;">
-            <Option value="系统内">系统内</Option>
-            <Option value="新页面">新页面</Option>
-        </Select>
-    </FormItem> -->
-    <FormItem label="排序" prop="priority">
-        <Input v-model="formValidate.priority"  style="width:240px;"></Input>
-    </FormItem>
-  </Form>
-</template>
-<script>
-import service from '@/plugins/request'
-export default {
-  name:'addPrivilege',
-  tit:'',
-  props:[
-   'seldata'
-   
-  ],
-  data(){
-    return {
-      formValidate:{name:'',up_id:-1,from_system:'',type:'',url:'',status:'',target:'',priority:'',secret_class:''},
-      ruleValidate: {
-        up_id:[{required: true}],
-        name:[{required: true}],
-        from_system:[{required: true}],
-        type:[{required: true}],
-        url:[{required: true}]
-        // priority:[ { required: true, message: '排序不能为空' },
-        //               { type: 'number', message: '请输入排序,只能填写数字' }]
-      },
-      list:[],
-      isShow:true,
-      allsystem:[
-        
-        {
-          value:'0',
-          label:'三车间MES'
-        },
-        {
-          value:'1',
-          label:'机加MES'
-        }
-      ],
-      allpages:[
-        {
-          value:'/a/index.html',
-          label:'/a/index.html'
-        },
-        {
-          value:'/a/port.html',
-          label:'/a/port.html'
-        },
-        {
-          value:'/a/default.html',
-          label:'/a/default.html'
-        }
-      ],
-      mijis:[
-        {
-          value:'机密',
-          label:'机密'
-        },
-        {
-          value:'一般',
-          label:'一般'
-        },
-        {
-          value:'内部',
-          label:'内部'
-        }
-      ]
-    }
-  },
-  created(){
-    this.formValidate.from_system=this.allsystem[0].value
-    //this.gettree(this.formValidate.from_system);
-  },
-  computed:{
-   
-  },
-  methods:{
-    
-    selectSys(){
-      this.$emit('selectSys',this.formValidate.from_system)
-    },
-    handleSelect(data){
-      this.list=[];
-      this.list.push({label:data[0].title,value:data[0].value});
-      console.log(this.list);             
-      this.formValidate.up_id=data[0].value;
-     
-    },
-    getdata(){
-      return this.formValidate
-    }
-  }
-}
-</script>
-<style scoped>
-  .ivu-form-item {width:48%;display:inline-block;}
-  .ivu-form-item:nth-child(odd) {
-     margin-left: 10px
-}
-</style>
\ No newline at end of file

pages/basicData/roleManagent/index.vue

@@ -384,8 +384,8 @@ export default {
               }
         })
         .then((response) => {
-          this.tbPro.data = response.data.result.items
-          this.total = response.data.result.total
+          this.tbPro.data = response.result.items
+          this.total = response.result.total
           this.tbPro.loading = false
           //console.log(this.tbPro.data)
         })

pages/basicData/userManagent/userInfo.vue

@@ -7,7 +7,7 @@
           <Avatar :src="avatorPath" size="150" />
         </p>
         <p style="text-align:center;padding:10px;">
-          <Button  @click="openModalAvatar">修改头像</Button>
+          <Button @click="openModalAvatar">修改头像</Button>
         </p>
       </div>
     </Card>
@@ -92,106 +92,106 @@
   </div>
 </template>
 <script>
-import Api from '../user/api'
-import avatar from '@/assets/images/avatar.png'
-import inputFiles from '@/components/page/inputFile.vue'
-var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
+import Api from "../user/api";
+import avatar from "@/assets/images/avatar.png";
+import inputFiles from "@/components/page/inputFile.vue";
 export default {
   components: {
     inputFiles
   },
   data() {
     return {
-      parms: 'app=user&eid=23&name=avatarUrl',
-      cardWidth: '600px',
+      parms: "app=user&eid=23&name=avatarUrl",
+      cardWidth: "600px",
+      userId: 0,
       pwdModel: {
         id: null,
-        oldPwd: '',
-        newPwd: '',
-        confirmPwd: ''
+        oldPwd: "",
+        newPwd: "",
+        confirmPwd: ""
       },
       modalAvatar: false,
-      mid: '',
+      mid: "",
       userInfo: {
         id: 0,
-        cardNo: '',
-        userName: '',
+        cardNo: "",
+        userName: "",
         gender: 0,
-        birthday: '',
+        birthday: "",
         degreeId: 0,
         titile: 0,
         workLicense: 0,
-        employeeNo: '',
-        jobName: '',
-        phone: '',
-        email: '',
+        employeeNo: "",
+        jobName: "",
+        phone: "",
+        email: "",
         departmentId: 0,
-        departmentTitle: '',
+        departmentTitle: "",
         status: 0,
-        remark: '',
-        avatarUrl: ''
+        remark: "",
+        avatarUrl: ""
       },
+      userInfos:{},
       imageModel: {
         id: null,
-        avatar_Url: '',
-        name: ''
+        avatar_Url: "",
+        name: ""
       },
-      imgName: '',
-      avatorPath: '',
-      oldImgName: ''
-    }
+      imgName: "",
+      avatorPath: "",
+      oldImgName: ""
+    };
   },
   created() {
-    this.cardWidth = window.innerWidth - 620 + 'px'
+    this.userId = this.$store.state.userInfo.userId;
+    this.cardWidth = window.innerWidth - 620 + "px";
   },
   async fetch({ store, params }) {
-    await store.dispatch('loadDictionary') // 加载数据字典
+    await store.dispatch("loadDictionary"); // 加载数据字典
   },
   methods: {
     pwdOk() {
       if (!this.pwdModel.oldPwd) {
-        this.$Message.warning('请输入初始密码!')
-        return
+        this.$Message.warning("请输入初始密码!");
+        return;
       }
       if (!this.pwdModel.newPwd) {
-        this.$Message.warning('请输入新密码!')
-        return
+        this.$Message.warning("请输入新密码!");
+        return;
       }
       if (this.pwdModel.newPwd !== this.pwdModel.confirmPwd) {
-        this.$Message.warning('两次密码不一致!')
-        return
+        this.$Message.warning("两次密码不一致!");
+        return;
       }
       if (this.pwdModel.newPwd === this.pwdModel.oldPwd) {
-        this.$Message.warning('新旧密码相同!')
-        return
+        this.$Message.warning("新旧密码相同!");
+        return;
       }
-      this.pwdModel.id = userId
+      this.pwdModel.id = this.userId;
       let params = {
         accountId: this.userInfo.accountId,
         userId: this.userInfo.id,
         newPassword: this.pwdModel.newPwd,
         oldPassword: this.pwdModel.oldPwd
-      }
+      };
 
-      Api.authChangepassword(params).then((res) => {
+      Api.authChangepassword(params).then(res => {
         if (res.success) {
-          this.$Message.success('修改成功!')
-        }
-        else
-        {
-           this.$Message.error('修改失败!')
+          this.$Message.success("修改成功!");
+        } else {
+          this.$Message.error("修改失败!");
         }
-      })
+      });
     },
     pwdModelReset() {
       this.pwdModel = {
-        oldPwd: '',
-        newPwd: '',
-        confirmPwd: ''
-      }
+        oldPwd: "",
+        newPwd: "",
+        confirmPwd: ""
+      };
     },
     openModalAvatar() {
-      this.modalAvatar = true
+      this.modalAvatar = true;
     },
     //单个文件选择后赋值方法
     // inputChangedFile(val) {
@@ -202,70 +202,69 @@ export default {
     //获取用户基本信息
     initUserInfo() {
       let parma = {
-        Id: userId
-      }
-      this.$http.sysUser.getuserinfo(parma).then((res) => {
+        Id: this.userId
+      };
+      this.$http.sysUser.getuserinfo(parma).then(res => {
         if (res.result) {
-          this.userInfo = res.result
-          this.imageModel.id = this.userInfo.id
+          this.userInfo = res.result;
+          this.userInfos=res.result;
+          this.imageModel.id = this.userInfo.id;
           if (
             res.result.avatarUrl &&
-            res.result.avatarUrl != '' &&
+            res.result.avatarUrl != "" &&
             res.result.avatarUrl != null
           ) {
-            this.userInfo.avatarUrl = res.result.avatarUrl
-            this.avatorPath = fileUrlDown + res.result.avatarUrl
-            this.oldImgName = fileUrlDown + res.result.avatarUrl
+            this.userInfo.avatarUrl = res.result.avatarUrl;
+            this.avatorPath = fileUrlDown + res.result.avatarUrl;
+            this.oldImgName = fileUrlDown + res.result.avatarUrl;
           } else {
-            this.userInfo.avatarUrl = avatar
+            this.userInfo.avatarUrl = avatar;
           }
         } else {
-          this.$Message.error('查询失败!')
+          this.$Message.error("查询失败!");
         }
-      })
+      });
     },
     cancelAvatar() {
-      this.modalAvatar = false
-      this.avatorPath = this.oldImgName
+      this.modalAvatar = false;
+      this.avatorPath = this.oldImgName;
     },
     upAvatar() {
-      if (this.imageModel.avatar_Url != '') {
-        this.$http.sysUser.changeavatar(this.imageModel).then((res) => {
+      if (this.imageModel.avatar_Url != "") {
+        this.$http.sysUser.changeavatar(this.imageModel).then(res => {
           if (res.success) {
-            this.$Message.success('修改成功!')
-            this.modalAvatar = false
-            this.$store.commit(
-              'setUserAvatar',
-              fileUrlDown + this.imageModel.avatar_Url
-            )
+            this.$Message.success("修改成功!");
+            this.modalAvatar = false;
+            this.userInfos.avatarUrl = fileUrlDown + this.imageModel.avatar_Url;
+            this.$store.commit("admin/user/setUserAvatar", this.userInfos);
           } else {
-            this.$Message.error('修改失败!')
+            this.$Message.error("修改失败!");
           }
-        })
+        });
       } else {
-        this.$Message.warning('请选择上传图片!')
+        this.$Message.warning("请选择上传图片!");
       }
     },
     reload() {
-      this.isRouterAlive = false //先关闭，
+      this.isRouterAlive = false; //先关闭，
       this.$nextTick(function() {
-        this.isRouterAlive = true //再打开
-      })
+        this.isRouterAlive = true; //再打开
+      });
     }
   },
   computed: {},
   mounted() {
-    this.initUserInfo()
+    this.initUserInfo();
   },
   watch: {
     imgName(newName, oldName) {
-      const imgPathsArr = JSON.parse(newName)
-      this.userInfo.avatarUrl = imgPathsArr[0].filePath
-      this.imageModel.avatar_Url = imgPathsArr[0].filePath
-      this.avatorPath = fileUrlDown + imgPathsArr[0].filePath
+      const imgPathsArr = JSON.parse(newName);
+      this.userInfo.avatarUrl = imgPathsArr[0].filePath;
+      this.imageModel.avatar_Url = imgPathsArr[0].filePath;
+      this.avatorPath = fileUrlDown + imgPathsArr[0].filePath;
     }
   }
-}
+};
 </script>
 <style  lang="less" >
 .ivu-card-body {
@@ -298,9 +297,9 @@ export default {
 .ivu-form-itemNo {
   margin-bottom: 4px;
 }
-.user_info_right{
-  float:left;
-  margin-left:20px;
+.user_info_right {
+  float: left;
+  margin-left: 20px;
   width: calc(78% - 20px);
 }
 </style>
\ No newline at end of file

pages/bug/index.vue

@@ -514,14 +514,14 @@ export default {
   },
   created() {
     window.screenHeight = window.innerHeight
-    this.gridHeight = window.screenHeight - 240
+    this.gridHeight = window.screenHeight - 250
   },
   mounted() {
     // this.search(this.searchForm)
     window.onresize = () => {
       return (() => {
         window.screenHeight = window.innerHeight
-        this.gridHeight = window.screenHeight - 240
+        this.gridHeight = window.screenHeight - 250
       })()
     }
   }

pages/crm/project/index.vue

@@ -107,13 +107,13 @@
   </div>
 </template>
 <script>
-import Api from './api'
-import Add from './add'
-import Edit from './edit'
-import Detail from './detail'
+import Api from "./api";
+import Add from "./add";
+import Edit from "./edit";
+import Detail from "./detail";
 
 export default {
-  name: 'list',
+  name: "list",
   components: {
     Add,
     Edit,
@@ -124,14 +124,14 @@ export default {
       action: Api.index,
       list: [
         {
-          name: 'jjk'
+          name: "jjk"
         }
       ],
       isactive: null,
-      keys: '',
+      keys: "",
       easySearch: {
-        keys: { op: 'name', value: null },
-        customerId: { op: 'Equal', value: null }
+        keys: { op: "name", value: null },
+        customerId: { op: "Equal", value: null }
       },
       addModal: false,
       editModal: false,
@@ -139,110 +139,110 @@ export default {
       deletelModal: false,
       curId: 0,
       customerId: 0,
-      columns: [{ key: 'id', title: this.l('id'), hide: true, align: 'left' }],
-      name: '',
+      columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }],
+      name: "",
       getlists: {
         conditions: [
           {
-            fieldName: '',
-            fieldValue: '',
-            conditionalType: 'Equal'
+            fieldName: "",
+            fieldValue: "",
+            conditionalType: "Equal"
           }
         ],
         pageSize: 1000
       }
-    }
+    };
   },
   computed: {
     projectList() {
-      return this.list.filter((u) => {
-        return u.name.indexOf(this.keys) > -1
-      })
+      return this.list.filter(u => {
+        return u.name.indexOf(this.keys) > -1;
+      });
     }
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   async fetch({ store, params }) {
-    await store.dispatch('loadDictionary') // 加载数据字典
+    await store.dispatch("loadDictionary"); // 加载数据字典
   },
   methods: {
     clickSearch() {
-      this.getlists.conditions[0].fieldName = 'name'
-      this.getlists.conditions[0].fieldValue = this.name
-      this.getList()
+      this.getlists.conditions[0].fieldName = "name";
+      this.getlists.conditions[0].fieldValue = this.name;
+      this.getList();
     },
     listData(li, index) {
-      this.easySearch.customerId.value = li.id
-      this.isactive = index
-      this.customerId = li.id
-      this.search()
+      this.easySearch.customerId.value = li.id;
+      this.isactive = index;
+      this.customerId = li.id;
+      this.search();
     },
     getList() {
-      Api.list(this.getlists).then((r) => {
+      Api.list(this.getlists).then(r => {
         if (r.success) {
-          this.list = r.result
+          this.list = r.result;
           // this.easySearch.customerId.value = r.result[0].id
-          this.search()
+          this.search();
         }
-      })
+      });
     },
     easySearchs() {},
     addOk() {
-      this.$refs.grid.load()
-      this.addModal = false
-      this.detailModal = false
-      this.editModal = false
-      this.curId = 0
+      this.$refs.grid.load();
+      this.addModal = false;
+      this.detailModal = false;
+      this.editModal = false;
+      this.curId = 0;
     },
     add() {
       if (this.isactive !== null) {
-        this.addModal = true
+        this.addModal = true;
       } else {
-        this.$Message.info('请选择企业')
+        this.$Message.info("请选择企业");
       }
     },
     search() {
-      this.$refs.grid.reload(this.easySearch)
+      this.$refs.grid.reload(this.easySearch);
     },
     detail(id) {
-      this.detailModal = true
-      this.curId = id
+      this.detailModal = true;
+      this.curId = id;
     },
     edit(id) {
-      this.editModal = true
-      this.curId = id
+      this.editModal = true;
+      this.curId = id;
     },
 
     remove(id) {
-      this.deletelModal = true
-      this.curId = id
+      this.deletelModal = true;
+      this.curId = id;
     },
     removeOk() {
-      Api.delete({ id: this.curId }).then((r) => {
+      Api.delete({ id: this.curId }).then(r => {
         if (r.success) {
-          this.$refs.grid.load()
-          this.deletelModal = false
-          this.$Message.success('删除成功')
+          this.$refs.grid.load();
+          this.deletelModal = false;
+          this.$Message.success("删除成功");
         }
-      })
+      });
     },
     removeCancel() {
-      this.deletelModal = false
+      this.deletelModal = false;
     },
     cancel() {
-      this.curId = 0
-      this.addModal = false
-      this.detailModal = false
-      this.editModal = false
-      this.deletedlModal = false
+      this.curId = 0;
+      this.addModal = false;
+      this.detailModal = false;
+      this.editModal = false;
+      this.deletedlModal = false;
     },
     l(key) {
-      let vkey = 'Project' + '.' + key
-      return this.$t(vkey) || key
+      let vkey = "Project" + "." + key;
+      return this.$t(vkey) || key;
     }
   }
-}
+};
 </script>
 <style lang="less">
 .addclass {
@@ -254,7 +254,8 @@ export default {
 .project-steps {
   display: flex;
   display: -webkit-flex;
-  height: 100%;
+  height: 85vh;
+  overflow: hidden;
   border-top: 1px solid #e4e6ed;
   h4 {
     margin-bottom: 5px;

pages/crm/sales/index.vue

@@ -12,7 +12,7 @@
   </div>
 </template>
 <script>
-import ProjectList from './projectList.vue'
+import ProjectList from "./projectList.vue";
 export default {
   components: {
     ProjectList
@@ -21,30 +21,31 @@ export default {
     return {
       current: 0,
       stage: 1
-    }
+    };
   },
   methods: {
     next(name) {
       if (name == 1) {
-        this.current = 0
-        this.stage = 1
+        this.current = 0;
+        this.stage = 1;
       } else if (name == 2) {
-        this.current = 1
-        this.stage = 2
+        this.current = 1;
+        this.stage = 2;
       } else if (name == 3) {
-        this.current = 2
-        this.stage = 3
+        this.current = 2;
+        this.stage = 3;
       } else if (name == 4) {
-        this.current = 3
-        this.stage = 4
+        this.current = 3;
+        this.stage = 4;
       }
     }
   }
-}
+};
 </script>
 <style lang='less' scoped>
 .sales {
   height: 90%;
+  padding-top: 8px;
   .steps-k {
     margin: 10px 30px;
     .title-c {

pages/crm/sales/projectList.vue

@@ -117,13 +117,13 @@
   </div>
 </template>
 <script>
-import Api from './api'
-import Add from './add'
-import Edit from './edit'
-import Detail from './detail'
-import Search from './search'
+import Api from "./api";
+import Add from "./add";
+import Edit from "./edit";
+import Detail from "./detail";
+import Search from "./search";
 export default {
-  name: 'ProjectList',
+  name: "ProjectList",
   components: {
     Add,
     Edit,
@@ -134,20 +134,20 @@ export default {
     stage: Number
   },
   async fetch({ store, params }) {
-    await store.dispatch('loadDictionary') // 加载数据字典
+    await store.dispatch("loadDictionary"); // 加载数据字典
   },
   data() {
     return {
       action: Api.index,
       activeindex: 0,
       list: [],
-      keys: '',
-      name: '',
-      status: '', //为空是全部排产，0为未排产；13为已排查；
-      partTaskPk: '', //车间
+      keys: "",
+      name: "",
+      status: "", //为空是全部排产，0为未排产；13为已排查；
+      partTaskPk: "", //车间
       result: [],
       isactive: null,
-      selectName: 'all',
+      selectName: "all",
       rowResult: {},
       addId: {
         projectId: 0,
@@ -157,148 +157,148 @@ export default {
       getSearch: {
         conditions: [
           {
-            fieldName: 'stage',
-            fieldValue: '1',
-            conditionalType: 'Equal'
+            fieldName: "stage",
+            fieldValue: "1",
+            conditionalType: "Equal"
           },
           {
-            fieldName: '',
-            fieldValue: '',
-            conditionalType: 'Equal'
+            fieldName: "",
+            fieldValue: "",
+            conditionalType: "Equal"
           }
         ],
         pageSize: 1000
       },
       listOperation: [],
       easySearch: {
-        keys: { op: 'deliverable', value: null },
-        stage: { op: 'Equal', value: null },
-        projectId: { op: 'Equal', value: null }
+        keys: { op: "deliverable", value: null },
+        stage: { op: "Equal", value: null },
+        projectId: { op: "Equal", value: null }
       },
       addModal: false,
       editModal: false,
       detailModal: false,
       deletelModal: false,
       curId: 0,
-      columns: [{ key: 'id', title: this.l('id'), hide: true, align: 'left' }]
-    }
+      columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }]
+    };
   },
   filters: {
     filterFun: function(value) {
       if (value && value.length > 8) {
-        value = value.substring(0, 8) + '...'
+        value = value.substring(0, 8) + "...";
       }
 
-      return value
+      return value;
     },
     filterFun2: function(value) {
       if (value && value.length > 15) {
-        value = value.substring(0, 15) + '...'
+        value = value.substring(0, 15) + "...";
       }
 
-      return value
+      return value;
     }
   },
   created() {
-    this.getList(1)
+    this.getList(1);
   },
   computed: {
     productList() {
-      return this.list.filter((u) => {
-        return u.name.indexOf(this.keys) > -1
-      })
+      return this.list.filter(u => {
+        return u.name.indexOf(this.keys) > -1;
+      });
     }
   },
   methods: {
     clickSearch() {
-      this.getSearch.conditions[1].fieldName = 'name'
-      this.getSearch.conditions[1].fieldValue = this.name
-      this.getList(this.getSearch.conditions[0].fieldValue)
+      this.getSearch.conditions[1].fieldName = "name";
+      this.getSearch.conditions[1].fieldValue = this.name;
+      this.getList(this.getSearch.conditions[0].fieldValue);
     },
     getList(v) {
-      this.getSearch.conditions[0].fieldValue = v + ''
-      Api.pagedList(this.getSearch).then((r) => {
+      this.getSearch.conditions[0].fieldValue = v + "";
+      Api.pagedList(this.getSearch).then(r => {
         if (r.success) {
-          this.list = r.result
-          this.search()
+          this.list = r.result;
+          this.search();
         }
-      })
+      });
     },
     listData(li, index) {
-      this.easySearch.projectId.value = li.id
-      this.easySearch.stage.value = li.stage
-      this.$refs.add.entity.stage = li.stage
-      this.addId.projectId = li.id
-      this.addId.customerId = li.customerId
-      this.addId.principal = li.principal
-      this.isactive = index
-      this.search()
+      this.easySearch.projectId.value = li.id;
+      this.easySearch.stage.value = li.stage;
+      this.$refs.add.entity.stage = li.stage;
+      this.addId.projectId = li.id;
+      this.addId.customerId = li.customerId;
+      this.addId.principal = li.principal;
+      this.isactive = index;
+      this.search();
     },
     search() {
-      this.$refs.grid.reload(this.easySearch)
+      this.$refs.grid.reload(this.easySearch);
     },
     addOk() {
-      this.$refs.grid.load()
-      this.addModal = false
-      this.detailModal = false
-      this.editModal = false
-      this.curId = 0
+      this.$refs.grid.load();
+      this.addModal = false;
+      this.detailModal = false;
+      this.editModal = false;
+      this.curId = 0;
     },
     add() {
       if (this.isactive !== null) {
-        this.addModal = true
+        this.addModal = true;
       } else {
-        this.$Message.info('请选择项目')
+        this.$Message.info("请选择项目");
       }
     },
     detail(id) {
-      this.detailModal = true
-      this.curId = id
+      this.detailModal = true;
+      this.curId = id;
     },
     edit(id) {
-      this.editModal = true
-      this.curId = id
+      this.editModal = true;
+      this.curId = id;
     },
 
     remove(id) {
-      this.deletelModal = true
-      this.curId = id
+      this.deletelModal = true;
+      this.curId = id;
     },
     removeOk() {
-      Api.delete({ id: this.curId }).then((r) => {
+      Api.delete({ id: this.curId }).then(r => {
         if (r.success) {
-          this.$refs.grid.load()
-          this.deletelModal = false
-          this.$Message.success('删除成功')
+          this.$refs.grid.load();
+          this.deletelModal = false;
+          this.$Message.success("删除成功");
         }
-      })
+      });
     },
     removeCancel() {
-      this.deletelModal = false
+      this.deletelModal = false;
     },
     cancel() {
-      this.curId = 0
-      this.addModal = false
-      this.detailModal = false
-      this.editModal = false
-      this.deletedlModal = false
+      this.curId = 0;
+      this.addModal = false;
+      this.detailModal = false;
+      this.editModal = false;
+      this.deletedlModal = false;
     },
     l(key) {
-      let vkey = 'Follow' + '.' + key
-      return this.$t(vkey) || key
+      let vkey = "Follow" + "." + key;
+      return this.$t(vkey) || key;
     }
   },
   watch: {
     stage(v) {
-      this.getList(v)
+      this.getList(v);
     },
-    'easySearch.projectId.value'(v) {
+    "easySearch.projectId.value"(v) {
       if (v) {
-        this.search()
+        this.search();
       }
     }
   }
-}
+};
 </script>
 <style lang="less" scoped>
 .addclass {
@@ -310,7 +310,8 @@ export default {
 .steps {
   display: flex;
   display: -webkit-flex;
-  height: 100%;
+  height: 80vh;
+  overflow: hidden;
   border-top: 1px solid #e4e6ed;
   h4 {
     margin-bottom: 5px;

pages/crm/statistical/card.less

@@ -59,14 +59,42 @@
                 width: 40px;
                 height: 40px;
                 border-radius: 50%;
-                background: #249e91;
+                // background: #249e91;
                 float: left;
                 margin: 12px 10px 0 5px;
+                .img_bg01 {
+                    display: inline-block;
+                    width: 40px;
+                    height: 40px;
+                    border-radius: 50%;
+                    background: #249e91;
+                  }
+                  .img_bg02 {
+                    display: inline-block;
+                    width: 40px;
+                    height: 40px;
+                    border-radius: 50%;
+                    background: #0099FF;
+                  }
+                  .img_bg03 {
+                    display: inline-block;
+                    width: 40px;
+                    height: 40px;
+                    border-radius: 50%;
+                    background: #FF7A8B;
+                  }
+                  .img_bg04 {
+                    display: inline-block;
+                    width: 40px;
+                    height: 40px;
+                    border-radius: 50%;
+                    background: #FFC300;
+                  }
                 .Icon_bg {
                     text-align: center;
                     padding: 10px 0 0;
                     img.Icon_icon {
-                        width: 18px;
+                        width: 20px;
                     }
                 }
             }

pages/crm/statistical/costomer/todolist.vue

@@ -18,8 +18,10 @@
           :key="index"
         >
           <div class="leftIcon">
-            <div class="Icon_bg">
-              <img class="Icon_icon" :src="imgUrl + item.image" alt />
+            <div class="Icon_bg" :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))" >
+            <!-- <div > -->
+              <img class="Icon_icon" src="@/assets/imgicon/u1640.png" alt="">
+              <!-- <img class="Icon_icon" :src="imgUrl + item.image" alt /> -->
             </div>
           </div>
           <div class="h60">

pages/handle/examine1/index.vue

@@ -145,7 +145,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -196,6 +196,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     this.getDetailInfos(this.detailId)

pages/handle/examine10/index.vue

@@ -84,7 +84,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -134,6 +134,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     this.getDetailInfos(this.detailId)

pages/handle/examine11/index.vue

@@ -84,7 +84,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -134,6 +134,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     this.getDetailInfos(this.detailId)

pages/handle/examine12/index.vue

@@ -84,7 +84,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -134,6 +134,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     this.getDetailInfos(this.detailId)

pages/handle/examine2/index.vue

@@ -98,7 +98,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -146,6 +146,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     this.getDetailInfos(this.detailId)

pages/handle/examine3/index.vue

@@ -97,7 +97,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -145,6 +145,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     this.getDetailInfos(this.detailId)

pages/handle/examine4/index.vue

@@ -84,7 +84,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId:0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -116,6 +116,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     this.getDetailInfos(this.detailId)

pages/handle/examine6/index.vue

@@ -131,7 +131,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -181,6 +181,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     console.log(this.detailId)

pages/handle/examine7/index.vue

@@ -155,7 +155,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId:0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -205,6 +205,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     this.getDetailInfos(this.detailId)

pages/handle/examine8/index.vue

@@ -156,7 +156,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -214,6 +214,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     console.log(this.footerStatu)

pages/handle/examine9/index.vue

@@ -83,7 +83,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -133,6 +133,7 @@ export default {
     await store.dispatch('loadDictionary') // 加载数据字典
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.detailId = this.$http.common.getquerystring('id')
     this.footerStatu = this.$http.common.getquerystring('statu')
     this.getDetailInfos(this.detailId)

pages/handle/footer.vue

@@ -96,7 +96,7 @@ export default {
   },
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       formMyCheck: {
         radioSp: '通过',
         comment: '',
@@ -132,6 +132,7 @@ export default {
   },
   created() {
     this.getDetailInfos(this.idVal)
+    this.currentUserId=this.$store.state.userInfo.userId
   },
   methods: {
     nextCheckOk() {

pages/handle/index.vue

@@ -209,7 +209,7 @@ export default {
   created() {
     window.screenHeight = window.innerHeight
     this.iframeHeight = window.screenHeight - 58
-    this.gridHeight = window.screenHeight - 240
+    this.gridHeight = window.screenHeight - 260
   },
   mounted() {
     window.onresize = () => {
@@ -217,7 +217,7 @@ export default {
       return (() => {
         window.screenHeight = window.innerHeight
         this.iframeHeight = window.screenHeight - 58
-        this.gridHeight = window.screenHeight - 240
+        this.gridHeight = window.screenHeight - 260
       })()
     }
     this.getSchema()

pages/handle/process.vue

@@ -59,7 +59,7 @@ export default {
   components: {},
   data() {
     return {
-      currentUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId,
+      currentUserId: 0,
       processTitle: '审批流程',
       currentNodeId: null,
       dataImmut: [],
@@ -129,6 +129,7 @@ export default {
     }
   },
   created() {
+    this.currentUserId=this.$store.state.userInfo.userId
     this.dataImmut = []
     this.dataMut = []
 

pages/handle/task.vue

 
-<style>
-/* @font-face {
-  font-family: 'iconfont';
-  src: url('./iconfont/iconfont.eot');
-  src: url('./iconfont/iconfont.eot?#iefix') format('embedded-opentype'),
-      url('./iconfont/iconfont.woff2') format('woff2'),
-      url('./iconfont/iconfont.woff') format('woff'),
-      url('./iconfont/iconfont.ttf') format('truetype'),
-      url('./iconfont/iconfont.svg#iconfont') format('svg');
-}
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 32px;
-  font-weight: bold;
-  /* font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  color:#249e91;
-} */
-.img_bg {
-  display: inline-block;
-  width: 48px;
-  height: 48px;
-  border-radius: 50%;
-  background: #249e91;
-}
-.img_icon {
-  width: 24px;
-  margin: 23% 0 0 0;
-}
-</style>
+
 <template>
   <div style="width:100%">
     <Card
@@ -41,9 +11,9 @@
       <div class="leftIco">
         <!-- color:rgba(36, 158, 145, 1) -->
         <!-- <span class="iconfont">&#xe607;</span> -->
-        <div class="img_bg">
-          <img class="img_icon" :src="imgUrl + item.image" alt />
-          <!-- <img class="img_icon" src="@/assets/imgicon/u1650.png" alt=""> -->
+        <div :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))" >
+          <!-- <img class="img_icon" :src="imgUrl + item.image" alt /> -->
+          <img class="img_icon" src="@/assets/imgicon/u1640.png" alt="">
         </div>
         <!-- <command icon="@/assets/imgicon/u1638.png"> -->
         <!-- <Icon type="md-analytics" size="36" color="#249e91" /> -->
@@ -82,6 +52,7 @@ export default {
             return (data.totalUrl = r.result)
           })
         })
+        console.log(list)
         this.listTask = list
       })
     },
@@ -93,6 +64,38 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.img_bg01 {
+  display: inline-block;
+  width: 48px;
+  height: 48px;
+  border-radius: 50%;
+  background: #249e91;
+}
+.img_bg02 {
+  display: inline-block;
+  width: 48px;
+  height: 48px;
+  border-radius: 50%;
+  background: #0099FF;
+}
+.img_bg03 {
+  display: inline-block;
+  width: 48px;
+  height: 48px;
+  border-radius: 50%;
+  background: #FF7A8B;
+}
+.img_bg04 {
+  display: inline-block;
+  width: 48px;
+  height: 48px;
+  border-radius: 50%;
+  background: #FFC300;
+}
+.img_icon {
+  width: 24px;
+  margin: 23% 0 0 0;
+}
 .waitTask {
   cursor: pointer;
   margin-bottom: 10px;

pages/mordent/Sluggish/placode/inventory.vue

@@ -66,10 +66,8 @@ export default {
   data() {
     return {
       entity: {
-        creator: parseInt(
-          JSON.parse(sessionStorage.getItem('userInfo')).userId
-        ),
-        creatorUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId
+        creator:"",
+        creatorUserId:0
       },
       rules: {
         storeTitle: [{ required: true, message: '请选择库位', trigger: 'blur' }]
@@ -174,6 +172,10 @@ export default {
       }
     }
   },
+  created() {
+    this.creator = this.$store.state.userInfo.name
+    this.creatorUserId = this.$store.state.userInfo.userId
+  },
   methods: {
     handleSubmit() {
       let listTemp = []

pages/mordent/Sluggish/powder/inventory.vue

@@ -66,10 +66,8 @@ export default {
   data() {
     return {
       entity: {
-        creator: parseInt(
-          JSON.parse(sessionStorage.getItem('userInfo')).userId
-        ),
-        creatorUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId
+        creator:"",
+        creatorUserId: 0
       },
       conditions: {
         storeId: { op: 'Equal', value: null },
@@ -166,6 +164,10 @@ export default {
       }
     }
   },
+  created() {
+    this.creator = this.$store.state.userInfo.name
+    this.creatorUserId = this.$store.state.userInfo.userId
+  },
   methods: {
     handleSubmit() {
       let listTemp = []

pages/mordent/Sluggish/scraper/inventory.vue

@@ -66,10 +66,8 @@ export default {
   data() {
     return {
       entity: {
-        creator: parseInt(
-          JSON.parse(sessionStorage.getItem('userInfo')).userId
-        ),
-        creatorUserId: JSON.parse(sessionStorage.getItem('userInfo')).userId
+        creator: '',
+        creatorUserId: 0
       },
       conditions: {
         storeId: { op: 'Equal', value: null },
@@ -167,6 +165,10 @@ export default {
       }
     }
   },
+  created() {
+    this.creator = this.$store.state.userInfo.name
+    this.creatorUserId = this.$store.state.userInfo.userId
+  },
   methods: {
     handleSubmit() {
       let listTemp = []

pages/order/quotation/index.vue

@@ -145,7 +145,6 @@ import PhotosensitiveDetails from "./components/photosensitiveDetails.vue"; //
 
 import MetalQuotationGeneration from "./components/metalQuotationGeneration.vue"; //生成报价单弹框
 import PhotosensitiveGeneration from "./components/photosensitiveGeneration.vue"; //生成报价单弹框
-var userId = JSON.parse(sessionStorage.getItem("userInfo")).userId;
 export default {
   components: {
     DrawerSet,
@@ -164,6 +163,7 @@ export default {
       zPhotosensitive: {
         result: []
       },
+      userId: 0,
       model1: "",
       rows: {},
       modalDai: false, //待审核
@@ -638,8 +638,9 @@ export default {
     },
     //报价状态
     statusData(row) {
+      this.userId = this.$store.state.userInfo.userId;
       if (row.status === 2) {
-        if (row.auditUser == userId) {
+        if (row.auditUser == this.userId) {
           //待审核
           this.modalDai = true;
           this.rows = {};
@@ -648,7 +649,7 @@ export default {
           this.$Message.error("您不是当前数据处理的指定人员");
         }
       } else if (row.status === 1) {
-        if (row.creatorUserId == userId) {
+        if (row.creatorUserId == this.userId) {
           //待送审
           this.modalSong = true;
           this.rows = {};

pages/processDesign/ChangeSingle/unqualifiedorder/index.vue

@@ -466,7 +466,7 @@ export default {
       this.formdata.department_name = ""; //部门名称departmentTitle
       this.formdata.status = 1;
       this.formdata.note = "";
-      var userId = JSON.parse(sessionStorage.getItem("userInfo")).userId;
+      var userId = this.$store.state.userInfo.userId;
       let parma = {
         Id: userId
       };

pages/processDesign/Process/index.vue

@@ -974,7 +974,7 @@ export default {
       }
       this.$refs.routingchangeorder.flag = 0
       this.$refs.routingchangeorder.routing_header_Id = this.headerSelected.id
-      var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
+      var userId = this.$store.state.userInfo.userId
       let parma = {
         Id: userId
       }

pages/processManage/Process/index.vue

@@ -935,7 +935,7 @@ export default {
       }
       this.$refs.routingchangeorder.flag = 0
       this.$refs.routingchangeorder.routing_header_Id = this.headerSelected.id
-      var userId = JSON.parse(sessionStorage.getItem('userInfo')).userId
+      var userId =this.$store.state.userInfo.userId
       let parma = {
         Id: userId
       }

pages/resource/material/powder/add.vue

@@ -131,7 +131,7 @@ export default {
       entity: {
         totalInventory: null,
         unitPrice: null,
-       
+       creator:this.$store.state.userInfo.userId,
       },
       rules: {
         storeTitle: [