定做单审核

This commit is contained in:
ljx120 2025-01-06 17:31:12 +08:00
parent 06c58cac4d
commit d617253361
5 changed files with 776 additions and 3 deletions

View File

@ -279,6 +279,30 @@
"bounce": "none"
}
}
},
{
"path" : "pages/distribution/distribution",
"style" :
{
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"disableScroll": true,
"app-plus": {
"bounce": "none"
}
}
},
{
"path" : "pages/distribution/detail",
"style" :
{
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"disableScroll": true,
"app-plus": {
"bounce": "none"
}
}
}
],
"globalStyle": {

View File

@ -365,7 +365,7 @@
// on cancel
});
} else {
} else if (form.value.customOrder.status === '待主管审核') {
showConfirmDialog({
title: '提示',
message: '是否确认通过本单?',
@ -381,6 +381,22 @@
.catch(() => {
// on cancel
});
} else if (form.value.customOrder.status === '取消审核中') {
showConfirmDialog({
title: '提示',
message: '是否确认通过本单?',
}).then(() => {
let url = '/customOrder/dispatcherCheckCancel/' + form.value.customOrder.id
putAction(url).then((res : any) => {
if (res.code === 200) {
showToast('操作成功!')
uni.navigateBack()
}
})
})
.catch(() => {
// on cancel
});
}
}
@ -406,7 +422,7 @@
<van-form @submit="onSubmit">
<view class="a-f">
<van-button type="danger" @click="showDialog=true"
v-if="!'取消审核中'.includes(form.customOrder.status)">取消</van-button>
v-if="!'取消审核中,已取消,被驳回'.includes(form.customOrder.status)">取消</van-button>
<van-button type="primary" style="margin: 0 15rpx;" native-type="submit"
v-if="!'取消审核中,已通过'.includes(form.customOrder.status)">编辑</van-button>
</view>
@ -512,7 +528,7 @@
</view>
</van-cell-group>
</van-form>
<view class="c-a" v-if="form.customOrder.status!=='已通过'">
<view class="c-a" v-if="!'已通过,已取消,被驳回'.includes(form.customOrder.status)">
<van-button type="danger" @click="check">驳回</van-button>
<van-button type="primary" @click="pass">通过</van-button>
</view>

View File

@ -0,0 +1,191 @@
<script setup lang="ts">
import { onLoad } from '@dcloudio/uni-app';
import { ref } from 'vue';
const form = ref({} as any)
const showDialog = ref(false)
const show = ref(false)
onLoad((option : any) => {
form.value = JSON.parse(option.item)
console.log(form.value);
})
const onClickLeft = () => {
uni.navigateBack()
}
const onConfirmDate = (val : any) => {
console.log(val);
}
const onSubmit = () => {
}
</script>
<template>
<view class="flex">
<van-nav-bar title="现货需求单" left-text="返回" left-arrow @click-left="onClickLeft" />
<view class="content">
<van-form @submit="onSubmit">
<van-cell-group inset>
<van-field v-model="form.id" name="需求单号" label="需求单号" colon class="bor" label-width="5em" readonly
:rules="[{ required: true, message: '请填写' }]" />
<van-field v-model="form.makeTime" name="做单日期" label="做单日期" colon class="bor" label-width="5em"
readonly :rules="[{ required: true, message: '请填写' }]" />
<van-field v-model="form.makeUser" name="订单归属" label="订单归属" colon label-width="5em"
:rules="[{ required: true, message: '请填写' }]" readonly />
<van-field v-model="form.color" name="颜色色号" label="颜色色号" colon class="bor" readonly
:rules="[{ required: true, message: '请填写' }]" label-width="5em" />
<van-field v-model="form.craft" name="工艺" label="工艺" colon
:rules="[{ required: true, message: '请填写' }]" label-width="5em" readonly class="bor" />
<van-field v-model="form.craft" name="备注" label="备注" colon
:rules="[{ required: true, message: '请填写' }]" label-width="5em" readonly class="bor" />
<view class="grid-container">
<view class="grid-item">面料名称</view>
<view class="grid-item">匹数</view>
<view class="grid-item">谁定</view>
<view class="grid-item">面料编号/米数</view>
</view>
<view class="grid-container" v-for="(item,index) in form.fabric" :key="index">
<view class="grid-item">面料名称</view>
<view class="grid-item">匹数</view>
<view class="grid-item">谁定</view>
<view class="grid-item">面料编号/米数</view>
</view>
<van-field v-model="form.id" name="第1次配货日期" label="第1次配货日期" colon class="bor" label-width="5em" readonly
:rules="[{ required: true, message: '请填写' }]" />
<van-field v-model="form.makeTime" name="染厂选择" label="染厂选择" colon class="bor" label-width="5em"
readonly :rules="[{ required: true, message: '请填写' }]" />
<van-field v-model="form.makeUser" name="进厂匹数" label="进厂匹数" colon label-width="5em"
:rules="[{ required: true, message: '请填写' }]" readonly />
<van-field v-model="form.color" name="进厂米数" label="进厂米数" colon class="bor" readonly
:rules="[{ required: true, message: '请填写' }]" label-width="5em" />
</van-cell-group>
<view style="margin: 16px;">
<van-button round block type="primary" native-type="submit">
部分配货
</van-button>
<van-button round block type="primary" native-type="submit">
已配全
</van-button>
</view>
</van-form>
</view>
</view>
<van-dialog v-model:show="showDialog">
<view>
<van-cell-group inset>
<view v-for="(item,index) in fabric" :key="index">
<view class="a-c">
<van-icon name="add" color="red" size="25" v-if="index===0"
@click="fabric.push({belongTo:'门店'})" />
<van-icon name="clear" color="red" size="25" v-if="index!=0" @click="fabric.splice(index,1)" />
<van-field v-model="item.name" name="面料名称" label="面料名称" colon readonly label-width="5em"
@click="selectChoose(index)" class="bor" />
</view>
<van-field v-model="item.quantity" name="需求匹数" label="需求匹数" type="number" colon
label-width="6.5em" />
<!-- <van-field v-model="item.storageQuantity" name="库存匹数" label="库存匹数" colon label-width="6.5em"
readonly /> -->
<van-field v-model="item.belongTo" name="订单归属人" label="订单归属人" colon label-width="6.5em" />
</view>
</van-cell-group>
</view>
<template #footer>
<view class="footer-button">
<van-button plain size="small" native-type="button" style="width: 25vw;" @click="showDialog=false">
取消
</van-button>
<van-button size="small" type="success" native-type="submit" style="width: 25vw;"
@click="confirmSecond">
确认
</van-button>
</view>
</template>
</van-dialog>
<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2010, 0, 1)"
:max-date="new Date(2050, 0, 31)" />
</template>
<style lang="scss" scoped>
.flex {
display: flex;
flex-direction: column;
height: 100vh;
width: 100vw;
.van-nav-bar {
width: 100%;
}
.content {
flex: 1;
padding: 0 10px;
.grid-container {
display: grid;
grid-template-columns: 2fr 1fr 1.5fr 1fr;
.grid-item {
border: 1px solid #f2f2f2;
text-align: center;
padding: 15rpx 0;
::v-deep .van-cell {
padding: 0 5px;
}
}
}
}
}
.footer-button {
margin: 20px;
display: flex;
justify-content: space-around;
}
::v-deep .van-field {
font-size: 16px;
}
.a-b {
margin: 10rpx;
::v-deep .van-button--normal {
padding: 5px 8px;
height: 30px;
}
}
.a-c {
display: flex;
align-items: center;
::v-deep .van-button--normal {
padding: 8rpx;
height: 50rpx;
width: 7em;
}
}
.bor {
::v-deep .van-field__control {
border: 1px solid #d7d7d7;
}
}
::v-deep .van-field__control {
border-bottom: 1px solid #d7d7d7;
text-align: center;
}
::v-deep .van-field__label {
text-align: end;
}
</style>

