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

报修添加上传图片 备件维修工单添加备件添加多条

master
zhang_li 9 months ago
parent
36ee99106e
commit
580ec08454
7 changed files with 299 additions and 94 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. 12
      api/upload.js
  2. 2
      config.js
  3. 7
      pages/deviceReport/addForm.vue
  4. 29
      pages/deviceReport/index.vue
  5. 9
      pages/repairOrder/detail.vue
  6. 334
      pages/sparePartsServiceWorkOrderList/addForm.vue
  7. BIN
      static/images/photo.png

12
api/upload.js
View File

@ -0,0 +1,12 @@
import upload from '@/utils/upload'
import request from '@/utils/request'
// 上传
export function uploadFile(data) {
console.log(data)
return upload({
url: '/infra/file/upload',
method: 'PUT',
filePath:data.filePath,
name: data.name
})
}

2
config.js
View File

@ -1,7 +1,7 @@
// 应用全局配置 // 应用全局配置
module.exports = { module.exports = {
// http://192.168.0.165:1208 // http://192.168.0.165:1208
baseUrl: process.env.NODE_ENV === 'development' ? 'http://192.168.1.18:12080' : 'http://dev.ccwin-in.com:25200/api', baseUrl: process.env.NODE_ENV === 'development' ? 'http://192.168.0.181:12080' : 'http://dev.ccwin-in.com:25200/api',
baseApi:process.env.NODE_ENV === 'development' ? '/admin-api' : '/api/admin-api', baseApi:process.env.NODE_ENV === 'development' ? '/admin-api' : '/api/admin-api',
// 应用信息 // 应用信息
appInfo: { appInfo: {

7
pages/deviceReport/addForm.vue
View File

@ -142,11 +142,16 @@
this.$modal.showToast('请输入所属厂区') this.$modal.showToast('请输入所属厂区')
return; return;
} }
if (this.imgList.length == 0) {
this.$modal.showToast('请选择图片')
return;
}
const data = { const data = {
describes: this.form.describes, describes: this.form.describes,
deviceNumber: this.form.deviceNumber, deviceNumber: this.form.deviceNumber,
factoryAreaNumber: this.form.factoryAreaNumber, factoryAreaNumber: this.form.factoryAreaNumber,
type: this.type type: this.type,
filePathList: this.imgList,
} }
this.$modal.confirm('是否添加报修').then(() => { this.$modal.confirm('是否添加报修').then(() => {
this.$modal.loading('加载中') this.$modal.loading('加载中')

29
pages/deviceReport/index.vue
View File

@ -31,6 +31,9 @@
<view class="dec"> <view class="dec">
所属厂区:<span>{{item.factoryAreaName}}</span> 所属厂区:<span>{{item.factoryAreaName}}</span>
</view> </view>
<view class="images">
<image :src="cur" mode="" v-for="(cur,key) in item.filePathList" :key='key' @click="previewImage(key,item.filePathList)"></image>
</view>
<view class="bottom"> <view class="bottom">
<view class="status"> <view class="status">
<u-tag :text="item.result" bg-color='rgba(255,255,255,0)' color='#2ba471' <u-tag :text="item.result" bg-color='rgba(255,255,255,0)' color='#2ba471'
@ -40,7 +43,6 @@
<u-button shape="circle" type="primary" size="mini" style="min-width: 120rpx;" <u-button shape="circle" type="primary" size="mini" style="min-width: 120rpx;"
v-if="item.isCancel == 0" @click="cancle(item)">撤销</u-button> v-if="item.isCancel == 0" @click="cancle(item)">撤销</u-button>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -104,6 +106,21 @@
}) })
}) })
},
previewImage(current,array){
uni.previewImage({
urls: array,
current:current,
longPressActions: {
itemList: ['发送给朋友', '保存图片', '收藏'],
success: function(data) {
console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
},
fail: function(err) {
console.log(err.errMsg);
}
}
});
} }
}, },
onLoad(option) { onLoad(option) {
@ -234,4 +251,14 @@
} }
} }
} }
.images{
display: flex;
width: 100%;
image{
width: 30%;
margin-right: 20rpx;
height: 200rpx;
border-radius: 10rpx;
}
}
</style> </style>

9
pages/repairOrder/detail.vue
View File

