diff --git a/apis/apis.js b/apis/apis.js index f8b4779..62df767 100644 --- a/apis/apis.js +++ b/apis/apis.js @@ -328,7 +328,14 @@ const fetchMaterialOutStore = { HttpConfig.serviceUrl.fetchMaterialOutStore.searchRfid, data ) - } + }, + async directOutStore(data = {}){ + return await Http.post( + HttpConfig.basePath, + HttpConfig.serviceUrl.fetchMaterialOutStore.directOutStore, + data + ) + }, } const exitMaterial = { @@ -827,6 +834,14 @@ const preCrashList = { header ) }, + async fetchDeptTree(data = {}, header = {}) { + return await Http.get( + HttpConfig.systemPath, + HttpConfig.serviceUrl.preCrashList.fetchDeptTree, + data, + header + ) + }, } const url = HttpConfig.systemPath diff --git a/apis/http.js b/apis/http.js index 08a6f5a..4b242f5 100644 --- a/apis/http.js +++ b/apis/http.js @@ -10,7 +10,7 @@ class HttpConfig { // baseUrl = "http://10.40.92.8:8080" // baseUrl = "http://10.40.92.52:28080" // baseUrl = "http://10.40.92.78:28080" - baseUrl = "http://10.40.92.60:38080" + baseUrl = "http://10.40.92.48:38080" // baseUrl = "https://z.csgmall.com.cn/gl" // baseUrl = "http://10.40.92.141:28080" // #endif @@ -72,6 +72,7 @@ class HttpConfig { subOutStoreArr: '/leaseOutDetails/submitOutRfid', // 领料出库提交-数组 fetchSingleDetail: '/tm_task/getLeaseAuditListDetail', // 根据领料id查询领料申请详情 searchRfid: '/backReceive/rfidCodeQuery', // 查询rfid + directOutStore: '/tm_task/outboundCompleted', // 直接完成出库 }, exitMaterial: { exitDeptList: '/back_apply/getbackUnit', // 获取退料单位，工程列表 @@ -167,6 +168,7 @@ class HttpConfig { }, preCrashList: { fetchPreSubList: '/scrap/getScrapTaskListApp', // 获取预报废提交列表 + fetchDeptTree: '/user/deptTree', // 获取部门树状结构 } } } diff --git a/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue b/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue index 26f2c6c..acebb05 100644 --- a/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue +++ b/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue @@ -73,12 +73,12 @@ 查看 - - 审核 + + 完成出库 --> @@ -266,6 +266,9 @@ import { basePath } from '../../public' }, searchKeyword () { this.initFetch(this.keywordVal) + }, + directlyOut (list) { + console.log(list); } }, onShow() { diff --git a/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue b/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue index b27c870..6ad8c25 100644 --- a/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue +++ b/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail.vue @@ -18,6 +18,22 @@ 待出库数量

{{ fetch.outNum }}

 + -

批量出库

+

数量出库

- 批量出库 + 数量出库 + + + 完成出库 @@ -208,7 +231,7 @@ }, multiOut () { let that = this - let posiIntReg = /^\+?[1-9]\d*$/ + let posiIntReg = /^\+?[0-9]\d*$/ if (!posiIntReg.test(that.multiNum)) { uni.showToast({ icon: 'none', @@ -292,6 +315,33 @@ multiNumChange(val){ console.log('multiNumChange ===============',val); + }, + finishOut () { + let that = this + uni.showModal({ + title: '完成出库', + content: '确定将此种机具完成出库吗？', + confirmText: '出库', + success: (res) => { + if (res.confirm) { + console.log(that.infoList); + that.$api.fetchMaterialOutStore.directOutStore({ + id: that.infoList.parentId, + typeId: that.infoList.typeId + }).then(res => { + console.log(res); + if (res.data.code == 200) { + uni.showToast({ + icon: 'none', + title: res.data.msg + }) + } + }).catch(err => { + console.log(err); + }) + } + } + }) } }, onLoad(params) { diff --git a/pages/orderCart/orderCart.vue b/pages/orderCart/orderCart.vue index d344361..85a9151 100644 --- a/pages/orderCart/orderCart.vue +++ b/pages/orderCart/orderCart.vue @@ -305,12 +305,13 @@ import { basePath } from '../../public'; status: '0', // createTime: that.formatDate(new Date().getTime()), typeId: item['typeId'], - preNum: item['bookNum'] + preNum: item['bookNum'], + manageType: item['manageType'] } }) let setArr = [] that.totalGoods.forEach(list => { - setArr.push(list.typeId) + setArr.push(list.manageType) }) console.log(setArr); let set = new Set(setArr) diff --git a/pages/preCrashExam/preCrashExam.vue b/pages/preCrashExam/preCrashExam.vue index 57d5573..5deae94 100644 --- a/pages/preCrashExam/preCrashExam.vue +++ b/pages/preCrashExam/preCrashExam.vue @@ -163,15 +163,15 @@ }) }, seePreDetail (taskId) { - uni.setStorageSync('preTaskId', taskId) + // uni.setStorageSync('preTaskId', taskId) uni.navigateTo({ - url: `/pages/preCrashExamDetail/preCrashExamDetail` + url: `/pages/preCrashExamDetail/preCrashExamDetail?taskId=${taskId}` }) }, examPreDetail (taskId) { - uni.setStorageSync('preTaskId', taskId) + // uni.setStorageSync('preTaskId', taskId) uni.navigateTo({ - url: `/pages/preCrashExamDetail/preCrashExamDetail?showBtn=0` + url: `/pages/preCrashExamDetail/preCrashExamDetail?showBtn=0&taskId=${taskId}` }) } }, diff --git a/pages/preCrashExamDetail/preCrashExamDetail.vue b/pages/preCrashExamDetail/preCrashExamDetail.vue index 6b8c7b1..5fbcaa4 100644 --- a/pages/preCrashExamDetail/preCrashExamDetail.vue +++ b/pages/preCrashExamDetail/preCrashExamDetail.vue @@ -5,70 +5,105 @@ v-for="(list, index) in preDetailList" :key="list.id" > - -

设备类型

-
{{ list.machineTypeName }}
+ + + + + + + +

设备类型

+
{{ list.machineTypeName }}
+ + +

规格型号

+
{{ list.specificationType }}
+ + +

设备编码

+
{{ list.maCode == null ? '-' : list.maCode }}
+ + +

报废数量

+
{{ list.scrapNum }}
+ + +

损坏原因

+
{{ list.scrapType == '0' ? '自然' : '人为' }}
+ + +

报废图片

+
+ +
+ + +
+

+ 待审核 +

+

+ 已通过 +

+

+ 驳回 +

+ - -

规格型号

-
{{ list.specificationType }}
+ + + + + + + 全选 - -

设备编码

-
{{ list.maCode == null ? '-' : list.maCode }}
- - -

报废数量

-
{{ list.scrapNum }}
- - -

损坏原因

-
{{ list.scrapType == '0' ? '自然' : '人为' }}
- - -

报废图片

-
- -
- -

- + 通过 - - + 驳回 - -

-
-

- 待审核 -

-

- 已通过 -

-

- 驳回 -

- + + { - uni.redirectTo({ - url: '/pages/preCrashExamDetail/preCrashExamDetail' - }) + uni.navigateBack() } }) } else { @@ -185,7 +221,7 @@ }, confirmReject () { let that = this - let arr = [] + /* let arr = [] arr.push({ auditBy: uni.getStorageSync('userInfo').userid, id: this.refuseList.id, @@ -198,15 +234,120 @@ } console.log(subObj); that.submitExam(subObj) - that.closePopup1() + that.closePopup1() */ + if (that.rejectReason == '') { + uni.showToast({ + icon: 'none', + title: '请填写驳回原因！' + }) + } else { + that.rejectList.forEach(item => { + item.auditRemark = that.rejectReason + }) + let subObj = { + scrapDetailList: that.rejectList, + taskId: that.taskId + } + console.log(subObj); + that.submitExam(subObj) + that.closePopup1() + } + }, + checkClick(item) { + item.checked = !item.checked + if (!item.checked) { + this.allChecked = false + } else { + const goods = this.preDetailList.every(item => { + return item.checked === true + }) + if (goods) { + this.allChecked = true + } else { + this.allChecked = false + } + } + }, + checkAll() { + this.allChecked = !this.allChecked + if (this.allChecked) { + this.preDetailList.map(item => { + if (item.checked == false) { + item.checked = true + } + }) + } else { + this.preDetailList.map(item => { + if (item.checked == true) { + item.checked = false + } + }) + } + }, + clickPass () { + let that = this + let subList = that.preDetailList.filter(item => { + return item.checked == true + }).map(subItem => { + return { + auditBy: uni.getStorageSync('userInfo').userid, + id: subItem['id'], + status: '1' + } + }) + if (subList.length == 0) { + uni.showToast({ + icon: 'none', + title: '未选中审核项！' + }) + } else { + let subObj = { + scrapDetailList: subList, + taskId: this.taskId + } + uni.showModal({ + title: '通过审核', + content: '是否通过审核？', + confirmText: '通过', + cancelText: '取消', + success: (res) => { + if (res.confirm) { + console.log(subObj); + that.submitExam(subObj) + } + } + }) + } + }, + clickReject () { + let that = this + let subList = that.preDetailList.filter(item => { + return item.checked == true + }).map(subItem => { + return { + auditBy: uni.getStorageSync('userInfo').userid, + id: subItem['id'], + status: '2' + } + }) + if (subList.length == 0) { + uni.showToast({ + icon: 'none', + title: '未选中审核项！' + }) + } else { + that.rejectList = subList + that.$refs.popup1.open() + } } }, onLoad(params) { this.showBtn = params.showBtn + this.taskId = params.taskId }, onShow() { this.imgPrefix = this.$api.url - this.fetchPreDetail(uni.getStorageSync('preTaskId')) + this.fetchPreDetail(this.taskId) } } @@ -214,6 +355,8 @@