wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

其它报工打印 2022年10月20日 sxm

master
[li_she] 3 years ago
parent
87647d6ad9
commit
4893252600
4 changed files with 1934 additions and 1862 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      src/views/modules/base/maintainProductRouting.vue
  2. 23
      src/views/modules/yieldReport/otherReport/change_packaging.vue
  3. 5
      src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
  4. 20
      src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue

86
src/views/modules/base/maintainProductRouting.vue
View File

@ -13,8 +13,10 @@
</el-form-item>
<el-form-item :label="'工厂编号：'">
<el-input v-model="mainData.site" readonly style="width: 130px"></el-input>
<el-button @click="getPartDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'物料信息'}}</el-button>
<el-button @click="changeStatus()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'更改状态'}}</el-button>
<el-button @click="getPartDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'物料信息'}}
</el-button>
<el-button @click="changeStatus()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'更改状态'}}
</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
@ -32,7 +34,8 @@
</el-form-item>
<el-form-item :label="'计量单位：'">
<el-input v-model="mainData.umid" readonly style="width: 130px"></el-input>
<el-button @click="tongBuOrder()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'同步工艺路线到订单'}}</el-button>
<el-button @click="tongBuOrder()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'同步工艺路线到订单'}}
</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
@ -47,17 +50,23 @@
<el-form-item :label="'修复版本：'" style="margin-left: 20px">
<el-checkbox style="margin-left: 0px" disabled v-model="mainData.repairFlag"></el-checkbox>
<el-button @click="setDefault()" type="primary" style="margin-left: 58px;margin-top: 0px">{{'设为默认'}}</el-button>
<el-button @click="copyRouting()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'复制产品工艺路线'}}</el-button>
<el-button @click="copyRouting()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'复制产品工艺路线'}}
</el-button>
</el-form-item>
</el-form>
<el-tabs v-model="activeName">
<el-tab-pane :label="'明细'" name="first">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-button @click="addRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
<el-button @click="editRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'修改'}}</el-button>
<el-button @click="deleteRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'删除'}}</el-button>
<el-button @click="jumpWorkCenter()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'加工中心'}}</el-button>
<el-button @click="getResourceModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'可用机台'}}</el-button>
<el-button @click="addRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}
</el-button>
<el-button @click="editRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'修改'}}
</el-button>
<el-button @click="deleteRoutingDetail()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'删除'}}
</el-button>
<el-button @click="jumpWorkCenter()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'加工中心'}}
</el-button>
<el-button @click="getResourceModel()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'可用机台'}}
</el-button>
</el-form>
<el-table
:height="height"
@ -87,10 +96,14 @@
</el-tab-pane>
<el-tab-pane :label="'工具清单'" name="second">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-button @click="addRoutingTool()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
<el-button @click="editRoutingTool()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'修改'}}</el-button>
<el-button @click="deleteRoutingTool()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'删除'}}</el-button>
<el-button @click="jumpToolInfo()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'工具信息'}}</el-button>
<el-button @click="addRoutingTool()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}
</el-button>
<el-button @click="editRoutingTool()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'修改'}}
</el-button>
<el-button @click="deleteRoutingTool()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'删除'}}
</el-button>
<el-button @click="jumpToolInfo()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'工具信息'}}
</el-button>
</el-form>
<el-table
:height="height"
@ -168,7 +181,8 @@
<el-dialog title="维护工艺路线明细" :close-on-click-modal="false" v-drag :visible.sync="detailmodelFlag" width="620px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
<el-form-item :label="'工序号：'">
<el-input v-model="detailData.itemNo" :disabled="detailmodelInputFlag" style="width: 130px;text-align: right" type="number"></el-input>
<el-input v-model="detailData.itemNo" :disabled="detailmodelInputFlag" style="width: 130px;text-align: right"
type="number"></el-input>
</el-form-item>
<el-form-item :label="'工序名称：'">
<el-input v-model="detailData.operationDesc" style="width: 130px"></el-input>
@ -222,7 +236,8 @@
<el-dialog title="维护工艺路线工具" :close-on-click-modal="false" v-drag :visible.sync="ToolmodelFlag" width="480px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
<el-form-item :label="'工序号：'">
<el-select v-model="toolData.itemNo" @change="getOperationDesc()" :disabled="toolmodelInputFlag" style="width: 130px" placeholder="请选择">
<el-select v-model="toolData.itemNo" @change="getOperationDesc()" :disabled="toolmodelInputFlag"
style="width: 130px" placeholder="请选择">
<el-option
v-for="(item,index) in selectList"
:key="index"
@ -237,7 +252,8 @@
</el-form-item>
<el-form-item>
<span slot="label" style="" @click="getBaseList(70,0)"><a herf="#">工具编号：</a></span>
<el-input v-model="toolData.toolID" @change="getToolDesc()" :disabled="toolmodelInputFlag" style="width: 130px;text-align: right" ></el-input>
<el-input v-model="toolData.toolID" @change="getToolDesc()" :disabled="toolmodelInputFlag"
style="width: 130px;text-align: right"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
@ -392,7 +408,8 @@
<el-input v-model="copyRoutingData.partNo" disabled style="width: 120px;text-align: right"></el-input>
</el-form-item>
<el-form-item :label="'工艺路线名称：'">
<el-input v-model="copyRoutingData.partDescription" disabled style="width: 250px;text-align: right" ></el-input>
<el-input v-model="copyRoutingData.partDescription" disabled
style="width: 250px;text-align: right"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -0px;">
@ -400,7 +417,8 @@
<el-input v-model="copyRoutingData.revNo" disabled style="width: 120px;text-align: right"></el-input>
</el-form-item>
<el-form-item :label="'启用日期：'">
<el-input v-model="copyRoutingData.phaseInDate" disabled style="width: 120px;text-align: right" ></el-input>
<el-input v-model="copyRoutingData.phaseInDate" disabled
style="width: 120px;text-align: right"></el-input>
</el-form-item>
<el-form-item :label="'修复版本：'">
<el-checkbox style="margin-left: 0px" disabled v-model="copyRoutingData.repairFlag"></el-checkbox>
@ -412,10 +430,12 @@
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -8px;">
<el-form-item>
<span slot="label" style="" @click="getBaseList(5,1)"><a herf="#">工艺路线编码：</a></span>
<el-input v-model="copyRoutingData.partNo1" @change="getPartDescription()" style="width: 120px;text-align: right" ></el-input>
<el-input v-model="copyRoutingData.partNo1" @change="getPartDescription()"
style="width: 120px;text-align: right"></el-input>
</el-form-item>
<el-form-item :label="'工艺路线名称：'">
<el-input v-model="copyRoutingData.partDescription1" disabled style="width: 250px;text-align: right" ></el-input>
<el-input v-model="copyRoutingData.partDescription1" disabled
style="width: 250px;text-align: right"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -0px;">
@ -465,7 +485,8 @@
<el-form :inline="true" label-position="top" style="margin-left: 0px;margin-top: -5px;">
<el-form-item>
<span slot="label" style="" @click="getBaseList(5,2)"><a herf="#">工艺路线编码：</a></span>
<el-input v-model="routingHeaderData.partNo" :disabled="routingHeaderInputFlag" style="width: 130px;text-align: right" ></el-input>
<el-input v-model="routingHeaderData.partNo" :disabled="routingHeaderInputFlag"
style="width: 130px;text-align: right"></el-input>
</el-form-item>
<el-form-item :label="'工厂编号：'">
<el-input v-model="routingHeaderData.site" disabled style="width: 130px;text-align: right"></el-input>
@ -476,7 +497,8 @@
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 0px;margin-top: -5px;">
<el-form-item :label="'版本号：'">
<el-input v-model="routingHeaderData.revNo" :disabled="routingHeaderInputFlag" style="width: 130px;text-align: right" ></el-input>
<el-input v-model="routingHeaderData.revNo" :disabled="routingHeaderInputFlag"
style="width: 130px;text-align: right"></el-input>
</el-form-item>
<el-form-item :label="'启用日期：'">
<el-date-picker
@ -551,6 +573,7 @@
deleteRoutingHeaderData
} from "@/api/base/site.js"
import Chooselist from '@/views/modules/common/Chooselist'
export default {
name: "maintainProductRouting",
components: {
@ -2095,7 +2118,11 @@
})
return false;
}
let inData={user:this.$store.state.user.name,site:this.currentRow.site,workCenterNo:this.currentRow.workCenterNo};
let inData = {
user: this.$store.state.user.name,
site: this.currentRow.site,
workCenterNo: this.currentRow.workCenterNo
};
localStorage.setItem('workCenterNo', JSON.stringify(inData))
this.$router.replace('base-workCenter')
},
@ -2106,7 +2133,11 @@
})
return false;
}
let inData={site:this.$store.state.user.site,toolId:this.currentRow2.toolID,toolDescription:this.currentRow2.toolDescription};
let inData = {
site: this.$store.state.user.site,
toolId: this.currentRow2.toolID,
toolDescription: this.currentRow2.toolDescription
};
localStorage.setItem('toolInfo', JSON.stringify(inData))
this.$router.replace('knifemold-tool-info')
},
@ -2339,6 +2370,13 @@
})
this.$message.success('操作成功')
let row = {
partNo: this.copyRoutingData.partNo1,
site: this.mainData.site,
revNo: this.copyRoutingData.revNo1,
}
this.tableHanddle(row)
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'

