diff --git a/.env.development b/.env.development
index 5a3ca04..12ef527 100644
--- a/.env.development
+++ b/.env.development
@@ -4,8 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台
# 开发环境配置
ENV = 'development'
-VUE_APP_BASE_API = 'http://dm.xmglxp.com:82/UDI_SPMS_SERVER'
-
+VUE_APP_BASE_API = 'http://27.156.44.222:9150/UDI_SPMS_SERVER/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/'
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index d36bb7e..e5bfc7a 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -192,5 +192,22 @@ aside {
.el-table--mini .el-table__cell {
- padding:0px!important;
+ padding: 0px !important;
+}
+
+//.query-form {
+// /* 你的样式定义 */
+// background-color: #fff1e8;
+// padding: 20px;
+// border-radius: 5px;
+//}
+.el-card {
+ /* 你的样式定义 */
+ background-color: #e8fff2;
+}
+
+/* 如果你想要更具体的选择器，可以进一步细化，比如： */
+.el-button--primary {
+ background-color: #11A983; /* 绿色背景 */
+ border-color: #11A983; /* 深绿色边框 */
}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index add427d..54039e0 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -8,17 +8,17 @@
<div class="right-menu">
<template v-if="device!=='mobile'">
- <div class="inv-hos-title">
- <span
- style="margin: 10px;color: #2d8cf0;font-size: 14px;">部门 : {{ deptName }}</span>
- <span
- style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库 : {{ inv }}</span>
- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户 : {{ this.companyName }}</span>
- <span
- style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{
- this.userName
- }})</span>
- </div>
+<!-- <div class="inv-hos-title">-->
+<!-- <span-->
+<!-- style="margin: 10px;color: #2d8cf0;font-size: 14px;">部门 : {{ deptName }}</span>-->
+<!-- <span-->
+<!-- style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库 : {{ inv }}</span>-->
+<!-- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户 : {{ this.companyName }}</span>-->
+<!-- <span-->
+<!-- style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{-->
+<!-- this.userName-->
+<!-- }})</span>-->
+<!-- </div>-->
<search id="header-search" class="right-menu-item"/>
<screenfull id="screenfull" class="right-menu-item hover-effect"/>
<el-tooltip content="布局大小" effect="dark" placement="bottom">
@@ -27,7 +27,7 @@
</template>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
- <img :src="avatar" class="user-avatar">
+<!-- <img :src="avatar" class="user-avatar">-->
<i class="el-icon-caret-bottom"/>
</div>
<el-dropdown-menu slot="dropdown">
diff --git a/src/views/index.vue b/src/views/index.vue
index d86b596..e492975 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,211 +1,211 @@
<template>
<div class="app-container home">
<div>
- <h2>欢迎使用供应商自助管理系统</h2>
+ <h2>欢迎使用</h2>
<el-divider/>
</div>
- <!-- 分割线 -->
- <div class="mt10 grid-container grid-container3" style="height: 15%">
- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:product']">
- <el-row>
- <div class="height-full fl center ml20" style="width: 30%">
- <el-image style="border-radius: 4%;width: 80%;height: 80%"
- :src="productSvg">
- <div slot="placeholder" class="image-slot">
- 加载中<span class="dot">...</span>
- </div>
- </el-image>
- </div>
- <div class="height-full fr center mr20">
- <span class="header d-block">
- 已对照产品
- </span>
- <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#394047'}">
- {{ productCount }}
- </span>
- </div>
- </el-row>
- </el-card>
-
- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:invWarn']">
- <el-row>
- <div class="height-full fl center ml20" style="width: 30%">
- <el-image style="border-radius: 4%;width: 80%;height: 80%"
- :src="invSvg">
- <div slot="placeholder" class="image-slot">
- 加载中<span class="dot">...</span>
- </div>
- </el-image>
- </div>
- <div class="height-full fr center mr20" @click="linkPage('/remind/invRemindMsg')">
- <span class="header d-block">
- 库存预警
- </span>
- <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#FF0000'}">
- {{ invMsgCount }}
- </span>
- </div>
- </el-row>
- </el-card>
-
- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:certWarn']">
- <el-row>
- <div class="height-full fl center ml20" style="width: 30%">
- <el-image style="border-radius: 4%;width: 80%;height: 80%"
- :src="certSvg">
- <div slot="placeholder" class="image-slot">
- 加载中<span class="dot">...</span>
- </div>
- </el-image>
- </div>
- <div class="height-full fr center mr20" @click="linkPage('/remind/sup/certRemind')">
- <span class="header d-block">
- 资质预警
- </span>
- <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#FF0000'}"
- >
- {{ certMsgCount }}
- </span>
- </div>
- </el-row>
- </el-card>
- </div>
- <!-- 分割线 -->
- <div class="m0 grid-container grid-container2" style="height: calc(40%);margin-top: 10px">
- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:todo']">
- <div slot="header" class="header">
- <el-icon class="el-icon-s-management"/>
- 待办事项{{ `(${todoCount}条)` }}
- <div class="fr">
- <el-button type="text" style="font-size: 15px;color: unset" @click="getSysMsgTodoList">
- <el-icon class="el-icon-refresh"/>
- 重新加载
- </el-button>
- <el-button type="text" style="font-size: 15px;color: unset"
- @click.stop="">
- 更多
- <el-icon class="el-icon-d-arrow-right"/>
- </el-button>
- </div>
- </div>
- <el-table
- v-loading="msgLoading"
- :data="msgList"
- height="calc(100% - 45px)"
- stripe
- style="">
- <el-table-column
- type="index"
- label="序号"
- width="50"/>
- <el-table-column
- label="消息编码"
- prop="code"
- width="120"/>
- <el-table-column
- label="消息类型"
- prop="msgTypeName"
- width="120"/>
- <el-table-column
- label="消息内容"
- prop="msgContent"
- width="280"/>
- <el-table-column
- label="处理状态"
- prop="dealStatusName"
- width="120"/>
- <el-table-column
- label="推送状态"
- prop="pushStatusName"
- width="120"/>
- <el-table-column
- label="仓库"
- prop="invName"
- width="120"/>
- <el-table-column
- label="部门"
- prop="deptName"
- width="120"/>
- <el-table-column
- label="创建时间"
- prop="createTime"
- width="140"/>
- <el-table-column label="操作" width="80" fixed="right">
- <template slot-scope="scope">
- <el-button
- type="text"
- @click="linkPage('/system/msg/sysMsgTodo')"
- >处理
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-card>
- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:ioAudit']">
- <div slot="header" class="header">
- <el-icon class="el-icon-s-platform"/>
- 审核送货单{{ `(${orderTotal}条)` }}
- <div class="fr">
- <el-button type="text" style="font-size: 15px;color: unset" @click="getOrderList">
- <el-icon class="el-icon-refresh"/>
- 重新加载
- </el-button>
- <el-button type="text" style="font-size: 15px;color: unset"
- @click="linkPage('/pur/auditDelivery')">更多
- <el-icon class="el-icon-d-arrow-right"/>
- </el-button>
- </div>
- </div>
- <el-table
- v-loading="orderLoading"
- :data="orderList"
- height="calc(100% - 45px)"
- stripe>
- <el-table-column
- type="index"
- label="序号"
- width="50"/>
- <el-table-column label="送货单号" prop="billNo" width="180"/>
- <el-table-column label="单据类型" prop="billTypeName" width="150"/>
- <el-table-column label="送货单位" prop="fromName" width="220"/>
- <el-table-column label="创建时间" prop="createTime" width="150"/>
- <el-table-column label="核对时间" prop="checkTime" width="150"/>
-
- <el-table-column label="采购部门" prop="deptName" width="120">
- </el-table-column>
- <el-table-column label="收货仓库" prop="invName" width="120">
- </el-table-column>
- <el-table-column label="核对人" prop="checkUserName" width="120">
- </el-table-column>
- <el-table-column label="来源单号" prop="corpOrderId" width="180"/>
- <!-- <el-table-column label="来源" prop="fromType" width="120">-->
- <!-- <template slot-scope="scope">-->
- <!-- <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
-
-
- <!-- <el-table-column label="审核状态" prop="status" width="100">-->
- <!-- <template slot-scope="scope">-->
- <!-- <el-tag :type="statusFilterType(scope.row.status)">{{-->
- <!-- checkStatus[scope.row.status]-->
- <!-- }}-->
- <!-- </el-tag>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <el-table-column label="备注" prop="remark" width="180"/>
- <el-table-column label="操作" width="80" fixed="right">
- <template slot-scope="scope">
- <el-button
- type="text"
- @click="linkPage('/pur/auditDelivery')"
- >处理
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-card>
- </div>
+<!-- <!– 分割线 –>-->
+<!-- <div class="mt10 grid-container grid-container3" style="height: 15%">-->
+<!-- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:product']">-->
+<!-- <el-row>-->
+<!-- <div class="height-full fl center ml20" style="width: 30%">-->
+<!-- <el-image style="border-radius: 4%;width: 80%;height: 80%"-->
+<!-- :src="productSvg">-->
+<!-- <div slot="placeholder" class="image-slot">-->
+<!-- 加载中<span class="dot">...</span>-->
+<!-- </div>-->
+<!-- </el-image>-->
+<!-- </div>-->
+<!-- <div class="height-full fr center mr20">-->
+<!-- <span class="header d-block">-->
+<!-- 已对照产品-->
+<!-- </span>-->
+<!-- <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#394047'}">-->
+<!-- {{ productCount }}-->
+<!-- </span>-->
+<!-- </div>-->
+<!-- </el-row>-->
+<!-- </el-card>-->
+
+<!-- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:invWarn']">-->
+<!-- <el-row>-->
+<!-- <div class="height-full fl center ml20" style="width: 30%">-->
+<!-- <el-image style="border-radius: 4%;width: 80%;height: 80%"-->
+<!-- :src="invSvg">-->
+<!-- <div slot="placeholder" class="image-slot">-->
+<!-- 加载中<span class="dot">...</span>-->
+<!-- </div>-->
+<!-- </el-image>-->
+<!-- </div>-->
+<!-- <div class="height-full fr center mr20" @click="linkPage('/remind/invRemindMsg')">-->
+<!-- <span class="header d-block">-->
+<!-- 库存预警-->
+<!-- </span>-->
+<!-- <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#FF0000'}">-->
+<!-- {{ invMsgCount }}-->
+<!-- </span>-->
+<!-- </div>-->
+<!-- </el-row>-->
+<!-- </el-card>-->
+
+<!-- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:certWarn']">-->
+<!-- <el-row>-->
+<!-- <div class="height-full fl center ml20" style="width: 30%">-->
+<!-- <el-image style="border-radius: 4%;width: 80%;height: 80%"-->
+<!-- :src="certSvg">-->
+<!-- <div slot="placeholder" class="image-slot">-->
+<!-- 加载中<span class="dot">...</span>-->
+<!-- </div>-->
+<!-- </el-image>-->
+<!-- </div>-->
+<!-- <div class="height-full fr center mr20" @click="linkPage('/remind/sup/certRemind')">-->
+<!-- <span class="header d-block">-->
+<!-- 资质预警-->
+<!-- </span>-->
+<!-- <span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#FF0000'}"-->
+<!-- >-->
+<!-- {{ certMsgCount }}-->
+<!-- </span>-->
+<!-- </div>-->
+<!-- </el-row>-->
+<!-- </el-card>-->
+<!-- </div>-->
+<!-- <!– 分割线 –>-->
+<!-- <div class="m0 grid-container grid-container2" style="height: calc(40%);margin-top: 10px">-->
+<!-- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:todo']">-->
+<!-- <div slot="header" class="header">-->
+<!-- <el-icon class="el-icon-s-management"/>-->
+<!-- 待办事项{{ `(${todoCount}条)` }}-->
+<!-- <div class="fr">-->
+<!-- <el-button type="text" style="font-size: 15px;color: unset" @click="getSysMsgTodoList">-->
+<!-- <el-icon class="el-icon-refresh"/>-->
+<!-- 重新加载-->
+<!-- </el-button>-->
+<!-- <el-button type="text" style="font-size: 15px;color: unset"-->
+<!-- @click.stop="">-->
+<!-- 更多-->
+<!-- <el-icon class="el-icon-d-arrow-right"/>-->
+<!-- </el-button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <el-table-->
+<!-- v-loading="msgLoading"-->
+<!-- :data="msgList"-->
+<!-- height="calc(100% - 45px)"-->
+<!-- stripe-->
+<!-- style="">-->
+<!-- <el-table-column-->
+<!-- type="index"-->
+<!-- label="序号"-->
+<!-- width="50"/>-->
+<!-- <el-table-column-->
+<!-- label="消息编码"-->
+<!-- prop="code"-->
+<!-- width="120"/>-->
+<!-- <el-table-column-->
+<!-- label="消息类型"-->
+<!-- prop="msgTypeName"-->
+<!-- width="120"/>-->
+<!-- <el-table-column-->
+<!-- label="消息内容"-->
+<!-- prop="msgContent"-->
+<!-- width="280"/>-->
+<!-- <el-table-column-->
+<!-- label="处理状态"-->
+<!-- prop="dealStatusName"-->
+<!-- width="120"/>-->
+<!-- <el-table-column-->
+<!-- label="推送状态"-->
+<!-- prop="pushStatusName"-->
+<!-- width="120"/>-->
+<!-- <el-table-column-->
+<!-- label="仓库"-->
+<!-- prop="invName"-->
+<!-- width="120"/>-->
+<!-- <el-table-column-->
+<!-- label="部门"-->
+<!-- prop="deptName"-->
+<!-- width="120"/>-->
+<!-- <el-table-column-->
+<!-- label="创建时间"-->
+<!-- prop="createTime"-->
+<!-- width="140"/>-->
+<!-- <el-table-column label="操作" width="80" fixed="right">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-button-->
+<!-- type="text"-->
+<!-- @click="linkPage('/system/msg/sysMsgTodo')"-->
+<!-- >处理-->
+<!-- </el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
+<!-- </el-card>-->
+<!-- <el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:ioAudit']">-->
+<!-- <div slot="header" class="header">-->
+<!-- <el-icon class="el-icon-s-platform"/>-->
+<!-- 审核送货单{{ `(${orderTotal}条)` }}-->
+<!-- <div class="fr">-->
+<!-- <el-button type="text" style="font-size: 15px;color: unset" @click="getOrderList">-->
+<!-- <el-icon class="el-icon-refresh"/>-->
+<!-- 重新加载-->
+<!-- </el-button>-->
+<!-- <el-button type="text" style="font-size: 15px;color: unset"-->
+<!-- @click="linkPage('/pur/auditDelivery')">更多-->
+<!-- <el-icon class="el-icon-d-arrow-right"/>-->
+<!-- </el-button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <el-table-->
+<!-- v-loading="orderLoading"-->
+<!-- :data="orderList"-->
+<!-- height="calc(100% - 45px)"-->
+<!-- stripe>-->
+<!-- <el-table-column-->
+<!-- type="index"-->
+<!-- label="序号"-->
+<!-- width="50"/>-->
+<!-- <el-table-column label="送货单号" prop="billNo" width="180"/>-->
+<!-- <el-table-column label="单据类型" prop="billTypeName" width="150"/>-->
+<!-- <el-table-column label="送货单位" prop="fromName" width="220"/>-->
+<!-- <el-table-column label="创建时间" prop="createTime" width="150"/>-->
+<!-- <el-table-column label="核对时间" prop="checkTime" width="150"/>-->
+
+<!-- <el-table-column label="采购部门" prop="deptName" width="120">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="收货仓库" prop="invName" width="120">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="核对人" prop="checkUserName" width="120">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="来源单号" prop="corpOrderId" width="180"/>-->
+<!-- <!– <el-table-column label="来源" prop="fromType" width="120">–>-->
+<!-- <!– <template slot-scope="scope">–>-->
+<!-- <!– <span>{{ fromTypeMap[scope.row.fromType] }}</span>–>-->
+<!-- <!– </template>–>-->
+<!-- <!– </el-table-column>–>-->
+
+
+<!-- <!– <el-table-column label="审核状态" prop="status" width="100">–>-->
+<!-- <!– <template slot-scope="scope">–>-->
+<!-- <!– <el-tag :type="statusFilterType(scope.row.status)">{{–>-->
+<!-- <!– checkStatus[scope.row.status]–>-->
+<!-- <!– }}–>-->
+<!-- <!– </el-tag>–>-->
+<!-- <!– </template>–>-->
+<!-- <!– </el-table-column>–>-->
+<!-- <el-table-column label="备注" prop="remark" width="180"/>-->
+<!-- <el-table-column label="操作" width="80" fixed="right">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-button-->
+<!-- type="text"-->
+<!-- @click="linkPage('/pur/auditDelivery')"-->
+<!-- >处理-->
+<!-- </el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
+<!-- </el-card>-->
+<!-- </div>-->
</div>
</template>
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index d2c1647..67e181a 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -1,15 +1,15 @@
<template>
<div class="login-container">
- <div>
- <el-row>
- <!-- <h3 class="toptitle">漳州市中医院</h3>-->
+<!-- <div>-->
+<!-- <el-row>-->
+<!-- <!– <h3 class="toptitle">漳州市中医院</h3>–>-->
- <h3 class="toptitle">{{ title }}</h3>
- </el-row>
- <el-row>
- <h3 class="topSubtitle">{{ subTitle }}</h3>
- </el-row>
- </div>
+<!-- <h3 class="toptitle">{{ title }}</h3>-->
+<!-- </el-row>-->
+<!-- <el-row>-->
+<!-- <h3 class="topSubtitle">{{ subTitle }}</h3>-->
+<!-- </el-row>-->
+<!-- </div>-->
<el-form
@submit.native.prevent
class="card-box login-form"
@@ -20,10 +20,11 @@
label-position="left"
>
<el-card class="box-card">
- <div style="text-align: center; margin-top: 10px; margin-bottom: 15px">
- <img alt="element-logo" src="@/assets/logo/logo.png"/>
- </div>
- <h3 class="title">用户登录</h3>
+<!-- <div style="text-align: center; margin-top: 10px; margin-bottom: 15px">-->
+<!-- <img alt="element-logo" src="@/assets/logo/logo.png"/>-->
+<!-- </div>-->
+ <h3 class="title" style="margin-top: 120px">用户登录</h3>
+ <h3 class="title" style="margin-top: 10px">演示系统</h3>
<el-form-item prop="username" class="item" style="margin-top: -20px">
<el-input
prefix-icon="el-icon-user"
@@ -116,28 +117,28 @@
</div>
</el-dialog>
- <div
- style="
- position: absolute;
- bottom: 0;
- font-size: 12px;
- color: white;
- width: 100%;
- display: flex;
- justify-content: center;
- "
- >
- <a href="http://www.xmglxp.com/" target="_blank">
- 软件名称: 供应商自助管理平台
- </a>
- <a
- href="http://www.xmglxp.com/"
- target="_blank"
- style="margin-left: 20px; font-size: 12px"
- >
- 开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112
- </a>
- </div>
+<!-- <div-->
+ <!-- style="-->
+ <!-- position: absolute;-->
+ <!-- bottom: 0;-->
+ <!-- font-size: 12px;-->
+ <!-- color: white;-->
+ <!-- width: 100%;-->
+ <!-- display: flex;-->
+ <!-- justify-content: center;-->
+ <!-- "-->
+ <!-- >-->
+ <!-- <a href="http://www.xmglxp.com/" target="_blank">-->
+ <!-- 软件名称: 供应商自助管理平台-->
+ <!-- </a>-->
+ <!-- <a-->
+ <!-- href="http://www.xmglxp.com/"-->
+ <!-- target="_blank"-->
+ <!-- style="margin-left: 20px; font-size: 12px"-->
+ <!-- >-->
+ <!-- 开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112-->
+ <!-- </a>-->
+ <!-- </div>-->
</div>
</template>