diff --git a/src/App.vue b/src/App.vue index 6f7dbbd7..642d8171 100644 --- a/src/App.vue +++ b/src/App.vue @@ -162,17 +162,39 @@ export default { padding: 0 20px 20px; } + +// .el-table thead.is-group th.el-table__cell.colorheader1{ +// background-color: rgb(255, 243, 202)!important; +// } +// .el-table thead.is-group th.el-table__cell.colorheader2{ +// background-color: rgb(227, 242, 217)!important; +// } +// .el-table thead.is-group th.el-table__cell.colorheader3{ +// background-color: rgb(250, 218, 222)!important; +// } +// .el-table thead.is-group th.el-table__cell.colorheader4{ +// background-color: rgb(168, 218, 228)!important; +// } .el-table thead.is-group th.el-table__cell.colorheader1{ - background-color: rgb(255, 243, 202)!important; + background-color: rgba(246, 98, 98, 0.323)!important; } .el-table thead.is-group th.el-table__cell.colorheader2{ - background-color: rgb(227, 242, 217)!important; + background-color: rgba(250, 130, 11, 0.325)!important; } .el-table thead.is-group th.el-table__cell.colorheader3{ - background-color: rgb(250, 218, 222)!important; + background-color: rgba(247, 235, 9, 0.311)!important; } .el-table thead.is-group th.el-table__cell.colorheader4{ - background-color: rgb(168, 218, 228)!important; + background-color: rgba(30, 252, 10, 0.202)!important; +} +.el-table thead.is-group th.el-table__cell.colorheader5{ + background-color: rgba(11, 251, 231, 0.326)!important; +} +.el-table thead.is-group th.el-table__cell.colorheader6{ + background-color: rgba(12, 85, 255, 0.326)!important; +} +.el-table thead.is-group th.el-table__cell.colorheader7{ + background-color: rgba(51, 15, 253, 0.317)!important; } // 排放系统 diff --git a/src/api/model/inm.js b/src/api/model/inm.js index eb098823..497d2b2f 100644 --- a/src/api/model/inm.js +++ b/src/api/model/inm.js @@ -185,6 +185,13 @@ export default { data); } }, + revertDel:{ + name: "撤回并删除", + req: async function(id){ + return await http.post( + `${config.API_URL}/inm/mioitem/${id}/revert_and_del/`); + } + } }, // mioitemw mioitemw: { diff --git a/src/components/scFormTable/index.vue b/src/components/scFormTable/index.vue index 2392c2b0..821edeaa 100644 --- a/src/components/scFormTable/index.vue +++ b/src/components/scFormTable/index.vue @@ -49,7 +49,8 @@ dragSort: { type: Boolean, default: false }, hideAdd: { type: Boolean, default: false }, hideDelete: { type: Boolean, default: false }, - hideIndex: { type: Boolean, default: false } + hideIndex: { type: Boolean, default: false }, + pushType: { type: String, default: 'push' } }, data(){ return { @@ -98,8 +99,12 @@ }) }, rowAdd(){ - const temp = JSON.parse(JSON.stringify(this.addTemplate)) - this.data.push(temp); + const temp = JSON.parse(JSON.stringify(this.addTemplate)); + if(this.pushType == 'unshift'){ + this.data.unshift(temp); + }else{ + this.data.push(temp); + } this.$emit('add', temp) }, rowDel(row, index){ diff --git a/src/config/index.js b/src/config/index.js index 2a1dc835..9f402f4a 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -6,7 +6,7 @@ const DEFAULT_CONFIG = { DASHBOARD_URL: "/dashboard", //版本号 - APP_VER: "2.6.2025061213", + APP_VER: "2.7.2025070310", //内核版本号 CORE_VER: "1.6.9", diff --git a/src/views/bigScreen/bxerp/jiejingdept.vue b/src/views/bigScreen/bxerp/jiejingdept.vue new file mode 100644 index 00000000..cc07aad6 --- /dev/null +++ b/src/views/bigScreen/bxerp/jiejingdept.vue @@ -0,0 +1,697 @@ + + + + diff --git a/src/views/bigScreen/bxerp/jiejingdept2.vue b/src/views/bigScreen/bxerp/jiejingdept2.vue new file mode 100644 index 00000000..4422f508 --- /dev/null +++ b/src/views/bigScreen/bxerp/jiejingdept2.vue @@ -0,0 +1,713 @@ + + + + diff --git a/src/views/bigScreen/bxerp/lengjiagongdept.vue b/src/views/bigScreen/bxerp/lengjiagongdept.vue new file mode 100644 index 00000000..2e0857bf --- /dev/null +++ b/src/views/bigScreen/bxerp/lengjiagongdept.vue @@ -0,0 +1,713 @@ + + + + diff --git a/src/views/bigScreen/bxerp/niuzhuandept.vue b/src/views/bigScreen/bxerp/niuzhuandept.vue new file mode 100644 index 00000000..39a1298f --- /dev/null +++ b/src/views/bigScreen/bxerp/niuzhuandept.vue @@ -0,0 +1,713 @@ + + + + diff --git a/src/views/bigScreen/bxerp/reyadept.vue b/src/views/bigScreen/bxerp/reyadept.vue new file mode 100644 index 00000000..b1b9c4b1 --- /dev/null +++ b/src/views/bigScreen/bxerp/reyadept.vue @@ -0,0 +1,713 @@ + + + + diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue index 5ed56cb2..491e9de3 100644 --- a/src/views/bigScreen/index_gx.vue +++ b/src/views/bigScreen/index_gx.vue @@ -524,6 +524,7 @@ export default { lineWidth:0, pieHeight:0, lineHeight:0, + setIntervals:null, }; }, mounted() { @@ -604,12 +605,19 @@ export default { that.getMaterials(); that.getMgroup(); that.getTaskNumber(); - that.addListener(); that.getArticles(); that.getpurinrate(); that.initFactory(); that.addListener(); }) + that.setIntervals = setInterval(function () { + that.getCountnotok(); + that.getMaterials(); + that.getMgroup(); + that.getTaskNumber(); + that.getArticles(); + that.getpurinrate(); + }, 300000); }, //获取公告和视频 getArticles(){ @@ -998,16 +1006,20 @@ export default { this.scene = null; clearInterval(that.timerTime); clearInterval(that.scrollInterval); + clearInterval(that.setIntervals); that.timerTime = null; that.scrollInterval = null; + that.setIntervals = null; }, beforeDestoryed() { let that = this; this.scene = null; clearInterval(that.timerTime); clearInterval(that.scrollInterval); + clearInterval(that.setIntervals); that.timerTime = null; that.scrollInterval = null; + that.setIntervals = null; }, }; diff --git a/src/views/inm/helpso.vue b/src/views/inm/helpso.vue index 85cc2972..564b9419 100644 --- a/src/views/inm/helpso.vue +++ b/src/views/inm/helpso.vue @@ -1,7 +1,7 @@ @@ -216,20 +225,28 @@ export default { table_del(row) { this.$confirm(`确定删除吗？`, "提示", { type: "warning", - }) - .then(() => { - this.$API.inm.mio.delete - .req(row.id) - .then((res) => { - this.$message.success("删除成功"); - this.$refs.table.refresh(); - return res; - }) - .catch((err) => { - return err; - }); - }) - .catch(() => {}); + }).then(() => { + this.$API.inm.mio.delete.req(row.id).then((res) => { + this.$message.success("删除成功"); + this.$refs.table.refresh(); + return res; + }).catch((err) => { + return err; + }); + }).catch(() => {}); + }, + table_revert(row){ + this.$confirm(`确定撤回吗？`, "提示", { + type: "warning", + }).then(() => { + this.$API.inm.mio.revert.req(row.id).then((res) => { + this.$message.success("撤回成功"); + this.$refs.table.refresh(); + return res; + }).catch((err) => { + return err; + }); + }).catch(() => {}); }, table_submit(row) { this.$API.inm.mio.submit.req(row.id).then((res) => { diff --git a/src/views/inm/helpso_mioitem.vue b/src/views/inm/helpso_mioitem.vue new file mode 100644 index 00000000..7d8ccd87 --- /dev/null +++ b/src/views/inm/helpso_mioitem.vue @@ -0,0 +1,398 @@ + + diff --git a/src/views/inm/materials.vue b/src/views/inm/materials.vue new file mode 100644 index 00000000..73eaf947 --- /dev/null +++ b/src/views/inm/materials.vue @@ -0,0 +1,247 @@ + + + diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue index 6eb5d4ac..cf595d8d 100644 --- a/src/views/inm/mioitem.vue +++ b/src/views/inm/mioitem.vue @@ -170,13 +170,7 @@ link type="primary" @click="table_check(scope.row)" - v-if=" - scope.row.test_date == null && - mioObj.state == 20 && - (type == 'pur_in' || - type == 'do_in' || - type == 'other_in') - " + v-if="scope.row.test_date == null &&mioObj.state == 20 &&(type == 'pur_in' ||type == 'do_in' ||type == 'other_in')" v-auth="'mioitem.test'" > 检验 @@ -195,7 +189,7 @@ @click="check_reSet(scope.row)" v-if="scope.row.test_date !== null" > - 撤回 + 检验作废 物料标签 - + + 撤回 + @@ -405,6 +407,21 @@ export default { }); }).catch(() => {}); }, + //撤回并删除 + check_revert(row){ + let that = this; + that.$confirm(`该记录已提交，确定撤回吗？`, "提示", { + type: "warning", + }).then(() => { + console.log('确定删除'); + that.$API.inm.mioitem.revertDel.req(row.id).then((res) => { + that.$message.success("撤回成功"); + that.$refs.table.refresh(); + }).catch((err) => { + return err; + }); + }).catch(() => {}); + }, //检验 table_check(row) { this.mioitemId = row.id; diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue index 5f938f52..9faf5db2 100644 --- a/src/views/inm/mioitem_form.vue +++ b/src/views/inm/mioitem_form.vue @@ -108,7 +108,7 @@ v-model="form.warehouse" clearable style="width: 100%" - :disabled="warehouseDisable" + :disabled="form.type == 'do_out'||form.type=='sale_out'" > - + @@ -64,17 +64,25 @@ ref="tableMlog" :apiObj="apiObj_mlog" row-key="id" - :params="params" - :query="params" + :params="params_mlog" + :query="params_mlog" > - + - + + + @@ -102,7 +110,7 @@ label="操作日期" prop="handle_date" > - + @@ -341,9 +350,13 @@ export default { other_out: "其他出库", }, //mlog\handover + params_mlog:{ + cbatch:'', + with_mlogb:'yes', + query: " { id,material_out_name,mlogb_full,count_real,count_ok,is_fix,belong_dept_name,mgroup_name,handle_user_name,handle_date,reminder_interval_list,mstate_json,work_start_time,work_end_time,oinfo_json,submit_time,submit_user_name}" + }, params:{ cbatch:'', - // query:" { id, name, code, last_data, gather_state }", }, params2:{ batch:'', @@ -353,7 +366,7 @@ export default { }, query:{ batch:'', - material_start__type:30, + // material_start__type:30, }, batch:'', activeName:'', @@ -364,12 +377,11 @@ export default { }, methods: { rowClick(row){ - console.log('row',row) let that = this; that.nodes =[]; that.edges = []; that.limitedWatch = false; - that.$API.wpm.batchlog.dag.req({batch:row.batch,version:row.version}).then((res) => { + that.$API.wpm.batchlog.dag.req({batch:row.batch,method:'direct'}).then((res) => { res.nodes.forEach(item => { let obj = {}; obj.id = item.id; @@ -388,6 +400,7 @@ export default { nodeClick(data){ let that = this; that.params.cbatch = data; + that.params_mlog.cbatch = data; that.params2.batch = data; that.params_mio.item_mio__batch=data; that.activeName = 'mlog'; diff --git a/src/views/statistics/good_check_gx.vue b/src/views/statistics/good_check_gx.vue index ffdf8e73..4fe1dd7f 100644 --- a/src/views/statistics/good_check_gx.vue +++ b/src/views/statistics/good_check_gx.vue @@ -78,7 +78,7 @@ show-summary > - + @@ -299,18 +299,18 @@ - + - + + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + @@ -439,117 +461,117 @@ - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + @@ -570,7 +592,8 @@ export default { return { params: { ordering:'-last_time', - batch__startswith__in:'ZB2,B1', + material_start__cate:'管', + last_time_isnull:false, }, query:{ batch__contains:'', @@ -585,7 +608,38 @@ export default { }, methods: { handleQuery(){ - this.$refs.table.queryData(this.query); + let that = this; + let querys = [],arr1=[],arr2=[]; + let obj = {},obj1 = {},obj2 = {}; + obj.field = 'batch__contains'; + obj.value = that.query.batch__contains; + obj.compare = ''; + obj1.field = 'last_time__gte'; + obj1.value = that.query.last_time__gte; + obj1.compare = 'gte'; + obj2.field = 'last_time__gte'; + obj2.value = that.query.last_time__gte; + obj2.compare = 'gte'; + if((that.query.last_time__gte==''||that.query.last_time__gte==null)&&(that.query.last_time__lte==''||that.query.last_time__lte==null)&&that.query.batch__contains!==''&&that.query.batch__contains!==null){ + querys.push(obj); + } + if(that.query.last_time__gte!==''&&that.query.last_time__gte!==null){ + arr1.push(obj1); + if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ + arr1.push(obj); + } + querys.push(arr1) + } + if(that.query.last_time__lte!==''&&that.query.last_time__lte!==null){ + arr2.push(obj2); + if(that.query.batch__contains!==''&&that.query.batch__contains!==null){ + arr2.push(obj); + } + querys.push(arr2) + } + let params = {}; + params.querys = querys; + this.$refs.table.queryData(params); }, getCountQt(data,type){ let count_qt = 0,count = 0; diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue index 35b84f80..92d425d9 100644 --- a/src/views/statistics/stock_statistics.vue +++ b/src/views/statistics/stock_statistics.vue @@ -46,7 +46,6 @@ :filters="nameFilters1" :filter-method="filterName1" filter-placement="bottom-end"/> - - - - @@ -210,12 +204,12 @@ export default { }) .then(async () => { if (that.handleTitle === "撤回工单") { - res = that.$API.wf.ticket.ticketRetreat.req( + res = await that.$API.wf.ticket.ticketRetreat.req( that.ticketId, that.handleForm ); } else { - res = that.$API.wf.ticket.ticketClose.req( + res = await that.$API.wf.ticket.ticketClose.req( that.ticketId, that.handleForm ); diff --git a/src/views/wpm_bx/handover.vue b/src/views/wpm_bx/handover.vue index 52d59d86..8d85eab3 100644 --- a/src/views/wpm_bx/handover.vue +++ b/src/views/wpm_bx/handover.vue @@ -70,6 +70,7 @@ @@ -97,12 +103,24 @@ - - - - - 编辑 - + diff --git a/src/views/wpm_bx/handover_form.vue b/src/views/wpm_bx/handover_form.vue index faf791d8..581cca1d 100644 --- a/src/views/wpm_bx/handover_form.vue +++ b/src/views/wpm_bx/handover_form.vue @@ -27,6 +27,9 @@ {{ totalCount }} + + {{ form.batch }} + @@ -416,7 +419,6 @@ export default { let that = this; that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => { that.mgroupOptions = res; - if(that.type==40){ res.forEach(item=>{ if(item.name=="废品库"){ @@ -595,6 +597,7 @@ export default { that.mgroupOptions = res; if(res.length==1){ that.form.recive_mgroup = res[0].id; + that.getUserList2(); } }) data.forEach((item,index)=>{ @@ -696,27 +699,26 @@ export default { //表单注入数据 setData(data) { let that = this; + console.log('交接记录查看',data) this.totalCount = data.count?data.count:data.handoverb.count; Object.assign(this.form, data); - if(data.type==30){ - this.getUserList3(); - }else{ - this.$API.system.user.list.req({ depts: data.recive_dept, page: 0 }).then((res) => { - that.userList2 = res; - }); - setTimeout(() => { - let arr =that.userList2.filter((item) => { - return item.id == data.recive_user - }) - if(arr.length>0){}else{ - let obj = {}; - obj.id = data.recive_user; - obj.name = data.recive_user_name; - that.userList2.push(obj); - } - },500) - - } + this.$API.system.user.list.req({ depts: data.send_dept, page: 0 }).then((res) => { + that.userList = res; + }); + this.$API.system.user.list.req({ depts: data.recive_dept, page: 0 }).then((res) => { + that.userList2 = res; + }); + setTimeout(() => { + let arr =that.userList2.filter((item) => { + return item.id == data.recive_user + }) + if(arr.length>0){}else{ + let obj = {}; + obj.id = data.recive_user; + obj.name = data.recive_user_name; + that.userList2.push(obj); + } + },500) if(data.new_batch!==''&&data.new_batch!==undefined&&data.new_batch!==null){ this.change_batch = true; } @@ -760,6 +762,7 @@ export default { that.mgroupOptions = res0; if(res0.length==1){ that.form.recive_mgroup = res0[0].id; + that.getUserList2(); } }) let obj = {}; diff --git a/src/views/wpm_bx/handover_form2.vue b/src/views/wpm_bx/handover_form2.vue index 9455924f..247ed4f4 100644 --- a/src/views/wpm_bx/handover_form2.vue +++ b/src/views/wpm_bx/handover_form2.vue @@ -1,6 +1,6 @@