23
src/views/modules/yieldReport/otherReport/change_packaging.vue
View File

@ -305,6 +305,9 @@
width="115"
:label=labels.rollListOperation>
<template slot-scope="scope">
<a v-if="scope.row.virtualRollFlag=='N'" class="customer-a"
@click="rollPrintLabel(scope.row)"
>{{'打印'}}</a>
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'"
@click="warnReopenSfdcRollsConfirm(scope.row)"
>{{ labels.rollListReopen }}</a>
@ -453,6 +456,9 @@
<!-- 为生产下机拆卷 -->
<notOverFinishRoll ref="notOverFinishRoll" :visible.sync="showNotOverFlag"
@refreshPageData="refreshPageData"></notOverFinishRoll>
<!--打印卷标签-->
<com-roll-label ref="comRollLabel" ></com-roll-label>
</div>
</template>
@ -493,6 +499,7 @@ import {
checkSfdcDefect
} from "@/api/yieldReport/produce_report_normal.js";
/*引入组件*/
import comRollLabel from "../../common/com-roll-label";/*打印卷标签*/
import comSwitchOperator from "../com_switch_operator";/*切换操作员*/
import changeSwitchRoll from "./change_switch_roll";/*切换卷操作*/
import comSeparateRoll from "../com_separate_roll";
@ -3275,6 +3282,7 @@ export default {
}
},
components: {
comRollLabel,
comSwitchOperator,/*切换用户的组件*/
changeSwitchRoll,/*切换卷操作*/
comSeparateRoll,/*創建分卷组件*/
@ -3297,6 +3305,12 @@ export default {
comFinishPartRoll,
},
methods: {
// 卷标签打印
rollPrintLabel(val){
this.$nextTick(() => {
this.$refs.comRollLabel.init(val.rollNo)
});
},
// 不良记录
sfdcDefectListSummaries(param){
const { columns, data } = param;
@ -3821,9 +3835,12 @@ export default {
this.createRoll.rollNums= ''
this.createRoll.rollQty= ''
//打印卷标签
let printList = data.printList;
printSfdcLabel(printList);
// let printList = data.printList;
// printSfdcLabel(printList);
// 打印
this.$nextTick(() => {
this.$refs.comRollLabel.init(data.rollNos)
});
//刷新报工的页面
this.getSfdcRollList()
}else {

5
src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
View File

@ -264,7 +264,7 @@
<template slot-scope="scope">
<a v-if="scope.row.virtualRollFlag=='N'" class="customer-a"
@click="rollPrintLabel(scope.row)"
>{{labels.rollListPrint}}</a>
>{{'打印'}}</a>
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'"
@click="warnReopenSfdcRollsConfirm(scope.row)"
>{{labels.rollListReopen}}</a>
@ -457,6 +457,7 @@
<notOverFinishRoll ref="notOverFinishRoll" :visible.sync="showNotOverFlag"
@refreshPageData="refreshPageData"></notOverFinishRoll>
<!--打印卷标签-->
<com-roll-label ref="comRollLabel" ></com-roll-label>
</div>
@ -490,7 +491,7 @@ import {
checkSfdcDefect
} from "@/api/yieldReport/produce_report_normal.js";
/*引入组件*/
import comRollLabel from "../../common/com-roll-label";/*切换操作员*/
import comRollLabel from "../../common/com-roll-label";/*打印卷标签*/
import comSwitchOperator from "../com_switch_operator";/*切换操作员*/
import otherSwitchRoll from "./other_switch_roll";/*切换卷操作*/
import comSeparateRoll from "../com_separate_roll";

20
src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
View File

@ -195,6 +195,9 @@
width="115"
:label=labels.rollListOperation>
<template slot-scope="scope">
<a v-if="scope.row.virtualRollFlag=='N'" class="customer-a"
@click="rollPrintLabel(scope.row)"
>{{'打印'}}</a>
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'"
@click="warnReopenSfdcRollsConfirm(scope.row)"
>{{ labels.rollListReopen }}</a>
@ -346,7 +349,8 @@
<defectList ref="defectList" @getSfdcDefectList='getSfdcDefectList' ></defectList>
<bulkInspection ref="bulkInspection" ></bulkInspection>
<!--打印卷标签-->
<com-roll-label ref="comRollLabel" ></com-roll-label>
</div>
</template>
@ -379,6 +383,7 @@ import {
checkSfdcDefect
} from "@/api/yieldReport/produce_report_normal.js";
/*引入组件*/
import comRollLabel from "../../common/com-roll-label";/*打印卷标签*/
import comSwitchOperator from "../com_switch_operator";/*切换操作员*/
import otherSwitchRoll from "./other_switch_roll";/*切换卷操作*/
import comSeparateRoll from "../com_separate_roll";
@ -3040,6 +3045,7 @@ export default {
}
},
components: {
comRollLabel,// 打印组件
comSwitchOperator,/*切换用户的组件*/
otherSwitchRoll,/*切换卷操作*/
comSeparateRoll,/*創建分卷组件*/
@ -3060,6 +3066,12 @@ export default {
bulkInspection, /**/
},
methods: {
// 卷标签打印
rollPrintLabel(val){
this.$nextTick(() => {
this.$refs.comRollLabel.init(val.rollNo)
});
},
// 机器下机卷
sfdcRollListSummaries(param){
const { columns, data } = param;
@ -3523,7 +3535,11 @@ export default {
//判断操作是否成功
if (data.code == 500) {
this.$message(data.msg);
} else {
} else if(data.code == 200) {
// 打印
this.$nextTick(() => {
this.$refs.comRollLabel.init(data.rollNos)
});
//刷新报工的页面
this.$emit('refreshPageData');
//关闭当前的页面

Write Preview
Loading…
Cancel
Save