Browse Source

fix: bug

master
zhang_li 6 months ago
parent
commit
3c530e0b46
  1. 11
      src/pages/deviceReport/addForm.vue
  2. 1
      src/pages/deviceReport/index.vue
  3. 1
      src/pages/deviceReport/myDeviceReport.vue
  4. 1
      src/pages/mold/index.vue
  5. 1
      src/pages/overhaulOrder/index.vue
  6. 1
      src/pages/overhaulOrder/reqairOrderList.vue
  7. 1
      src/pages/repairOrder/index.vue
  8. 1
      src/pages/repairOrder/myOrder.vue
  9. 27
      src/pages/repairOrder/transfer.vue
  10. 1
      src/pages/spareParts/index.vue
  11. 1
      src/pages/sparePartsApplication/index.vue
  12. 1
      src/pages/sparePartsApplication/mySparePartsApplication.vue
  13. 1
      src/pages/sparePartsApplicationApprove/index.vue
  14. 1
      src/pages/sparePartsApplicationApprove/mySparePartsApplicationApprove.vue
  15. 1
      src/pages/sparePartsServiceWorkOrderList/mySparePartsService.vue
  16. 1
      src/pages/spotCheckOrder/myOrder.vue
  17. 1
      src/pages/upkeepOrder/index.vue
  18. 1
      src/pages/upkeepOrder/myOrder.vue

11
src/pages/deviceReport/addForm.vue

@ -137,7 +137,7 @@
type: type.value, type: type.value,
flag:1 flag:1
}).then((res) => { }).then((res) => {
console.log(res) console.log(res)
if (!res.data) { if (!res.data) {
form.value.deviceName = '' form.value.deviceName = ''
form.value.factoryAreaName = '' form.value.factoryAreaName = ''
@ -241,6 +241,7 @@ console.log(res)
} }
// //
function chooseSingleColumn(e) { function chooseSingleColumn(e) {
if(form.value[field.value] == e[0].value)return;
form.value[field.value] = e[0].value form.value[field.value] = e[0].value
if (field.value == 'factoryAreaNumber') { if (field.value == 'factoryAreaNumber') {
form.value.deviceNumber = '' form.value.deviceNumber = ''
@ -250,7 +251,11 @@ console.log(res)
if (field.value == 'type') { if (field.value == 'type') {
type.value = form.value[field.value] type.value = form.value[field.value]
form.value.typeName = e[0].label form.value.typeName = e[0].label
getDetailsByNumber() form.value.deviceNumber = ''
form.value.deviceName = ''
form.value.factoryAreaName = ''
form.value.factoryAreaNumber = ''
// getDetailsByNumber()
} }
singleColumnShow.value = false singleColumnShow.value = false
} }
@ -293,7 +298,7 @@ console.log(res)
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: '模具报修' title: '模具报修'
}) })
appDeviceMoldTyp.value =appDeviceMoldType.value.filter((item => item.value == "MOLD")) appDeviceMoldType.value =appDeviceMoldType.value.filter((item => item.value == "MOLD"))
} }
form.value.type = appDeviceMoldType.value[0].value form.value.type = appDeviceMoldType.value[0].value
form.value.typeName = appDeviceMoldType.value[0].label form.value.typeName = appDeviceMoldType.value[0].label

1
src/pages/deviceReport/index.vue

@ -173,6 +173,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/deviceReport/myDeviceReport.vue

@ -129,6 +129,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/mold/index.vue

