diff --git a/src/views/inm/helpso_mio.vue b/src/views/inm/helpso_mio.vue index a261b14b..37e3a6b7 100644 --- a/src/views/inm/helpso_mio.vue +++ b/src/views/inm/helpso_mio.vue @@ -49,12 +49,34 @@ @change="handleQuery" > + + + + +
- + + + + @@ -124,6 +130,7 @@ diff --git a/src/views/inm/mioitemlist.vue b/src/views/inm/mioitemlist.vue index f8765435..64d96ec5 100644 --- a/src/views/inm/mioitemlist.vue +++ b/src/views/inm/mioitemlist.vue @@ -18,6 +18,17 @@ placeholder="结束日期" style="width: 150px;" /> + + + - + + + + {{ scope.row.material_.model }} - @@ -125,6 +141,20 @@ + + + @@ -155,6 +185,12 @@ export default { material__type:40, mio__state:20 }, + mquery:{ + page: 0, + type__in: "40, 50, 60, 70", + is_hidden: false, + is_assemb: false, + }, selection: [], tableData:[], nameFilters1: [], @@ -167,9 +203,10 @@ export default { nameFilters8: [], nameFilters9: [], query: { - search: "", - mio__inout_date__gte: "", - mio__inout_date__lte: "", + search : "", + material : "", + mio__inout_date__gte : "", + mio__inout_date__lte : "", }, stateDict: { 10: "创建中", @@ -183,15 +220,16 @@ export default { other_in: "其他入库", other_out: "其他出库", }, + selectObj: {}, project_code:'', dataTotal:0, + apiObjm:this.$API.mtm.material.list, }; }, mounted() { this.checkTemplate = this.checkTemplate+"?t=" + new Date().getTime(); this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code; this.params.mio = this.mioId; - // this.apiObj = this.$API.inm.mioitem.list; let that = this; that.getList(); }, @@ -199,9 +237,13 @@ export default { getList(val){ let that = this; that.params.page = val?val:1; + that.params.with_mio = 'yes'; that.params.search = that.query.search; that.params.mio__inout_date__gte = that.query.mio__inout_date__gte; that.params.mio__inout_date__lte = that.query.mio__inout_date__lte; + if(that.query.material!==''||that.query.material!==undefined||that.query.material!==null){ + that.params.material = that.query.material; + } that.$API.inm.mioitem.list.req(that.params).then((res) => { if (res.count > 0) { that.tableData = res.results; @@ -296,7 +338,10 @@ export default { resetQuery() { this.query = {}; }, - + selectMaterialChange() { + var that = this; + that.query.material = that.selectObj.id; + }, //打印物料标签 printMaterial(row,type){ let that = this; @@ -339,7 +384,7 @@ export default { sums[index] = "合计"; return; } - if (index == 8|| index == 10) { + if (index == 9|| index == 11) { const values = data.map((item) => Number(item[column.property]) ); @@ -387,6 +432,19 @@ export default { filterName9(value, row) { return row. 入库凭证号 === value; }, + revertAndDel(row){ + let that = this; + that.$confirm('此操作将撤回并删除该记录, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(res=>{ + that.$API.inm.mioitem.revertDel.req(row.id).then(res=>{ + that.$message.success("撤回并删除成功"); + that.getList(1); + }) + }) + }, }, }; diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue index 1cdd75d4..4b5b1463 100644 --- a/src/views/mtm/materials_form_gx.vue +++ b/src/views/mtm/materials_form_gx.vue @@ -183,6 +183,12 @@ import { mCateEnum } from "@/utils/enum.js"; export default { emits: ["success", "closed"], + props: { + type: { + type: Number, + default: 10, + } + }, data() { return { mCateEnum, @@ -260,6 +266,7 @@ export default { if(this.project_code !== 'bxerp'){ this.options.push({ name: "辅助材料", id: 40 }); } + this.form.type = this.type; this.getProcessOptions(); }, methods: { diff --git a/src/views/mtm/materials_gx.vue b/src/views/mtm/materials_gx.vue index 2118dbad..bcfdbfb2 100644 --- a/src/views/mtm/materials_gx.vue +++ b/src/views/mtm/materials_gx.vue @@ -115,6 +115,12 @@ > + + + { that.materialsIn = res; }); diff --git a/src/views/ofm/booking_form.vue b/src/views/ofm/booking_form.vue index 2efb8464..0dd96a6c 100644 --- a/src/views/ofm/booking_form.vue +++ b/src/views/ofm/booking_form.vue @@ -210,16 +210,13 @@ export default { getTid (){ var that = this; if (that.t_id) { - that.$API.wpm.handover.item.req(that.t_id).then(res=>{ - that.setData(res); + that.$API.ofm.mroombooking.item.req(that.t_id).then(res=>{ + that.form = res; if(res.ticket_.state_.type == 1 && res.create_by == that.$TOOL.data.get("USER_INFO").id ) { that.type = "edit"; }else{ that.type = "show"; } - that.$nextTick(()=>{ - that.$refs.ticketd_b_start.init(); - }) }) } }, diff --git a/src/views/wpm_bx/mlogbw_check_table.vue b/src/views/wpm_bx/mlogbw_check_table.vue index b894869c..f5b9712a 100644 --- a/src/views/wpm_bx/mlogbw_check_table.vue +++ b/src/views/wpm_bx/mlogbw_check_table.vue @@ -503,8 +503,10 @@ export default { }, getEquipments(){ let that = this; + let eqId = localStorage.getItem("bxerpChenckEquipmentId"); that.$API.em.equipment.list.req({page:0,cate__code:"6"}).then((res) => { that.equipmentOptions = res; + that.form.equipment = eqId; }) }, getdefects(){ @@ -636,8 +638,13 @@ export default { if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ let str = item.rule_expression.replace(/`/g, ''); str = str.replace(/\${(.*?)}/g, 'row.\$1') - let judge = eval(str); - row[item.defect_name] = judge; + let judge = false; + try { + judge = eval(str); + row[index][item.defect_name] = judge; + }catch (error) { + console.error('error',error); + } } }); obj.ftest = {}; @@ -745,9 +752,14 @@ export default { that.qct_defects.forEach(item => { if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){ let str = item.rule_expression.replace(/`/g, ''); - str = str.replace(/\${(.*?)}/g, 'row.\$1') - let judge = eval(str); - that.mlogbwlist[index][item.defect_name] = judge; + str = str.replace(/\${(.*?)}/g, 'row.\$1'); + let judge = false; + try { + judge = eval(str); + that.mlogbwlist[index][item.defect_name] = judge; + }catch (error) { + console.error(error); + } }else{ that.mlogbwlist[index][item.defect_name] = false; } @@ -794,6 +806,7 @@ export default { }, equipmentChange(){ let that = this; + localStorage.setItem("bxerpChenckEquipmentId",that.form.equipment); that.equipmentOptions.forEach(item => { if(item.id == that.form.equipment){ that.form.equipment_name = item.name;