Browse Source

bug修改

master
zhang_li 9 months ago
parent
commit
f9de47b5ac
  1. 1
      src/api/upload.js
  2. 4
      src/components/form/index.vue
  3. 2
      src/components/verifition/verifyPoint/verifyPoint.vue
  4. 2
      src/pages/device/index.vue
  5. 7
      src/pages/deviceReport/addForm.vue
  6. 7
      src/pages/deviceReport/index.vue
  7. 4
      src/pages/deviceReport/myDeviceReport.vue
  8. 5
      src/pages/index.vue
  9. 6
      src/pages/login.vue
  10. 6
      src/pages/mine/index.vue
  11. 2
      src/pages/mold/index.vue
  12. 6
      src/pages/overhaulOrder/addForm.vue
  13. 4
      src/pages/overhaulOrder/addServiceRecord.vue
  14. 4
      src/pages/overhaulOrder/detail.vue
  15. 5
      src/pages/overhaulOrder/index.vue
  16. 6
      src/pages/repairOrder/addForm.vue
  17. 6
      src/pages/repairOrder/addServiceRecord.vue
  18. 11
      src/pages/repairOrder/detail.vue
  19. 4
      src/pages/repairOrder/index.vue
  20. 5
      src/pages/repairOrder/myOrder.vue
  21. 3
      src/pages/repairOrder/transfer.vue
  22. 3
      src/pages/spareParts/index.vue
  23. 42
      src/pages/sparePartsApplication/addForm.vue
  24. 6
      src/pages/sparePartsApplication/detail.vue
  25. 4
      src/pages/sparePartsApplication/index.vue
  26. 2
      src/pages/sparePartsApplication/mySparePartsApplication.vue
  27. 6
      src/pages/sparePartsApplicationApprove/index.vue
  28. 2
      src/pages/sparePartsApplicationApprove/mySparePartsApplicationApprove.vue
  29. 6
      src/pages/sparePartsServiceWorkOrderList/addForm.vue
  30. 2
      src/pages/sparePartsServiceWorkOrderList/mySparePartsService.vue
  31. 2
      src/pages/spotCheckOrder/addForm.vue
  32. 3
      src/pages/spotCheckOrder/myOrder.vue
  33. 11
      src/pages/upkeepOrder/addServiceRecord.vue
  34. 4
      src/pages/upkeepOrder/detail.vue
  35. 3
      src/pages/upkeepOrder/index.vue
  36. 3
      src/pages/upkeepOrder/myOrder.vue
  37. 1
      src/utils/upload.js

1
src/api/upload.js

@ -2,7 +2,6 @@ import upload from '@/utils/upload'
import request from '@/utils/request' import request from '@/utils/request'
// 上传 // 上传
export function uploadFile(data) { export function uploadFile(data) {
console.log(data)
return upload({ return upload({
url: '/infra/file/upload', url: '/infra/file/upload',
method: 'PUT', method: 'PUT',

4
src/components/form/index.vue

@ -322,10 +322,8 @@
}, },
// //
chooseSingleColumn(e){ chooseSingleColumn(e){
console.log(e)
this.$forceUpdate() this.$forceUpdate()
this.data[this.field] = e[0].value this.data[this.field] = e[0].value
console.log(this.data)
this.singleColumnShow = false this.singleColumnShow = false
this.$emit('singleColumn',this.field,this.data[this.field]) this.$emit('singleColumn',this.field,this.data[this.field])
}, },
@ -380,7 +378,6 @@
}, },
// //
openRegion(field,val){ openRegion(field,val){
console.log(val)
this.field = field this.field = field
this.data[this.field] = val ? val :[] this.data[this.field] = val ? val :[]
if(val){ if(val){
@ -391,7 +388,6 @@
this.regionShow = true this.regionShow = true
}, },
chooseRegion(e){ chooseRegion(e){
console.log(e)
this.data[this.field] = [e.province.code,e.city.code,e.area.code] this.data[this.field] = [e.province.code,e.city.code,e.area.code]
this.regionText = `${e.province.name}-${e.city.name}-${e.area.name}` this.regionText = `${e.province.name}-${e.city.name}-${e.area.name}`
this.$emit('region',this.field,this.data[this.field]) this.$emit('region',this.field,this.data[this.field])

2
src/components/verifition/verifyPoint/verifyPoint.vue

@ -238,7 +238,6 @@
let y =Math.round(155 * p.y/parseInt(imgSize.height)) let y =Math.round(155 * p.y/parseInt(imgSize.height))
return {x,y} return {x,y}
}) })
// console.log(newPointArr,"newPointArr");
return newPointArr return newPointArr
}, },
}, },
@ -252,7 +251,6 @@
} }
}, },
mounted() { mounted() {
console.log(this.defaultImg)
} }
} }
</script> </script>

