From da5a0afa330e15016d37af0b9b776590e8ae6aad Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Mon, 24 Feb 2020 16:07:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartWorkCraftSelect_rdlc.js | 4 +- .../AmountInputBox/AmountInputBox.js | 3 +- .../PartWorkCraftSelect_rdlc/index.vue | 131 +++++------------- 3 files changed, 36 insertions(+), 102 deletions(-) diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js index dc8b0c80..02349744 100644 --- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js +++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js @@ -44,7 +44,7 @@ export function initPerson() { }) } // 查询 -export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4) { +export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6) { return request({ url: '', method: 'post', @@ -53,7 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3 ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查', - param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}`, + param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/components/AmountInputBox/AmountInputBox.js b/src/components/AmountInputBox/AmountInputBox.js index 2514ead5..3332bd83 100644 --- a/src/components/AmountInputBox/AmountInputBox.js +++ b/src/components/AmountInputBox/AmountInputBox.js @@ -70,8 +70,7 @@ export default { checkFloat(e, reg, charcode, el) break case 'notZero': - // reg = (/^([1-9]\d*(\.\d*[1-9])?)|(0\.\d*[1-9])$/) - reg = (/^(?!(0[0-9]{0,}$))[0-9]{1,}[.]{0,}[0-9]{0,}$/) + reg = (/^[1-9][0-9]*$/) checkFloat(e, reg, charcode, el) break } diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 1cb6a61a..ad51a8d0 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -28,63 +28,66 @@ :label="item.label" :value="item.value"/> + 查询 - 零件工艺调整 + 打回重新编制 - + - - - + + + - + - + - + - + - + + + + -
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -