This commit is contained in:
bb_pan 2025-05-16 16:22:30 +08:00
parent bd6d009312
commit 17ac0b7e6f
8 changed files with 43 additions and 40 deletions

View File

@ -52,6 +52,9 @@ Vue.prototype.downloadJson = downloadJson
Vue.prototype.handleTree = handleTree
Vue.prototype.indexContinuation = indexContinuation
Vue.prototype.globalUrl = global_
// 全局设置element-ui Dialog组件的close-on-click-modal close-on-press-escape属性为false
Element.Dialog.props.closeOnClickModal.default = false
Element.Dialog.props.closeOnPressEscape.default = false
// 全局组件挂载
Vue.component('DictTag', DictTag)
Vue.component('Pagination', Pagination)

View File

@ -5,7 +5,7 @@
{{ state.title }}
</div>
<div class="f-count">{{ state.count }}</div>
<div class="f-14">
<!-- <div class="f-14">
<span v-if="!state.isIncrease">
较上月降低
<span style="color: red">{{ state.increase || 0 }}</span>
@ -15,7 +15,7 @@
<svg-icon v-if="!state.isIncrease" icon-class="down_arrow" />
<svg-icon v-else icon-class="up_arrow" />
</div>
</div> -->
</div>
</template>
@ -49,7 +49,7 @@ export default {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
justify-content: space-around;
border-radius: 12px;
color: #fff;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); /* 初始阴影 */

View File

@ -259,7 +259,7 @@ export default {
})
try {
const res = await iwsLogin({
ticket: origin.split('ticket%3D')[1].split('%26')[0] || origin.split('ticket=')[1].split('#/')[0],
ticket: origin.split('ticket=')[1].split('#/')[0] || origin.split('ticket%3D')[1].split('%26')[0],
sysType: 0
})
console.log('🚀 ~ created ~ res:', res)

View File

@ -66,27 +66,27 @@
<el-table v-loading="loading" :data="tableList" ref="multipleTable" row-key="taskId" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" :selectable="selectable"/>
<el-table-column label="序号" align="center" width="80" type="index">
<!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" :selectable="selectable"/> -->
<el-table-column label="序号" align="center" width="50" type="index">
<template slot-scope="scope">
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" prop="arrivalTime" width="180" :show-overflow-tooltip="true"/>
<el-table-column label="到货时间" align="center" prop="arrivalTime" width="110" :show-overflow-tooltip="true"/>
<el-table-column label="采购单号" align="center" prop="code" width="150" :show-overflow-tooltip="true"/>
<el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" width="150" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" prop="purchaseMaNumber" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="采购物资" align="center" prop="purchaseMaTypeName" min-width="150" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" prop="purchaseMaNumber" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格(元含税)" align="center" prop="purchaseTaxPrice" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格(元不含税)" align="center" prop="purchasePrice" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="税率" align="center" prop="taxRate" :show-overflow-tooltip="true">
<el-table-column label="税率" align="center" width="60" prop="taxRate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.taxRate }}%</span>
</template>
</el-table-column>
<el-table-column label="物资厂家" align="center" prop="supplier" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="操作人" align="center" prop="createBy" width="100" :show-overflow-tooltip="true"/>
<el-table-column label="操作时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true" width="100">
<el-table-column label="操作时间" align="center" prop="createTime" width="110" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true" width="80">
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>-->
<!-- </template>-->

View File

@ -85,24 +85,24 @@
<el-table v-loading="loading" :data="typeList" row-key="id" border>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column width="60" align="center" label="序号" type="index" />
<el-table-column align="center" width="160" label="到货时间" prop="arrivalTime" :show-overflow-tooltip="true"/>
<el-table-column width="50" align="center" label="序号" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" />
<el-table-column align="center" width="110" label="到货时间" prop="arrivalTime" :show-overflow-tooltip="true"/>
<el-table-column label="采购单号" width="150" align="center" prop="code" :show-overflow-tooltip="true"/>
<el-table-column label="采购物资" align="center" width="180" prop="purchaseMaTypeName" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" width="100" prop="purchaseMaNumber" :show-overflow-tooltip="true"/>
<el-table-column label="采购数量" align="center" width="80" prop="purchaseMaNumber" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格(元含税)" align="center" width="100" prop="purchaseTaxPrice" :show-overflow-tooltip="true"/>
<el-table-column label="采购价格(元不含税)" align="center" width="100" prop="purchasePrice" :show-overflow-tooltip="true"/>
<el-table-column label="税率" align="center" prop="taxRate" :show-overflow-tooltip="true">
<el-table-column label="税率" align="center" width="60" prop="taxRate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.taxRate }}%</span>
</template>
</el-table-column>
<el-table-column label="物资厂家" align="center" prop="supplier" width="120" :show-overflow-tooltip="true"/>
<el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true"/>
<el-table-column label="操作时间" align="center" width="160" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="操作时间" align="center" width="110" prop="createTime" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="taskStatusName" width="80" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
<el-table-column label="操作" align="center" width="200" fixed="right">
<el-table-column label="操作" align="center" width="280">
<template slot-scope="scope">
<el-button size="mini" style="margin-bottom: 10px" type="normal"
@click="handleView(scope.row)"

View File

@ -107,7 +107,7 @@
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column align="center" label="序号" type="index" />
<el-table-column align="center" label="序号" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" />
<el-table-column
align="center"
label="到货时间"

View File

@ -63,24 +63,24 @@
align="center"
:reserve-selection="true"
/> -->
<el-table-column label="序号" align="center" width="80" type="index">
<el-table-column label="序号" align="center" width="50" type="index">
<template slot-scope="scope">
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="到货时间" align="center" prop="arrivalTime" width="180" :show-overflow-tooltip="true" />
<el-table-column label="到货时间" align="center" prop="arrivalTime" width="110" :show-overflow-tooltip="true" />
<el-table-column label="采购单号" align="center" prop="code" width="150" :show-overflow-tooltip="true" />
<el-table-column
label="采购物资"
align="center"
width="150"
min-width="150"
prop="purchaseMaTypeName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="采购数量"
align="center"
width="100"
width="80"
prop="purchaseMaNumber"
:show-overflow-tooltip="true"
/>
@ -98,21 +98,21 @@
width="100"
:show-overflow-tooltip="true"
/>
<el-table-column label="税率" align="center" prop="taxRate" :show-overflow-tooltip="true">
<el-table-column label="税率" align="center" prop="taxRate" width="60" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.taxRate }}%</span>
</template>
</el-table-column>
<el-table-column label="物资厂家" align="center" prop="supplier" width="100" :show-overflow-tooltip="true" />
<el-table-column label="物资厂家" align="center" prop="supplier" min-width="120" :show-overflow-tooltip="true" />
<el-table-column label="操作人" align="center" prop="createBy" width="100" :show-overflow-tooltip="true" />
<el-table-column label="操作时间" align="center" prop="createTime" width="180" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="taskStatusName" :show-overflow-tooltip="true">
<el-table-column label="操作时间" align="center" prop="createTime" width="110" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="taskStatusName" width="80" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>-->
<!-- </template>-->
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" width="250" fixed="right">
<el-table-column label="操作" align="center" width="230" fixed="right">
<template slot-scope="scope">
<el-button size="mini" @click="handleView(scope.row)">查看</el-button>
<el-button

