调整登录

src/layout/components/Navbar.vue

@@ -7,9 +7,9 @@
     <div class="right-menu">
 
       <el-dropdown class="avatar-container" trigger="click">
-        <div class="avatar-wrapper">
+        <div class="avatar-wrapper"> {{name}}
 
-          <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
+<!--          <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">-->
           <i class="el-icon-caret-bottom" />
         </div>
 
@@ -34,7 +34,6 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-    <div class="menu-mame">{{name}}</div>
     <el-dialog title="修改密码" :visible.sync="changePassWordDialog" append-to-body>
       <change-password></change-password>
     </el-dialog>

src/layout/components/Sidebar/Logo.vue

@@ -1,16 +1,16 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}">
-    <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title">{{ supplierName }} </h1>
-      </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 class="sidebar-title">{{ supplierName }} </h1>
-      </router-link>
-    </transition>
-  </div>
+  <!--  <div class="sidebar-logo-container" :class="{'collapse':collapse}">-->
+  <!--    <transition name="sidebarLogoFade">-->
+  <!--      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">-->
+  <!--        <img v-if="logo" :src="logo" class="sidebar-logo">-->
+  <!--        <h1 v-else class="sidebar-title">{{ supplierName }} </h1>-->
+  <!--      </router-link>-->
+  <!--      <router-link v-else key="expand" class="sidebar-logo-link" to="/">-->
+  <!--        <img v-if="logo" :src="logo" class="sidebar-logo">-->
+  <!--        <h1 class="sidebar-title">{{ supplierName }} </h1>-->
+  <!--      </router-link>-->
+  <!--    </transition>-->
+  <!--  </div>-->
 </template>
 
 <script>
