sfms3.0
/
sfms3.0-uniapp3
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat: update bug

master
TengXF 6 months ago
parent
fb5ed77c2c
commit
7704dfd1b1
4 changed files with 54 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/pages/mes/reworkBatch/create.vue
  2. 36
      src/pages/mes/reworkBatch/index.vue
  3. 13
      src/pages/mes/reworkSingle/create.vue
  4. 51
      src/pages/mes/reworkSingle/index.vue

1
src/pages/mes/reworkBatch/create.vue
View File

@ -121,6 +121,7 @@
timestamp: true, timestamp: true,
}) })
const form = ref({ const form = ref({
status:'1',
reworkAction:'', reworkAction:'',
reworkPersoncode:'', reworkPersoncode:'',
processCode:'', processCode:'',

36
src/pages/mes/reworkBatch/index.vue
View File

@ -20,8 +20,9 @@
<view>处理状态：</view> <view>处理状态：</view>
<view> <view>
<u-tag text="待处理" type="warning" mode="light" shape="circle" v-if="item.status==1" :style="{ width: '65px' }" /> <u-tag text="待处理" type="warning" mode="light" shape="circle" v-if="item.status==1" :style="{ width: '65px' }" />
<!-- <u-tag text="处理中" type="primary" mode="light" shape="circle" v-if="item.status==2" :style="{ width: '65px' }" /> --> <u-tag text="处理中" type="primary" mode="light" shape="circle" v-if="item.status==2" :style="{ width: '65px' }" />
<u-tag text="已完成" type="success" mode="light" shape="circle" v-if="item.status==2" :style="{ width: '65px' }" /> <u-tag text="已完成" type="success" mode="light" shape="circle" v-if="item.status==3" :style="{ width: '65px' }" />
<u-tag text="已终止" type="error" mode="light" shape="circle" v-if="item.status==-1" :style="{ width: '65px' }" />
</view> </view>
</view> </view>
<view class="dec"> <view class="dec">
@ -49,17 +50,11 @@
<view>返修结果：</view><view>{{item.reworkResult}}</view> <view>返修结果：</view><view>{{item.reworkResult}}</view>
</view> </view>
<view class="dec"> <view class="dec">
<view v-if="item.status==1"> <u-button v-if="item.status==1" size="medium" type="primary" @click="handleItem(item)" >去处理</u-button>
<u-button size="medium" type="primary" @click="handleItem(item)" >去处理</u-button> <u-button v-if="item.status==2" size="medium" type="warning" @click="handleRefuse(item)" >退回</u-button>
</view> <u-button v-if="item.status==2" size="medium" type="error" @click="handleSuspend(item)" >终止</u-button>
<view v-if="item.status==2"> <u-button v-if="item.status==2" size="medium" type="success" @click="handleSuccess(item)" >完成</u-button>
<u-button size="medium" type="error" @click="handleRefuse(item)" >退回</u-button> <u-button v-if="item.status==3" size="medium" type="warning" @click="handleRefuse(item)" >退回</u-button>
<!-- <u-button size="medium" type="warning" @click="handleSuspend(item)" >终止</u-button>
<u-button size="medium" type="success" @click="handleSuccess(item)" >完成</u-button> -->
</view>
<view v-if="item.status==3">
<u-button size="medium" type="error" @click="handleRefuse(item)" >退回</u-button>
</view>
</view> </view>
</view> </view>
<view style="height: 94rpx;padding-top: 30rpx;"> <view style="height: 94rpx;padding-top: 30rpx;">
@ -96,8 +91,8 @@
import * as reworkBatchApi from "@/api/mes/reworkBatch/reworkBatchApi.ts" import * as reworkBatchApi from "@/api/mes/reworkBatch/reworkBatchApi.ts"
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const paramData = ref() const paramData = ref()
// const tabsList = ref([{name:'待返修'},{name:'返修中'},{name:'已完成'}]) const tabsList = ref([{name:'待返修'},{name:'返修中'},{name:'已完成'},{name:'已终止'}])
const tabsList = ref([{name:'待处理'},{name:'已完成'}]) // const tabsList = ref([{name:'待处理'},{name:'已完成'}])
const reworkPersoncode = ref() const reworkPersoncode = ref()
const showType = ref(false) const showType = ref(false)
const current = ref(0) const current = ref(0)
@ -151,7 +146,7 @@
function handleSuspend(index){ function handleSuspend(index){
proxy.$modal.confirm('确定提交吗').then(() => { proxy.$modal.confirm('确定提交吗').then(() => {
paramData.value = index paramData.value = index
changeStatus(1) changeStatus(-1)
}) })
} }
// 完成按钮提交事件 // 完成按钮提交事件
@ -171,8 +166,8 @@
// 状态变更通用方法 // 状态变更通用方法
function changeStatus(val){ function changeStatus(val){
paramData.value.status = val
proxy.$modal.loading('加载中') proxy.$modal.loading('加载中')
paramData.value.status = val
reworkBatchApi.update(paramData.value).then((res) => { reworkBatchApi.update(paramData.value).then((res) => {
proxy.$modal.closeLoading() proxy.$modal.closeLoading()
if (res.data) { if (res.data) {
@ -194,8 +189,13 @@
} }
function tabsChange(curr){ function tabsChange(curr){
current.value = curr if(curr == 3 ){
params.value.status = -1
}else{
params.value.status = (curr + 1) params.value.status = (curr + 1)
}
current.value = curr
params.value.pageNo = 1 params.value.pageNo = 1
params.value.pageSize = 5 params.value.pageSize = 5
list.value = [] list.value = []

13
src/pages/mes/reworkSingle/create.vue
View File

@ -3,10 +3,10 @@
<view> <view>
<u-form :model="form"> <u-form :model="form">
<view> <view>
<u-form-item label="产品编码" prop="productCode"> <u-form-item label="产品编码" prop="productionCode">
<view> <view>
<!-- <u-input v-model="form.productName" type="select" @click="showProduct = true" placeholder="请选择产品编码"/> --> <!-- <u-input v-model="form.productName" type="select" @click="showProduct = true" placeholder="请选择产品编码"/> -->
<u-input v-model="form.productCode" /> <u-input v-model="form.productionCode" />
</view> </view>
</u-form-item> </u-form-item>
</view> </view>
@ -109,10 +109,11 @@
timestamp: true, timestamp: true,
}) })
const form = ref({ const form = ref({
status:'1',
reworkAction:'', reworkAction:'',
reworkPersoncode:'', reworkPersoncode:'',
processCode:'', processCode:'',
productCode:'', productionCode:'',
productName:'', productName:'',
stationCode:'', stationCode:'',
offlineReson:'', offlineReson:'',
@ -134,7 +135,7 @@
// 提交事件 // 提交事件
function handleSubmit(){ function handleSubmit(){
// 验证必填项 // 验证必填项
if(form.value.productCode=='' && form.value.productCode.trim() == ''){ if(form.value.productionCode=='' && form.value.productionCode.trim() == ''){
proxy.$modal.showToast('请先选择产品') proxy.$modal.showToast('请先选择产品')
return return
} }
@ -172,7 +173,7 @@
} }
// 选择产品回调函数 // 选择产品回调函数
function selectProduct(index){ function selectProduct(index){
form.value.productCode = index[0].value form.value.productionCode = index[0].value
form.value.productName = index[0].label form.value.productName = index[0].label
showProduct.value = false showProduct.value = false
} }
@ -244,7 +245,7 @@
form.value.planCode = paramData.value.planMasterCode form.value.planCode = paramData.value.planMasterCode
form.value.processCode = paramData.value.workingNode form.value.processCode = paramData.value.workingNode
form.value.stationCode = paramData.value.currentWorkstation form.value.stationCode = paramData.value.currentWorkstation
form.value.productCode = paramData.value.currentWorkstation form.value.productionCode = paramData.value.productCode
} }
}) })

51
src/pages/mes/reworkSingle/index.vue
View File

@ -20,8 +20,9 @@
<view>处理状态：</view> <view>处理状态：</view>
<view> <view>
<u-tag text="待处理" type="warning" mode="light" shape="circle" v-if="item.status==1" :style="{ width: '65px' }" /> <u-tag text="待处理" type="warning" mode="light" shape="circle" v-if="item.status==1" :style="{ width: '65px' }" />
<!-- <u-tag text="处理中" type="primary" mode="light" shape="circle" v-if="item.status==2" :style="{ width: '65px' }" /> --> <u-tag text="处理中" type="primary" mode="light" shape="circle" v-if="item.status==2" :style="{ width: '65px' }" />
<u-tag text="已完成" type="success" mode="light" shape="circle" v-if="item.status==2" :style="{ width: '65px' }" /> <u-tag text="已完成" type="success" mode="light" shape="circle" v-if="item.status==3" :style="{ width: '65px' }" />
<u-tag text="已终止" type="error" mode="light" shape="circle" v-if="item.status==-1" :style="{ width: '65px' }" />
</view> </view>
</view> </view>
<view class="dec"> <view class="dec">
@ -43,17 +44,11 @@
<view>返修结果：</view><view>{{item.reworkResult}}</view> <view>返修结果：</view><view>{{item.reworkResult}}</view>
</view> </view>
<view class="dec"> <view class="dec">
<view v-if="item.status==1"> <u-button v-if="item.status==1" class="btn" size="medium" type="primary" @click="handleItem(item)" >去处理</u-button>
<u-button size="medium" type="primary" @click="handleItem(item)" >去处理</u-button> <u-button v-if="item.status==2" class="btn" size="medium" type="warning" @click="handleRefuse(item)" >退回</u-button>
</view> <u-button v-if="item.status==2" class="btn" size="medium" type="error" @click="handleSuspend(item)" >终止</u-button>
<view v-if="item.status==2"> <u-button v-if="item.status==2" class="btn" size="medium" type="success" @click="handleSuccess(item)" >完成</u-button>
<u-button size="medium" type="error" @click="handleRefuse(item)" >退回</u-button> <u-button v-if="item.status==3" class="btn" size="medium" type="warning" @click="handleRefuse(item)" >退回</u-button>
<!-- <u-button size="medium" type="warning" @click="handleSuspend(item)" >终止</u-button>
<u-button size="medium" type="success" @click="handleSuccess(item)" >完成</u-button> -->
</view>
<view v-if="item.status==3">
<u-button size="medium" type="error" @click="handleRefuse(item)" >退回</u-button>
</view>
</view> </view>
</view> </view>
<view style="height: 94rpx;padding-top: 30rpx;"> <view style="height: 94rpx;padding-top: 30rpx;">
@ -90,8 +85,8 @@
import * as reworkSingleApi from "@/api/mes/reworkSingle/reworkSingleApi.ts" import * as reworkSingleApi from "@/api/mes/reworkSingle/reworkSingleApi.ts"
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const paramData = ref() const paramData = ref()
// const tabsList = ref([{name:'待返修'},{name:'返修中'},{name:'已完成'}]) const tabsList = ref([{name:'待返修'},{name:'返修中'},{name:'已完成'},{name:'已终止'}])
const tabsList = ref([{name:'待处理'},{name:'已完成'}]) // const tabsList = ref([{name:'待处理'},{name:'已完成'}])
const reworkPersoncode = ref() const reworkPersoncode = ref()
const showType = ref(false) const showType = ref(false)
const current = ref(0) const current = ref(0)
@ -131,21 +126,22 @@
} }
// “去处理”按钮提交事件 // “去处理”按钮提交事件
function handleReceive(){ function handleReceive(){
if(reworkPersoncode.value != '' && reworkPersoncode.value.trim() != ''){ if(reworkPersoncode.value == '' && reworkPersoncode.value.trim() == ''){
proxy.$modal.showToast('请输入返修人员')
reworkPersoncode.value = null
return;
}
else{
paramData.value.reworkPersoncode=reworkPersoncode.value paramData.value.reworkPersoncode=reworkPersoncode.value
changeStatus(2) changeStatus(2)
showType.value = false showType.value = false
} }
else{
proxy.$modal.showToast('请输入返修人员')
reworkPersoncode.value = null
}
} }
// 终止按钮提交事件 // 终止按钮提交事件
function handleSuspend(index){ function handleSuspend(index){
proxy.$modal.confirm('确定提交吗').then(() => { proxy.$modal.confirm('确定提交吗').then(() => {
paramData.value = index paramData.value = index
changeStatus(1) changeStatus(-1)
}) })
} }
// 完成按钮提交事件 // 完成按钮提交事件
@ -165,8 +161,8 @@
// 状态变更通用方法 // 状态变更通用方法
function changeStatus(val){ function changeStatus(val){
paramData.value.status = val
proxy.$modal.loading('加载中') proxy.$modal.loading('加载中')
paramData.value.status = val
reworkSingleApi.update(paramData.value).then((res) => { reworkSingleApi.update(paramData.value).then((res) => {
proxy.$modal.closeLoading() proxy.$modal.closeLoading()
if (res.data) { if (res.data) {
@ -188,8 +184,13 @@
} }
function tabsChange(curr){ function tabsChange(curr){
current.value = curr if(curr == 3 ){
params.value.status = -1
}else{
params.value.status = (curr + 1) params.value.status = (curr + 1)
}
current.value = curr
params.value.pageNo = 1 params.value.pageNo = 1
params.value.pageSize = 5 params.value.pageSize = 5
list.value = [] list.value = []
@ -228,6 +229,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.btn{
margin-left:5px;
width:20px
}
.container{ .container{
background: #f5f5f5; background: #f5f5f5;
min-height: 100vh; min-height: 100vh;

Write Preview
Loading…
Cancel
Save