czg_team
/
management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test

This commit is contained in:
duan 2024-10-25 15:23:08 +08:00
parent 869da7f0f0 64794aa8b8
commit 4d6635e9be
3 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/home/home.vue
View File

@ -194,9 +194,9 @@
<el-radio-button label="30">30天</el-radio-button> <el-radio-button label="30">30天</el-radio-button>
</el-radio-group> </el-radio-group>
</div> </div>
<div class="chart" ref="saleChart" v-loading="saleLoading" style="height: 500px;" v-show="lineChartType == 0"> <div class="chart" ref="saleChart" v-loading="saleLoading" style="height: 350px;" v-show="lineChartType == 0">
</div> </div>
<div class="chart" ref="payChart" v-loading="payChartLoading" style="height: 500px;" <div class="chart" ref="payChart" v-loading="payChartLoading" style="height: 350px;"
v-show="lineChartType == 1"> v-show="lineChartType == 1">
</div> </div>
</div> </div>
@ -213,13 +213,13 @@
</el-radio-group> </el-radio-group>
</div> </div>
<div class="sale_data"> <div class="sale_data">
<div class="card"> <!-- <div class="card">
<div class="sale_data_header"> <div class="sale_data_header">
<div class="card_title">销售数量</div> <div class="card_title">销售数量</div>
</div> </div>
<div class="number">{{ productCount }}</div> <div class="number">{{ productCount }}</div>
<div class="product_chart_wrap" ref="productCountChart"></div> <div class="product_chart_wrap" ref="productCountChart"></div>
</div> </div> -->
<!-- <div class="card"> <!-- <div class="card">
<div class="sale_data_header"> <div class="sale_data_header">
<div class="card_title">销售金额</div> <div class="card_title">销售金额</div>

56
src/views/invoicing/consumable/information.vue
View File

