diff --git a/pages.json b/pages.json index 19c1c12..fc1d013 100644 --- a/pages.json +++ b/pages.json @@ -615,6 +615,14 @@ } } + ,{ + "path" : "pages/ProductManage/PlusShaftReturn", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/ProductManage/CallPaperShaft.vue b/pages/ProductManage/CallPaperShaft.vue index e9d5649..430fba4 100644 --- a/pages/ProductManage/CallPaperShaft.vue +++ b/pages/ProductManage/CallPaperShaft.vue @@ -1,6 +1,6 @@ @@ -65,7 +66,7 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import {queryProductArea, queryDeviceByarea} from '@/utils/getData2.js' - import {paperQueryPaperMaterial, callPaperShaft} from '@/utils/getData3.js' + import {paperQueryPaperMaterial, callPaperShaft, labourShaftBack} from '@/utils/getData3.js' export default { components: { NavBar, @@ -88,7 +89,8 @@ upL: '', upR: '', qty: null, - disabled: false + disabled: false, + disabled1: false }; }, onLoad (options) { @@ -127,6 +129,7 @@ this.index4 = '' this.qty = null this.disabled = false + this.disabled1 = false }, async _callPaperShaft () { this.disabled = true @@ -186,6 +189,33 @@ }, showSelector2 () { this.newaxis2 = this.axis + }, + async _labourShaftBack () { + this.disabled1 = true + if (!this.index1 || !this.index2 || (!this.upL && !this.upR) || !this.index3 || !this.index4) { + this.disabled1 = false + return + } + let upLT = '' + let upRT = '' + this.axis.map(el => { + if (el.value === this.upL) { + upLT = el.text + } + if (el.value === this.upR) { + upRT = el.text + } + }) + try { + let res = await labourShaftBack(this.index1, this.index2, upLT, this.upL, upRT, this.upR, this.index3, this.index4) + this.disabled1 = false + uni.showToast({ + title: res.message, + icon: 'none' + }) + } catch (e) { + this.disabled1 = false + } } } } diff --git a/pages/ProductManage/PlusShaftReturn.vue b/pages/ProductManage/PlusShaftReturn.vue new file mode 100644 index 0000000..1df67de --- /dev/null +++ b/pages/ProductManage/PlusShaftReturn.vue @@ -0,0 +1,72 @@ + + + \ No newline at end of file diff --git a/pages/ProductManage/UnAxisBack.vue b/pages/ProductManage/UnAxisBack.vue index 844336b..93bcc0e 100644 --- a/pages/ProductManage/UnAxisBack.vue +++ b/pages/ProductManage/UnAxisBack.vue @@ -29,8 +29,9 @@ - - + + + @@ -38,7 +39,7 @@