View File

@ -0,0 +1,537 @@
<script setup lang="ts">
import { onMounted, ref, watch } from 'vue';
import { getAction } from '../../common/http';
import { formatDate } from '../../utils/date';
import { onShow } from '@dcloudio/uni-app';
import { showToast } from 'vant';
const form = ref({} as any)
const list = ref([] as any[])
const statusList = ref([
{ status: "待审核", code: "UnCheck", type: "warning", path: '/pages/spot/audit' },
{ status: "待主管审核", code: "UnCheckByLeader", type: "primary" },
{ status: "待排单员审核", code: "UnCheckByCharger", type: "success" },
{ status: "已通过", code: "Checked", type: "primary", path: '/pages/spot/pass' },
{ status: "取消审核中", code: "Canceling", type: "warning" },
{ status: "已取消", code: "Canceled", type: "danger" },
{ status: "被驳回", code: "Rejected", type: "danger" },
{ status: "部分配货", code: "Allocating", type: "warning" },
{ status: "已配完(待进厂)", code: "Allocated", type: "success" },
{ status: "已进厂", code: "Processing", type: "primary" },
{ status: "已出厂(待收货)", code: "Processed", type: "success" },
{ status: "待质检", code: "UnTested", type: "warning" },
{ status: "已质检(待入库)", code: "Testing", type: "primary" },
{ status: "已质检(待入库)", code: "Tested", type: "primary" },
{ status: "已入库", code: "Storage", type: "success" }
])
const nameList = ref([] as any[])
onMounted(() => {
getAction('/fabric/info/all').then((res : any) => {
if (res.code === 200) {
res.data.forEach((l : any) => {
let itemMl = mlList.value.find(m => m.text === l.commodity)
if (itemMl) {
let itemMm = itemMl.children.find(m => m.value === l.momme)
if (itemMm) {
itemMm.children.push({ text: l.width + 'cm', value: l.width })
} else {
itemMl.children.push({
text: l.momme + 'mm',
value: l.momme,
children: [{ text: l.width + 'cm', value: l.width }]
})
}
} else {
mlList.value.push({
text: l.commodity,
value: l.commodity,
children: [{ text: l.momme + 'mm', value: l.momme, children: [{ text: l.width + 'cm', value: l.width }] }]
})
}
})
}
})
//
getAction('/v1/user/getNames').then((res : any) => {
if (res.code === 200) {
nameList.value = res.data.map((l : any) => ({ value: l, text: l }))
}
})
})
onShow(() => {
list.value = []
init()
})
const onClickLeft = () => {
history.back()
}
const total = ref(0)
const currentPage = ref(1)
const finished = ref(false)
const loading = ref(false);
//
const onLoad = () => {
if (list.value.length < total.value) {
currentPage.value++
init()
} else {
finished.value = true
}
};
function init() {
getAction('/customOrder', form.value).then((res : any) => {
if (res.code === 200) {
res.data.record.forEach((l : any) => {
list.value.push(l)
let item = statusList.value.find((m : any) => m.status == l.customOrder.status)
l.customOrder.statusColor = item.type
})
total.value = res.data.total
loading.value = false;
finished.value = false
}
})
}
watch(form.value, () => {
list.value = []
init()
})
const showPicker = ref(false)
const typeData = ref()
const popuList = ref([] as any[])
//
const choosePic = (type : any) => {
showPicker.value = true
typeData.value = type
}
//
const pickerConfirm = (val : any) => {
form.value[typeData.value] = val.selectedValues[0]
showPickerCancel()
}
//
const showPickerCancel = () => {
showPicker.value = false
}
//
const handleOpen = () => {
if (typeData.value === 'status') {
popuList.value = [{ text: '待主管审核', value: '待主管审核' }, { text: '待主管审核', value: '待主管审核' }, { text: '待排单审核', value: '待排单审核' }, { text: '已通过', value: '已通过' }, { text: '被驳回', value: '被驳回' }, { text: '取消审核中', value: '取消审核中' }, { text: '已取消', value: '已取消' }]
} else {
popuList.value = nameList.value
}
}
//
const show = ref(false)
const dataType = ref('')
const chooseDate = (val : any) => {
show.value = true
dataType.value = val
}
const onConfirmDate = (val : any) => {
form.value[dataType.value] = formatDate(val)
show.value = false
}
//
const toDetile = (item : any) => {
let url = './detail' + '?' + 'item=' + JSON.stringify(item)
uni.navigateTo({
url: url,
})
}
const pickerList = ref([])//
const pickerContainerList = ref([])
const showPickerList = ref(false)
const searchValue = ref('')//
const searchIndex = ref(0)//
const mlList = ref([])
//
const selectChoose = () => {
showPickerList.value = true
}
//
const mlmcOpen = () => {
pickerList.value = mlList.value
pickerContainerList.value = pickerList.value
searchValue.value = ''
}
//
const pickerCancel = () => {
showPickerList.value = false
}
//
const selectedValue = ref()
const getSeachList = () => {
searchIndex.value = 0
let reg = new RegExp(searchValue.value)
let arr = []
pickerList.value.forEach(l => {
if (reg.test(l.text)) {
arr.push(l)
}
})
pickerContainerList.value = arr
}
//
const upSearch = () => {
if (searchIndex.value === 0 && pickerContainerList.value.length) {
searchIndex.value = pickerContainerList.value.length - 1
selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
} else if (pickerContainerList.value.length) {
searchIndex.value--
selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
} else {
showToast('没有了!')
}
}
//
const downSearch = () => {
if (pickerContainerList.value.length) {
if (searchIndex.value === pickerContainerList.value.length) {
searchIndex.value = 0
selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
} else {
searchIndex.value++
selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
}
} else {
showToast('没有了!')
}
}
//
const timer = ref()
const searchTo = () => {
if (timer.value) {
clearTimeout(timer.value)
}
timer.value = setTimeout(() => {
getSeachList()
}, 800)
}
const onConfirm = (val : any) => {
form.value.category = val.selectedValues[2] + '/' + val.selectedValues[0] + val.selectedValues[1]
pickerCancel()
}
</script>
<template>
<view class="flex">
<van-nav-bar title="待配货列表" left-text="返回" left-arrow @click-left="onClickLeft" />
<van-cell-group inset style="display: flex;">
<van-field v-model="form.startDate" name="开始时间" label="开始时间" colon class="bor" label-width="5em" readonly
@click="chooseDate('startDate')" :rules="[{ required: true, message: '请填写' }]" />
<van-field v-model="form.endDate" name="截止时间" label="截止时间" colon class="bor" label-width="5em" readonly
@click="chooseDate('endDate')" />
</van-cell-group>
<van-cell-group inset style="display: flex;">
<van-field v-model="form.makeUser" name="颜色筛选" label="颜色筛选" class="bor-a" colon label-width="5em" />
<van-field v-model="form.category" name="面料筛选" label="面料筛选" colon class="bor" label-width="5em" readonly
@click="selectChoose" />
</van-cell-group>
<van-cell-group inset style="display: flex;">
<van-field v-model="form.makeUser" name="做单人员" label="做单人员" colon class="bor" label-width="5em" readonly
@click="choosePic('makeUser')" />
<van-field v-model="form.status" name="订单状态" label="订单状态" colon class="bor" label-width="5em" readonly
@click="choosePic('status')" />
</van-cell-group>
<view class="grid-container">
<view class="grid-item">日期/颜色</view>
<view class="grid-item">面料名称/工艺/谁定</view>
<view class="grid-item">匹数</view>
<view class="grid-item">状态</view>
</view>
<view class="content">
<van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
<view class="grid-container" v-for="(item,index) in list" :key="index">
<view class="grid-item">{{item.customOrder.makeTime}}</view>
<view class="grid-item">
{{item.customOrder.makeUser}}/{{item.customOrder.belongTo}}<br>{{item.customOrder.sd}}
</view>
<view class="grid-item">{{item.customOrder.totalLen}}/{{item.customOrder.totalQty}}</view>
<view class="grid-item" @click="toDetile(item)">
<van-button :type="item.customOrder.statusColor">{{item.customOrder.status}}</van-button>
</view>
</view>
</van-list>
</view>
</view>
<!--选择框-->
<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
ref="pickerRef" />
</van-popup>
<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2010, 0, 1)"
:max-date="new Date(2050, 0, 31)" />
<!-- 面料选择框-->
<van-popup v-model:show="showPickerList" position="bottom" @open="mlmcOpen">
<view class="select-model">
<van-picker :columns="pickerContainerList" @cancel="pickerCancel" v-model="selectedValue"
@confirm="onConfirm" />
<view>
<view class="top-select">
<view class="confirm-select">
<p>请选择品种</p>
</view>
<view class="search-box">
<view>
<van-search placeholder="请输入品种名字" v-model="searchValue" label="面料搜索:" background="#ffffff"
@input="searchTo()" :clearable="false" />
</view>
<view class="flex-btn">
<button class="search-btn" @click="upSearch()"></button>
<button class="search-btn" @click="downSearch()"></button>
</view>
</view>
</view>
</view>
</view>
</van-popup>
</template>
<style lang="scss" scoped>
.flex {
display: flex;
flex-direction: column;
height: 100vh;
width: 100vw;
overflow-y: hidden;
.van-nav-bar {
width: 100%;
}
.grid-container {
display: grid;
grid-template-columns: 1.5fr 2fr 1fr 1.5fr;
padding: 0 15rpx;
.grid-item {
border: 1px solid #f2f2f2;
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
}
.content {
flex: 1;
overflow-y: scroll;
}
}
::v-deep .van-cell {
padding: 5px !important;
}
::v-deep .van-field {
font-size: 16px;
}
.bor {
::v-deep .van-field__control {
border: 1px solid #d7d7d7;
text-align: center;
}
::v-deep .van-field__label {
margin: 0;
}
}
.bor-a {
::v-deep .van-field__control {
border-bottom: 1px solid #d7d7d7;
text-align: center;
}
::v-deep .van-field__label {
margin: 0;
}
}
::v-deep .van-button--normal {
padding: 5px 8px;
height: 30px;
}
::v-deep .van-field__control {
text-align: center;
}
/*面料选择搜索框*/
.select-model {
position: relative;
}
.confirm-select {
width: 100%;
}
.confirm-select>p {
text-align: center;
}
.confirm-select>button {
border: none;
background-color: #ffffff;
color: #388aed;
margin: 10px 30px 0 0;
}
.top-select {
position: absolute;
top: 30px;
left: 0;
right: 0;
margin: auto;
z-index: 999;
}
::v-deep .select-model .van-picker__toolbar {
height: 66px;
align-items: flex-start;
/*justify-content: flex-end;*/
}
::v-deep .select-model .van-picker__cancel,
.select-model .van-picker__confirm {
height: 30px;
padding: 10px 16px 0;
}
.search-btn {
padding: 1px 8px;
border: none;
background-color: #388aed;
color: #ffffff;
margin-left: 5px;
height: 30px;
line-height: 25px;
}
.search-box {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
padding-top: 15px;
padding-bottom: 5px;
position: relative;
background-color: #fff;
}
.van-search {
background-color: #f7f7f8;
}
.ml-search-jump {
padding: 3px 10px;
background-color: #388aed;
color: #ffffff;
border: none;
margin-left: 10px;
}
.flex-btn {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
/*面料选择搜索框*/
.select-model {
position: relative;
}
.confirm-select {
width: 100%;
}
.confirm-select>p {
text-align: center;
}
.confirm-select>button {
border: none;
background-color: #ffffff;
color: #388aed;
margin: 10px 30px 0 0;
}
.top-select {
position: absolute;
top: 30px;
left: 0;
right: 0;
margin: auto;
z-index: 999;
}
::v-deep .select-model .van-picker__toolbar {
height: 66px;
align-items: flex-start;
/*justify-content: flex-end;*/
}
::v-deep .select-model .van-picker__cancel,
.select-model .van-picker__confirm {
height: 30px;
padding: 10px 16px 0;
}
.search-btn {
padding: 1px 8px;
border: none;
background-color: #388aed;
color: #ffffff;
margin-left: 5px;
height: 30px;
line-height: 25px;
}
.search-box {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
padding-top: 15px;
padding-bottom: 5px;
position: relative;
background-color: #fff;
}
.van-search {
background-color: #f7f7f8;
}
.ml-search-jump {
padding: 3px 10px;
background-color: #388aed;
color: #ffffff;
border: none;
margin-left: 10px;
}
.flex-btn {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
</style>

View File

@ -93,6 +93,11 @@ const ListData =ref([
name:'定做单列表',
type:'',
},
{
path:'../distribution/distribution',
name:'待配货列表',
type:'',
}
] as any[])