Compare commits

...

3 Commits

Author SHA1 Message Date
9223df562c 1 2026-02-10 17:31:57 +08:00
7152839d60 增加两个文件 2026-02-10 17:31:13 +08:00
150e8abf0f 订单管理 2026-02-10 17:28:08 +08:00
6 changed files with 693 additions and 27 deletions

View File

@ -47,7 +47,6 @@ import ListItem from "./ListItem.vue";
const {proxy} = getCurrentInstance()
const queryParams = ref({
state: '1',
isPayNow: '',

View File

@ -8,7 +8,7 @@
style="margin: 0;margin-bottom: 20px"
@click="handleDetail(item)"
>
<view class="context">
<view class="context" v-if="userType === '01' || userType === '02'" >
<view class="label">
<text>货主:</text>
<text>{{ item.companyName }}</text>
@ -36,17 +36,73 @@
<view class="label">
<text>操作:</text>
<view class="action-buttons">
<button type='primary' :plain="true" @click="Edit(item)" class="btn">编辑</button>
<button type='warn'
plain='true'
@click="deleteData(item)"
<button type='primary'
:plain="true"
@click.stop="Edit(item)"
class="btn"
v-if="item.state == 1 || item.state == -1 || item.state == -2"
v-if="item.state == 0 "
>
编辑
</button>
<button type='warn'
:plain="true"
@click.stop="deleteData(item)"
class="btn"
v-if="item.state == 0 || item.state == 1 || item.state == -1 || item.state == -2"
>删除</button>
</view>
</view>
</view>
<view class="context" v-else >
<view class="label">
<text>货主:</text>
<text>{{ item.companyName }}</text>
</view>
<view class="label">
<text>发货仓库:</text>
<text>{{ item.warehouseName }}</text>
</view>
<view class="label">
<text>制单日期:</text>
<text>{{ formatDate(item.adddate, 'yyyy-MM-dd') }}</text>
</view>
<view class="label">
<text>订单金额:</text>
<text>{{ formatPrice(item.contractmoney) }}</text>
</view>
<view class="label">
<text>补差金额:</text>
<text>{{ formatPrice(item.disCount) }}</text>
</view>
<view class="label">
<text>本月/下月:</text>
<text>{{ item.actioninfo }}</text>
</view>
<view class="label">
<text>支付方式:</text>
<view>
<text>{{ item.creditperiods > 0 ? '非现款' : '现款' }}</text>
</view>
</view>
<view class="label">
<text>状态:</text>
<text>
<text>{{ item.stateText }}</text>
</text>
</view>
<!-- <view class="label">
<text>操作:</text>
<view class="action-buttons">
<button type='primary'
:plain="true"
@click.stop="Edit(item)"
class="btn"
>
编辑
</button>
</view>
</view> -->
</view>
</uni-card>
</template>
@ -58,7 +114,7 @@ import {formatPrice} from "../../../utils/utils";
import DictTag from "../../../components/dict-tag/dict-tag.vue";
import {delsalemain} from "../../../api/orderManager/index.js"
import { getUserProfile } from "@/api/system/user"
const {proxy} = getCurrentInstance()
// const {order_state, dazhong_dingdan_type} = proxy.useDict(['order_state', 'dazhong_dingdan_type'])
@ -69,7 +125,7 @@ defineOptions({
name: 'ListItem'
})
const userType = ref()
const props = defineProps(['items'])
@ -79,10 +135,15 @@ const orderTypeList = ref([])
onMounted(async () => {
try {
await getDictData()
await getUser()
} finally {
}
})
function getUser() {
getUserProfile().then(response => {
userType.value = response.data.userType
})
}
const Edit = async (row) => {
try {
console.log(row,'当前行数据')
@ -93,12 +154,12 @@ const Edit = async (row) => {
console.error('失败:', error)
}
}
const emit = defineEmits(['refresh'])
//
const deleteData = async (row) => {
uni.showModal({
title: '删除确认',
content: `确定删除合同 ${row.contractcode || ''} 吗?`,
content: `确定删除 ${row.contractcode || ''} 吗?`,
confirmText: '确定',
cancelText: '取消',
confirmColor: '#DD524D',
@ -148,7 +209,6 @@ const getDictData = async () => {
text: item.dictLabel
}
})
orderTypeList.value = typeRes.data
} catch (error) {
console.error('获取字典数据失败:', error)
@ -156,7 +216,12 @@ const getDictData = async () => {
}
const handleDetail = (row) => {
proxy.$tab.navigateTo(`/pages/work/OrderManager/components/EditData?id=${row.saleid}`)
console.log(userType.value,'userType')
if(userType.value == '01' || userType.value == '02'){
proxy.$tab.navigateTo(`/pages/work/OrderManager/components/LookDataSY?id=${row.saleid}`)
}else{
proxy.$tab.navigateTo(`/pages/work/OrderManager/components/LookDataNB?id=${row.saleid}`)
}
}
</script>

View File

@ -0,0 +1,590 @@
<template>
<view class="order-detail-container">
<!-- 基础信息区域 -->
<view class="info-section">
<uni-row class="info-grid">
<uni-col class="flex-row">
<view class="label">生产单位: </view>
<uni-data-select
v-model="form.companyId"
:localdata="companyOptions"
text-field="deptName"
value-field="deptId"
@change="getEdu"
:clear="true"
disabled="true"
/>
</uni-col>
</uni-row>
<uni-row class="info-grid">
<uni-col :span="12">
<view class="label">剩余金额:{{ remainingMoney}}</view>
</uni-col>
<uni-col :span="12">
<view class="label">订单金额:{{ orderAmount }}</view>
</uni-col>
</uni-row>
<uni-row class="info-grid">
<!-- <uni-col :span="24" style="display: flex;">
<view class="label">已选补差:</view>
<view class="">
<view style="color: red;" v-if="buchaGoodsList.length&&selectedBuCha.length==0">
提示:当前有补差数据可选择
</view>
<view v-else class="" v-for="(item,index) in selectedBuCha" :key="index">
商品{{item.goodsname}},金额{{item.piaokou}}
</view>
</view>
</uni-col> -->
</uni-row>
</view>
<view>
<!-- 商品信息区域 -->
<view class="goods-section">
<view class="section-title">
<view class="">
商品信息
</view>
</view>
<view v-if="goodsList.length === 0" class="no-data">
暂无商品数据
</view>
<view v-else class="goods-double-column">
<view
v-for="(goods, index) in goodsList"
:key="goods.goodsid"
class="goods-item"
>
<view class="goods-header">
<text class="serial-number">{{ index + 1 }}</text>
<text class="goods-name">{{ goods.goodsname }}</text>
</view>
<view class="goods-content">
<uni-row class="info-row">
<uni-col :span="12" class="info-pair">
<view class="label">件装数:{{ goods.packingnum }}</view>
</uni-col>
<uni-col :span="12" class="info-pair">
<view class="label">供应参考价:{{ goods.invoiceprice }}</view>
</uni-col>
</uni-row>
<uni-row class="info-row">
<uni-col :span="12" class="info-pair">
<view class="label">前三月平均数:{{ goods.threeMonths }}</view>
</uni-col>
<uni-col :span="12" class="info-pair">
<view class="label">使用票扣:{{ goods.piaokou }}</view>
</uni-col>
</uni-row>
<uni-row class="info-row">
<uni-col :span="12" class="info-pair">
<view class="label">小计:{{ goods.allmoney }}</view>
</uni-col>
<uni-col :span="12" class="info-pair">
<view class="label">税率:{{ goods.taxrate }}</view>
</uni-col>
</uni-row>
<uni-row class="info-row">
<uni-col :span="12" class="info-pair flex-row" >
<view class="label">采购数量:</view>
<view class="label">税率:{{ goods.goodsnum }}</view>
<!-- <input
class="uni-input custom-input"
v-model="goods.goodsnum"
placeholder="请输入采购数量"
@confirm="e =>handleInput(e,index)"/> -->
</uni-col>
</uni-row>
</view>
</view>
</view>
</view>
<!-- 操作按钮 -->
<view class="action-buttons">
<button @click="goCancel" class="btn btn-secondary">取消</button>
<!-- <button @click="goSubmit" class="btn btn-primary">确认提交</button> -->
</view>
</view>
</view>
</template>
<script setup>
import { addsalemain } from '../../../../api/orderManager/index.js'
import { onMounted, ref ,computed} from 'vue'
import { contractData, goodsData } from '../detailData.js'
import { listsaleBusGoodsList } from '../../../../api/orderManager/index.js'
import { listproductList,salemainDetail,businessManagerReviewGoodsList,getsalemaincheckAmount } from '../../../../api/orderManager/index.js'
// import { getInfo } from '../../../../store/modules/user.js'
import { useUserStore } from '../../../../store/modules/user.js'
import { useOrderManagerStore } from '../../../../store/modules/orderManager.js'
import data1 from './data1.js'
//
const selectedBuCha = ref([])
//
const buchaGoodsList =ref([])
const goodsList = ref([])
const form = ref({
companyId:1,
})
const userStore = useUserStore()
const RemainingMoney = ref('0.00') //
//
const buChaButState = ref(true)
//
const allSelected = ref(false)
//
const selectedList = ref([])
//
const ShowBucha = ref(false)
//
const remainingMoney = ref(0)
//
const orderAmount = ref(0.00)
//
const queryNum = ref({})
//
const contract = ref({})
//
const companyOptions = ref([])
const monthOptions = ref([
{ value: 0, text: '本月执行' },
{ value: 1, text: '下月执行' }
])
// //
// const formatMoney = (value) => {
// const num = Number(value)
// return isNaN(num)
// ? '0.00'
// : num.toLocaleString('en-US', {
// minimumFractionDigits: 2,
// maximumFractionDigits: 2
// })
// }
// //
// const formattedRemainingMoney = computed(() => formatMoney(RemainingMoney.value))
// const formattedContractMoney = computed(() => formatMoney(form.value.contractmoney))
onMounted(() => {
// contract.value = contractData.data[0]
// console.log(contract.value)
getEdu()
getDeptLists()
// GetlistsaleBusGoodsList()
getAllData()
})
//
// console.log('saleid',saleid)
const getAllData = () =>{
const rowdata = useOrderManagerStore().oeders[0]
salemainDetail(rowdata.saleid).then(res => {
form.value = res.data
});
businessManagerReviewGoodsList(rowdata.saleid).then(res => {
goodsList.value = res.data
});
//
const AmountqueryParams = {
companyId:rowdata.companyId,
saleId: rowdata.saleid,
}
getsalemaincheckAmount(AmountqueryParams).then(res => {
remainingMoney.value = res.data.amounts
});
}
function GetlistsaleBusGoodsList() {
// //
const KeSaleGoodsParams = {
companyId:form.value.companyId,
userid: userStore.id,
// userid: 41,
deleteflag:0, // 0: 1: 2,
// state:1, //0,1
}
// const KeSaleGoodsQuery = {
// pageNum: 1,
// pageSize: 999,
// }
listsaleBusGoodsList(KeSaleGoodsParams).then(res => {
goodsList.value = res.data
// console.log(' goodsList.value', goodsList.value)
});
// console.log(' userStore.id', userStore.id)
}
const getDeptLists = () =>{
listproductList().then(res => {
companyOptions.value = res.data.map(item => {
return {
value:item.deptId,
text:item.deptName
}
})
console.log('companyOptions.value', companyOptions.value)
});
}
/** 更改生产单位时,查询额度 */
function getEdu() {
console.log(form.value.companyId,'form.value.companyId生产单位ID')
//
const AmountqueryParams = {
companyId:form.value.companyId,
saleId: 0,
}
//
getsalemaincheckAmount(AmountqueryParams).then(res => {
remainingMoney.value = res.data.amounts
});
GetlistsaleBusGoodsList()
// getsalemainpiAoKouList()
}
//
const goCancel = () => {
uni.navigateTo({
url:'/pages/work/OrderManager/index'
})
}
</script>
<style lang="scss" scoped>
// ::v-deep .uni-checkbox-input {
// background-color: #fff !important;
// border-color: #67c23a !important;
// }
// ::v-deep .uni-checkbox-input-checked {
// background-color: #fff !important;
// color: #67c23a !important; /* */
// }
// ::v-deep .uni-checkbox-input svg{
// viewBox: 0 0 36 36;
// width: 22rpx;
// height: 22rpx;
// }
.select-all {
//
margin-left: auto;
// margin-left: 10rpx;
// background-color: #67c23a;
}
.custom-input {
border: 1px solid #ccc;
border-radius: 4px;
padding: 5px;
height: 25px;
}
.order-detail-container {
padding: 16px;
background-color: #f5f5f5;
min-height: 100vh;
}
.flex-row {
display: flex;
align-items: center; /* 垂直居中对齐 */
gap: 10px; /* 标签和下拉框之间的间距 */
}
.page-title {
text-align: center;
margin-bottom: 24px;
color: #333;
font-size: 18px;
font-weight: 600;
padding: 12px 0;
background: #fff;
border-radius: 12px;
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
}
/* 基础信息网格布局 */
.info-section {
background: #fff;
border-radius: 12px;
padding: 16px;
margin-bottom: 20px;
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
}
.info-grid {
:deep(.uni-row) {
display: flex;
flex-wrap: wrap;
}
.info-value {
font-size: 15px;
color: #333;
font-weight: 500;
display: flex;
justify-content: flex-end;
}
margin-bottom: 20rpx;
margin-top: 20rpx;
}
.info-item {
margin-bottom: 12px;
}
.label {
font-size: 14px;
color: #666;
margin-bottom: 4px;
font-weight: 500;
}
.required::after {
content: '*';
color: #f56c6c;
margin-left: 2px;
}
.amount {
color: #f56c6c;
font-weight: 600;
}
.select-container {
width: 100%;
}
:deep(.uni-data-select__text) {
padding: 8px 12px;
border: 1px solid #ddd;
border-radius: 8px;
background-color: #fff;
}
:deep(.month-popup) {
min-width: 120px;
}
/* 商品信息区域 */
.goods-section {
background: #fff;
border-radius: 12px;
padding: 16px;
margin-bottom: 20px;
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
}
.section-title {
font-size: 16px;
color: #333;
margin: 0 0 16px 0;
padding-bottom: 8px;
border-bottom: 1px solid #eee;
font-weight: 600;
display: flex;
align-items: center;
}
.no-data {
text-align: center;
color: #999;
padding: 40px 0;
font-size: 14px;
}
/* 商品双栏布局 */
.goods-double-column {
display: flex;
flex-direction: column;
gap: 12px;
}
.goods-item {
border: 1px solid #eee;
border-radius: 12px;
overflow: hidden;
background: #fafafa;
}
.goods-header {
background: #409eff;
color: white;
padding: 5px 8px;
display: flex;
align-items: center;
gap: 12px;
}
.serial-number {
display: inline-flex;
align-items: center;
justify-content: center;
width: 20px;
height: 20px;
background: rgba(255, 255, 255, 0.2);
border-radius: 50%;
font-size: 12px;
font-weight: 600;
}
.goods-name {
font-size: 15px;
font-weight: 600;
flex: 1;
}
/* 商品内容区域 */
.goods-content {
padding: 12px 16px;
}
.info-row {
display: flex;
margin-bottom: 8px;
}
.info-pair {
flex: 1;
padding: 0 8px;
}
.info-pair .label {
font-size: 14px;
color: #666;
margin-bottom: 2px;
}
.info-pair .value {
font-size: 14px;
color: #333;
font-weight: 500;
text-align: right;
}
.quantity {
color: #409eff;
font-weight: 600;
}
.total {
color: #f56c6c;
font-weight: 600;
}
.empty {
visibility: hidden;
}
/* 操作按钮 */
.action-buttons {
display: flex;
justify-content: center;
gap: 12px;
padding: 16px 0;
background: #fff;
border-radius: 12px;
box-shadow: 0 2px 8px rgba(0,0,0,0.1);
}
.btn {
padding: 12px 24px;
border: none;
border-radius: 8px;
font-size: 15px;
font-weight: 500;
cursor: pointer;
min-width: 80px;
text-align: center;
flex: 1;
}
.btn-primary {
background: #409eff;
color: white;
}
.btn-secondary {
background: #67c23a;
color: white;
}
.btn-outline {
background: #fff;
color: #333;
border: 1px solid #ddd;
}
/* 响应式设计 */
@media (max-width: 768px) {
.order-detail-container {
padding: 12px;
}
.info-item {
margin-bottom: 10px;
}
.info-pair {
padding: 0 4px;
}
.action-buttons {
flex-direction: column;
}
.btn {
width: 100%;
margin-bottom: 8px;
}
.btn:last-child {
margin-bottom: 0;
}
}
/* 添加多选框样式 */
.uni-checkbox {
display: inline-flex;
align-items: center;
margin-right: 8px;
}
</style>

View File

@ -11,7 +11,6 @@
text-field="text"
value-field="value"
@change="handleCompanyChange"
:clear="true"
/>
</uni-col>
</uni-row>
@ -174,8 +173,8 @@
<!-- 商品列表操作按钮 -->
<view class="action-buttons ">
<button @click="goSave" class="btn btn-secondary">保存</button>
<button @click="goSubmit" class="btn btn-primary">确认提交</button>
<button @click="goSave" class="btn btn-secondary" :loading="btnloading" :disabled="btnloading">保存</button>
<button @click="goSubmit" class="btn btn-primary":loading="btnloading" :disabled="btnloading">确认提交</button>
</view>
</view>
</view>
@ -191,7 +190,7 @@ import data1 from './data1.js'
const userStore = useUserStore()
const userID = ref(userStore.id)
const loading = ref(true)
const btnloading = ref(false)
//
const isShowingBuchaList = ref(false) //
@ -232,9 +231,9 @@ onMounted(async () => {
//
function getsalemainpiAoKouList() {
const body = { companyId: form.value.companyId }
buchaGoodsList.value = data1.data
// buchaGoodsList.value = data1.data
salemainpiAoKouList(body).then(res => {
// buchaGoodsList.value = res.data || []
buchaGoodsList.value = res.data || []
})
}
@ -564,7 +563,7 @@ const goSave = () => {
if (!validatePiaokou()) {
return //
}
btnloading.value = true
form.value.state = 0 // 01
addsalemain(form.value).then(res => {
@ -573,6 +572,7 @@ const goSave = () => {
icon: 'success',
duration: 2000
})
btnloading.value = false
uni.navigateTo({
url: '/pages/work/OrderManager/index'
})
@ -583,6 +583,7 @@ const goSave = () => {
icon: 'error',
duration: 2000
})
btnloading.value = false
})
}
@ -614,7 +615,7 @@ const goSubmit = () => {
if (!validatePiaokou()) {
return //
}
btnloading.value = true
form.value.state = 1 // 1
addsalemain(form.value).then(res => {
@ -623,6 +624,7 @@ const goSubmit = () => {
icon: 'success',
duration: 2000
})
btnloading.value = false
uni.navigateTo({
url: '/pages/work/OrderManager/index'
})
@ -633,6 +635,7 @@ const goSubmit = () => {
icon: 'error',
duration: 2000
})
btnloading.value = false
})
}
</script>

View File

@ -20,15 +20,21 @@
@change="getTableData"
></uni-data-select>
</uni-forms-item>
<uni-forms-item label="合同编号">
<uni-forms-item label="合同编号" v-if="userType === '01' || userType === '02'" >
<input
v-model="queryParams.contractcode"
class="uni-input custom-input"
placeholder="请输入合同编号"
@confirm="getTableData"/>
</uni-forms-item>
<uni-forms-item label="商业公司" v-if="userType === '00'" >
<input
v-model="queryParams.businessCompany"
class="uni-input custom-input"
placeholder="请输入商业公司"
@confirm="getTableData"/>
</uni-forms-item>
</uni-forms>
<button
type="primary"
@click="gotoNewAdd"
@ -40,7 +46,7 @@
<MBLoading v-if="loading"/>
<view v-else>
<ListItem :items="tableData" />
<ListItem :items="tableData" @refresh="getTableData" />
<MBPagination
v-if="total > 0"
v-model:limit="paging.pageSize"
@ -82,7 +88,7 @@ const paging = ref({
//
pageNum: 1,
//
pageSize: 2,
pageSize: 20,
isAsc: 'descending',
orderByColumn: 'adddate'
})
@ -303,4 +309,7 @@ const handleQuery = async () => {
color: #999;
font-size: 16px;
}
uni-button{
font-size: 14px;
}
</style>