@@ -27,7 +27,7 @@ export default {
   },
   data() {
     return {
-      title: '弘盛联合ERP',
+      title: '印刷MIS系统',
       logo: LogoImg
     }
   },

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '弘盛联合ERP',
+  title: '印刷MIS系统',
   /**
    * @type {boolean} true | false
    * @description Whether fix the header

src/store/modules/user.js

@@ -73,7 +73,7 @@ const user = {
         getIndex().then(response => {
           // console.log("getIndex", response.data)
           const data = {
-            avatar: LogoImg,
+            // avatar: LogoImg,
             introduction: 'I am a super administrator',
             menus: response.data.menus,
             name: response.data.user.userName,

src/views/baseInfo/outAssis/list.vue

@@ -42,7 +42,7 @@
           <el-button @click="editStatus(row.id,'1')" v-else="row.enable==0" size="mini">
             启用
           </el-button>
-          <el-button size="mini" @click="carEditOrderAddr(row.id,row.clientName)" type="primary">配置收货地址</el-button><br>
+<!--          <el-button size="mini" @click="carEditOrderAddr(row.id,row.clientName)" type="primary">配置收货地址</el-button><br>-->
           </template>
           <template v-else>
             <el-button @click="chooseThis(row)" type="primary" size="mini">

src/views/dashboard/admin/index.vue

@@ -2,7 +2,7 @@
   <div class="dashboard-editor-container">
 
 
-    <panel-group :panelData="panelData" @handleSetLineChartData="handleSetLineChartData" />
+<!--    <panel-group :panelData="panelData" @handleSetLineChartData="handleSetLineChartData" />-->
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>公司公告</span>

src/views/doc/client/clientList.vue

@@ -33,7 +33,7 @@
       :size="!webType || isChoose ? 'mini':''"
       border
       default-expand-all>
-      <el-table-column label="操作" align="center" :width="webType&&!isChoose?'360':'100'"
+      <el-table-column label="操作" align="center" :width="webType&&!isChoose?'150':'100'"
                        class-name="small-padding fixed-width">
         <template slot-scope="{row}">
           <template v-if="webType">
@@ -49,8 +49,8 @@
               <el-button @click="editStatus(row.id,'1')" v-else-if="row.enable==0" size="mini">
                 启用
               </el-button>
-              <el-button size="mini" @click="carEditOrderAddr(row.id,row.clientName)" type="primary">配置收货地址
-              </el-button>
+<!--              <el-button size="mini" @click="carEditOrderAddr(row.id,row.clientName)" type="primary">配置收货地址-->
+<!--              </el-button>-->
             </template>
             <template v-else>
               <el-button @click="sourceType == 1? chooseThisTo(row):chooseThis(row)" type="primary" size="mini">

src/views/login/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login-container" :style="{background: 'url(' + bg2 + ') no-repeat 50%' }">
+  <div class="login-container" :style="{background: 'url(' + bg2 + ')' }">
     <el-form
       ref="loginForm"
       :model="loginForm"
@@ -7,28 +7,26 @@
       class="login-form"
       auto-complete="on"
       label-position="left">
-
       <div class="title-container">
-        <img :src="logoImg">
-        <span class="title">弘盛联合ERP</span>
+        <span class="title">印刷MIS系统</span>
       </div>
-   <div style="margin-bottom: 40px;margin-left: 80px">
-     <el-dropdown @command="handleCommand">
-  <span class="el-dropdown-link">
-    {{itemNameCheck}}<i class="el-icon-arrow-down el-icon--right"></i>
-  </span>
-       <el-dropdown-menu slot="dropdown">
-         <el-dropdown-item
-           v-for="(order,index) in ERPSupplierList"
-           :key="order.index"
-           :command="order"
-           @click="clickSupplier(order.id,order.itemName)"
-         >{{order.itemName}}
-         </el-dropdown-item>
+<!--   <div style="margin-bottom: 40px;margin-left: 80px">-->
+<!--     <el-dropdown @command="handleCommand">-->
+<!--  <span class="el-dropdown-link">-->
+<!--    {{itemNameCheck}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+<!--  </span>-->
+<!--       <el-dropdown-menu slot="dropdown">-->
+<!--         <el-dropdown-item-->
+<!--           v-for="(order,index) in ERPSupplierList"-->
+<!--           :key="order.index"-->
+<!--           :command="order"-->
+<!--           @click="clickSupplier(order.id,order.itemName)"-->
+<!--         >{{order.itemName}}-->
+<!--         </el-dropdown-item>-->
 
-       </el-dropdown-menu>
-     </el-dropdown>
-   </div>
+<!--       </el-dropdown-menu>-->
+<!--     </el-dropdown>-->
+<!--   </div>-->
 
       <el-form-item prop="loginName">
         <span class="svg-container">
@@ -75,14 +73,14 @@
       </el-button>
     </el-form>
     <div class="tips-foter">
-      Copyright © 2019 河南弘盛联合印务有限公司
     </div>
   </div>
 </template>
 
 <script>
 import { validUsername } from '@/utils/validate'
-import Bg2 from '@/assets/background.svg'
+// import Bg2 from '@/assets/background.svg'
+import Bg2 from '@/assets/background.jpg'
 import LogoImg from '@/assets/logo.png'
 import { loginSupplierList } from '@/api/login/login.js'
 
@@ -108,7 +106,7 @@ export default {
       itemNameCheck: '',
       idCheck: '',
       bg2: Bg2,
-      logoImg: LogoImg,
+      // logoImg: LogoImg,
       loginForm: {
         loginName: '',
         password: ''
@@ -206,12 +204,13 @@ export default {
     box-sizing: border-box;
 
     .login-form {
-      width: 520px;
+      width: 350px;
       max-width: 100%;
       padding: 40px 35px 0;
-      margin: 0 auto;
+      margin: 5% 30% 0 auto;
       overflow: hidden;
       position: relative;
+      background: #fefeff;
     }
 
     .tips-foter {

src/views/order/orderList/component/ordermis.vue

@@ -4,7 +4,7 @@
     <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
       <div class="filter-container clearfix">
         <template v-if="orderCategory == 1">
-          <el-button type="primary" size="mini" @click="save(1)" :disabled="clickLoading">保存</el-button>
+          <el-button type="success" size="mini" @click="save(1)" :disabled="clickLoading">新建保存</el-button>
         </template>
         <template v-else>
           <el-button type="primary" size="mini" @click="editOrder(1)" :disabled="clickLoading">修改保存</el-button>
@@ -21,10 +21,6 @@
             label="已审核"
             value="1">
           </el-option>
-          <el-option
-            label="已作废"
-            value="2">
-          </el-option>
         </el-select>
         <span v-if="idOrder">
           ({{ orderCode }})
@@ -211,20 +207,20 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="0" type="flex" justify="left">
-        <el-col :span="4">
-          <el-form-item size="small" label="上传图片">
-            <el-button size="mini" type="success" round>选择</el-button>
-            <el-button size="mini" type="primary" round>查看</el-button>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item size="small" label="上传附件">
-            <el-button size="mini" type="success" round>选择</el-button>
-            <el-button size="mini" type="primary" round>查看</el-button>
-          </el-form-item>
-        </el-col>
-      </el-row>
+<!--      <el-row :gutter="0" type="flex" justify="left">-->
+<!--        <el-col :span="4">-->
+<!--          <el-form-item size="small" label="上传图片">-->
+<!--            <el-button size="mini" type="success" round>选择</el-button>-->
+<!--            <el-button size="mini" type="primary" round>查看</el-button>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--        <el-col :span="4">-->
+<!--          <el-form-item size="small" label="上传附件">-->
+<!--            <el-button size="mini" type="success" round>选择</el-button>-->
+<!--            <el-button size="mini" type="primary" round>查看</el-button>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--      </el-row>-->
       <el-row :gutter="0" type="flex" justify="left">
             <el-col :span="24">
               <div class="tip">外发信息</div>
@@ -604,6 +600,7 @@ export default {
       // console.log(data);
       this.form.clientName = data.clientName
       this.form.idClient = data.id
+      this.form.sendAddress = data.province + data.city + data.area + data.address
     },
     chooseClientByPay(data) {
       this.createInnerVisible = false

src/views/order/orderList/orderList.vue

@@ -100,11 +100,11 @@
           class-name="small-padding fixed-width">
           <template slot-scope="{row}">
             <el-dropdown
-              v-if="row.orderState == 0"
+              v-if="row.orderState == 0 || row.orderState == 1"
               size="mini"
               @command="getUploadType1($event,row)"
               trigger="click">
-              <el-button size="mini" type="info" icon="el-icon-upload"></el-button>
+              <el-button size="mini" type="warning" icon="el-icon-upload"></el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="1">上传图片</el-dropdown-item>
                 <el-dropdown-item command="2">上传附件</el-dropdown-item>
@@ -116,7 +116,7 @@
               size="mini"
               icon="el-icon-delete"
               @click="voidOrderbtn(row)"
-              title="回收站"></el-button>
+              title="作废订单"></el-button>
             <el-button
               title="编辑"
               v-if="row.orderState == 0"

src/views/system/user/Roledialog.vue

@@ -44,13 +44,13 @@
         <el-form-item label="密码" v-show="dialogStatus==='add'" :label-width="formLabelWidth" v-if="configType == 1">
           <el-input v-model="form.password" type="password" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="部门名称" :label-width="formLabelWidth" v-if="configType == 1">
-          <!--          <el-input :readonly="true"  autocomplete="off"></el-input>-->
-          <el-button @click="deptTreeVisible = true">{{ innerText }}</el-button>
-        </el-form-item>
-        <el-form-item label="邮箱" :label-width="formLabelWidth" v-if="configType == 1">
-          <el-input v-model="form.email" type="email" autocomplete="off"></el-input>
-        </el-form-item>
+        <!--        <el-form-item label="部门名称" :label-width="formLabelWidth" v-if="configType == 1">-->
+        <!--          &lt;!&ndash;          <el-input :readonly="true"  autocomplete="off"></el-input>&ndash;&gt;-->
+        <!--          <el-button @click="deptTreeVisible = true">{{ innerText }}</el-button>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="邮箱" :label-width="formLabelWidth" v-if="configType == 1">-->
+        <!--          <el-input v-model="form.email" type="email" autocomplete="off"></el-input>-->
+        <!--        </el-form-item>-->
         <el-form-item label="手机" :label-width="formLabelWidth" v-if="configType == 1">
           <el-input v-model="form.phoneNumber" autocomplete="off"></el-input>
         </el-form-item>
@@ -116,7 +116,7 @@ const form = {
   sex: '',
   password: '',
   roleIds: '',
-  deptId: ''
+  deptId: 1
 }
 export default {
   name: 'RoleDialog',
@@ -147,7 +147,7 @@ export default {
       treeData: {},
       handleTree: false,
       innerText: '选择部门',
-      checkedDept: '',
+      checkedDept: '全部',
       roleOptions: [],
 
       listData: {
@@ -262,10 +262,10 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           _that.form.roleIds = _that.roleList.join(',')
-          if (_that.form.deptId == 0 || _that.form.deptId == null || _that.form.deptId == '') {
-            _that.$message.error('部门不可为空')
-            return
-          }
+          // if (_that.form.deptId == 0 || _that.form.deptId == null || _that.form.deptId == '') {
+          //   _that.$message.error('部门不可为空')
+          //   return
+          // }
           if (type == 1) {
             var data = {
               'info': JSON.stringify(_that.form)
@@ -401,7 +401,7 @@ export default {
           sex: data.sex,
           password: data.password,
           roleIds: data.roleIds,
-          deptId: data.deptId
+          deptId: 1
         }
         _that.roleList = data.roleIds.split(',')
         _that.roleList = _that.roleList.map(Number)
@@ -433,7 +433,7 @@ export default {
           sex: data.sex,
           password: data.password,
           roleIds: data.roleIds,
-          deptId: data.deptId
+          deptId: 1
         }
         _that.roleList = data.roleIds.split(',')
         _that.roleList = _that.roleList.map(Number)

src/views/system/user/user.vue

@@ -2,22 +2,22 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
-                    style="margin-bottom: 20px"/>
-        </div>
-        <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            default-expand-all
-            @node-click="handleNodeClick"/>
-        </div>
-      </el-col>
+<!--      <el-col :span="4" :xs="24">-->
+<!--        <div class="head-container">-->
+<!--          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"-->
+<!--                    style="margin-bottom: 20px"/>-->
+<!--        </div>-->
+<!--        <div class="head-container">-->
+<!--          <el-tree-->
+<!--            :data="deptOptions"-->
+<!--            :props="defaultProps"-->
+<!--            :expand-on-click-node="false"-->
+<!--            :filter-node-method="filterNode"-->
+<!--            ref="tree"-->
+<!--            default-expand-all-->
+<!--            @node-click="handleNodeClick"/>-->
+<!--        </div>-->
+<!--      </el-col>-->
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <div class="filter-container" style="margin-bottom: 15px">
@@ -28,6 +28,10 @@
             class="filter-item"
             :size="tableSize"
             @keyup.enter.native="handleFilter"/>
+          <template>
+            <!-- `checked` 为 true 或 false -->
+            <el-checkbox v-model="checked" @change="checkLock">查看已禁用</el-checkbox>
+          </template>
 
           <el-button :size="tableSize" class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
             搜索
@@ -42,16 +46,16 @@
             @click="handleCreate(1)">
             增加用户
           </el-button>
-          <el-button
-            v-if="webType && isChoose == false && permissionFlag1"
-            class="filter-item"
-            style="margin-left: 10px;"
-            type="primary"
-            icon="el-icon-plus"
-            :size="tableSize"
-            @click="handleCreate(2)">
-            增加人员
-          </el-button>
+<!--          <el-button-->
+<!--            v-if="webType && isChoose == false && permissionFlag1"-->
+<!--            class="filter-item"-->
+<!--            style="margin-left: 10px;"-->
+<!--            type="primary"-->
+<!--            icon="el-icon-plus"-->
+<!--            :size="tableSize"-->
+<!--            @click="handleCreate(2)">-->
+<!--            增加人员-->
+<!--          </el-button>-->
           <el-button
             v-if="type == 1"
             :size="tableSize"
@@ -89,14 +93,14 @@
             prop="userName"
             label="用户名">
           </el-table-column>
-          <el-table-column
-            prop="deptName"
-            label="部门">
-          </el-table-column>
-          <el-table-column
-            prop="email"
-            label="邮箱">
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="deptName"-->
+<!--            label="部门">-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            prop="email"-->
+<!--            label="邮箱">-->
+<!--          </el-table-column>-->
           <el-table-column
             prop="phoneNumber"
             label="手机">
@@ -123,12 +127,13 @@
             </span>
             </template>
           </el-table-column>
-          <el-table-column v-if="type !=1" fixed="left" label="操作" align="center" width="230" class-name="small-padding fixed-width">
+          <el-table-column v-if="type !=1" fixed="left" label="操作" align="center" width="300"
+                           class-name="small-padding fixed-width">
             <template slot-scope="{row}">
               <template v-if="webType">
                 <template v-if="!isChoose">
               <el-button v-if="permissionFlag5" @click="handleUpdate(row.id,1)" class="operateBtn" type="primary" size="mini">
-                编辑
+                权限设定
               </el-button>
               <el-button @click="resetPwd(row.id)" class="operateBtn" type="success" size="mini">
                 重置密码
@@ -143,12 +148,12 @@
               <el-button @click="editStatus(row.id,'0')" class="operateBtn" v-else size="mini">
                 启用
               </el-button>
-                  <el-button v-if="permissionFlag2" @click="handleUpdate(row.id,2)" class="operateBtn" type="primary" size="mini">
-                    编辑
-                  </el-button>
-                  <el-button v-if="permissionFlag3" @click="configUser(row.id)" class="operateBtn" type="warning" size="mini">
-                    角色配置
-                  </el-button>
+<!--                  <el-button v-if="permissionFlag2" @click="handleUpdate(row.id,2)" class="operateBtn" type="primary" size="mini">-->
+<!--                    编辑-->
+<!--                  </el-button>-->
+<!--                  <el-button v-if="permissionFlag3" @click="configUser(row.id)" class="operateBtn" type="warning" size="mini">-->
+<!--                    角色配置-->
+<!--                  </el-button>-->
 
                 </template>
                 <template v-else>
@@ -259,8 +264,10 @@ export default {
       dialogVisible: false,
       oldPassword: '',
       newPassword: '',
+      checked: false,
       search: {
         keyWord: '',
+        status: 0,
         deptId: undefined
       },
       listData: {
@@ -406,6 +413,13 @@ export default {
       if (!value) return true
       return data.name.indexOf(value) !== -1
     },
+    checkLock() {
+      if (this.checked) {
+        this.search.status = 1;
+      } else {
+        this.search.status = 0
+      }
+    },
 
     // 部门树选中
     handleNodeClick(data) {

src/views/user/index.vue

@@ -9,7 +9,7 @@
       label-position="left">
 
       <div class="title-container">
-        <img :src="logoImg">
+<!--        <img :src="logoImg">-->
         <span class="title">弘盛联合ERP</span>
       </div>
 
@@ -58,7 +58,6 @@
       </el-button>
     </el-form>
     <div class="tips-foter">
-      Copyright © 2019 河南弘盛联合印务有限公司
     </div>
   </div>
 </template>
@@ -66,7 +65,7 @@
 <script>
 import { validUsername } from '@/utils/validate'
 import Bg2 from '@/assets/background.svg'
-import LogoImg from '@/assets/logo.png'
+// import LogoImg from '@/assets/logo.png'
 
 export default {
   name: 'Login',
@@ -87,7 +86,7 @@ export default {
     }
     return {
       bg2: Bg2,
-      logoImg: LogoImg,
+      // logoImg: LogoImg,
       loginForm: {
         loginName: '',
         password: ''