eam
/
eam-uniapp
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 去掉备件维修工单添加备件的loading

master
张立 2 weeks ago
parent
5809f61cce
commit
4bf3a73a43
1 changed files with 537 additions and 559 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. 406
      src/pages/sparePartsServiceWorkOrderList/addForm.vue

406
src/pages/sparePartsServiceWorkOrderList/addForm.vue
View File

@ -7,52 +7,41 @@
</u-form-item> </u-form-item>
</u-form> --> </u-form> -->
<view class="list"> <view class="list">
<view class="title"> <view class="title"> <span>*</span>申请备件 </view>
<span>*</span>申请备件 <view class="item" v-for="(item, index) in form.itemNumbers" :key="index">
</view>
<view class="item " v-for="(item,index) in form.itemNumbers" :key="index">
<view class="item-box"> <view class="item-box">
<view class="spare-title"> <view class="spare-title">
<view class="title-txt"> <view class="title-txt">
{{item.name}} {{ item.name }}
</view> </view>
</view> </view>
<u-row gutter="16"> <u-row gutter="16">
<u-col :span="24"> <u-col :span="24">
<view class="dec"> <view class="dec"> 库位:{{ item.locationNumber }} </view>
库位:{{item.locationNumber}}
</view>
</u-col> </u-col>
<u-col :span="24"> <u-col :span="24">
<view class="dec"> <view class="dec"> 数量:{{ item.qty }} </view>
数量:{{item.qty}}
</view>
</u-col> </u-col>
<u-col :span="24"> <u-col :span="24">
<view class="dec"> <view class="dec"> 维修结果:{{ item.result == 'YES' ? '完成' : '未完成' }} </view>
维修结果:{{item.result == 'YES'?'完成':'未完成'}}
</view>
</u-col> </u-col>
<u-col :span="24"> <u-col :span="24">
<view class="dec"> <view class="dec"> 维修原因:{{ item.reasons }} </view>
维修原因:{{item.reasons}}
</view>
</u-col> </u-col>
</u-row> </u-row>
</view> </view>
<u-icon name="minus-circle" color="#aaaaaa" size="60" @click="delSpareParts(index)"></u-icon> <u-icon name="minus-circle" color="#aaaaaa" size="60" @click="delSpareParts(index)"></u-icon>
</view> </view>
<view class="add-btn"> <view class="add-btn">
<u-button type="primary" @click="open"><u-icon name="plus-circle" color="#ffffff" <u-button type="primary" @click="open"><u-icon name="plus-circle" color="#ffffff" size="36"></u-icon>添加备件</u-button>
size="36"></u-icon>添加备件</u-button>
</view> </view>
</view> </view>
<view class="footer"> <view class="footer">
<view class="btns"> <view class="btns">
<button class="reset" @click="reset">重置</button> <button class="reset" @click="reset">重置</button>
<button class="sure" @click="submit" :loading='loading' :disabled='loading'>确定</button> <button class="sure" @click="submit" :loading="loading" :disabled="loading">确定</button>
</view> </view>
<view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view> <view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom)"></view>
</view> </view>
<!-- 添加备件 --> <!-- 添加备件 -->
<u-popup v-model="isPopupShow" mode="center" border-radius="14"> <u-popup v-model="isPopupShow" mode="center" border-radius="14">
@ -60,29 +49,24 @@
<view class="popup"> <view class="popup">
<u-form :model="form1" ref="formRef" label-width="200rpx"> <u-form :model="form1" ref="formRef" label-width="200rpx">
<u-form-item :label="`备件`" prop="itemNumber" required> <u-form-item :label="`备件`" prop="itemNumber" required>
<view class="select" @click="openSingleColumn('itemNumber',form1.itemNumber,sparePartsList)"> <view class="select" @click="openSingleColumn('itemNumber', form1.itemNumber, sparePartsList)">
<view class="input" v-if='form1.itemNumber'> <view class="input" v-if="form1.itemNumber">
{{form1.name}} {{ form1.name }}
</view>
<view class="placeholder" v-else>
请选择备件
</view> </view>
<view class="placeholder" v-else> 请选择备件 </view>
<u-icon name="arrow-right" color="#aaaaaa" size="28"></u-icon> <u-icon name="arrow-right" color="#aaaaaa" size="28"></u-icon>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item label="库位" prop="locationNumber" required v-if="isShow"> <u-form-item label="库位" prop="locationNumber" required v-if="isShow">
<u-input v-model="form1.locationNumber" placeholder="请输入库位" @blur="blur()" @confirm='blur()'/> <u-input v-model="form1.locationNumber" placeholder="请输入库位" @blur="blur()" @confirm="blur()" />
<view class="right-button" @click="chickRightButton"> <view class="right-button" @click="chickRightButton"> 扫描 </view>
扫描
</view>
</u-form-item> </u-form-item>
<u-form-item label="数量" prop="qty" required> <u-form-item label="数量" prop="qty" required>
<u-input v-model="form1.qty" type="number" placeholder="请输入数量" /> <u-input v-model="form1.qty" type="number" placeholder="请输入数量" />
</u-form-item> </u-form-item>
<u-form-item label="维修结果" prop="reasons" required> <u-form-item label="维修结果" prop="reasons" required>
<u-radio-group v-model="form1.result"> <u-radio-group v-model="form1.result">
<u-radio :name="item.value" v-for="(item,index) in result" <u-radio :name="item.value" v-for="(item, index) in result" :key="index">{{ item.label }}</u-radio>
:key="index">{{item.label}}</u-radio>
</u-radio-group> </u-radio-group>
</u-form-item> </u-form-item>
<u-form-item label="维修原因" prop="reasons" required> <u-form-item label="维修原因" prop="reasons" required>
@ -95,69 +79,65 @@
<view class="sure" @click="addSpare">确认</view> <view class="sure" @click="addSpare">确认</view>
</view> </view>
</u-popup> </u-popup>
<u-select v-model="singleColumnShow" mode="single-column" :default-value='singleColumnDefaultValue' <u-select v-model="singleColumnShow" mode="single-column" :default-value="singleColumnDefaultValue" :list="singleColumnList" @confirm="chooseSingleColumn" @cancle="singleColumnShow = false"></u-select>
:list="singleColumnList" @confirm="chooseSingleColumn" @cancle='singleColumnShow = false'></u-select> <SelectItemList :isShowSelectItem="isShowSelectItem" :singleColumnList="singleColumnList" @searchItem="searchItem" @chooseItem1="chooseItem1" />
<SelectItemList :isShowSelectItem='isShowSelectItem' :singleColumnList='singleColumnList' @searchItem='searchItem' @chooseItem1='chooseItem1'/>
</view> </view>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { import { onLoad } from '@dcloudio/uni-app'
onLoad, import { ref, getCurrentInstance } from 'vue'
} from '@dcloudio/uni-app' import * as sparePartsApi from '@/api/spareParts'
import { import * as sparePartsServiceWorkOrderListApi from '@/api/sparePartsServiceWorkOrderList'
ref, import * as dictApi from '@/api/dict'
getCurrentInstance import * as locationApi from '@/api/location'
} from 'vue' import SelectItemList from '../../components/item/slectItemList.vue'
import * as sparePartsApi from "@/api/spareParts" import { noPage } from '@/api/spareParts'
import * as sparePartsServiceWorkOrderListApi from "@/api/sparePartsServiceWorkOrderList"
import * as dictApi from "@/api/dict" const { proxy } = getCurrentInstance()
import * as locationApi from "@/api/location" const loading = ref(false)
import SelectItemList from "../../components/item/slectItemList.vue" const type = ref('')
import {noPage} from "@/api/spareParts"; // 备件弹窗
const { proxy } = getCurrentInstance() const isPopupShow = ref(false)
const loading = ref(false) const sparePartsList = ref([])
const type = ref('')
// 备件弹窗 const singleColumnShow = ref(false)
const isPopupShow = ref(false) const singleColumnDefaultValue = ref([])
const sparePartsList = ref([]) const singleColumnList = ref([])
const isShowSelectItem = ref(false)
const singleColumnShow = ref(false) const field = ref('')
const singleColumnDefaultValue = ref([]) const form = ref({
const singleColumnList = ref([])
const isShowSelectItem = ref(false)
const field = ref('')
const form = ref({
itemNumbers: [] itemNumbers: []
}) })
const form1 = ref({ const form1 = ref({
itemNumber: "", itemNumber: '',
qty: '', qty: '',
result: 'YES', result: 'YES',
reasons: '', reasons: '',
locationNumber: '', locationNumber: '',
areaNumber: '' areaNumber: ''
}) })
const result = ref([]) const result = ref([])
const isShow = ref(false) const isShow = ref(false)
const choosesingleColumnItem = ref() const choosesingleColumnItem = ref()
const isInAccount = ref() const isInAccount = ref()
const itemNumber = ref() const itemNumber = ref()
const msg = ref('') const msg = ref('')
// 触发提交表单 // 触发提交表单
function submit() { function submit() {
// 校验 // 校验
if (form.value.itemNumbers == 0) { if (form.value.itemNumbers == 0) {
proxy.$modal.showToast('请选择备件') proxy.$modal.showToast('请选择备件')
return; return
} }
proxy.$modal.confirm('是否添加备件维修工单').then(() => { proxy.$modal.confirm('是否添加备件维修工单').then(() => {
proxy.$modal.loading('加载中') proxy.$modal.loading('加载中')
loading.value = true loading.value = true
sparePartsServiceWorkOrderListApi.sparePartsServiceWorkOrderListCreate(form.value).then(( sparePartsServiceWorkOrderListApi
res) => { .sparePartsServiceWorkOrderListCreate(form.value)
.then((res) => {
proxy.$modal.closeLoading() proxy.$modal.closeLoading()
if (res.data) { if (res.data) {
proxy.$modal.showToast('添加成功') proxy.$modal.showToast('添加成功')
@ -166,46 +146,43 @@
loading.value = false loading.value = false
}, 1500) }, 1500)
} else { } else {
if(res.msg){ if (res.msg) {
proxy.$modal.showToast(res.msg) proxy.$modal.showToast(res.msg)
}else{ } else {
proxy.$modal.showToast('添加失败') proxy.$modal.showToast('添加失败')
} }
loading.value = false loading.value = false
} }
}).catch(() => { })
.catch(() => {
proxy.$modal.closeLoading() proxy.$modal.closeLoading()
loading.value = false loading.value = false
}) })
}) })
} }
// 重置 // 重置
function reset() { function reset() {
form.value = { form.value = {
itemNumbers: [] itemNumbers: []
} }
} }
// 单列模式 // 单列模式
function openSingleColumn(fieldName, val, list) { function openSingleColumn(fieldName, val, list) {
if (fieldName == 'deviceNumber' && form.value.id) return; if (fieldName == 'deviceNumber' && form.value.id) return
uni.showLoading({
title: "加载中....",
mask: true
});
singleColumnList.value = list singleColumnList.value = list
field.value = fieldName field.value = fieldName
if (val) { if (val) {
singleColumnDefaultValue.value = [list.findIndex(item => item.value == val)] singleColumnDefaultValue.value = [list.findIndex((item) => item.value == val)]
} else { } else {
singleColumnDefaultValue.value = [] singleColumnDefaultValue.value = []
} }
isShowSelectItem.value = true isShowSelectItem.value = true
} }
// 单列模式点击确定之后 // 单列模式点击确定之后
function chooseSingleColumn(e) { function chooseSingleColumn(e) {
form1.value[field.value] = e[0].value form1.value[field.value] = e[0].value
if (field.value == 'itemNumber') { if (field.value == 'itemNumber') {
choosesingleColumnItem.value = singleColumnList.value.filter(item => item.number == e[0].value) choosesingleColumnItem.value = singleColumnList.value.filter((item) => item.number == e[0].value)
form1.value.name = e[0].label form1.value.name = e[0].label
form1.value.locationNumber = choosesingleColumnItem.value[0].locationNumber form1.value.locationNumber = choosesingleColumnItem.value[0].locationNumber
form1.value.areaNumber = choosesingleColumnItem.value[0].areaNumber form1.value.areaNumber = choosesingleColumnItem.value[0].areaNumber
@ -217,59 +194,66 @@
} }
} }
singleColumnShow.value = false singleColumnShow.value = false
} }
// 获取备件列表 // 获取备件列表
async function getServiceSparePartsList() { async function getServiceSparePartsList() {
uni.showLoading({ uni.showLoading({
title: "加载中....", title: '加载中....',
mask: true mask: true
}); })
await sparePartsApi.noPage({}).then(res => { await sparePartsApi
res.data.map(item => { .noPage({})
.then((res) => {
res.data.map((item) => {
item.value = item.number item.value = item.number
item.label = item.name item.label = item.name
}) })
sparePartsList.value = res.data sparePartsList.value = res.data
}).catch(() => { }).finally(()=>{
uni.hideLoading() uni.hideLoading()
}) })
.catch(() => {})
} .finally(() => {
// 扫描设备条码 uni.hideLoading()
function chickRightButton(field) { })
}
// 扫描设备条码
function chickRightButton(field) {
uni.scanCode({ uni.scanCode({
success: function (res) { success(res) {
form1.value.locationNumber = res.result form1.value.locationNumber = res.result
getLocation() getLocation()
} }
}); })
} }
function getLocation() { function getLocation() {
locationApi.getLocation(form1.value.locationNumber).then(res => { locationApi
.getLocation(form1.value.locationNumber)
.then((res) => {
if (!res.data) { if (!res.data) {
msg.value = res.msg ? res.msg : '找不到该库位' msg.value = res.msg ? res.msg : '找不到该库位'
proxy.$modal.showToast(msg.value) proxy.$modal.showToast(msg.value)
form1.value.areaNumber ='' form1.value.areaNumber = ''
isInAccount.value = '' isInAccount.value = ''
itemNumber.value = '' itemNumber.value = ''
return; return
} }
msg.value = '' msg.value = ''
form1.value.areaNumber = res.data.areaNumber; form1.value.areaNumber = res.data.areaNumber
isInAccount.value = res.data.isInAccount isInAccount.value = res.data.isInAccount
itemNumber.value = res.data.itemNumber itemNumber.value = res.data.itemNumber
}).catch(() => { }) })
} .catch(() => {})
function blur() { }
function blur() {
if (form1.value.locationNumber) { if (form1.value.locationNumber) {
getLocation() getLocation()
} }
} }
// 打开弹窗 // 打开弹窗
function open() { function open() {
form1.value = { form1.value = {
itemNumber: "", itemNumber: '',
qty: '', qty: '',
result: 'YES', result: 'YES',
reasons: '', reasons: '',
@ -277,106 +261,105 @@
areaNumber: '' areaNumber: ''
} }
isPopupShow.value = true isPopupShow.value = true
} }
// 添加配件 // 添加配件
function addSpare() { function addSpare() {
// 校验 // 校验
if (!form1.value.itemNumber) { if (!form1.value.itemNumber) {
proxy.$modal.showToast('请选择备件') proxy.$modal.showToast('请选择备件')
return; return
} }
if (!form1.value.locationNumber) { if (!form1.value.locationNumber) {
proxy.$modal.showToast('请扫描库位') proxy.$modal.showToast('请扫描库位')
return; return
} }
if(msg.value){ if (msg.value) {
proxy.$modal.showToast(msg.value) proxy.$modal.showToast(msg.value)
return; return
} }
if (isInAccount.value == 'TRUE') { if (isInAccount.value == 'TRUE') {
proxy.$modal.showToast('该库位属于帐内库，请选择帐外库') proxy.$modal.showToast('该库位属于帐内库，请选择帐外库')
return; return
} }
if (!form1.value.itemNumber && form1.value.itemNumber != itemNumber.value) { if (!form1.value.itemNumber && form1.value.itemNumber != itemNumber.value) {
proxy.$modal.showToast('该库位与填写备件不一致') proxy.$modal.showToast('该库位与填写备件不一致')
return; return
} }
if (!form1.value.qty) { if (!form1.value.qty) {
proxy.$modal.showToast(`请输入数量`) proxy.$modal.showToast('请输入数量')
return; return
} }
if (!form1.value.result) { if (!form1.value.result) {
proxy.$modal.showToast('请选择维修结果') proxy.$modal.showToast('请选择维修结果')
return; return
} }
if (!form1.value.reasons) { if (!form1.value.reasons) {
proxy.$modal.showToast('请输入维修原因') proxy.$modal.showToast('请输入维修原因')
return; return
} }
if (form.value.itemNumbers && form.value.itemNumbers.length > 0) { if (form.value.itemNumbers && form.value.itemNumbers.length > 0) {
let arr = form.value.itemNumbers.filter(item => item.itemNumber == form1.value.itemNumber) const arr = form.value.itemNumbers.filter((item) => item.itemNumber == form1.value.itemNumber)
if (arr && arr.length > 0) { if (arr && arr.length > 0) {
proxy.$modal.showToast('该备件已添加') proxy.$modal.showToast('该备件已添加')
return; return
} }
} }
if (form.value.itemNumbers && form.value.itemNumbers.length > 0) { if (form.value.itemNumbers && form.value.itemNumbers.length > 0) {
let arr1 = form.value.itemNumbers.filter(item => item.locationNumber == form1.value.locationNumber) const arr1 = form.value.itemNumbers.filter((item) => item.locationNumber == form1.value.locationNumber)
if (arr1 && arr1.length > 0) { if (arr1 && arr1.length > 0) {
proxy.$modal.showToast('该库位已经绑定备件') proxy.$modal.showToast('该库位已经绑定备件')
return; return
} }
} }
form.value.itemNumbers.push(form1.value) form.value.itemNumbers.push(form1.value)
isPopupShow.value = false isPopupShow.value = false
} }
// 删除备件 // 删除备件
function delSpareParts(index) { function delSpareParts(index) {
form.value.itemNumbers.splice(index, 1) form.value.itemNumbers.splice(index, 1)
} }
async function searchItem(name) {
async function searchItem(name){
uni.showLoading({ uni.showLoading({
title: "加载中....", title: '加载中....',
mask: true mask: true
}); })
await getSparePartsList(name); await getSparePartsList(name)
} }
// 获取备件列表 // 获取备件列表
async function getSparePartsList(name) { async function getSparePartsList(name) {
let param = { const param = {
name:name name
} }
await sparePartsApi.noPage(param).then(res => { await sparePartsApi
res.data.map(item => { .noPage(param)
.then((res) => {
res.data.map((item) => {
item.value = item.number item.value = item.number
item.label = item.name item.label = item.name
}) })
sparePartsList.value = res.data sparePartsList.value = res.data
singleColumnList.value = sparePartsList.value singleColumnList.value = sparePartsList.value
uni.hideLoading() uni.hideLoading()
}).catch(() => { })
.catch(() => {
uni.hideLoading() uni.hideLoading()
}) })
}
} async function chooseItem1(type, form) {
async function chooseItem1(type, form) {
if (!form.value.number && type == 1) { if (!form.value.number && type == 1) {
proxy.$modal.showToast('请选择备件'); proxy.$modal.showToast('请选择备件')
return; return
} }
if (type == 1) { if (type == 1) {
uni.showLoading({ uni.showLoading({
title: "加载中....", title: '加载中....',
mask: true mask: true
}); })
form1.value['itemNumber'] = form.value.number form1.value.itemNumber = form.value.number
choosesingleColumnItem.value = sparePartsList.value.filter(item => item.number == form.value.number) choosesingleColumnItem.value = sparePartsList.value.filter((item) => item.number == form.value.number)
form1.value.name = form.value.name form1.value.name = form.value.name
form1.value.locationNumber = choosesingleColumnItem.value[0].locationNumber form1.value.locationNumber = choosesingleColumnItem.value[0].locationNumber
form1.value.areaNumber = choosesingleColumnItem.value[0].areaNumber form1.value.areaNumber = choosesingleColumnItem.value[0].areaNumber
@ -386,50 +369,48 @@
isShow.value = false isShow.value = false
itemNumber.value = '' itemNumber.value = ''
} }
await getSparePartsList(null); await getSparePartsList(null)
isShowSelectItem.value = false; isShowSelectItem.value = false
uni.hideLoading() uni.hideLoading()
}else{ } else {
isShowSelectItem.value = false; isShowSelectItem.value = false
uni.hideLoading() uni.hideLoading()
} }
} }
onLoad(async (option) => {
onLoad(async (option) => { if (option.type) type.value = option.type
if (option.type) type.value = option.type;
result.value = await dictApi.getDict('result') result.value = await dictApi.getDict('result')
await getServiceSparePartsList() await getServiceSparePartsList()
}) })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.add-form-container { .add-form-container {
min-height: calc(100vh - 140rpx); min-height: calc(100vh - 140rpx);
background: white; background: white;
padding: 0px 0rpx 140rpx; padding: 0px 0rpx 140rpx;
} }
.u-form-item { .u-form-item {
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
} }
.disabled { .disabled {
background: #f5f5f5; background: #f5f5f5;
} }
.footer { .footer {
position: fixed; position: fixed;
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
width: 100%; width: 100%;
z-index: 22; z-index: 22;
} }
.btns { .btns {
display: flex; display: flex;
button { button {
flex: 1; flex: 1;
} }
@ -446,25 +427,25 @@
} }
.reset { .reset {
background: #F5F5F5; background: #f5f5f5;
border-radius: 0px; border-radius: 0px;
&::after { &::after {
border-radius: 0px; border-radius: 0px;
} }
} }
} }
.right-button { .right-button {
background: #409eff; background: #409eff;
color: white; color: white;
padding: 0rpx 30rpx; padding: 0rpx 30rpx;
border-radius: 16rpx; border-radius: 16rpx;
text-align: center; text-align: center;
font-size: 28rpx; font-size: 28rpx;
} }
.select { .select {
display: flex; display: flex;
align-items: center; align-items: center;
height: 72rpx; height: 72rpx;
@ -480,11 +461,10 @@
flex: 1; flex: 1;
font-size: 28rpx; font-size: 28rpx;
color: rgb(192, 196, 204); color: rgb(192, 196, 204);
}
} }
}
.title { .title {
padding: 32rpx 0rpx; padding: 32rpx 0rpx;
position: relative; position: relative;
@ -494,9 +474,9 @@
color: #fa3534; color: #fa3534;
top: 19px; top: 19px;
} }
} }
.list { .list {
padding: 0rpx 30rpx; padding: 0rpx 30rpx;
.item { .item {
@ -504,7 +484,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
.item-box { .item-box {
background: #F5F5F5; background: #f5f5f5;
border-radius: 12rpx; border-radius: 12rpx;
flex: 1; flex: 1;
width: 0rpx; width: 0rpx;
@ -525,31 +505,29 @@
color: #9c9c9c; color: #9c9c9c;
padding: 20rpx 30rpx 20rpx; padding: 20rpx 30rpx 20rpx;
} }
}
} }
}
.add-btn { .add-btn {
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
.popup-title { .popup-title {
text-align: center; text-align: center;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
color: #409eff; color: #409eff;
padding: 30rpx 30rpx 0px padding: 30rpx 30rpx 0px;
} }
.popup { .popup {
width: 600rpx; width: 600rpx;
padding: 30rpx 0rpx 30rpx; padding: 30rpx 0rpx 30rpx;
}
} .popup-footer {
.popup-footer {
display: flex; display: flex;
border-top: 1px solid #e4e4e4; border-top: 1px solid #e4e4e4;
@ -562,9 +540,9 @@
color: #409eff; color: #409eff;
} }
} }
} }
::v-deep .u-checkbox-group { ::v-deep .u-checkbox-group {
display: grid !important; display: grid !important;
} }
</style> </style>
Write Preview
Loading…
Cancel
Save