This commit is contained in:
魏啾 2024-10-12 10:08:27 +08:00
parent 6882f41786
commit 7bad259789
3 changed files with 55 additions and 23 deletions

View File

@ -50,7 +50,7 @@
<div class="row">
<el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
<el-option label="创建时间" value="createTime,desc" />
<el-option label="数量由低到高" value="balance,desc" />
<el-option label="数量由低到高" value="balance,asc" />
</el-select>
</div>
</div>
@ -151,16 +151,31 @@
<el-dialog :title="variabilitytitle" :visible.sync="variabilityshow">
<div class="head-container">
<el-table ref="table" :data="stockData.data" v-loading="stockData.loading" row-key="id" height="450">
<!-- 共存前面 -->
<el-table-column label="耗材名称" prop="conName" />
<el-table-column label="变动库存" prop="amount">
<el-table-column label="原有库存" prop="balance">
<template v-slot="scope">
<span>{{ scope.row.balance > 0 ? (scope.row.balance + (scope.row.bizType == '-' ?
scope.row.amount : -scope.row.amount)) : Number(scope.row.balance) + Number(scope.row.amount) }}</span>
</template>
</el-table-column>
<el-table-column label="变动后库存" prop="balance"></el-table-column>
<el-table-column label="库存变动数量" prop="amount">
<template v-slot="scope">
<span :class="{ red: scope.row.bizType == '-' }">{{ scope.row.bizType }}{{ scope.row.amount }}</span>
</template>
</el-table-column>
<el-table-column label="现有库存" prop="balance" />
<el-table-column label="操作" prop="bizName" />
<!-- 减少数量 -->
<el-table-column v-if="variabilitytitle == '报损'" label="图片" prop="coverImg" />
<!-- 尾巴 -->
<el-table-column v-if="variabilitytitle != '消耗'" label="操作人" prop="operator" />
<el-table-column v-if="variabilitytitle != '消耗'" label="备注" prop="remark" />
<el-table-column label="操作时间" prop="createTime"></el-table-column>
<!-- <el-table-column label="现有库存" prop="balance" />
<el-table-column label="业务说明" prop="bizName" />
<!-- <el-table-column label="商品信息" prop="productName"></el-table-column> -->
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column> -->
</el-table>
</div>
<div class="head-container">
@ -183,25 +198,31 @@
<el-table ref="table" :data="tableData.data" v-loading="tableData.loading" row-key="id">
<el-table-column label="耗材名称" prop="conName" style="width: 100px;">
<template v-slot="scope">
<div v-if="scope.row.editNYD == 1">
<el-input v-model="scope.row.conName" placeholder="请输入内容" @blur="conNameClick(scope.row)"></el-input>
</div>
<span v-else>
<!-- <div v-if="scope.row.editNYD == 1">
<el-input v-model="scope.row.conName" placeholder="请输入内容"
@blur="conNameClick(scope.row)"></el-input>
</div> -->
<span>
{{ scope.row.conName }}
</span>
<i class="el-icon-edit" @click="scope.row.editNYD = 1"></i>
<!-- <i class="el-icon-edit" @click="scope.row.editNYD = 1"></i> -->
<i class="el-icon-edit" @click="editorHandle(scope.row)"></i>
</template>
</el-table-column>
<!-- <el-table-column label="分类名称" prop="conTypeName"></el-table-column> -->
<el-table-column label="单位" prop="conUnit">
<template v-slot="scope">
<div v-if="scope.row.editNYD == 2">
<!-- <div v-if="scope.row.editNYD == 2">
<el-input v-model="scope.row.conUnit" placeholder="请输入内容" @blur="conNameClick(scope.row)"></el-input>
</div>
<span v-else>
{{ scope.row.conUnit }}
</span>
<i class="el-icon-edit" @click="scope.row.editNYD = 2"></i>
<i class="el-icon-edit" @click="scope.row.editNYD = 2"></i> -->
<span>
{{ scope.row.conUnit }}
</span>
<i class="el-icon-edit" @click="editorHandle(scope.row)"></i>
</template>
</el-table-column>
@ -250,13 +271,18 @@
</el-table-column>
<el-table-column label="预警值" prop="conWarning">
<template v-slot="scope">
<div v-if="scope.row.editNYD == 3">
<!-- <div v-if="scope.row.editNYD == 3">
<el-input v-model="scope.row.conWarning" placeholder="请输入内容" @blur="conNameClick(scope.row)"></el-input>
</div>
<span v-else>
{{ scope.row.conWarning }}
</span>
<i class="el-icon-edit" @click="scope.row.editNYD = 3"></i>
<i class="el-icon-edit" @click="scope.row.editNYD = 3"></i> -->
<span>
{{ scope.row.conWarning }}
</span>
<i class="el-icon-edit" @click="editorHandle(scope.row)"></i>
</template>
</el-table-column>
<el-table-column label="状态" prop="status">
@ -269,7 +295,7 @@
<el-table-column label="操作" width="250" fixed="right">
<template v-slot="scope">
<el-button type="text" @click="editorHandle(scope.row)">编辑</el-button>
<el-button type="text" @click="clicksee(scope.row)" style="margin-left: 10px !important">耗材记录</el-button>
<!-- <el-button type="text" @click="clicksee(scope.row)" style="margin-left: 10px !important">耗材记录</el-button> -->
<el-button type="text" size="mini" style="margin-left: 10px !important"
@click="$refs.AddConsTakin.show(scope.row)">耗材盘点</el-button>
<!-- <el-button style="margin-left: 10px !important" type="text" @click="lookDetail(scope.row)">查看详情</el-button> -->
@ -414,9 +440,9 @@
placeholder="请输入耗材信息代码"
></el-input>
</el-form-item> -->
<el-form-item label="耗材价格">
<!-- <el-form-item label="耗材价格">
<el-input v-model="ruleForm.price" placeholder="请输入耗材价格"></el-input>
</el-form-item>
</el-form-item> -->
<el-form-item label="预警值">
<el-input v-model="ruleForm.conWarning" placeholder="请输入耗材预警值"></el-input>
</el-form-item>
@ -1104,7 +1130,7 @@ export default {
// consId: this.consRecordItem.consId,
// conName: this.consRecordItem.conName,
shopId: localStorage.getItem("shopId"),
sort:'createTime,desc'
sort: 'createTime,desc'
});
this.clickseetableData.loading = false;
this.clickseetableData.data = res.content;