2
src/pages/device/index.vue

@ -83,7 +83,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
}, },
onShow() { onShow() {

7
src/pages/deviceReport/addForm.vue

@ -120,7 +120,7 @@
} else { } else {
this.factoryAreaList = [] this.factoryAreaList = []
} }
}) }).catch(()=>{})
}, },
// / // /
getDetailsByNumber() { getDetailsByNumber() {
@ -135,7 +135,7 @@
} else { } else {
this.deviceList = [] this.deviceList = []
} }
}) }).catch(()=>{})
} else if (this.type == 'MOLD') { } else if (this.type == 'MOLD') {
moldApi.getMoldByFactoryAreaNumber(this.form.factoryAreaNumber).then((res) => { moldApi.getMoldByFactoryAreaNumber(this.form.factoryAreaNumber).then((res) => {
if (res.data && res.data.length > 0) { if (res.data && res.data.length > 0) {
@ -147,7 +147,7 @@
} else { } else {
this.deviceList = [] this.deviceList = []
} }
}) }).catch(()=>{})
} }
}, },
// //
@ -251,7 +251,6 @@
}).then(ret => { }).then(ret => {
this.$modal.closeLoading() this.$modal.closeLoading()
this.imgList.push(ret.data) this.imgList.push(ret.data)
console.log(ret)
}).catch((err) => { }).catch((err) => {
this.$modal.closeLoading() this.$modal.closeLoading()
}); });

7
src/pages/deviceReport/index.vue

@ -78,7 +78,6 @@
this.$tab.navigateTo(`/pages/deviceReport/screen?type=${this.type}`) this.$tab.navigateTo(`/pages/deviceReport/screen?type=${this.type}`)
}, },
addForm() { addForm() {
console.log(this.params)
this.$tab.navigateTo(`/pages/deviceReport/addForm?type=${this.params.type}`) this.$tab.navigateTo(`/pages/deviceReport/addForm?type=${this.params.type}`)
}, },
// //
@ -95,7 +94,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
// //
cancle(item) { cancle(item) {
@ -108,7 +107,7 @@
this.status = 'loadmore' this.status = 'loadmore'
await this.getList() await this.getList()
this.$modal.showToast('撤销成功') this.$modal.showToast('撤销成功')
}) }).catch(()=>{})
}) })
}, },
@ -122,7 +121,7 @@
console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片'); console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
}, },
fail: function(err) { fail: function(err) {
console.log(err.errMsg); // console.log(err.errMsg);
} }
} }
}); });

4
src/pages/deviceReport/myDeviceReport.vue

@ -85,7 +85,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
// //
cancle(item) { cancle(item) {
@ -95,7 +95,7 @@
this.list = [] this.list = []
this.status = 'loadmore' this.status = 'loadmore'
this.getList() this.getList()
}) }).catch(()=>{})
}) })
}, },

5
src/pages/index.vue

@ -163,12 +163,12 @@
getCounts() { getCounts() {
getCounts().then(res => { getCounts().then(res => {
this.counts = res.data this.counts = res.data
}) }).catch(()=>{})
}, },
getToDoCountsByUser() { getToDoCountsByUser() {
getToDoCountsByUser().then(res => { getToDoCountsByUser().then(res => {
this.counts1 = res.data this.counts1 = res.data
}) }).catch(()=>{})
}, },
}, },
onLoad: async function() { onLoad: async function() {
@ -176,7 +176,6 @@
this.getCounts() this.getCounts()
this.getToDoCountsByUser() this.getToDoCountsByUser()
} }
console.log( this.$store.state)
}, },
onPageScroll(e) { onPageScroll(e) {
if (e.scrollTop > 0) { if (e.scrollTop > 0) {

6
src/pages/login.vue

@ -96,17 +96,17 @@
this.$modal.closeLoading() this.$modal.closeLoading()
await this.loginSuccess() await this.loginSuccess()
// this.$tab.reLaunch('/pages/index') // this.$tab.reLaunch('/pages/index')
}) }).catch(()=>{})
}, },
// //
async loginSuccess(result) { async loginSuccess(result) {
// //
await this.$store.dispatch('GetPermissionInfo').then(res => { await this.$store.dispatch('GetPermissionInfo').then(res => {
// this.$tab.reLaunch('/pages/index') // this.$tab.reLaunch('/pages/index')
}) }).catch(()=>{})
await this.$store.dispatch('GetInfo').then(res => { await this.$store.dispatch('GetInfo').then(res => {
this.$tab.reLaunch('/pages/index') this.$tab.reLaunch('/pages/index')
}) }).catch(()=>{})
} }
} }
} }