@ -246,10 +246,13 @@
}, },
// APP维修工单接单、点击完成、验证 // APP维修工单接单、点击完成、验证
orderClick(type) { orderClick(type) {
if(!this.serviceList || this.serviceList&&this.serviceList.length == 0){ if(this.data.status == 'PECEIVED'){
this.$modal.showToast('请添加维修内容') if(!this.serviceList || this.serviceList&&this.serviceList.length == 0){
return; this.$modal.showToast('请添加维修内容')
return;
}
} }
const data = { const data = {
number: this.data.number, number: this.data.number,
status: this.data.status, status: this.data.status,

334
pages/sparePartsServiceWorkOrderList/addForm.vue
View File

@ -1,11 +1,68 @@
<template> <template>
<!-- 添加维修工单 --> <!-- 添加维修工单 -->
<view class="add-form-container"> <view class="add-form-container">
<u-form :model="form" ref="form1" label-width="160rpx"> <!-- <u-form :model="form" ref="form1" label-width="160rpx">
<u-form-item :label="`备件`" prop="itemNumber" required> <u-form-item label="申请主题" prop="name" required>
<view class="select" @click="openSingleColumn('itemNumber',form.itemNumber,sparePartsList)"> <u-input v-model="form.name" placeholder="请输入申请主题" />
<view class="input" v-if='form.itemNumber'> </u-form-item>
{{selectFormat(form.itemNumber,sparePartsList)}} </u-form> -->
<view class="list">
<view class="title">
<span>*</span>申请备件
</view>
<view class="item " v-for="(item,index) in form.itemNumbers" :key="index">
<view class="item-box">
<view class="spare-title">
<view class="title-txt">
{{item.name}}
</view>
</view>
<u-row gutter="16">
<u-col :span="24">
<view class="dec">
库位:{{item.locationNumber}}
</view>
</u-col>
<u-col :span="24">
<view class="dec">
数量:{{item.qty}}
</view>
</u-col>
<u-col :span="24">
<view class="dec">
维修结果:{{item.result == 'YES'?'完成':'未完成'}}
</view>
</u-col>
<u-col :span="24">
<view class="dec">
维修原因:{{item.reasons}}
</view>
</u-col>
</u-row>
</view>
<u-icon name="minus-circle" color="#aaaaaa" size="60" @click="delSpareParts(index)"></u-icon>
</view>
<view class="add-btn">
<u-button type="primary" @click="open"><u-icon name="plus-circle" color="#ffffff"
size="36"></u-icon>添加备件</u-button>
</view>
</view>
<view class="footer">
<view class="btns">
<button class="reset" @click="reset">重置</button>
<button class="sure" @click="submit" :loading='loading' :disabled='loading'>确定</button>
</view>
<view style="height: constant(safe-area-inset-bottom); height: env(safe-area-inset-bottom);"></view>
</view>
<!-- 添加备件 -->
<u-popup v-model="isPopupShow" mode="center" border-radius="14">
<view class="popup-title">添加备件</view>
<view class="popup">
<u-form :model="form1" ref="form1" label-width="200rpx">
<u-form-item :label="`备件`" prop="itemNumber" required>
<view class="select" @click="openSingleColumn('itemNumber',form1.itemNumber,sparePartsList)">
<view class="input" v-if='form1.itemNumber'>
{{selectFormat(form1.itemNumber,sparePartsList)}}
</view> </view>
<view class="placeholder" v-else> <view class="placeholder" v-else>
请选择备件 请选择备件
@ -14,30 +71,29 @@
</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="form.locationNumber" placeholder="请选择库位" @blur="blur"/> <u-input v-model="form1.locationNumber" placeholder="请选择库位" @blur="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="form.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="form.result"> <u-radio-group v-model="form1.result">
<u-radio :name="item.value" v-for="(item,index) in result" :key="index">{{item.label}}</u-radio> <u-radio :name="item.value" v-for="(item,index) in result" :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>
<u-input v-model="form.reasons" placeholder="请输入维修原因" /> <u-input v-model="form1.reasons" placeholder="请输入维修原因" />
</u-form-item> </u-form-item>
</u-form> </u-form>
<view class="footer">
<view class="btns">
<button class="reset" @click="reset">重置</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 class="popup-footer">
</view> <view @click="isPopupShow = false">取消</view>
<view class="sure" @click="addSpare">确认</view>
</view>
</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"></u-select> :list="singleColumnList" @confirm="chooseSingleColumn"></u-select>
</view> </view>
@ -48,14 +104,25 @@
import * as sparePartsServiceWorkOrderListApi from "@/api/sparePartsServiceWorkOrderList.js" import * as sparePartsServiceWorkOrderListApi from "@/api/sparePartsServiceWorkOrderList.js"
import * as dictApi from "@/api/dict.js" import * as dictApi from "@/api/dict.js"
import * as locationApi from "@/api/location.js" import * as locationApi from "@/api/location.js"
export default { export default {
data() { data() {
return { return {
loading: false, loading: false,
type: "", type: "",
// 备件弹窗
isPopupShow: false,
sparePartsList: [],
// 下拉框字段
singleColumnShow: false,
singleColumnDefaultValue: [],
singleColumnList: [],
field: '',
form: { form: {
itemNumbers:[]
},
form1: {
itemNumber: "", itemNumber: "",
qty: '', qty: '',
result: 'YES', result: 'YES',
@ -63,11 +130,6 @@
locationNumber:'', locationNumber:'',
areaNumber:'' areaNumber:''
}, },
sparePartsList: [],
singleColumnShow: false,
singleColumnDefaultValue: [],
singleColumnList: [],
field: '',
result: [], result: [],
isShow:false isShow:false
} }
@ -76,30 +138,10 @@
// 触发提交表单 // 触发提交表单
submit() { submit() {
// 校验 // 校验
if (!this.form.itemNumber) { if (this.form.itemNumbers == 0) {
this.$modal.showToast('请选择备件') this.$modal.showToast('请选择备件')
return; return;
} }
if (this.isInAccount == 'TRUE') {
this.$modal.showToast('该库位属于帐内库，请选择帐外库')
return;
}
if (this.itemNumber) {
this.$modal.showToast('该库位已绑定过备件')
return;
}
if (!this.form.qty) {
this.$modal.showToast(`请输入数量`)
return;
}
if (!this.form.result) {
this.$modal.showToast('请选择维修结果')
return;
}
if (!this.form.reasons) {
this.$modal.showToast('请输入维修原因')
return;
}
this.$modal.confirm('是否添加备件维修工单').then(() => { this.$modal.confirm('是否添加备件维修工单').then(() => {
this.$modal.loading('加载中') this.$modal.loading('加载中')
this.loading = true this.loading = true
@ -124,12 +166,8 @@
}, },
// 重置 // 重置
reset() { reset() {
if (this.form.id) { this.form = {
this.form.classes = ''; itemNumbers:[]
this.form.faultType = ''
} else {
this.form = {}
} }
}, },
// //
@ -155,14 +193,16 @@
}, },
// 单列模式点击确定之后 // 单列模式点击确定之后
chooseSingleColumn(e) { chooseSingleColumn(e) {
console.log(this.field) this.form1[this.field] = e[0].value
this.form[this.field] = e[0].value
if (this.field == 'itemNumber') { if (this.field == 'itemNumber') {
this.choosesingleColumnItem = this.singleColumnList.filter(item => item.number == e[0].value) this.choosesingleColumnItem = this.singleColumnList.filter(item => item.number == e[0].value)
this.form.locationNumber = this.choosesingleColumnItem[0].locationNumber console.log( this.choosesingleColumnItem[0])
this.form.areaNumber = this.choosesingleColumnItem[0].areaNumber this.form1.locationNumber = this.choosesingleColumnItem[0].locationNumber
this.form1.areaNumber = this.choosesingleColumnItem[0].areaNumber
if(!this.choosesingleColumnItem[0].locationNumber){ if(!this.choosesingleColumnItem[0].locationNumber){
this.isShow = true this.isShow = true
}else{
this.isShow = false
} }
} }
this.singleColumnShow = false this.singleColumnShow = false
@ -194,16 +234,77 @@
this.$modal.showToast('找不到该库位') this.$modal.showToast('找不到该库位')
return; return;
} }
this.form.areaNumber = res.data.areaNumber; this.form1.areaNumber = res.data.areaNumber;
this.isInAccount = res.data.isInAccount this.isInAccount = res.data.isInAccount
this.itemNumber = res.data.itemNumber this.itemNumber = res.data.itemNumber
}) })
}, },
blur() { blur() {
if (this.form.locationNumber) { if (this.form1.locationNumber) {
this.getLocation() this.getLocation()
} }
}, },
// 打开弹窗
open() {
this.form1 = {
itemNumber: "",
qty: '',
result: 'YES',
reasons: '',
locationNumber:'',
areaNumber:''
}
this.isPopupShow = true
},
// 添加配件
addSpare() {
// 校验
if (!this.form1.itemNumber) {
this.$modal.showToast('请选择备件')
return;
}
console.log(this.form1)
if (!this.form1.locationNumber) {
this.$modal.showToast('请扫描库位')
return;
}
if (this.isInAccount == 'TRUE') {
this.$modal.showToast('该库位属于帐内库，请选择帐外库')
return;
}
if (this.itemNumber) {
this.$modal.showToast('该库位已绑定过备件')
return;
}
if (!this.form1.qty) {
this.$modal.showToast(`请输入数量`)
return;
}
if (!this.form1.result) {
this.$modal.showToast('请选择维修结果')
return;
}
if (!this.form1.reasons) {
this.$modal.showToast('请输入维修原因')
return;
}
this.form1.name = this.selectFormat(this.form1.itemNumber, this.sparePartsList)
if (this.form.itemNumbers && this.form.itemNumbers.length > 0) {
let arr = this.form.itemNumbers.filter(item => item.itemNumber == this.form1.itemNumber)
if (arr && arr.length > 0) {
this.$modal.showToast('该备件已添加')
return;
}
}
this.form.itemNumbers.push(this.form1)
this.isPopupShow = false
},
// 删除备件
delSpareParts(index) {
this.form.itemNumbers.splice(index, 1)
}
}, },
async onLoad(option) { async onLoad(option) {
if (option.type) this.type = option.type; if (option.type) this.type = option.type;
@ -217,42 +318,15 @@
.add-form-container { .add-form-container {
min-height: calc(100vh - 140rpx); min-height: calc(100vh - 140rpx);
background: white; background: white;
padding: 0px 30rpx 140rpx; padding: 0px 0rpx 140rpx;
} }
.list { .u-form-item {
padding-bottom: 20rpx; padding: 20rpx 30rpx;
}
.item {
margin-top: 20rpx;
background: white;
padding: 30rpx;
display: flex;
align-items: center;
image {
width: 160rpx;
height: 160rpx;
margin-right: 20rpx;
}
.title {
font-size: 32rpx;
font-weight: bold;
}
.dec1 {
font-size: 28rpx;
margin-top: 16rpx;
color: #acacac;
}
.dec2 { .disabled {
font-size: 28rpx; background: #f5f5f5;
margin-top: 6rpx;
color: #acacac;
}
}
} }
.footer { .footer {
@ -260,6 +334,7 @@
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
width: 100%; width: 100%;
z-index: 22;
} }
.btns { .btns {
@ -319,4 +394,87 @@
} }
} }
.title {
padding: 32rpx 0rpx;
position: relative;
span {
position: absolute;
left: -16rpx;
color: #fa3534;
top: 19px;
}
}
.list {
padding: 0rpx 30rpx;
.item {
display: flex;
margin-bottom: 20rpx;
.item-box {
background: #F5F5F5;
border-radius: 12rpx;
flex: 1;
width: 0rpx;
}
.spare-title {
padding: 20rpx 30rpx;
border-bottom: 1px solid #e4e4e4;
.title-txt {
color: #409eff;
font-size: 30rpx;
font-weight: bold;
}
}
.dec {
color: #9c9c9c;
padding: 20rpx 30rpx 20rpx;
}
}
}
.add-btn {
display: flex;
justify-content: flex-start;
align-items: center;
}
.popup-title {
text-align: center;
font-size: 32rpx;
font-weight: bold;
color: #409eff;
padding: 30rpx 30rpx 0px
}
.popup {
width: 600rpx;
padding: 30rpx 0rpx 30rpx;
}
.popup-footer {
display: flex;
border-top: 1px solid #e4e4e4;
view {
line-height: 100rpx;
flex: 1;
text-align: center;
&.sure {
color: #409eff;
}
}
}
::v-deep .u-checkbox-group {
display: grid !important;
}
</style> </style>

BIN
static/images/photo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

Write Preview
Loading…
Cancel
Save