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

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

This commit is contained in:
YeMingfei666 2024-11-27 09:01:26 +08:00
parent 63349360fa dc0b2f7605
commit c4f9bdfb8a
6 changed files with 73 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/shopList/index.vue
View File

@ -54,7 +54,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="分类名称" prop="categoryName"></el-table-column> <el-table-column label="分类名称" prop="categoryName"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" v-if="radio">
<template v-slot="scope"> <template v-slot="scope">
<el-button type="primary" @click="selectHandle(scope.row)">选择</el-button> <el-button type="primary" @click="selectHandle(scope.row)">选择</el-button>
</template> </template>

6
src/views/application/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<div class="title">应用中心</div> <div class="title">应用中心</div>
<div class="list"> <div class="list">
<div class="item" @click="upPop"> <!-- <div class="item" @click="upPop">
<img src="./kp.png" class="icon"> <img src="./kp.png" class="icon">
<div class="info"> <div class="info">
<div class="name">开票</div> <div class="name">开票</div>
@ -10,7 +10,7 @@
</div> </div>
</div> </div>
</div> </div> -->
<div class="item" v-for="item in list" :key="item.id" @click="to(item)"> <div class="item" v-for="item in list" :key="item.id" @click="to(item)">
<img :src="item.coverImg" class="icon"> <img :src="item.coverImg" class="icon">
<div class="info"> <div class="info">
@ -67,7 +67,7 @@ export default {
}, },
mounted() { mounted() {
this.appCenterGet() this.appCenterGet()
this.getbinding() // this.getbinding()
}, },
methods: { methods: {
upPop() { upPop() {

9
src/views/invoicing/components/addConsTakin.vue
View File

@ -81,7 +81,8 @@ export default {
stocktakinNum: '', // 必传 stocktakinNum: '', // 必传
price: '', // 商品价格 非必传 为空盘点价格为商品价格 price: '', // 商品价格 非必传 为空盘点价格为商品价格
remark: "", // 盘点备注 非必传 remark: "", // 盘点备注 非必传
stockNumber: 0 stockNumber: 0,
balance: ''
}, },
rules: { rules: {
stocktakinNum: [ stocktakinNum: [
@ -155,6 +156,7 @@ export default {
}) })
}, },
async show(obj) { async show(obj) {
console.log(obj, 111)
let res = await hasPermission('允许耗材盘点'); let res = await hasPermission('允许耗材盘点');
if (!res) { return; } if (!res) { return; }
this.form.remark = '' this.form.remark = ''
@ -165,8 +167,9 @@ export default {
this.form = Object.assign(this.form, obj) this.form = Object.assign(this.form, obj)
this.dialogVisible = true this.dialogVisible = true
this.form.conInfoId = obj.consId this.form.conInfoId = obj.consId
this.form.stockNumber = obj.stockNumber this.form.stockNumber = obj.balance < 0 ? 0 : obj.balance
this.form.balance = obj.stockNumber // this.form.balance = obj.stockNumber
this.form.balance = obj.balance
this.form.price == null ? 0 : this.form.price this.form.price == null ? 0 : this.form.price
this.searhForm.productId = obj.id this.searhForm.productId = obj.id
this.getTableData() this.getTableData()

31
src/views/order_manage/order_list.vue
View File

@ -57,9 +57,9 @@
</el-form> </el-form>
</div> </div>
<div class="head-container"> <!-- <div class="head-container">
<div class="collect_wrap"> <div class="collect_wrap">
<!-- <div class="item"> <div class="item">
<div class="icon_wrap" style="--bg-color:#C978EE"> <div class="icon_wrap" style="--bg-color:#C978EE">
<i class="icon el-icon-s-goods"></i> <i class="icon el-icon-s-goods"></i>
</div> </div>
@ -67,8 +67,8 @@
<div class="m">￥{{ payCountTotal }}</div> <div class="m">￥{{ payCountTotal }}</div>
<div class="t">总金额</div> <div class="t">总金额</div>
</div> </div>
</div> --> </div>
<div class="item" v-for="item in payCountList" :key="item.payType"> <div class="item" v-for="item in payCountList" :key="item.payType">
<div class="icon_wrap" style="--bg-color:#fff"> <div class="icon_wrap" style="--bg-color:#fff">
<el-image class="img" :src="item.icon"></el-image> <el-image class="img" :src="item.icon"></el-image>
</div> </div>
@ -78,7 +78,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>-->
<div class="head-container"> <div class="head-container">
<el-table :data="tableData.data" v-loading="tableData.loading"> <el-table :data="tableData.data" v-loading="tableData.loading">
<el-table-column label="订单号信息"> <el-table-column label="订单号信息">
@ -150,7 +150,8 @@
<template v-slot="scope"> <template v-slot="scope">
<div class="u-flex gap-10"> <div class="u-flex gap-10">
<el-button type="text" @click="$refs.orderDetail.show(scope.row)">详情</el-button> <el-button type="text" @click="$refs.orderDetail.show(scope.row)">详情</el-button>
<el-button v-if="scope.row.status == 'unpaid'" type="primary" size="mini" @click="payOrder(scope.row)">结账</el-button> <el-button v-if="scope.row.status == 'unpaid'" type="primary" size="mini"
@click="payOrder(scope.row)">结账</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -207,24 +208,24 @@ export default {
filters: { filters: {
orderTypeFilter(t) { orderTypeFilter(t) {
if (t) { if (t) {
const item= orderEnum.orderType.find(item => item.key == t); const item = orderEnum.orderType.find(item => item.key == t);
return t && item?item.label:''; return t && item ? item.label : '';
} else { } else {
return t; return t;
} }
}, },
sendTypeFilter(t) { sendTypeFilter(t) {
if (t) { if (t) {
const item= orderEnum.sendType.find(item => item.key == t); const item = orderEnum.sendType.find(item => item.key == t);
return item?item.label:''; return item ? item.label : '';
} else { } else {
return t; return t;
} }
}, },
statusFilter(t) { statusFilter(t) {
if (t) { if (t) {
const item= orderEnum.status.find(item => item.key == t); const item = orderEnum.status.find(item => item.key == t);
return t && item?item.label:''; return t && item ? item.label : '';
} else { } else {
return t; return t;
} }
@ -258,7 +259,7 @@ export default {
}, },
methods: { methods: {
//结账 //结账
payOrder(order){ payOrder(order) {
console.log(order); console.log(order);
this.$router.push({ this.$router.push({
path: "/tool/Instead/index", path: "/tool/Instead/index",
@ -268,7 +269,7 @@ export default {
useType: order.useType, useType: order.useType,
masterId: order.masterId, masterId: order.masterId,
orderId: order.id, orderId: order.id,
key:'isJieZhang' key: 'isJieZhang'
}, },
}); });
}, },
@ -324,7 +325,7 @@ export default {
async getTableData(switchs = false) { async getTableData(switchs = false) {
this.tableData.loading = true; this.tableData.loading = true;
try { try {
this.payCount(); // this.payCount();
const productName = this.query.productName.replace(/\s+/g, '') const productName = this.query.productName.replace(/\s+/g, '')
const res = await tbOrderInfoData({ const res = await tbOrderInfoData({
page: this.tableData.page, page: this.tableData.page,

13
src/views/shop/components/addPadPage.vue
View File

@ -192,7 +192,18 @@ export default {
}, },
// 确认选择商品 // 确认选择商品
selectConfirmGoods(res) { selectConfirmGoods(res) {
this.$set(this.form.list, this.activeItem, { ...res[0] }) // this.form.list = res
const flag = this.form.list.filter(item => item.id == res[0].id)
if (flag.length) {
this.$notify({
title: '注意',
message: '请勿重复添加',
type: 'error'
})
} else {
this.$set(this.form.list, this.activeItem, { ...res[0] })
}
}, },
// 切换tab // 切换tab
tabChange() { tabChange() {

35
src/views/shop/pad_setting.vue
View File

@ -7,8 +7,12 @@
</el-input> </el-input>
</div> </div>
<div class="tree_wrap"> <div class="tree_wrap">
<el-tree :data="treeData" node-key="id" highlight-current :props="{ label: 'name' }" default-expand-all <!-- <el-tree :data="treeData" node-key="id" highlight-current :props="{ label: 'name' }" default-expand-all
@node-click="treeItemClick"></el-tree> @node-click="treeItemClick"></el-tree> -->
<div class="item" :class="{ active: selectCatoryIndex == index }" v-for="(item, index) in treeData"
:key="item.id" @click="treeItemClick(item, index)">
{{ item.name }}
</div>
</div> </div>
</div> </div>
<div class="table_wrap"> <div class="table_wrap">
@ -62,6 +66,7 @@ export default {
query: { query: {
name: '' name: ''
}, },
selectCatoryIndex: 0,
selectCatory: '', selectCatory: '',
treeDataOrgin: [], treeDataOrgin: [],
treeData: [], treeData: [],
@ -88,6 +93,12 @@ export default {
this.treeData = this.treeDataOrgin.filter(item => { this.treeData = this.treeDataOrgin.filter(item => {
return item.name.includes(this.query.name) return item.name.includes(this.query.name)
}) })
if (this.treeData.length) {
this.selectCatoryIndex = 0
this.selectCatory = this.treeData[this.selectCatoryIndex]
this.getTableData()
}
}, },
//表格拖拽 //表格拖拽
tableDrag() { tableDrag() {
@ -147,7 +158,8 @@ export default {
} }
}, },
// 分类被点击 // 分类被点击
treeItemClick(data) { treeItemClick(data, index) {
this.selectCatoryIndex = index
this.selectCatory = data this.selectCatory = data
this.tableData.page = 1 this.tableData.page = 1
this.getTableData() this.getTableData()
@ -164,6 +176,7 @@ export default {
}) })
this.treeDataOrgin = res.content this.treeDataOrgin = res.content
this.treeData = res.content this.treeData = res.content
this.selectCatory = res.content[this.selectCatoryIndex]
this.getTableData() this.getTableData()
} catch (error) { } catch (error) {
console.log(error) console.log(error)
@ -235,6 +248,22 @@ export default {
width: 100%; width: 100%;
height: calc(100% - 70px); height: calc(100% - 70px);
overflow-y: auto; overflow-y: auto;
.item {
padding: 10px 15px;
font-size: 14px;
display: flex;
align-items: center;
&:hover {
cursor: pointer;
}
&.active {
background-color: #1890ff;
color: #fff;
}
}
} }
} }