6
src/pages/mine/index.vue

@ -124,7 +124,7 @@
getInfo() { getInfo() {
getInfo().then(res => { getInfo().then(res => {
this.user = res.data this.user = res.data
}) }).catch(()=>{})
}, },
handleToInfo() { handleToInfo() {
this.$tab.navigateTo('/pages/mine/info/index') this.$tab.navigateTo('/pages/mine/info/index')
@ -160,8 +160,8 @@
this.$modal.confirm('确定注销并退出系统吗?').then(() => { this.$modal.confirm('确定注销并退出系统吗?').then(() => {
this.$store.dispatch('LogOut').then(() => { this.$store.dispatch('LogOut').then(() => {
this.$tab.reLaunch('/pages/login') this.$tab.reLaunch('/pages/login')
}) }).catch(()=>{})
}) }).catch(()=>{})
}, },
handleLogin() { handleLogin() {
this.$tab.navigateTo('/pages/login/index') this.$tab.navigateTo('/pages/login/index')

2
src/pages/mold/index.vue

@ -87,7 +87,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
}, },
onShow() { onShow() {

6
src/pages/overhaulOrder/addForm.vue

@ -221,7 +221,7 @@
item.label = item.describes item.label = item.describes
}) })
this.repairOrderList = res.data this.repairOrderList = res.data
}) }).catch(()=>{})
}, },
// / // /
@ -233,7 +233,7 @@
item.label = item.name item.label = item.name
}) })
this.deviceList = res.data this.deviceList = res.data
}) }).catch(()=>{})
}else if(this.type == 'MOLD'){ }else if(this.type == 'MOLD'){
await moldApi.moldList().then(res => { await moldApi.moldList().then(res => {
res.data.map(item => { res.data.map(item => {
@ -241,7 +241,7 @@
item.label = item.name item.label = item.name
}) })
this.deviceList = res.data this.deviceList = res.data
}) }).catch(()=>{})
} }
}, },

4
src/pages/overhaulOrder/addServiceRecord.vue

@ -328,7 +328,7 @@
}) })
}) })
this.selecUserList = res.data this.selecUserList = res.data
}) }).catch(()=>{})
}, },
// //
openSelecUser() { openSelecUser() {
@ -380,7 +380,7 @@
item.label = item.name item.label = item.name
}) })
this.sparePartsList = res.data this.sparePartsList = res.data
}) }).catch(()=>{})
}, },
// //
open() { open() {

4
src/pages/overhaulOrder/detail.vue

@ -224,7 +224,7 @@
if (res.data) { if (res.data) {
this.serviceList = res.data this.serviceList = res.data
} }
}) }).catch(()=>{})
}, },
// //
delService(item) { delService(item) {
@ -233,7 +233,7 @@
overhaulOrderApi.overhaulOrderDetailDelete(item.id).then((res) => { overhaulOrderApi.overhaulOrderDetailDelete(item.id).then((res) => {
this.$modal.closeLoading() this.$modal.closeLoading()
this.getOverhaulOrderDetailList() this.getOverhaulOrderDetailList()
}) }).catch(()=>{})
}) })
}, },

5
src/pages/overhaulOrder/index.vue

@ -98,7 +98,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
// //
cancle(item) { cancle(item) {
@ -110,7 +110,7 @@
this.list = [] this.list = []
this.status = 'loadmore' this.status = 'loadmore'
this.getList() this.getList()
}) }).catch(()=>{})
}) })
} }
}, },
@ -120,7 +120,6 @@
onShow() { onShow() {
uni.$on('screen',(data)=>{ uni.$on('screen',(data)=>{
console.log(data)
this.params = {...this.params,...data} this.params = {...this.params,...data}
}) })
this.params.pageNo = 1 this.params.pageNo = 1

6
src/pages/repairOrder/addForm.vue

@ -224,8 +224,7 @@
item.label = item.name item.label = item.name
}) })
this.deviceList = res.data this.deviceList = res.data
// console.log(22,this.deviceList) }).catch(()=>{})
})
}else if(this.type == 'MOLD'){ }else if(this.type == 'MOLD'){
await moldApi.moldList().then(res => { await moldApi.moldList().then(res => {
res.data.map(item => { res.data.map(item => {
@ -233,7 +232,7 @@
item.label = item.name item.label = item.name
}) })
this.deviceList = res.data this.deviceList = res.data
}) }).catch(()=>{})
} }
}, },
@ -253,7 +252,6 @@
faultType: data.faultType, faultType: data.faultType,
type: data.type type: data.type
} }
console.log(this.form)
}; };
await this.getDeviceList() await this.getDeviceList()
this.maintenanceShift = await dictApi.getDict('maintenance_shift') this.maintenanceShift = await dictApi.getDict('maintenance_shift')