@ -129,6 +129,7 @@
.title { .title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
word-wrap: break-word;
} }
.dec1 { .dec1 {

1
src/pages/overhaulOrder/index.vue

@ -142,6 +142,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/overhaulOrder/reqairOrderList.vue

@ -132,6 +132,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/repairOrder/index.vue

@ -144,6 +144,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/repairOrder/myOrder.vue

@ -138,6 +138,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

27
src/pages/repairOrder/transfer.vue

@ -36,17 +36,17 @@
<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="`${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`" prop="deviceNumber" required <u-form-item :label="`${form.receiverType=='DEVICE'||form.receiverType == 'TECH'?'设备' : '模具'}编码`" prop="deviceNumber" required
v-if="form.status==0"> v-if="form.status==0">
<u-input v-model="form.deviceNumber" :placeholder="`请输入${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码`" <u-input v-model="form.deviceNumber" :placeholder="`请输入${form.receiverType=='DEVICE'||form.receiverType == 'TECH'?'设备' : '模具'}编码`"
@blur="blur()" /> @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="`${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}名称`" prop="deviceNumber" required <u-form-item :label="`${form.receiverType=='DEVICE'||form.receiverType == 'TECH'?'设备' : '模具'}名称`" prop="deviceNumber" required
class="disabled" v-if="form.status==0"> class="disabled" v-if="form.status==0">
<u-input v-model="form.deviceName" :placeholder="`根据${type=='DEVICE'||type == 'TECH'?'设备' : '模具'}编码获得`" <u-input v-model="form.deviceName" :placeholder="`根据${form.receiverType=='DEVICE'||form.receiverType == 'TECH'?'设备' : '模具'}编码获得`"
disabled /> disabled />
</u-form-item> </u-form-item>
<u-form-item label="维修人员" prop="describes" required> <u-form-item label="维修人员" prop="describes" required>
@ -150,7 +150,7 @@
} }
if (form.value.status == 0) { if (form.value.status == 0) {
if (!form.value.deviceNumber) { if (!form.value.deviceNumber) {
proxy.$modal.showToast(`请选择${type.value == 'DEVICE' || type.value == 'TECH' ? '设备' : '模具'}编码`) proxy.$modal.showToast(`请选择${form.value.receiverType == 'DEVICE' || form.value.receiverType == 'TECH' ? '设备' : '模具'}编码`)
return; return;
} }
} }
@ -258,16 +258,18 @@
form.value.factoryAreaName = '' form.value.factoryAreaName = ''
form.value.factoryAreaNumber = '' form.value.factoryAreaNumber = ''
selecUserList.value = [] selecUserList.value = []
form.value.receiverUserId = ''
}) })
} else if (form.value.receiverType == 'MOLD') { } else if (form.value.receiverType == 'MOLD') {
moldApi.getMoldDetailsByNumber({ moldApi.getMoldDetailsByNumber({
number: form.deviceNumber number: form.value.deviceNumber,
}).then(async (res) => { }).then(async (res) => {
if (!res.data) { if (!res.data) {
form.value.deviceName = '' form.value.deviceName = ''
form.value.factoryAreaName = '' form.value.factoryAreaName = ''
form.value.factoryAreaNumber = '' form.value.factoryAreaNumber = ''
selecUserList.value = [] selecUserList.value = []
form.value.receiverUserId = ''
return; return;
} }
form.value.deviceName = res.data.name form.value.deviceName = res.data.name
@ -279,6 +281,7 @@
form.value.factoryAreaName = '' form.value.factoryAreaName = ''
form.value.factoryAreaNumber = '' form.value.factoryAreaNumber = ''
selecUserList.value = [] selecUserList.value = []
form.value.receiverUserId = ''
}) })
} }
} }
@ -298,14 +301,16 @@
function chooseSingleColumn(e) { function chooseSingleColumn(e) {
form.value[field.value] = e[0].value form.value[field.value] = e[0].value
if (field.value == 'receiverType') { if (field.value == 'receiverType') {
type.value = form.value[field.value]
form.value.deviceName = '' form.value.deviceName = ''
form.value.deviceNumber = '' form.value.deviceNumber = ''
form.value.receiverUserId = undefined form.value.receiverUserId = undefined
form.value.receiverTypeTxt = e[0].label form.value.receiverTypeTxt = e[0].label
selecUserList.value = []
form.value.receiverUserId = ''
getDeviceList() getDeviceList()
} else if (field.value == 'factoryAreaNumber') { } else if (field.value == 'factoryAreaNumber') {
form.value.factoryAreaName = e[0].label form.value.factoryAreaName = e[0].label
form.value.receiverUserId = ''
getSelecUser() getSelecUser()
} else if (field.value == 'status') { } else if (field.value == 'status') {
@ -318,13 +323,15 @@
console.log(deviceMoldType.value) console.log(deviceMoldType.value)
form.value.receiverType = deviceMoldType.value[0].value form.value.receiverType = deviceMoldType.value[0].value
form.value.receiverTypeTxt = deviceMoldType.value[0].label form.value.receiverTypeTxt = deviceMoldType.value[0].label
selecUserList.value = []
form.value.receiverUserId = ''
} }
singleColumnShow.value = false singleColumnShow.value = false
} }
// / // /
async function getDeviceList() { async function getDeviceList() {
if (type.value == 'DEVICE' || type.value == 'TECH') { if (form.value.receiverType == 'DEVICE' || form.value.receiverType == '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
@ -332,7 +339,7 @@
}) })
deviceList.value = res.data deviceList.value = res.data
}) })
} else if (type.value == 'MOLD') { } else if (form.value.receiverType == 'MOLD') {
await moldApi.moldList().then(res => { await moldApi.moldList().then(res => {
res.data.map(item => { res.data.map(item => {
item.value = item.number item.value = item.number
@ -346,7 +353,7 @@
// //
async function getSelecUser() { async function getSelecUser() {
let data = { let data = {
classType: type.value, classType: form.value.receiverType,
factoryAreaNumber: form.value.factoryAreaNumber, factoryAreaNumber: form.value.factoryAreaNumber,
} }
let arr = [] let arr = []

1
src/pages/spareParts/index.vue

@ -191,6 +191,7 @@
.title { .title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
word-wrap: break-word;
} }
.dec1 { .dec1 {

1
src/pages/sparePartsApplication/index.vue

@ -148,6 +148,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/sparePartsApplication/mySparePartsApplication.vue

@ -135,6 +135,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/sparePartsApplicationApprove/index.vue

@ -164,6 +164,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/sparePartsApplicationApprove/mySparePartsApplicationApprove.vue

@ -135,6 +135,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/sparePartsServiceWorkOrderList/mySparePartsService.vue

@ -131,6 +131,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/spotCheckOrder/myOrder.vue

@ -125,6 +125,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/upkeepOrder/index.vue

@ -133,6 +133,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

1
src/pages/upkeepOrder/myOrder.vue

@ -137,6 +137,7 @@
font-size: 36rpx; font-size: 36rpx;
width: 0px; width: 0px;
flex: 1; flex: 1;
word-wrap: break-word;
} }
.time { .time {

Loading…
Cancel
Save