View File

@ -2,7 +2,7 @@
<div class="app-container">
<div class="head-container">
<el-form ref="queryForm" :model="queryForm" :rules="queryRules" label-position="left" label-width="80px">
<el-form-item label="入库内容">
<!-- <el-form-item label="入库内容">
<div class="shop_type_box">
<div class="item" v-for="item in inTabs" :key="item.value"
:class="{ active: inTabValue == item.value }" @click="tabChange(item.value, item.type)">
@ -12,7 +12,7 @@
</div>
</div>
</div>
</el-form-item>
</el-form-item> -->
<!-- <el-form-item label="入库类型" v-if="inTabValue == 'goods'">
<div class="shop_type_box">
<div class="item" v-for="(item, index) in shopTypes" :key="index"
@ -233,7 +233,7 @@ export default {
data() {
return {
formatDecimal,
inTabValue: 'goods',
inTabValue: 'consumable',
inTabs: [
{
label: '商品入库',
@ -246,7 +246,7 @@ export default {
type: 'in'
}
],
shopTypesActive: 1,
shopTypesActive: 0,
shopTypes: [
{
label: '供应商入库',
@ -382,6 +382,7 @@ export default {
},
//
tabChange(value, type) {
console.log(value,type)
this.shopTypesActive = type == 'in' ? 0 : 1
this.inTabValue = value
this.resetHandle()

View File

@ -35,7 +35,12 @@
</div>
<div class="head-container">
<el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
@current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
@current-change="paginationChange" @size-change="(e) => {
tableData.size = e;
tableData.page = 0;
paginationChange();
}
" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
</div>
</div>
</template>