6
src/pages/repairOrder/addServiceRecord.vue

@ -164,7 +164,6 @@
this.$modal.showToast('请选择备件') this.$modal.showToast('请选择备件')
return; return;
} }
console.log(this.form)
if (this.form.id) { if (this.form.id) {
this.$modal.confirm('是否修改维修内容').then(() => { this.$modal.confirm('是否修改维修内容').then(() => {
this.$modal.loading('加载中') this.$modal.loading('加载中')
@ -242,7 +241,7 @@
}) })
}) })
this.selecUserList = res.data this.selecUserList = res.data
}) }).catch(()=>{})
}, },
// //
openSelecUser() { openSelecUser() {
@ -280,7 +279,6 @@
}, },
// //
chooseSingleColumn(e) { chooseSingleColumn(e) {
console.log(e[0])
this.form1[this.field] = e[0].value this.form1[this.field] = e[0].value
this.singleColumnShow = false this.singleColumnShow = false
@ -295,7 +293,7 @@
item.label = item.name item.label = item.name
}) })
this.sparePartsList = res.data this.sparePartsList = res.data
}) }).catch(()=>{})
}, },
// //
open() { open() {

11
src/pages/repairOrder/detail.vue

@ -225,7 +225,6 @@
}, },
methods: { methods: {
change(index) { change(index) {
console.log("index", index);
this.current = index this.current = index
this.changeItem = this.list[this.current] this.changeItem = this.list[this.current]
}, },
@ -257,8 +256,6 @@
orderClickSuccess() { orderClickSuccess() {
// //
if (this.data.status == 'PECEIVED') { if (this.data.status == 'PECEIVED') {
console.log(this.$store.state.user.id)
console.log(this.data)
if (this.$store.state.user.id != this.data.maintenance) { if (this.$store.state.user.id != this.data.maintenance) {
this.$modal.showToast('当前人员与接单人员不一致') this.$modal.showToast('当前人员与接单人员不一致')
return; return;
@ -276,7 +273,6 @@
this.isShowSuccess = true this.isShowSuccess = true
}, },
radioGroupChange(e) { radioGroupChange(e) {
console.log(e)
this.result = e this.result = e
}, },
sure() { sure() {
@ -336,9 +332,8 @@
}).then((res) => { }).then((res) => {
if (res.data) { if (res.data) {
this.data1 = res.data this.data1 = res.data
console.log(this.data1)
} }
}) }).catch(()=>{})
}, },
// //
getRepairOrderDetaiList() { getRepairOrderDetaiList() {
@ -348,7 +343,7 @@
if (res.data) { if (res.data) {
this.serviceList = res.data this.serviceList = res.data
} }
}) }).catch(()=>{})
}, },
// //
delService(item) { delService(item) {
@ -357,7 +352,7 @@
repairOrderApi.repairOrderDetailDelete(item.id).then((res) => { repairOrderApi.repairOrderDetailDelete(item.id).then((res) => {
this.$modal.closeLoading() this.$modal.closeLoading()
this.getRepairOrderDetaiList() this.getRepairOrderDetaiList()
}) }).catch(()=>{})
}) })
}, },
transfer() { transfer() {

4
src/pages/repairOrder/index.vue

@ -83,7 +83,6 @@
this.$tab.navigateTo(`/pages/repairOrder/screen?type=${this.params.type}`) this.$tab.navigateTo(`/pages/repairOrder/screen?type=${this.params.type}`)
}, },
itemClick(item, index) { itemClick(item, index) {
console.log(33,item)
this.$tab.navigateTo(`/pages/repairOrder/detail?type=${this.params.type}&data=${encodeURIComponent(JSON.stringify(item))}`) this.$tab.navigateTo(`/pages/repairOrder/detail?type=${this.params.type}&data=${encodeURIComponent(JSON.stringify(item))}`)
}, },
addForm(item) { addForm(item) {
@ -115,7 +114,7 @@
this.list = [] this.list = []
this.status = 'loadmore' this.status = 'loadmore'
this.getList() this.getList()
}) }).catch(()=>{})
}) })
} }
@ -126,7 +125,6 @@
onShow() { onShow() {
uni.$on('screen',(data)=>{ uni.$on('screen',(data)=>{
console.log(data)
this.params = {...this.params,...data} this.params = {...this.params,...data}
}) })
this.params.pageNo = 1 this.params.pageNo = 1

5
src/pages/repairOrder/myOrder.vue

@ -92,7 +92,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
// //
cancle(item) { cancle(item) {
@ -104,7 +104,7 @@
this.list = [] this.list = []
this.status = 'loadmore' this.status = 'loadmore'
this.getList() this.getList()
}) }).catch(()=>{})
}) })
} }
@ -112,7 +112,6 @@
onShow() { onShow() {
uni.$on('screen',(data)=>{ uni.$on('screen',(data)=>{
console.log(data)
this.params = {...this.params,...data} this.params = {...this.params,...data}
}) })
this.params.pageNo = 1 this.params.pageNo = 1

3
src/pages/repairOrder/transfer.vue

@ -169,7 +169,6 @@
}, },
// //
chooseSingleColumn(e) { chooseSingleColumn(e) {
console.log(e[0])
this.form[this.field] = e[0].value this.form[this.field] = e[0].value
if (this.field == 'receiverType') { if (this.field == 'receiverType') {
this.type = this.form[this.field] this.type = this.form[this.field]
@ -190,7 +189,7 @@
}, },
// / // /
async getDeviceList() { async getDeviceList() {
if (this.type == 'DEVICE') { if (this.type == 'DEVICE'||this.type=='TECH') {
await deviceApi.deviceList().then(res => { await deviceApi.deviceList().then(res => {
res.data.map(item => { res.data.map(item => {
item.value = item.number item.value = item.number

3
src/pages/spareParts/index.vue

@ -76,7 +76,6 @@
}, },
// //
screen() { screen() {
console.log(222)
this.$tab.navigateTo(`/pages/spareParts/screen`) this.$tab.navigateTo(`/pages/spareParts/screen`)
}, },
// //
@ -93,7 +92,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
}, },
onShow() { onShow() {

42
src/pages/sparePartsApplication/addForm.vue

@ -19,12 +19,12 @@
</view> </view>
<u-row gutter="16"> <u-row gutter="16">
<u-col :span="24"> <u-col :span="24">
<view class="dec"> <view class="dec" v-if="item.type">
类型:{{`${item.type=='DEVICE'?'设备' : '模具'}`}} 类型:{{`${item.type=='DEVICE'?'设备' :item.type=='MOLD'?'模具' : ''}`}}
</view> </view>
</u-col> </u-col>
<u-col :span="24"> <u-col :span="24">
<view class="dec"> <view class="dec" v-if="item.deviceName">
{{`${item.type=='DEVICE'?'设备' : '模具'}`}}:{{item.deviceName}} {{`${item.type=='DEVICE'?'设备' : '模具'}`}}:{{item.deviceName}}
</view> </view>
</u-col> </u-col>
@ -75,7 +75,7 @@
<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="type" required> <u-form-item label="类型" prop="type" >
<view class="select" @click="openSingleColumn('type',form1.type,deviceMoldType)"> <view class="select" @click="openSingleColumn('type',form1.type,deviceMoldType)">
<view class="input" v-if='form1.type'> <view class="input" v-if='form1.type'>
{{selectFormat(form1.type,deviceMoldType)}} {{selectFormat(form1.type,deviceMoldType)}}
@ -86,7 +86,7 @@
<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="`${form1.type=='DEVICE'?'设备' : '模具'}`" prop="deviceNumber" required> <u-form-item :label="`${form1.type=='DEVICE'?'设备' : '模具'}`" prop="deviceNumber" >
<view class="select" @click="openSingleColumn('deviceNumber',form1.deviceNumber,deviceList)"> <view class="select" @click="openSingleColumn('deviceNumber',form1.deviceNumber,deviceList)">
<view class="input" v-if='form1.deviceNumber'> <view class="input" v-if='form1.deviceNumber'>
{{selectFormat(form1.deviceNumber,deviceList)}} {{selectFormat(form1.deviceNumber,deviceList)}}
@ -149,9 +149,9 @@
subList:[] subList:[]
}, },
form1: { form1: {
itemNumber: "", itemNumber: undefined,
type:'', type:'',
deviceNumber: '', deviceNumber: undefined,
isRadeIn: '', isRadeIn: '',
currentQty: '', currentQty: '',
qty: '' qty: ''
@ -225,7 +225,7 @@
}) })
}) })
this.selecUserList = res.data this.selecUserList = res.data
}) }).catch(()=>{})
}, },
selectFormat(val, array) { selectFormat(val, array) {
let str = array.filter(item => item.value == val)[0].label let str = array.filter(item => item.value == val)[0].label
@ -266,11 +266,10 @@
item.label = item.name item.label = item.name
}) })
this.sparePartsList = res.data this.sparePartsList = res.data
}) }).catch(()=>{})
}, },
// //
async getApplyDeviceList() { async getApplyDeviceList() {
console.log(this.form1.type)
if (this.form1.type == 'DEVICE') { if (this.form1.type == 'DEVICE') {
await deviceApi.getApplyDeviceList().then(res => { await deviceApi.getApplyDeviceList().then(res => {
res.data.map(item => { res.data.map(item => {
@ -278,7 +277,7 @@
item.label = item.name item.label = item.name
}) })
this.deviceList = res.data this.deviceList = res.data
}) }).catch(()=>{})
} else if (this.form1.type == 'MOLD') { } else if (this.form1.type == 'MOLD') {
moldApi.getApplyMoldList().then((res) => { moldApi.getApplyMoldList().then((res) => {
res.data.map(item => { res.data.map(item => {
@ -286,15 +285,15 @@
item.label = item.name item.label = item.name
}) })
this.deviceList = res.data this.deviceList = res.data
}) }).catch(()=>{})
} }
}, },
// //
open() { open() {
this.form1 = { this.form1 = {
itemNumber: "", itemNumber:undefined,
type:'', type:'',
deviceNumber: '', deviceNumber: undefined,
isRadeIn: '', isRadeIn: '',
currentQty: "", currentQty: "",
qty: '', qty: '',
@ -307,10 +306,10 @@
this.$modal.showToast('请选择备件') this.$modal.showToast('请选择备件')
return; return;
} }
if (!this.form1.deviceNumber) { // if (!this.form1.deviceNumber) {
this.$modal.showToast('请选择设备') // this.$modal.showToast('')
return; // return;
} // }
if (!this.form1.qty || this.form1.qty==0) { if (!this.form1.qty || this.form1.qty==0) {
this.$modal.showToast('请输入数量') this.$modal.showToast('请输入数量')
return; return;
@ -319,8 +318,12 @@
this.$modal.showToast('数量不可以大于库存') this.$modal.showToast('数量不可以大于库存')
return; return;
} }
if(this.form1.itemNumber){
this.form1.name = this.selectFormat(this.form1.itemNumber, this.sparePartsList) this.form1.name = this.selectFormat(this.form1.itemNumber, this.sparePartsList)
this.form1.deviceName = this.selectFormat(this.form1.deviceNumber, this.deviceList) }
if(this.form1.deviceNumber){
this.form1.deviceName = this.selectFormat(this.form1.deviceNumber, this.deviceList)
}
if (this.form.subList && this.form.subList.length > 0) { if (this.form.subList && this.form.subList.length > 0) {
let arr = this.form.subList.filter(item => item.itemNumber == this.form1.itemNumber) let arr = this.form.subList.filter(item => item.itemNumber == this.form1.itemNumber)
if (arr && arr.length > 0) { if (arr && arr.length > 0) {
@ -348,7 +351,6 @@
this.$set(this.form, 'subList', this.form.subList) this.$set(this.form, 'subList', this.form.subList)
}; };
this.deviceMoldType = await dictApi.getDict('device_mold_type') this.deviceMoldType = await dictApi.getDict('device_mold_type')
console.log(this.deviceMoldType)
await this.getApplySparePartsList() await this.getApplySparePartsList()
} }
} }