@ -30,35 +30,40 @@
<el-date-picker v-model="query.createdAt" type="daterange" range-separator="至" start-placeholder="开始日期" <el-date-picker v-model="query.createdAt" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" value-format="yyyy-MM-dd"> end-placeholder="结束日期" value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
<el-button type="primary" @click="getTableData">查询</el-button> <el-button type="primary" @click="getTableData">查询</el-button>
<el-button @click="resetHandle">重置</el-button> <el-button @click="resetHandle">重置</el-button>
</div> </div>
<div class="row"> <div class="row">
<el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button> <!-- <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
<el-button @click="routerGo('operation_in')">入库</el-button> <el-button @click="routerGo('operation_in')">入库</el-button>
<el-button @click="routerGo('operation_out')">出库</el-button> <el-button @click="routerGo('operation_out')">出库</el-button>
<el-button @click="$router.push({ name: 'type' })">分类管理</el-button> <el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
<el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button> <el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
<el-button icon="el-icon-download" :loading="downloadLoading" @click="protHandle">导出耗材</el-button> <el-button icon="el-icon-download" :loading="downloadLoading" @click="protHandle">导出耗材</el-button>
<el-button icon="el-icon-upload2" :loading="uploadLoading" @click="dialogVisible = true">导入耗材</el-button> <el-button icon="el-icon-upload2" :loading="uploadLoading" @click="dialogVisible = true">导入耗材</el-button> -->
</div> <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
</div>
<div class="row_wrap" style="margin-top: 12px">
<div class="row">
<!-- <el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
<el-button @click="$router.push({ name: 'operation_in' })">入库</el-button>
<el-button @click="$router.push({ name: 'operation_out' })">出库</el-button>
<el-button @click="$router.push({ name: 'cons_record' })">耗材记录</el-button>
<el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
<el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button> -->
</div>
<div class="row">
<el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
<el-option label="创建时间" value="createTime,desc" /> <el-option label="创建时间" value="createTime,desc" />
<el-option label="数量由低到高" value="balance,asc" /> <el-option label="数量由低到高" value="balance,asc" />
</el-select> </el-select>
</div> </div>
</div>
<div class="row_wrap" style="margin-top: 12px">
<div class="row">
<el-button type="primary" icon="el-icon-plus" @click="clickdialogframe('add')">添加</el-button>
<el-button @click="$router.push({ name: 'operation_in' })">入库</el-button>
<el-button @click="$router.push({ name: 'operation_out' })">出库</el-button>
<el-button @click="$router.push({ name: 'cons_record' })">耗材记录</el-button>
<el-button @click="$router.push({ name: 'type' })">分类管理</el-button>
<el-button @click="$router.push({ name: 'supplier_manage' })">供应商管理</el-button>
</div>
<!-- <div class="row">
<el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
<el-option label="创建时间" value="createTime,desc" />
<el-option label="数量由低到高" value="balance,asc" />
</el-select>
</div> -->
</div> </div>
</div> </div>
<template> <template>
@ -162,7 +167,8 @@
<el-table-column label="原有库存" prop="balance"> <el-table-column label="原有库存" prop="balance">
<template v-slot="scope"> <template v-slot="scope">
<span>{{ scope.row.balance > 0 ? (scope.row.balance + (scope.row.bizType == '-' ? <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> scope.row.amount : -scope.row.amount)).toFixed(2) : (Number(scope.row.balance) +
Number(scope.row.amount)).toFixed(2) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="变动后库存" prop="balance"></el-table-column> <el-table-column label="变动后库存" prop="balance"></el-table-column>
@ -249,7 +255,7 @@
<el-table-column label="耗材入库" prop="conIn" /> <el-table-column label="耗材入库" prop="conIn" />
<el-table-column label="耗材出库" prop="conOut" /> <el-table-column label="耗材出库" prop="conOut" />
<el-table-column label="耗材反还" prop="conReturn" />--> <el-table-column label="耗材反还" prop="conReturn" />-->
<el-table-column label="所属商品"> <el-table-column label="所属商品">
<template v-slot="scope"> <template v-slot="scope">
<div class="goodslang"> <div class="goodslang">
@ -297,7 +303,7 @@
<el-switch v-model="scope.row.isCheck" active-value="1" inactive-value="0" <el-switch v-model="scope.row.isCheck" active-value="1" inactive-value="0"
@change="showChange($event, scope.row)"></el-switch> @change="showChange($event, scope.row)"></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="状态" prop="status"> <!-- <el-table-column label="状态" prop="status">
<template v-slot="scope"> <template v-slot="scope">
<el-switch v-model="scope.row.status" active-value="1" inactive-value="0" <el-switch v-model="scope.row.status" active-value="1" inactive-value="0"
@ -647,7 +653,7 @@ export default {
tableDatatype: { tableDatatype: {
data: [], data: [],
page: 0, page: 0,
size:100, size: 100,
loading: false, loading: false,
total: 0 total: 0
}, },
@ -722,13 +728,13 @@ export default {
this.getTableDatatype(); this.getTableDatatype();
}, },
methods: { methods: {
async routerGo (name) { async routerGo(name) {
let text; let text;
if ( name == 'operation_in') { text = "允许耗材入库"} if (name == 'operation_in') { text = "允许耗材入库" }
if ( name == 'operation_out') { text = "允许耗材出库"} if (name == 'operation_out') { text = "允许耗材出库" }
let res = await hasPermission(text); let res = await hasPermission(text);
if ( !res) { return; } if (!res) { return; }
this.$router.push({ name: name}) this.$router.push({ name: name })
}, },
lookDetail(row) { lookDetail(row) {
this.$refs.recodeDetail.open({ this.$refs.recodeDetail.open({

6
src/views/product/add_shop.vue
View File

@ -362,10 +362,10 @@
<el-input-number @change="priceFormat(form, 'stockNumber')" @blur="priceFormat(form, 'stockNumber')" <el-input-number @change="priceFormat(form, 'stockNumber')" @blur="priceFormat(form, 'stockNumber')"
v-model="form.stockNumber" controls-position="right"></el-input-number> v-model="form.stockNumber" controls-position="right"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="标签打印"> <!-- <el-form-item label="标签打印">
<el-switch v-model="form.enableLabel" :active-value="1" :inactive-value="0"></el-switch> <el-switch v-model="form.enableLabel" :active-value="1" :inactive-value="0"></el-switch>
<div class="tips">开启后: 收银完成后会自动打印对应数量的标签数</div> <div class="tips">开启后: 收银完成后会自动打印对应数量的标签数</div>
</el-form-item> </el-form-item>-->
<el-form-item label="打包费"> <el-form-item label="打包费">
<el-input-number @change="priceFormat(form, 'packFee')" @blur="priceFormat(form, 'packFee')" <el-input-number @change="priceFormat(form, 'packFee')" @blur="priceFormat(form, 'packFee')"
v-model="form.packFee" controls-position="right"></el-input-number> v-model="form.packFee" controls-position="right"></el-input-number>
@ -774,7 +774,7 @@ export default {
}); });
return false; return false;
} }
let arr = []; let arr = [];
this.imgList.forEach((ele) => { this.imgList.forEach((ele) => {
arr.push(ele.url); arr.push(ele.url);