bonus
/
SmartStorage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

6.14重庆仓储bug修改

This commit is contained in:
FrancisHu 2024-06-14 10:22:42 +08:00
parent ffbbf4b5ed
commit c9ccc41247
14 changed files with 328 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apis/apis.js
View File

@ -602,6 +602,14 @@ const backMaterialReceive = {
) )
}, },
// fetchMaterialOutStore // fetchMaterialOutStore
async searchByCode (data = {}, header = {}){
return await Http.get(
HttpConfig.basePath,
HttpConfig.serviceUrl.backMaterialReceive.searchByCode,
data,
header
)
},
} }
const crashExam = { const crashExam = {

14
apis/http.js
View File

@ -5,23 +5,24 @@ class HttpConfig {
// #ifdef APP-PLUS // #ifdef APP-PLUS
// baseUrl = "http://112.29.103.165:21624" // baseUrl = "http://112.29.103.165:21624"
// baseUrl = "http://192.168.0.14:21624" // baseUrl = "http://192.168.0.14:21624"
baseUrl = "http://192.168.0.14:18866" // baseUrl = "http://192.168.0.14:18866"
// baseUrl = "http://112.29.103.165:21626" // baseUrl = "http://112.29.103.165:21626"
// baseUrl = "http://172.20.10.3:8080" // baseUrl = "http://172.20.10.3:8080"
// baseUrl = "http://10.40.92.9:8080" // baseUrl = "http://10.40.92.9:8080"
// baseUrl = "http://10.40.92.52:28080" // baseUrl = "http://10.40.92.52:28080"
// baseUrl = "http://10.40.92.78:28080" baseUrl = "http://10.40.92.138:28080"
// baseUrl = "http://10.40.92.52:28080"
// baseUrl = "https://z.csgmall.com.cn/gl" // baseUrl = "https://z.csgmall.com.cn/gl"
// #endif // #endif
// 基地址 // 基地址
authPath = `${this.baseUrl}/dev-api/auth` /* authPath = `${this.baseUrl}/dev-api/auth`
systemPath = `${this.baseUrl}/dev-api/system` systemPath = `${this.baseUrl}/dev-api/system`
basePath = `${this.baseUrl}/dev-api/base` basePath = `${this.baseUrl}/dev-api/base`
materialPath = `${this.baseUrl}/dev-api/material` materialPath = `${this.baseUrl}/dev-api/material` */
/* authPath = `${this.baseUrl}/auth` authPath = `${this.baseUrl}/auth`
systemPath = `${this.baseUrl}/system` systemPath = `${this.baseUrl}/system`
basePath = `${this.baseUrl}/base` basePath = `${this.baseUrl}/base`
materialPath = `${this.baseUrl}/material` */ materialPath = `${this.baseUrl}/material`
// 短链 // 短链
serviceUrl = { serviceUrl = {
login: { login: {
@ -118,6 +119,7 @@ class HttpConfig {
seeBackMaterialDetail: '/backReceive/backReceiveRecord', // 查看退料明细 seeBackMaterialDetail: '/backReceive/backReceiveRecord', // 查看退料明细
searchRfid: '/backReceive/rfidCodeQuery', // 查询rfid searchRfid: '/backReceive/rfidCodeQuery', // 查询rfid
subRfid: '/backReceive/setRfidCodeBack', // rfid接收 subRfid: '/backReceive/setRfidCodeBack', // rfid接收
searchByCode: '/backReceive/getBackMachineApp', // 根据编码查询该工程下的设备
}, },
// 报废审核接口 // 报废审核接口
crashExam: { crashExam: {

6
pages.json
View File

@ -246,7 +246,7 @@
{ {
"path": "pages/testExam/testExam", "path": "pages/testExam/testExam",
"style": { "style": {
"navigationBarTitleText": "试验检验审核" "navigationBarTitleText": "维修审核"
} }
}, },
@ -254,14 +254,14 @@
"path" : "pages/testExam/testExamDetails", "path" : "pages/testExam/testExamDetails",
"style" : "style" :
{ {
"navigationBarTitleText": "试验检验审核明细" "navigationBarTitleText": "维修审核明细"
} }
},{ },{
"path" : "pages/testExam/testExamList", "path" : "pages/testExam/testExamList",
"style" : "style" :
{ {
"navigationBarTitleText": "试验检验审核详情" "navigationBarTitleText": "维修审核详情"
} }
}, },

6
pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
View File

@ -308,7 +308,8 @@ export default {
manageType, manageType,
typeName, typeName,
typeCode, typeCode,
num num,
agreementId
} = this.infoList } = this.infoList
const params = { const params = {
taskId, taskId,
@ -319,7 +320,8 @@ export default {
userId, userId,
typeName, typeName,
typeCode, typeCode,
num num,
agreementId
} }
const urlStr = QS.stringify(params) const urlStr = QS.stringify(params)
console.log("urlSTR", urlStr) console.log("urlSTR", urlStr)

15
pages/codeReceive/codeReceive.vue
View File

@ -18,7 +18,7 @@
</view> </view>
<view> <view>
<h4>规格型号</h4> <h4>规格型号</h4>
<span>{{ item.typeCode }}</span> <span>{{ item.typeModelName }}</span>
</view> </view>
<view> <view>
<h4>设备编码</h4> <h4>设备编码</h4>
@ -26,7 +26,7 @@
</view> </view>
<view> <view>
<h4>设备状态</h4> <h4>设备状态</h4>
<span>{{ item.sdStatus }}</span> <span>{{ item.maStatus }}</span>
</view> </view>
<!-- <uni-data-checkbox v-model="item.selectStatus" :localdata="fixRange"></uni-data-checkbox> --> <!-- <uni-data-checkbox v-model="item.selectStatus" :localdata="fixRange"></uni-data-checkbox> -->
<!-- <view> <!-- <view>
@ -85,7 +85,9 @@
manageType:'', manageType:'',
createBy:'', createBy:'',
updatedSubList: '', updatedSubList: '',
transCode: '' transCode: '',
taskId: '',
agreementId: ''
} }
}, },
methods: { methods: {
@ -94,8 +96,10 @@
that.infoList = [] that.infoList = []
console.log(that.transCode); console.log(that.transCode);
// 根据maId获取设备详情 // 根据maId获取设备详情
that.$api.backMaterialReceive.backReceiveCodeQuery({ that.$api.backMaterialReceive.searchByCode({
maCode: that.transCode maCode: that.transCode,
typeId: this.typeId,
agreementId: this.agreementId
}).then(res => { }).then(res => {
console.log(res); console.log(res);
if (res.data.data.length == 0) { if (res.data.data.length == 0) {
@ -232,6 +236,7 @@
this.manageType = params.manageType this.manageType = params.manageType
this.createBy=params.userId this.createBy=params.userId
this.taskId = params.taskId this.taskId = params.taskId
this.agreementId = params.agreementId
} }
} }
</script> </script>

19
pages/exitExam/exitExam.vue
View File

@ -56,14 +56,14 @@
<uni-icons style="color: #fff;" type="auth"></uni-icons> <uni-icons style="color: #fff;" type="auth"></uni-icons>
机具审核 机具审核
</view> </view>
<view <!-- <view
style="background-color: #FCA30D;" style="background-color: #FCA30D;"
v-show="fetch.taskStatus == 37 && roles.includes('tsfgs') && fetch.status == 0" v-show="fetch.taskStatus == 37 && roles.includes('tsfgs') && fetch.status == 0"
@click="toggleOpenModal(fetch)" @click="toggleOpenModal(fetch)"
> >
<uni-icons style="color: #fff;" type="auth"></uni-icons> <uni-icons style="color: #fff;" type="auth"></uni-icons>
调试审核 调试审核
</view> </view> -->
</view> </view>
<view class="sticky-area"> <view class="sticky-area">
<!-- <image src="/static/passed.png" v-show="Number(fetch.taskStatus) >= '38'" mode=""></image> <!-- <image src="/static/passed.png" v-show="Number(fetch.taskStatus) >= '38'" mode=""></image>
@ -242,7 +242,8 @@ import { basePath } from '../../public'
modalReject () { modalReject () {
let that = this let that = this
console.log(that.modalList); console.log(that.modalList);
that.$refs.popup1.open() that.rejectExam(that.modalList.id)
// that.$refs.popup1.open()
}, },
confirmReject () { confirmReject () {
let that = this let that = this
@ -263,12 +264,12 @@ import { basePath } from '../../public'
closePopup1 () { closePopup1 () {
this.$refs.popup1.close() this.$refs.popup1.close()
}, },
seeExam (id, directAuditRemark) { seeExam (id) {
let that = this let that = this
// 提交单个审核 // 提交单个审核
that.$api.exitExam.subExitExam({ that.$api.exitExam.subExitExam({
id, id
directAuditRemark // directAuditRemark
}).then(res => { }).then(res => {
console.log(res); console.log(res);
if (res.data.code == 200) { if (res.data.code == 200) {
@ -295,12 +296,12 @@ import { basePath } from '../../public'
console.log(err); console.log(err);
}) })
}, },
rejectExam (id, directAuditRemark) { rejectExam (id) {
let that = this let that = this
// 拒绝单个审核 // 拒绝单个审核
that.$api.exitExam.rejectExitExam({ that.$api.exitExam.rejectExitExam({
id, id
directAuditRemark // directAuditRemark
}).then(res => { }).then(res => {
console.log(res); console.log(res);
if (res.data.code == 200) { if (res.data.code == 200) {

87
pages/exitMaterial/exitMaterial.vue
View File

@ -220,7 +220,8 @@ import { basePath } from '../../public'
backPerson: '', backPerson: '',
remark: '' remark: ''
}, },
fetchedList: [] fetchedList: [],
phoneReg: /^(?:(?:\+|00)86)?1[3-9]\d{9}$/
} }
}, },
methods: { methods: {
@ -248,50 +249,58 @@ import { basePath } from '../../public'
}) })
} }
}).catch(err => { }).catch(err => {
console.log(err);
}) })
}, },
formSubmit () { formSubmit () {
let that = this let that = this
that.$refs.exitForm.validate().then(formData => { that.$refs.exitForm.validate().then(formData => {
that.$refs.popup.close() console.log(formData);
// 判断单位id和工程id是否匹配 if (!that.phoneReg.test(formData.phone)) {
that.$api.exitMaterial.ifAgreement({ uni.showToast({
unitId: formData.unitId, icon: 'none',
projectId: formData.lotId title: '请输入正确格式的手机号！'
}).then(res => { })
console.log(res); } else {
if (res.data.code == 200) { that.$refs.popup.close()
if (res.data.data.agreementId != null) { // 判断单位id和工程id是否匹配
that.newAdd.agreementId = res.data.data.agreementId that.$api.exitMaterial.ifAgreement({
that.newAdd.backPerson = formData.backPerson unitId: formData.unitId,
that.newAdd.phone = formData.phone projectId: formData.lotId
that.newAdd.unitId = formData.unitId }).then(res => {
that.newAdd.lotId = formData.lotId console.log(res);
that.newAdd.backTime = formData.exitTime if (res.data.code == 200) {
that.newAdd.remark = formData.remark if (res.data.data.agreementId != null) {
console.log(that.newAdd); that.newAdd.agreementId = res.data.data.agreementId
that.$api.exitMaterial.newExitList(that.newAdd).then(res => { that.newAdd.backPerson = formData.backPerson
console.log(res); that.newAdd.phone = formData.phone
if (res.data.code == 200) { that.newAdd.unitId = formData.unitId
uni.showToast({ that.newAdd.lotId = formData.lotId
icon: 'none', that.newAdd.backTime = formData.exitTime
title: '新增申请成功！', that.newAdd.remark = formData.remark
success: () => { console.log(that.newAdd);
uni.redirectTo({ that.$api.exitMaterial.newExitList(that.newAdd).then(res => {
url: '/pages/exitMaterial/exitMaterial' console.log(res);
}) if (res.data.code == 200) {
} uni.showToast({
}) icon: 'none',
} title: '新增申请成功！',
}).catch(err => { success: () => {
console.log(err); uni.redirectTo({
}) url: '/pages/exitMaterial/exitMaterial'
})
}
})
}
}).catch(err => {
console.log(err);
})
}
} }
} }).catch(err => {
}).catch(err => { console.log(err);
})
}) }
}) })
}, },
seeDetail (id, typeId) { seeDetail (id, typeId) {

6
pages/fixDetail/fixDetail.vue
View File

@ -164,10 +164,10 @@ import { basePath } from '../../public';
console.log(err); console.log(err);
}) })
}, },
initFixList (taskId) { initFixList () {
let that = this let that = this
that.$api.fix.fixDetail({ that.$api.fix.fixDetail({
taskId taskId: this.initTaskId
}).then(res => { }).then(res => {
console.log(res); console.log(res);
if (res.data.code == 200) { if (res.data.code == 200) {
@ -202,7 +202,7 @@ import { basePath } from '../../public';
// 获取维修任务机具列表 // 获取维修任务机具列表
}, },
onShow() { onShow() {
this.initFixList(this.initTaskId) this.initFixList()
} }
} }
</script> </script>

19
pages/innerFix/innerFix.vue
View File

@ -131,6 +131,7 @@ import form from '../../uni_modules/uview-ui/libs/config/props/form';
subForm () { subForm () {
let that = this let that = this
this.submitForm = this.allForm this.submitForm = this.allForm
console.log(this.submitForm);
for (let i = 0; i < this.submitForm.length; i++) { for (let i = 0; i < this.submitForm.length; i++) {
this.submitForm[i].partId = this.submitForm[i].partId[0] this.submitForm[i].partId = this.submitForm[i].partId[0]
} }
@ -153,16 +154,26 @@ import form from '../../uni_modules/uview-ui/libs/config/props/form';
title: res.data.msg, title: res.data.msg,
success: () => { success: () => {
that.showLoading = false that.showLoading = false
uni.navigateBack({ uni.navigateBack()
delta: 2
})
} }
}) })
} else { } else {
that.showLoading = false that.showLoading = false
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: res.data.msg title: res.data.msg,
success: () => {
that.allForm = [
{
repairNum: 1,
partType: 0,
partId: [],
partNum: '',
repairer: '',
repairContent: ''
}
]
}
}) })
} }
}).catch(err => { }).catch(err => {

11
pages/qrcodeBindPage/qrcodeBindPage.vue
View File

@ -22,7 +22,11 @@
<span >{{ qrcode }}</span> <span >{{ qrcode }}</span>
</view> </view>
<uni-forms-item name="deviceCode" required label="设备编号"> <uni-forms-item name="deviceCode" required label="设备编号">
<uni-easyinput v-model="qrFormData.deviceCode"></uni-easyinput> <uni-easyinput
v-model="qrFormData.deviceCode"
maxlength="20"
>
</uni-easyinput>
</uni-forms-item> </uni-forms-item>
<view class="bind" @click="toggleBind">绑定</view> <view class="bind" @click="toggleBind">绑定</view>
</uni-forms> </uni-forms>
@ -108,11 +112,12 @@
}, },
toggleBind () { toggleBind () {
let that = this let that = this
console.log(that.qrcode); console.log(that.qrcode, uni.getStorageSync('userInfo').sysUser.userId);
that.$refs.qrForm.validate().then(formData => { that.$refs.qrForm.validate().then(formData => {
that.showLoading = true that.showLoading = true
console.log(formData); console.log(formData, that.qrcode);
that.$api.qrcodeBinding.bindQrcode({ that.$api.qrcodeBinding.bindQrcode({
binder: uni.getStorageSync('userInfo').sysUser.userId,
typeId: formData.specVal, typeId: formData.specVal,
maCode: formData.deviceCode, maCode: formData.deviceCode,
qrCode: that.qrcode, qrCode: that.qrcode,

2
pages/workSpace/workSpace.vue
View File

@ -108,7 +108,7 @@
url: 'crashExam' url: 'crashExam'
}, },
{ {
name: '试验检验审核', name: '维修审核',
pic: '/static/testExam.png', pic: '/static/testExam.png',
url: 'testExam' url: 'testExam'
} }

2
unpackage/dist/dev/app-plus/app-config-service.js vendored
View File

File diff suppressed because one or more lines are too long

357
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

144
unpackage/dist/dev/app-plus/app-view.js vendored
View File

@ -11487,44 +11487,46 @@ var render = function () {
], ],
1 1
), ),
_c(
"uni-view",
{
directives: [
{
name: "show",
rawName: "v-show",
value: _vm._$g("31-" + $30, "v-show"),
expression: "_$g((\"31-\"+$30),'v-show')",
},
],
staticStyle: { "background-color": "#FCA30D" },
attrs: { _i: "31-" + $30 },
on: {
click: function ($event) {
return _vm.$handleViewEvent($event)
},
},
},
[
_c("uni-icons", {
staticStyle: { color: "#fff" },
attrs: { _i: "32-" + $30 },
}),
_vm._v("调试审核"),
],
1
),
], ],
1 1
), ),
_c( _c(
"uni-view", "uni-view",
{ {
staticClass: _vm._$g("33-" + $30, "sc"), staticClass: _vm._$g("31-" + $30, "sc"),
attrs: { _i: "33-" + $30 }, attrs: { _i: "31-" + $30 },
}, },
[ [
_c(
"h4",
{
directives: [
{
name: "show",
rawName: "v-show",
value: _vm._$g("32-" + $30, "v-show"),
expression: "_$g((\"32-\"+$30),'v-show')",
},
],
attrs: { _i: "32-" + $30 },
},
[_vm._v("退料待审核")]
),
_c(
"h4",
{
directives: [
{
name: "show",
rawName: "v-show",
value: _vm._$g("33-" + $30, "v-show"),
expression: "_$g((\"33-\"+$30),'v-show')",
},
],
attrs: { _i: "33-" + $30 },
},
[_vm._v("退料已审核")]
),
_c( _c(
"h4", "h4",
{ {
@ -11538,7 +11540,7 @@ var render = function () {
], ],
attrs: { _i: "34-" + $30 }, attrs: { _i: "34-" + $30 },
}, },
[_vm._v("退料待审核")] [_vm._v("退料核查中")]
), ),
_c( _c(
"h4", "h4",
@ -11551,9 +11553,13 @@ var render = function () {
expression: "_$g((\"35-\"+$30),'v-show')", expression: "_$g((\"35-\"+$30),'v-show')",
}, },
], ],
staticStyle: {
border: "1px solid #EE603D",
color: "#EE603D",
},
attrs: { _i: "35-" + $30 }, attrs: { _i: "35-" + $30 },
}, },
[_vm._v("退料已审核")] [_vm._v("退料审核驳回")]
), ),
_c( _c(
"h4", "h4",
@ -11566,45 +11572,11 @@ var render = function () {
expression: "_$g((\"36-\"+$30),'v-show')", expression: "_$g((\"36-\"+$30),'v-show')",
}, },
], ],
attrs: { _i: "36-" + $30 },
},
[_vm._v("退料核查中")]
),
_c(
"h4",
{
directives: [
{
name: "show",
rawName: "v-show",
value: _vm._$g("37-" + $30, "v-show"),
expression: "_$g((\"37-\"+$30),'v-show')",
},
],
staticStyle: {
border: "1px solid #EE603D",
color: "#EE603D",
},
attrs: { _i: "37-" + $30 },
},
[_vm._v("退料审核驳回")]
),
_c(
"h4",
{
directives: [
{
name: "show",
rawName: "v-show",
value: _vm._$g("38-" + $30, "v-show"),
expression: "_$g((\"38-\"+$30),'v-show')",
},
],
staticStyle: { staticStyle: {
border: "1px solid #27D870", border: "1px solid #27D870",
color: "#27D870", color: "#27D870",
}, },
attrs: { _i: "38-" + $30 }, attrs: { _i: "36-" + $30 },
}, },
[_vm._v("退料完成")] [_vm._v("退料完成")]
), ),
@ -11617,20 +11589,20 @@ var render = function () {
}), }),
_c( _c(
"uni-popup", "uni-popup",
{ ref: "popup", attrs: { _i: 39 } }, { ref: "popup", attrs: { _i: 37 } },
[ [
_c( _c(
"uni-view", "uni-view",
{ staticClass: _vm._$g(40, "sc"), attrs: { _i: 40 } }, { staticClass: _vm._$g(38, "sc"), attrs: { _i: 38 } },
[ [
_c( _c(
"uni-view", "uni-view",
{ staticClass: _vm._$g(41, "sc"), attrs: { _i: 41 } }, { staticClass: _vm._$g(39, "sc"), attrs: { _i: 39 } },
[ [
_c("h4", { attrs: { _i: 42 } }, [_vm._v("审批")]), _c("h4", { attrs: { _i: 40 } }, [_vm._v("审批")]),
_c("uni-icons", { _c("uni-icons", {
staticStyle: { color: "#AAAAAA", "font-weight": "bold" }, staticStyle: { color: "#AAAAAA", "font-weight": "bold" },
attrs: { _i: 43 }, attrs: { _i: 41 },
on: { on: {
click: function ($event) { click: function ($event) {
return _vm.$handleViewEvent($event) return _vm.$handleViewEvent($event)
@ -11649,18 +11621,18 @@ var render = function () {
"font-weight": "normal", "font-weight": "normal",
"text-align": "center", "text-align": "center",
}, },
attrs: { _i: 44 }, attrs: { _i: 42 },
}, },
[_vm._v("是否通过审批？")] [_vm._v("是否通过审批？")]
), ),
_c( _c(
"uni-view", "uni-view",
{ staticClass: _vm._$g(45, "sc"), attrs: { _i: 45 } }, { staticClass: _vm._$g(43, "sc"), attrs: { _i: 43 } },
[ [
_c( _c(
"uni-view", "uni-view",
{ {
attrs: { _i: 46 }, attrs: { _i: 44 },
on: { on: {
click: function ($event) { click: function ($event) {
return _vm.$handleViewEvent($event) return _vm.$handleViewEvent($event)
@ -11672,7 +11644,7 @@ var render = function () {
_c( _c(
"uni-view", "uni-view",
{ {
attrs: { _i: 47 }, attrs: { _i: 45 },
on: { on: {
click: function ($event) { click: function ($event) {
return _vm.$handleViewEvent($event) return _vm.$handleViewEvent($event)
@ -11692,20 +11664,20 @@ var render = function () {
), ),
_c( _c(
"uni-popup", "uni-popup",
{ ref: "popup1", attrs: { _i: 48 } }, { ref: "popup1", attrs: { _i: 46 } },
[ [
_c( _c(
"uni-view", "uni-view",
{ staticClass: _vm._$g(49, "sc"), attrs: { _i: 49 } }, { staticClass: _vm._$g(47, "sc"), attrs: { _i: 47 } },
[ [
_c( _c(
"uni-view", "uni-view",
{ staticClass: _vm._$g(50, "sc"), attrs: { _i: 50 } }, { staticClass: _vm._$g(48, "sc"), attrs: { _i: 48 } },
[ [
_c("h4", { attrs: { _i: 51 } }, [_vm._v("驳回原因")]), _c("h4", { attrs: { _i: 49 } }, [_vm._v("驳回原因")]),
_c("uni-icons", { _c("uni-icons", {
staticStyle: { color: "#AAAAAA", "font-weight": "bold" }, staticStyle: { color: "#AAAAAA", "font-weight": "bold" },
attrs: { _i: 52 }, attrs: { _i: 50 },
on: { on: {
click: function ($event) { click: function ($event) {
return _vm.$handleViewEvent($event) return _vm.$handleViewEvent($event)
@ -11717,12 +11689,12 @@ var render = function () {
), ),
_c( _c(
"uni-view", "uni-view",
{ staticClass: _vm._$g(53, "sc"), attrs: { _i: 53 } }, { staticClass: _vm._$g(51, "sc"), attrs: { _i: 51 } },
[ [
_c("uni-easyinput", { _c("uni-easyinput", {
attrs: { _i: 54 }, attrs: { _i: 52 },
model: { model: {
value: _vm._$g(54, "v-model"), value: _vm._$g(52, "v-model"),
callback: function () {}, callback: function () {},
expression: "rejectReason", expression: "rejectReason",
}, },
@ -11730,8 +11702,8 @@ var render = function () {
_c( _c(
"uni-view", "uni-view",
{ {
staticClass: _vm._$g(55, "sc"), staticClass: _vm._$g(53, "sc"),
attrs: { _i: 55 }, attrs: { _i: 53 },
on: { on: {
click: function ($event) { click: function ($event) {
return _vm.$handleViewEvent($event) return _vm.$handleViewEvent($event)