View File

@ -2,7 +2,7 @@
<div class="app-container">
<el-row :gutter="20">
<!--部门数据-->
<el-col :span="4" :xs="24">
<el-col :span="5" :xs="24">
<div class="head-container">
<el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
style="margin-bottom: 20px"
@ -16,12 +16,12 @@
</div>
</el-col>
<!--用户数据-->
<el-col :span="20" :xs="24">
<el-col :span="19" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px"
>
<el-form-item label="用户名称" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
<el-form-item label="用户昵称" prop="nickName">
<el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -85,7 +85,7 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" :selectable="checkSelectable" :row-class-name="getRowClassName">
<el-table-column type="selection" width="50" align="center"/>
<el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="false"/>
<el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
<el-table-column label="登录名" align="center" key="userName" prop="userName" v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
@ -197,8 +197,8 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
<el-form-item v-if="form.userId == undefined" label="登录名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入登录名" maxlength="30"/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -397,7 +397,7 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
userName: undefined,
nickName: undefined,
phonenumber: undefined,
status: undefined,
deptId: undefined
@ -405,7 +405,7 @@ export default {
//
columns: [
{ key: 0, label: `用户编号`, visible: true },
{ key: 1, label: `用户名称`, visible: true },
{ key: 1, label: `登录名`, visible: true },
{ key: 2, label: `用户昵称`, visible: true },
{ key: 3, label: `部门`, visible: true },
{ key: 4, label: `手机号码`, visible: true },
@ -415,8 +415,8 @@ export default {
//
rules: {
userName: [
{ required: true, message: '用户名称不能为空', trigger: 'blur' },
{ min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
{ required: true, message: '登录名不能为空', trigger: 'blur' },
{ min: 2, max: 20, message: '登录名长度必须介于 2 和 20 之间', trigger: 'blur' }
],
nickName: [
{ required: true, message: '用户昵称不能为空', trigger: 'blur' }