fix:排板工段bw新增不要默认number

This commit is contained in:
shijing 2025-02-24 13:42:13 +08:00
parent 1674cb7d95
commit 527f44c443
2 changed files with 21 additions and 23 deletions

View File

@ -357,6 +357,7 @@
:mlogb="mlogb" :mlogb="mlogb"
:wm = "wm" :wm = "wm"
:mgroup="mgroup" :mgroup="mgroup"
:mgroupName= "mlogItem.mgroup_name"
:isSubmit="isSubmit" :isSubmit="isSubmit"
:batchNumber="batchNumber" :batchNumber="batchNumber"
:handle_user="handle_user" :handle_user="handle_user"
@ -604,6 +605,7 @@ export default {
that.batchNumber = row.batch; that.batchNumber = row.batch;
that.handle_date=that.mlogItem.handle_date; that.handle_date=that.mlogItem.handle_date;
that.handle_user = that.mlogItem.handle_user; that.handle_user = that.mlogItem.handle_user;
console.log('that.mlogItem',that.mlogItem);
that.dialog.check_single = true; that.dialog.check_single = true;
if(row.qct==null){ if(row.qct==null){
that.$API.qm.qct.list.req({qctmat__material:row.material_out,page:0}).then((res)=>{ that.$API.qm.qct.list.req({qctmat__material:row.material_out,page:0}).then((res)=>{

View File

@ -24,8 +24,8 @@
</div> </div>
</el-header> </el-header>
<el-main id="mlogbwMain"> <el-main id="mlogbwMain">
<el-button type="primary" @click="check_start" style="position: absolute;top: 20px;left: 150px;">检验</el-button> <el-button type="primary" v-if="!isSubmit" @click="check_start" style="position: absolute;top: 20px;left: 150px;">检验</el-button>
<el-button type="primary" v-if="setForm.equipment!=''" @click="check_set" style="position: absolute;top: 20px;left: 210px;">批量操作</el-button> <el-button type="primary" v-if="multipleSet" @click="check_set" style="position: absolute;top: 20px;left: 210px;">批量操作</el-button>
<sc-form-table <sc-form-table
hideDelete hideDelete
id="mlogbwlist" id="mlogbwlist"
@ -329,20 +329,9 @@
</el-main> </el-main>
</el-container> </el-container>
</el-dialog> </el-dialog>
<!-- <check-drawer
v-if="drawerVisible"
ref="saveDialog"
:defects="qct_defects"
:testitems="qct_testitems"
:mlogbwlist="mlogbwlist"
@success="handleSaveSuccess"
@closed="saveMlogbInClose"
>
</check-drawer> -->
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import checkDrawer from "./mlogbw_check_form.vue";
export default { export default {
props: { props: {
mlogb: { mlogb: {
@ -369,14 +358,18 @@ export default {
type: String, type: String,
default: "", default: "",
}, },
mgroupName:{
type:String,
default:"",
},
isSubmit:{ isSubmit:{
type: Boolean, type: Boolean,
default: false, default: false,
}, },
}, },
components: { // components: {
checkDrawer // checkDrawer
}, // },
emits: ["success", "closed"], emits: ["success", "closed"],
data() { data() {
return { return {
@ -402,6 +395,7 @@ export default {
hideAdd: true, hideAdd: true,
visible: false, visible: false,
setVisible:false, setVisible:false,
multipleSet:false,
checkVisible:false, checkVisible:false,
descriptionVisible:false, descriptionVisible:false,
options:[], options:[],
@ -438,8 +432,12 @@ export default {
mounted() { mounted() {
let that = this; let that = this;
that.hideAdd = that.isSubmit; that.hideAdd = that.isSubmit;
that.addTemplate.number = that.batchNumber; if(that.mgroupName!=='排板'){
that.addTemplate.number = that.batchNumber;
}
that.params.mlogb = that.addTemplate.mlogb = that.mlogb; that.params.mlogb = that.addTemplate.mlogb = that.mlogb;
that.currentDate = this.$TOOL.dateFormat2(new Date());
console.log(that.currentDate);
}, },
methods: { methods: {
open(mode = "ins",qct = '') { open(mode = "ins",qct = '') {
@ -573,7 +571,7 @@ export default {
obj.ftest.ftestitems = []; obj.ftest.ftestitems = [];
obj.ftest.ftestdefects = []; obj.ftest.ftestdefects = [];
obj.ftest.qct = that.qct; obj.ftest.qct = that.qct;
obj.ftest.test_date = that.handle_date; obj.ftest.test_date = that.handle_date!=null?that.handle_date:that.currentDate;
obj.ftest.test_user = that.handle_user; obj.ftest.test_user = that.handle_user;
that.qct_defects.forEach((item) => { that.qct_defects.forEach((item) => {
let itemObj = {}; let itemObj = {};
@ -754,13 +752,11 @@ export default {
this.$refs.dialogForm.validate((valid) => { this.$refs.dialogForm.validate((valid) => {
if (valid) { if (valid) {
Object.assign(that.setForm,that.form); Object.assign(that.setForm,that.form);
this.form = {};
that.mlogbwlist.forEach(item => { that.mlogbwlist.forEach(item => {
if(item.ftest!==null){ if(item.ftest!==null){
item.ftest.ftestdefects.forEach(defect => { item.ftest.ftestdefects.forEach(defect => {
if(that.setForm.defectids.indexOf(defect.defect) > -1){ if(that.setForm.defectids.indexOf(defect.defect) > -1){
defect.test_user = that.setForm.test_user; defect.test_user = that.setForm.test_user;
// defect.test_equip = that.setForm.equipment;
} }
}) })
item.ftest.ftestitems.forEach(testitem => { item.ftest.ftestitems.forEach(testitem => {
@ -774,7 +770,7 @@ export default {
ftest.ftestitems = []; ftest.ftestitems = [];
ftest.ftestdefects = []; ftest.ftestdefects = [];
ftest.qct = that.qct; ftest.qct = that.qct;
ftest.test_date = that.handle_date; ftest.test_date =that.handle_date!=null?that.handle_date:that.currentDate;
ftest.test_user = that.handle_user; ftest.test_user = that.handle_user;
that.qct_defects.forEach((item0) => { that.qct_defects.forEach((item0) => {
let itemObj = {}; let itemObj = {};
@ -782,7 +778,6 @@ export default {
itemObj.has = false; itemObj.has = false;
if(that.setForm.defectids.indexOf(item0.defect) > -1){ if(that.setForm.defectids.indexOf(item0.defect) > -1){
itemObj.test_user = that.setForm.test_user; itemObj.test_user = that.setForm.test_user;
// itemObj.test_equip = that.setForm.equipment;
}else{ }else{
itemObj.test_user = that.handle_user; itemObj.test_user = that.handle_user;
} }
@ -805,8 +800,9 @@ export default {
} }
}); });
that.$API.wpm.mlogbw.update.req("bulk",that.mlogbwlist).then((res) => { that.$API.wpm.mlogbw.update.req("bulk",that.mlogbwlist).then((res) => {
console.log('blukres',res); this.form = {};
that.checkVisible = false; that.checkVisible = false;
this.multipleSet = true;
that.descriptionVisible = true; that.descriptionVisible = true;
that.getList(); that.getList();
}).catch((err) => { }).catch((err) => {