6
src/pages/sparePartsApplication/detail.vue

@ -21,10 +21,10 @@
<view class="items-name"> <view class="items-name">
备件名称{{cur.itemName}} 备件名称{{cur.itemName}}
</view> </view>
<view class="items-dec"> <view class="items-dec" v-if="cur.type">
类型{{cur.type == 'type'?'设备' :'模具'}} 类型{{cur.type == 'type'?'设备' :'模具'}}
</view> </view>
<view class="items-dec"> <view class="items-dec" v-if="cur.name">
{{cur.type == 'type'?'设备' :'模具'}}名称{{cur.name}} {{cur.type == 'type'?'设备' :'模具'}}名称{{cur.name}}
</view> </view>
<view class="items-dec"> <view class="items-dec">
@ -63,7 +63,7 @@
getSparePartsApplicationDetail(){ getSparePartsApplicationDetail(){
sparePartsApplicationApi.sparePartsApplicationDetail(this.number).then((res)=>{ sparePartsApplicationApi.sparePartsApplicationDetail(this.number).then((res)=>{
this.data = res.data this.data = res.data
}) }).catch(()=>{})
}, },
// //
agree() { agree() {

4
src/pages/sparePartsApplication/index.vue

@ -90,7 +90,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
// //
cancle(item) { cancle(item) {
@ -103,7 +103,7 @@
this.status = 'loadmore' this.status = 'loadmore'
await this.getList() await this.getList()
this.$modal.showToast('撤回成功') this.$modal.showToast('撤回成功')
}) }).catch(()=>{})
}) })

