From 57ab4f3914715f47bd85f480e3cf69c519c55abc Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 14 Aug 2024 17:41:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E5=85=89=E8=8A=AF=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mtm/materials_gx.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/mtm/materials_gx.vue b/src/views/mtm/materials_gx.vue index 9bcb57f8..cab59c2b 100644 --- a/src/views/mtm/materials_gx.vue +++ b/src/views/mtm/materials_gx.vue @@ -190,7 +190,7 @@ export default { }, data() { return { - materialTemplate: "/media/template/material.xlsx", + materialTemplate: " /media/default/template/material.xlsx", dialog: { save: false, }, From d001a981682ae245443eb2f510a1399d45ce36f7 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 14 Aug 2024 21:23:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E9=A1=B9=EF=BC=8C=E6=8A=BD=E6=A3=80=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qm/products_form.vue | 76 +++++++++++++++++++++++++++++++-- src/views/wpm_gx/check_form.vue | 39 +++++++++++++++++ src/views/wpm_gx/inm.vue | 5 ++- 3 files changed, 115 insertions(+), 5 deletions(-) diff --git a/src/views/qm/products_form.vue b/src/views/qm/products_form.vue index 30cb17ea..8da06396 100644 --- a/src/views/qm/products_form.vue +++ b/src/views/qm/products_form.vue @@ -88,9 +88,27 @@ > + + + + + + + - + + + + + + + + + + + + + + + + { + that.userList = res; + }); + }, handleCheckChange(){ this.form.count_ok = this.form.count-this.form.count_notok; }, @@ -433,7 +501,10 @@ export default { this.count_notok_json.count_n_yd+ this.count_notok_json.count_n_txd+ this.count_notok_json.count_n_hd+ + this.count_notok_json.count_n_zhg+ + this.count_notok_json.count_n_yz+ this.count_notok_json.count_n_qp+ + this.count_notok_json.count_n_z+ this.count_notok_json.count_n_swen+ this.count_notok_json.count_n_zb+ this.count_notok_json.count_n_hs+ @@ -511,7 +582,6 @@ export default { setData(data) { Object.assign(this.form, data); this.formCount = this.form.count; - // this.form.test_group = this.form.split(","); }, //设置过滤项 setFilters(filters) { diff --git a/src/views/wpm_gx/check_form.vue b/src/views/wpm_gx/check_form.vue index bec81734..eb777ba6 100644 --- a/src/views/wpm_gx/check_form.vue +++ b/src/views/wpm_gx/check_form.vue @@ -95,6 +95,24 @@ /> + + + + + + + @@ -250,6 +268,7 @@ export default { modeTitle: '', loading: false, form: { + type:'process', type2:10, test_date: "", batch: "", @@ -294,6 +313,7 @@ export default { visible: false, isSaveing: false, options: [], + userList : [], selectionFilters: [], setFiltersVisible: false, }; @@ -303,6 +323,8 @@ export default { this.form.batch = this.itemObj.batch; this.form.wm = this.itemObj.id; this.form.count = this.itemObj.count; + this.deptID = this.$TOOL.data.get('gx_deptID'); + this.getUsers(); }, methods: { //显示 @@ -310,8 +332,25 @@ export default { this.mode = mode; this.modeTitle = mode+'抽检'; this.visible = true; + return this; }, + getUsers(){ + let that = this; + let userList = []; + that.$API.system.user.list + .req({ page: 0, posts__code__contains: "check" }) + .then((res) => { + userList = res; + that.$API.system.user.list.req({ depts: that.deptID, page: 0 }) + .then((res2) => { + res2.forEach((item) => { + userList.push(item); + }); + that.userList = userList ; + }); + }); + }, handleCheckChange(){ this.form.count_ok = this.form.count-this.form.count_notok; }, diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue index 8d49bedd..7a128e1e 100644 --- a/src/views/wpm_gx/inm.vue +++ b/src/views/wpm_gx/inm.vue @@ -1,15 +1,15 @@