2
src/pages/sparePartsApplication/mySparePartsApplication.vue

@ -90,7 +90,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
}, },
onLoad(option) { onLoad(option) {

6
src/pages/sparePartsApplicationApprove/index.vue

@ -89,7 +89,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
// //
agree(item) { agree(item) {
@ -104,7 +104,7 @@
this.$modal.showToast('审核成功') this.$modal.showToast('审核成功')
}) })
}) }).catch(()=>{})
}, },
// //
reject(item) { reject(item) {
@ -117,7 +117,7 @@
this.status = 'loadmore' this.status = 'loadmore'
await this.getList() await this.getList()
this.$modal.showToast('已驳回') this.$modal.showToast('已驳回')
}) }).catch(()=>{})
}) })
}, },

2
src/pages/sparePartsApplicationApprove/mySparePartsApplicationApprove.vue

@ -90,7 +90,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
}, },
onLoad(option) { onLoad(option) {

6
src/pages/sparePartsServiceWorkOrderList/addForm.vue

@ -196,7 +196,6 @@
this.form1[this.field] = e[0].value this.form1[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)
console.log( this.choosesingleColumnItem[0])
this.form1.locationNumber = this.choosesingleColumnItem[0].locationNumber this.form1.locationNumber = this.choosesingleColumnItem[0].locationNumber
this.form1.areaNumber = this.choosesingleColumnItem[0].areaNumber this.form1.areaNumber = this.choosesingleColumnItem[0].areaNumber
if(!this.choosesingleColumnItem[0].locationNumber){ if(!this.choosesingleColumnItem[0].locationNumber){
@ -217,7 +216,7 @@
item.label = item.name item.label = item.name
}) })
this.sparePartsList = res.data this.sparePartsList = res.data
}) }).catch(()=>{})
}, },
// //
chickRightButton(field) { chickRightButton(field) {
@ -237,7 +236,7 @@
this.form1.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
}) }).catch(()=>{})
}, },
blur() { blur() {
if (this.form1.locationNumber) { if (this.form1.locationNumber) {
@ -263,7 +262,6 @@
this.$modal.showToast('请选择备件') this.$modal.showToast('请选择备件')
return; return;
} }
console.log(this.form1)
if (!this.form1.locationNumber) { if (!this.form1.locationNumber) {
this.$modal.showToast('请扫描库位') this.$modal.showToast('请扫描库位')
return; return;

2
src/pages/sparePartsServiceWorkOrderList/mySparePartsService.vue

@ -86,7 +86,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
}, },
onLoad(option) { onLoad(option) {

2
src/pages/spotCheckOrder/addForm.vue

@ -188,7 +188,6 @@
}, },
// //
reset() { reset() {
console.log('表单数据信息1:', this.data);
this.form = {} this.form = {}
}, },
selectFormat(val, array) { selectFormat(val, array) {
@ -208,7 +207,6 @@
}, },
// //
chooseSingleColumn(e) { chooseSingleColumn(e) {
console.log(e[0])
this.form[this.field] = e[0].value this.form[this.field] = e[0].value
this.singleColumnShow = false this.singleColumnShow = false
this.$emit('singleColumn', this.field, this.form[this.field]) this.$emit('singleColumn', this.field, this.form[this.field])

3
src/pages/spotCheckOrder/myOrder.vue

@ -75,13 +75,12 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
}, },
onShow() { onShow() {
uni.$on('screen',(data)=>{ uni.$on('screen',(data)=>{
console.log(data)
this.params = {...this.params,...data} this.params = {...this.params,...data}
}) })
this.params.pageNo = 1 this.params.pageNo = 1

11
src/pages/upkeepOrder/addServiceRecord.vue

@ -8,10 +8,10 @@
<!-- <u-form-item label="保养部位" prop="equipmentParts" required> <!-- <u-form-item label="保养部位" prop="equipmentParts" required>
<u-input v-model="form.equipmentParts" placeholder="请输入保养部位" maxlength="50" disabled/> <u-input v-model="form.equipmentParts" placeholder="请输入保养部位" maxlength="50" disabled/>
</u-form-item> --> </u-form-item> -->
<u-form-item label="预估人数" prop="peoples" required class="disabled"> <u-form-item label="预估人数" prop="peoples" class="disabled">
<u-input v-model="form.peoples" type="number" placeholder="请输入预估人数" maxlength="50"/> <u-input v-model="form.peoples" type="number" placeholder="请输入预估人数" maxlength="50"/>
</u-form-item> </u-form-item>
<u-form-item label="预估分钟" prop="estimatedMinutes" required class="disabled"> <u-form-item label="预估分钟" prop="estimatedMinutes" class="disabled">
<u-input v-model="form.estimatedMinutes" type="number" placeholder="请输入预估分钟" maxlength="50"/> <u-input v-model="form.estimatedMinutes" type="number" placeholder="请输入预估分钟" maxlength="50"/>
</u-form-item> </u-form-item>
<u-form-item label="实际分钟" prop="actualMinutes" required> <u-form-item label="实际分钟" prop="actualMinutes" required>
@ -111,7 +111,7 @@
</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> </u-form>
</view> </view>
@ -327,7 +327,7 @@
}) })
}) })
this.selecUserList = res.data this.selecUserList = res.data
}) }).catch(()=>{})
}, },
// //
openSelecUser() { openSelecUser() {
@ -379,7 +379,7 @@
item.label = item.name item.label = item.name
}) })
this.sparePartsList = res.data this.sparePartsList = res.data
}) }).catch(()=>{})
}, },
// //
open() { open() {
@ -463,7 +463,6 @@
this.$set(this.form,'itemNumbers',this.form.items) this.$set(this.form,'itemNumbers',this.form.items)
this.formatDate =this.form.completionTime ? this.$time.formatDate(this.form.completionTime*1000):'' this.formatDate =this.form.completionTime ? this.$time.formatDate(this.form.completionTime*1000):''
}; };
console.log(this.form)
this.jxDetailsStatus = await dictApi.getDict('jx_details_status') this.jxDetailsStatus = await dictApi.getDict('jx_details_status')
await this.getSelecUser() await this.getSelecUser()

4
src/pages/upkeepOrder/detail.vue

@ -258,7 +258,7 @@
if (res.data) { if (res.data) {
this.serviceList = res.data this.serviceList = res.data
} }
}) }).catch(()=>{})
}, },
// //
delService(item) { delService(item) {
@ -267,7 +267,7 @@
upkeepOrderApi.upkeepOrderDetailDelete(item.id).then((res) => { upkeepOrderApi.upkeepOrderDetailDelete(item.id).then((res) => {
this.$modal.closeLoading() this.$modal.closeLoading()
this.getUpkeepOrderDetailList() this.getUpkeepOrderDetailList()
}) }).catch(()=>{})
}) })
}, },

3
src/pages/upkeepOrder/index.vue

@ -91,7 +91,7 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
}, },
onLoad(option) { onLoad(option) {
@ -100,7 +100,6 @@
onShow() { onShow() {
uni.$on('screen',(data)=>{ uni.$on('screen',(data)=>{
console.log(data)
this.params = {...this.params,...data} this.params = {...this.params,...data}
}) })
this.params.pageNo = 1 this.params.pageNo = 1

3
src/pages/upkeepOrder/myOrder.vue

@ -84,13 +84,12 @@
} else { } else {
this.status = 'nomore' this.status = 'nomore'
} }
}) }).catch(()=>{})
}, },
}, },
onShow() { onShow() {
uni.$on('screen',(data)=>{ uni.$on('screen',(data)=>{
console.log(data)
this.params = {...this.params,...data} this.params = {...this.params,...data}
}) })
this.params.pageNo = 1 this.params.pageNo = 1

1
src/utils/upload.js

@ -8,7 +8,6 @@ const baseUrl = config.baseUrl
const baseApi = config.baseApi const baseApi = config.baseApi
const upload = config => { const upload = config => {
console.log(config)
// 是否需要设置 token // 是否需要设置 token
const isToken = (config.headers || {}).isToken === false const isToken = (config.headers || {}).isToken === false
config.header = config.header || {} config.header = config.header || {}

Loading…
Cancel
Save