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

删除多余的代码

LIrui
DouDou 2 years ago
parent
11983f59ce
commit
bcc9d59ea4
10 changed files with 0 additions and 20279 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 446
      src/views/modules/scheduleReport/otherReport/bulk_inspection.vue
  2. 1401
      src/views/modules/scheduleReport/otherReport/change_finish_roll.vue
  3. 4249
      src/views/modules/scheduleReport/otherReport/change_packaging.vue
  4. 445
      src/views/modules/scheduleReport/otherReport/change_switch_roll.vue
  5. 318
      src/views/modules/scheduleReport/otherReport/defectList.vue
  6. 668
      src/views/modules/scheduleReport/otherReport/fqc_merge_roll.vue
  7. 4297
      src/views/modules/scheduleReport/otherReport/fqc_produce_report_normal.vue
  8. 3928
      src/views/modules/scheduleReport/otherReport/fqc_split_roll_report.vue
  9. 329
      src/views/modules/scheduleReport/otherReport/other_switch_roll.vue
  10. 4198
      src/views/modules/scheduleReport/otherReport/rework_inspect_report.vue

446
src/views/modules/scheduleReport/otherReport/bulk_inspection.vue
View File

@ -1,446 +0,0 @@
<template>
<div class="">
<el-dialog
v-drag
@close="closeDialog"
width="600px"
:title=titleCon
:close-on-click-modal="false"
:visible.sync="visible">
<el-row style="margin-top: 0px">
<el-col :span="24" style="margin-top: -12px">
<el-form :inline="true" label-position="top">
<el-form-item label="卷号:">
<el-input style="width: 120px" v-model="sfdcRolls.rollNo">
</el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" style="margin-top: 24px" @click="getDataList">{{buttons.searchButton}}</el-button>
</el-form-item>
</el-form>
</el-col>
<el-col :span="24" style="margin-top: -5px">
<fieldset class="customer-fieldset" style="width: 350px; height: 60px">
<legend class="customer-legend">排程班次信息</legend>
<el-form style="margin-top: -10px" :inline="true" label-position="top">
<el-form-item label="排产日期:">
<el-date-picker style="width: 100px"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd hh:mm:ss" v-model="currentDate" readonly>
</el-date-picker>
</el-form-item>
<el-form-item label="班次:">
<el-input style="width: 120px" v-model="shift" readonly>
</el-input>
</el-form-item>
<el-button type="info" :disabled="buttonTags.selectShiftFlag" plain @click="selectSchduleShiftModal"
style="margin-left: -10px; margin-top: 20px; height: 20px; padding: 3px 3px;">
<icon-svg name="ellipsis" style="height: 10px; width: 10px;" ></icon-svg>
</el-button>
<el-form-item>
<!-- <el-button type="primary" style="margin-top: 24px">查询</el-button>-->
</el-form-item>
</el-form>
</fieldset>
</el-col>
<el-col :span="24">
<el-table
height="300"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in languageColumnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:align="item.align"
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="item.columnProp!='inspectqty'"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnProp=='inspectqty'"><input
class="sl-input"
oninput="value=value.replace(/[^0-9]/g,'')"
v-model="scope.row[item.columnProp]" type="text"
clearable></input></span>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForInspection">{{buttons.inspectionButton}}</el-button>
<el-button @click="visible = false" type="primary">{{buttons.closeButton}}</el-button>
<el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>
</span>
</el-dialog>
<!-- 班次选择组件 -->
<comSelectShift ref="comSelectShift" :close-on-click-modal="false"
:visible.sync="showShiftFlag"
@initScheduleShift = "initScheduleShift">
</comSelectShift>
</div>
</template>
<script>
/*组件*/
import comSelectShift from "../com_select_shift";//班次选择的组件
import {
searchFqcSfdcRolls,
getScheduleDateShift,
workbenchPostinspection,
getScheduleShiftData,/*LR 新增查询班次的方法*/
} from "@/api/yieldReport/produce_report_normal.js";
import {
searchSysLanguagePackList,
searchSysLanguageParam,
searchFunctionButtonList,
saveButtonList,
searchSysLanguage,
searchLanguageListByLanguageCode,
saveSysLanguageOne,
searchPageLanguageData,
removerLanguage,
saveSysLanguageList
} from "@/api/sysLanguage.js";
var functionId = 'C10000022';
export default {
data() {
return {
titleCon: '批量直接送检',
showDefault: false,
currentDate: '',
repairOrderFlag: '',
shift: '',
visible: false,
showShiftFlag: false,
operatorId: '',
dataList: [],
site: this.$store.state.user.site,
reportedBy: this.$store.state.user.name,
sfdcRolls: {
site: this.$store.state.user.site,
reportedBy: this.$store.state.user.name,
orderNo: '',
itemNo: '',
seqNo: '',
histSeqNo: '',
rollNo: '',
resourceId: ''
},
scheduleDateShiftDto: {
site: '',
resourceId: '',
currentDateTime: ''
},
dataListLoading: false,
buttonTags:{
selectShiftFlag: true,
},
languageColumnList: [
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5301ToolHistSeqNo',
tableId: "5303Tool",
tableName: "批量送卷",
columnProp: "rollNo",
headerAlign: "center",
align: "center",
columnLabel: "卷号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
}
],
buttons: {
inspectionButton: '送检',
searchButton: '查询',
closeButton: '关闭',
sureSelectRollDirectInspection: '确定要对选中的卷做“直接送检”处理?',
confirmLabel: '确认',
cancelLabel: '取消',
},
buttonList: [
{
functionId: functionId,
languageValue: '送检',
objectId: 'inspectionButton',
objectType: 'button',
tableId: '*'
}, {
functionId: functionId,
languageValue: '查询',
objectId: 'searchButton',
objectType: 'button',
tableId: '*'
}, {
functionId: functionId,
languageValue: '关闭',
objectId: 'closeButton',
objectType: 'button',
tableId: '*'
},
],
queryButton: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'button'
},
labels: {
titleCon: '批量直接送检',
rollNo: '卷号:',
scheduleShiftInfo: '排程班次信息',
scheduledDate: '排程日期:',
shitNo: '班次:',
},
labelsList: [
{
functionId: functionId,
languageValue: '批量直接送检',
objectId: 'titleCon',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '卷号:',
objectId: 'rollNo',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '排程班次信息:',
objectId: 'scheduleShiftInfo',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '排程日期:',
objectId: 'scheduledDate',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '班次:',
objectId: 'shitNo',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '确定要对选中的卷做“直接送检”处理?',
objectId: 'sureSelectRollDirectInspection',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '确定',
objectId: 'confirmLabel',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '取消',
objectId: 'cancelLabel',
objectType: 'label',
tableId: '*'
},
],
queryLabel: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'label'
},
}
},
components: {
comSelectShift,/*班次选择的组件*/
},
mounted() {
},
activated() {
},
methods: {
init(val, val2) {
this.visible = true
this.repairOrderFlag = val2
this.sfdcRolls.site = val.site
this.sfdcRolls.orderNo = val.orderNo
this.sfdcRolls.itemNo = val.itemNo
this.sfdcRolls.seqNo = val.seqNo
this.sfdcRolls.resourceId = val.resourceId
this.scheduleDateShiftDto.site = val.site
this.operatorId = val.operatorId
this.scheduleDateShiftDto.resourceId = val.resourceId
this.scheduleDateShiftDto.currentDateTime = this.dayjs().format("YYYY-MM-DD HH:mm:ss")
//判断是否启用多语言
this.getMultiLanguageList(); //刷新多语言的信息
this.searchScheduleDateShift();
//刷新是否可以选择班次的按钮
this.searchScheduleShiftData();
//重置标题
this.titleCon = this.labels.titleCon;
},
// 获取不良列表
getDataList() {
searchFqcSfdcRolls(this.sfdcRolls).then(({data}) => {
this.dataList = data.list
})
},
// 获取排产日期
searchScheduleDateShift() {
getScheduleDateShift(this.scheduleDateShiftDto).then(({data}) => {
if (data.code == 0) {
this.currentDate = data.map.scheduleddate
this.shift = data.map.ShiftNo
}
})
},
// 送检
submitForInspection() {
if (this.dataList.length == 0) {
return;
}
let paramData = this.dataList.map(item => {
item = {
site: this.sfdcRolls.site,
orderNo: this.sfdcRolls.orderNo,
itemNo: this.sfdcRolls.itemNo,
seqNo: this.sfdcRolls.seqNo,
shift: this.shift,
resourceId: this.sfdcRolls.resourceId,
scheduleDate: this.currentDate,
rollNo: item.rollNo,
repairOrderFlag: this.repairOrderFlag,
operatorId: this.operatorId,
currentDatetime: this.scheduleDateShiftDto.currentDateTime,
remark: ''
}
return item
})
this.$confirm(`确定要对选中的卷做“直接送检”处理?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
workbenchPostinspection(paramData).then(({data}) => {
if (data.code == 0) {
this.$message.success(data.msg)
}
if (data.code == 400) {
this.$message.warning(data.msg)
}
if (data.code == 500) {
this.$message.error(data.msg)
}
})
})
},
closeDialog() {
Object.assign(this.$data.sfdcRolls, this.$options.data.call(this).sfdcRolls);
},
searchScheduleShiftData(){
let requestData = {'site': this.site, 'username': this.reportedBy,reportedTime:this.scheduleDateShiftDto.currentDateTime};
getScheduleShiftData(requestData).then(({data}) => {
let specialAuth = data.row.specialAuth;
//根据不同设置不同的属性
if("Y" === specialAuth){
this.buttonTags.selectShiftFlag = false;
}else{
this.buttonTags.selectShiftFlag = true;
}
});
},
/*打开班次选择页面*/
selectSchduleShiftModal(){
//1.首先调用菜单判断方式 打开生产过程的材料的页面
//checkProduceButton('produceMaterialFlag');
//处理请求的参数
let requestData = {'site': this.site, 'username': this.reportedBy, 'resourceId': this.sfdcRolls.resourceId,
'reportedTime': this.scheduleDateShiftDto.currentDateTime, 'scheduledDate': this.scheduleDateShiftDto.currentDateTime.substring(0, 10)};
//打开生产过程的工具的页面
this.$nextTick(() => {
this.showShiftFlag = true;
this.$refs.comSelectShift.init(requestData);
});
},
/*修改页面的班次和排产的时间*/
initScheduleShift(scheduleDate, shiftDesc, username){
//重置班次和排产的时间
this.currentDate = scheduleDate.substring(0, 10);
this.shift = shiftDesc;
},
// 保存 默认配置 列
async saveMultiLanguage() {
// 保存页面 button label title 属性
let buttons = this.buttonList;
let labels = this.labelsList;
await saveButtonList(buttons)
await saveButtonList(labels)
},
getMultiLanguageList() {
//首先查询当前按钮的多语言
searchFunctionButtonList(this.queryButton).then(({data}) => {
if (data && data.code == 0 ) {
this.buttons = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
//其次查询当前标签的多语言
searchFunctionButtonList(this.queryLabel).then(({data}) => {
if (data && data.code == 0 ) {
this.labels = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
},
},
created() {
}
}
</script>
<style scoped>
.sl-input {
background-color: transparent;
border: 0 !important;
font-size: 12px !important;
height: 12px !important;
line-height: 14px !important;
background-color: transparent !important;
width: 140px;
}
.sl-input:focus, textarea:focus {
outline: none;
}
.el-table /deep/ th {
padding: 0;
}
</style>

1401
src/views/modules/scheduleReport/otherReport/change_finish_roll.vue
File diff suppressed because it is too large
View File

4249
src/views/modules/scheduleReport/otherReport/change_packaging.vue
File diff suppressed because it is too large
View File

445
src/views/modules/scheduleReport/otherReport/change_switch_roll.vue
View File

@ -1,445 +0,0 @@
<template>
<div class="customer-css">
<el-dialog @close="closeDialog" :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
width="255px" style="height: 680px;" class="customer-dialog">
<el-form :inline="true" label-position="top" style="height: 60px;"
label-width="80px">
<!-- 半成品卷卷号 -->
<el-row>
<el-col :span="24" style="margin-left: 0px;margin-top: -5px">
<el-form-item :label=labels.sfdcRollNo>
<el-input ref="newRollNo" v-model="pageData.rollNo" style="width: 208px;" ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="margin-left: 0px; margin-top: -5px;margin-bottom: 10px;">
<el-form-item :label=labels.scheduledDate>
<el-date-picker style="width: 100px"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd hh:mm:ss" v-model="currentDate" readonly>
</el-date-picker>
</el-form-item>
<el-form-item :label=labels.shiftNo>
<el-input style="width: 95px" v-model="shift" readonly>
</el-input>
</el-form-item>
<el-button type="info" :disabled="buttonTags.selectShiftFlag" plain @click="selectSchduleShiftModal"
style="margin-left: -10px; margin-top: 20px; height: 20px; padding: 3px 3px;">
<icon-svg name="ellipsis" style="height: 10px; width: 10px;" ></icon-svg>
</el-button>
</el-col>
</el-row>
</el-form>
<span style="margin-top: 20px" slot="footer" class="dialog-footer">
<el-button type="primary" @click="switchRollOperation">{{ buttons.confirmButton }}</el-button>
<el-button type="primary" @click="closeDialog">{{ buttons.closeButton }}</el-button>
<el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>
</span>
</el-dialog>
<!-- 班次选择组件 -->
<comSelectShift ref="comSelectShift" :close-on-click-modal="false"
:visible.sync="showShiftFlag"
@initScheduleShift = "initScheduleShift">
</comSelectShift>
</div>
</template>
<script>
/*添加组件*/
import comExceptionReason from "../com_exception_reason";//异常远远
import {
getScheduleDateShift,
getScheduleShiftData,/*LR 新增查询班次的方法*/
} from "@/api/yieldReport/produce_report_normal.js";
/*添加js的方法和请求*/
import {
switchrollRepackCheck , /*换包装切换卷校验*/
switchrollRepackAction/*换包装执行切换卷的操作*/
} from '@/api/yieldReport/com_switch_roll.js'
import comSelectShift from "../com_select_shift";
import {
searchSysLanguagePackList,
searchSysLanguageParam,
searchFunctionButtonList,
saveButtonList,
searchSysLanguage,
searchLanguageListByLanguageCode,
saveSysLanguageOne,
searchPageLanguageData,
removerLanguage,
saveSysLanguageList
} from "@/api/sysLanguage.js";
var functionId = 'C10000030';
export default {
data() {
return {
titleCon: '扫描卷',
showDefault: false,
shift: '',
showShiftFlag:false,
site: this.$store.state.user.site,
reportedBy: this.$store.state.user.name,
buttonTags:{
selectShiftFlag: true,
},
currentDate: '',
scheduleData: {
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
seqNo: '',
orderNo: '',
itemNo: 0,
resourceId: '',
scheduledDate: '',
shiftNo: '',
partNo: '',
workCenterNo: '',
workCenterDesc: '',
resourceDesc: '',
rollNo: '',
partDesc: '',
planStartTime: '',
planFinishTime: '',
qtyRequiredOriginal: 0,
preItemDesc: '',
nextItemDesc: '',
nextItemNo: 0,
operatorId: '',
functionName: '',
currentRollFlag: false
},
pageData: {
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
seqNo: '',
orderNo: '',
rollNo: '',
itemNo: '',
newRollNo: '',
operatorId: '',
// fqc , 切换卷参数
repairOrderFlag: 'N',
checkMultipleRoll: 'Y',
directPass: 'N',
// repackage
resourceId: '',
currentDate:'',
directRepackageflag:'N',
workCenterNo: '',
shiftNo: '',
scheduledDate: ''
},
operatorData: {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
operatorId: '',
operatorName: '',
status: '',
seqNo: '',
showFlag: false
},
scheduleDateShiftDto: {
site: this.$store.state.user.site,
resourceId: '',
currentDateTime: ''
},
buttons: {
confirmButton: '确定',
closeButton: '关闭',
},
buttonList: [
{
functionId: functionId,
languageValue: '确定',
objectId: 'confirmButton',
objectType: 'button',
tableId: '*'
}, {
functionId: functionId,
languageValue: '关闭',
objectId: 'closeButton',
objectType: 'button',
tableId: '*'
},
],
queryButton: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'button'
},
labels: {
titleCon: '扫描卷',
sfdcRollNo: '产品卷号:',
scheduledDate: '排产日期:',
shiftNo: '班次:',
pleaseSwitchOperator: '请先切换人员!',
pleaseEnterSfdcRoll: '请输入半成品卷号!',
pleaseSelectScheduledDate: '请选择排产日期!',
},
labelsList: [
{
functionId: functionId,
languageValue: '扫描卷',
objectId: 'titleCon',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '产品卷号:',
objectId: 'sfdcRollNo',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '排产日期:',
objectId: 'scheduledDate',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '班次:',
objectId: 'shiftNo',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '请先切换人员!',
objectId: 'pleaseSwitchOperator',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '请输入半成品卷号!',
objectId: 'pleaseEnterSfdcRoll',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '请选择排产日期!',
objectId: 'pleaseSelectScheduledDate',
objectType: 'label',
tableId: '*'
},
],
queryLabel: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'label'
},
}
},
components: {
comExceptionReason,/*异常原因的组件*/
comSelectShift,/*班次选择的组件*/
},
methods: {
// 获取排产日期
searchScheduleDateShift() {
getScheduleDateShift(this.scheduleDateShiftDto).then(({data}) => {
if (data.code == 0) {
this.currentDate = data.map.scheduleddate?data.map.scheduleddate:this.scheduleDateShiftDto.currentDateTime
this.shift = data.map.ShiftNo
}
})
},
searchScheduleShiftData(){
let requestData = {'site': this.site, 'username': this.reportedBy,reportedTime:this.scheduleDateShiftDto.currentDateTime};
getScheduleShiftData(requestData).then(({data}) => {
let specialAuth = data.row.specialAuth;
//根据不同设置不同的属性
if("Y" === specialAuth){
this.buttonTags.selectShiftFlag = false;
}else{
this.buttonTags.selectShiftFlag = true;
}
});
},
/*打开班次选择页面*/
selectSchduleShiftModal(){
//1.首先调用菜单判断方式 打开生产过程的材料的页面
//checkProduceButton('produceMaterialFlag');
//处理请求的参数
let requestData = {'site': this.site, 'username': this.reportedBy, 'resourceId': this.scheduleDateShiftDto.resourceId ,
'reportedTime': this.scheduleDateShiftDto.currentDateTime, 'scheduledDate': this.scheduleDateShiftDto.currentDateTime.substring(0, 10)};
//打开生产过程的工具的页面
this.$nextTick(() => {
this.showShiftFlag = true;
this.$refs.comSelectShift.init(requestData);
});
},
/*修改页面的班次和排产的时间*/
initScheduleShift(scheduleDate, shiftDesc, username){
//重置班次和排产的时间
this.currentDate = scheduleDate.substring(0, 10);
this.shift = shiftDesc;
},
//页面的初始化的方法
init(scheduleData, operatorData) {
this.pageData.newRollNo = ''
//初始化参数
this.scheduleData = scheduleData;
//初始化操作员对象
this.operatorData = JSON.parse(JSON.stringify(operatorData));
//设置对应的参数
this.pageData.orderNo = scheduleData.orderNo;
this.pageData.itemNo = scheduleData.itemNo;
this.pageData.seqNo = scheduleData.seqNo;
this.pageData.operatorId = operatorData.operatorId;
this.pageData.repairOrderFlag = scheduleData.repairOrderFlag;
this.pageData.checkMultipleRoll = scheduleData.checkMultipleRoll;
this.pageData.directPass = scheduleData.directPass;
this.pageData.resourceId = scheduleData.resourceId;
this.pageData.workCenterNo = scheduleData.workCenterNo;
this.pageData.currentDate = this.dayjs().format("YYYY-MM-DD HH:mm:ss")
this.currentDate = this.dayjs().format("YYYY-MM-DD HH:mm:ss")
this.scheduleDateShiftDto.resourceId = scheduleData.resourceId
this.scheduleDateShiftDto.currentDateTime = this.dayjs().format("YYYY-MM-DD HH:mm:ss")
//判断是否启用多语言
this.getMultiLanguageList(); //刷新多语言的信息
this.searchScheduleDateShift();
//刷新是否可以选择班次的按钮
this.searchScheduleShiftData();
//自动获取焦点
this.$nextTick(() => {
this.$refs.newRollNo.focus();
});
//重置标题
this.titleCon = this.labels.titleCon;
},
/*关闭modal*/
closeDialog(){
this.$emit('update:visible', false);
this.currentDate = ''
this.shift = ''
this.pageData.rollNo = ''
},
switchRollBun() {
//人员判断
if (this.pageData.operatorId == '' || this.pageData.operatorId == null) {
this.$message.warning(this.labels.pleaseSwitchOperator);
return false;
}
if (!this.pageData.rollNo) {
this.$message.warning(this.labels.pleaseEnterSfdcRoll);
return false;
}
//校验是否继续
switchrollRepackCheck(this.pageData).then(({data}) => {
//判断是否成功
if (data.code == 400) {
this.$message.warning(data.msg);
} else if (data.code == 500){
this.$message.error(data.msg);
} else { //执行切换卷的操作
this.switchRollOperation();
}
});
},
/*执行切换卷的操作*/
switchRollOperation() {
//人员判断
if (this.pageData.operatorId == '' || this.pageData.operatorId == null) {
this.$message.warning(this.labels.pleaseSwitchOperator);
return false;
}
if (!this.pageData.rollNo) {
this.$message.warning(this.labels.pleaseEnterSfdcRoll);
return false;
}
if (!this.currentDate){
this.$message.warning(this.labels.pleaseSelectScheduledDatesho);
return;
}
this.pageData.scheduledDate = this.currentDate
this.pageData.shiftNo = this.shift
switchrollRepackAction(this.pageData).then(({data}) => {
//判断操作是否成功
if (data.code == 400) {
this.$message.warning(data.msg);
} else if (data.code == 500){
this.$message.error(data.msg);
} else {
//刷新报工的页面
this.$emit('refreshPageData');
//关闭当前的页面
this.closeDialog();
}
})
},
// 保存 默认配置 列
async saveMultiLanguage() {
// 保存页面 button label title 属性
let buttons = this.buttonList;
let labels = this.labelsList;
await saveButtonList(buttons)
await saveButtonList(labels)
},
getMultiLanguageList() {
//首先查询当前按钮的多语言
searchFunctionButtonList(this.queryButton).then(({data}) => {
if (data && data.code == 0 ) {
this.buttons = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
//其次查询当前标签的多语言
searchFunctionButtonList(this.queryLabel).then(({data}) => {
if (data && data.code == 0 ) {
this.labels = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
},
},
created() {
// this.factoryList()
// this.getLanguageList()
}
}
</script>
<style scoped lang="scss">
/*调节页面button和input的上下间距*/
.customer-css .customer-button{
margin-top: 25px;
}
/*调节fieldset下的样式*/
.customer-fieldset .customer-item{
margin-top: -15px;
}
/*fieldset下table的样式*/
.customer-fieldset /deep/ .el-table__header th.is-leaf{
line-height: 16px;
}
/deep/ .customer-tab .el-tabs__content{
padding: 0px !important;
}
</style>

318
src/views/modules/scheduleReport/otherReport/defectList.vue
View File

@ -1,318 +0,0 @@
<template>
<el-dialog
width="800px"
:title=titleCon
:close-on-click-modal="false"
:visible.sync="visible">
<el-row >
<el-col :span="24">
<el-form :inline="true" label-position="top">
<el-form-item :label=labels.reportedDate>
<el-date-picker style="width: 120px"
format = "yyyy-MM-dd"
value-format="yyyy-MM-dd hh:mm:ss" v-model="harmful.reportedDate">
</el-date-picker>
</el-form-item>
</el-form>
</el-col>
<el-col :span="24">
<el-table
height="450"
:data="dataList"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in languageColumnList" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="item.columnProp!='inspectqty'"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnProp=='inspectqty'">
<input type="number" v-model="scope.row[item.columnProp]"
class="sl-input"
oninput="value=value.replace(/[^0-9]/g,'')"
style="margin-top: -3px;background-color: transparent; width: 100%;">
</input>
</span>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="save" >{{ buttons.saveButton }}</el-button>
<el-button @click="visible = false" type="primary">{{ buttons.closeButton }}</el-button>
<el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>
</span>
</el-dialog>
</template>
<script>
import {
inspectiondefectcode,
saveSfdcDefectList
} from "@/api/yieldReport/produce_report_normal.js";
import {
searchSysLanguagePackList,
searchSysLanguageParam,
searchFunctionButtonList,
saveButtonList,
searchSysLanguage,
searchLanguageListByLanguageCode,
saveSysLanguageOne,
searchPageLanguageData,
removerLanguage,
saveSysLanguageList
} from "@/api/sysLanguage.js";
var functionId = 'C10000029';
export default {
data() {
return {
visible: false,
titleCon: '批量录入不良',
showDefault: false,
dataList: [],
site: this.$store.state.user.site,
reportedBy: this.$store.state.user.name,
harmful: {
site: this.$store.state.user.site,
reportedBy: this.$store.state.user.name,
orderNo: '',
itemNo: '',
seqNo: '',
histSeqNo: '',
rollNo: '',
reportedDate: '',
defectCode: '',
defectQty: '',
defectDesc: ''
},
dataListLoading: false,
languageColumnList: [
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5301ToolHistSeqNo',
tableId: "5303Tool",
tableName: "不良信息列表",
columnProp: "defectcode",
headerAlign: "center",
align: "center",
columnLabel: "不良代码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5301ToolHistSeqNo',
tableId: "5303Tool",
tableName: "工具记录表",
columnProp: "defectdesc",
headerAlign: "center",
align: "center",
columnLabel: "不良原因",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5301ToolHistSeqNo',
tableId: "5303Tool",
tableName: "工具记录表",
columnProp: "inspectqty",
headerAlign: "center",
align: "center",
columnLabel: "数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
],
buttons: {
saveButton: '保存',
closeButton: '关闭',
},
buttonList: [
{
functionId: functionId,
languageValue: '保存',
objectId: 'saveButton',
objectType: 'button',
tableId: '*'
},{
functionId: functionId,
languageValue: '关闭',
objectId: 'closeButton',
objectType: 'button',
tableId: '*'
},
],
queryButton: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'button'
},
labels: {
titleCon: '批量录入不良',
reportedDate: '报告日期:',
},
labelsList: [
{
functionId: functionId,
languageValue: '批量录入不良',
objectId: 'titleCon',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '报告日期:',
objectId: 'reportedDate',
objectType: 'label',
tableId: '*'
},
],
queryLabel: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'label'
},
}
},
mounted() {
},
activated() {
},
methods: {
init(val){
this.visible = true
this.harmful.reportedDate = this.dayjs().format("YYYY-MM-DD 00:00:00")
this.harmful.orderNo = val.orderNo
this.harmful.itemNo = val.itemNo
this.harmful.seqNo = val.seqNo
this.harmful.rollNo = val.rollNo
this.harmful.reportedBy = val.operatorId
//判断是否启用多语言
this.getMultiLanguageList(); //刷新多语言的信息
this.getDataList();
//重置标题
this.titleCon = this.labels.titleCon;
},
// 获取不良列表
getDataList(){
inspectiondefectcode().then(({data}) =>{
data.list.map( item => {
if (item.inspectqty==null){
item.inspectqty = 0
}
return item
})
this.dataList = data.list
})
},
// 保存不良记录
save(){
let data = this.dataList.map( item => {
item = {
defectCode: item.defectcode,
defectQty: Number(item.inspectqty),
reportedBy: this.harmful.reportedBy,
reportedDate: this.harmful.reportedDate,
site: this.harmful.site,
orderNo: this.harmful.orderNo ,
itemNo: this.harmful.itemNo ,
seqNo: this.harmful.seqNo ,
rollNo: this.harmful.rollNo
}
return item ;
}).filter( item => item.defectQty>0 )
saveSfdcDefectList(data).then(({data}) =>{
if (data.code==0){
this.$message.success(data.msg)
this.visible = false
this.$emit('getSfdcDefectList')
}else{
this.$message.error(data.msg)
}
})
console.log(data)
},
// 保存 默认配置 列
async saveMultiLanguage() {
// 保存页面 button label title 属性
let buttons = this.buttonList;
let labels = this.labelsList;
await saveButtonList(buttons)
await saveButtonList(labels)
},
getMultiLanguageList() {
//首先查询当前按钮的多语言
searchFunctionButtonList(this.queryButton).then(({data}) => {
if (data && data.code == 0 ) {
this.buttons = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
//其次查询当前标签的多语言
searchFunctionButtonList(this.queryLabel).then(({data}) => {
if (data && data.code == 0 ) {
this.labels = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
},
},
created() {
}
}
</script>
<style scoped>
.sl-input {
background-color: transparent;
border: 0 !important;
font-size: 12px !important;
height: 12px !important;
line-height: 14px !important;
background-color: transparent !important;
width: 140px;
}
.sl-input:focus, textarea:focus {
outline: none;
}
</style>

668
src/views/modules/scheduleReport/otherReport/fqc_merge_roll.vue
View File

@ -1,668 +0,0 @@
<template>
<div class="customer-css">
<el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
width="300px" style="height: 680px;" class="customer-dialog">
<el-form :inline="true" label-position="top" style="height: 100px;"
label-width="80px">
<!-- 当前卷 -->
<el-row>
<el-col :span="10">
<el-form-item class="customer-item" :label=labels.currentRollNo>
<el-input v-model="pageData.rollNo" readonly style="width: 100px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="customer-item" :label=labels.currentRollQty>
<el-input v-model="pageData.rollQty" @blur="checkValidQty" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="customer-item" label="">
</el-form-item>
</el-col>
</el-row>
<!-- 新卷 -->
<el-row>
<el-col :span="10">
<el-form-item class="customer-item" :label=labels.newRollNo>
<el-input ref="newRollNo" v-model="pageData.newRollNo" style="width: 100px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="customer-item" :label=labels.newRollQty>
<el-input v-model="pageData.newRollQty" @blur="checkValidQty" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="customer-item" :label=labels.totalQty>
<el-input v-model="pageData.totalQty" readonly style="width: 60px;"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer" style="margin-top: -20px;">
<el-button type="primary" @click="warnMergeSfdcRollsConfirm">{{ buttons.confirmButton }}</el-button>
<el-button type="primary" @click="closeDialog">{{ buttons.closeButton }}</el-button>
<el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>
</span>
</el-dialog>
<com-roll-label ref="comRollLabel" ></com-roll-label>
</div>
</template>
<script>
import comRollLabel from "../../common/com-roll-label";/*切换操作员*/
import {
getMergeRollPageData,
checkMergeSfdcRoll,/*校验是否合并卷*/
processMergeSfdcRoll,/*执行合并卷的操作*/
getSfdcFlowLabelData,/*执行打印的请求*/
} from "@/api/yieldReport/com_merge_roll.js";
/*打印标签专用的js*/
import {
printSfdcLabel,
getRollInfList
} from "@/views/modules/yieldReport/print_roll_label.js";
import {
searchSysLanguagePackList,
searchSysLanguageParam,
searchFunctionButtonList,
saveButtonList,
searchSysLanguage,
searchLanguageListByLanguageCode,
saveSysLanguageOne,
searchPageLanguageData,
removerLanguage,
saveSysLanguageList
} from "@/api/sysLanguage.js";
var functionId = 'C10000027';
export default {
data() {
return {
titleCon: '合并卷',
showDefault: false,
rollType: '',
isFinishItemNo: false,
scheduleData: {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
seqNo: '',
orderNo: '',
itemNo: 0,
resourceId: '',
scheduledDate: '',
shiftNo: '',
partNo: '',
workCenterNo: '',
workCenterDesc: '',
resourceDesc: '',
rollNo: '',
partDesc: '',
planStartTime: '',
planFinishTime: '',
qtyRequiredOriginal: 0,
preItemDesc: '',
nextItemDesc: '',
nextItemNo: 0,
operatorId: '',
functionName: '',
currentRollFlag: false
},
pageData: {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
orderNo: '',
itemNo: '',
seqNo: '',
rollNo: '',
rollQty: 0,
newRollNo: '',/*参与合并的新卷号*/
newRollQty: 0,/*参与合并的新卷号*/
reportTime: '',
reportedFlag: 'N',
qtyRequiredOriginal: 0,
scheduledDate: '',
shiftNo: '',
preItemDesc: '',
nextItemDesc: '',
nextItemNo: 0,
currentRollFlag: false
},
operatorData: {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
operatorId: '',
operatorName: '',
status: '',
seqNo: '',
showFlag: false
},
buttons: {
confirmButton: '确定',
closeButton: '关闭',
},
buttonList: [
{
functionId: functionId,
languageValue: '确定',
objectId: 'confirmButton',
objectType: 'button',
tableId: '*'
},{
functionId: functionId,
languageValue: '关闭',
objectId: 'closeButton',
objectType: 'button',
tableId: '*'
},
],
queryButton: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'button'
},
labels: {
titleCon: '合并卷',
currentRollNo: '当前卷号:',
currentRollQty: '当前卷数量:',
newRollNo: '新卷卷号:',
newRollQty: '新卷数量:',
totalQty: '总数量:',
pleaseEnterNewRoll: '请输入新卷数量!',
newRollMustMoreTanZero: '新卷数量必须是大于零的整数!',
sameRollCantBeMerge: '相同卷号无法合并!',
confirmLabel: '确认',
cancelLabel: '取消',
},
labelsList: [
{
functionId: functionId,
languageValue: '合并卷',
objectId: 'titleCon',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '当前卷号:',
objectId: 'currentRollNo',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '当前卷数量:',
objectId: 'currentRollQty',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '新卷卷号:',
objectId: 'newRollNo',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '新卷数量:',
objectId: 'newRollQty',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '总数量:',
objectId: 'totalQty',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '请输入新卷数量!',
objectId: 'pleaseEnterNewRoll',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '新卷数量必须是大于零的整数!',
objectId: 'newRollMustMoreTanZero',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '相同卷号无法合并!',
objectId: 'sameRollCantBeMerge',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '确认',
objectId: 'confirmLabel',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '取消',
objectId: 'cancelLabel',
objectType: 'label',
tableId: '*'
},
],
queryLabel: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'label'
},
}
},
components: {
comRollLabel,// 打印组件
},
methods: {
//初始化页面
init(scheduleData, operatorData, rollType,isFinishItemNo) {
this.rollType = rollType ? 1 : 0
this.isFinishItemNo = isFinishItemNo
//初始化参数
this.scheduleData = scheduleData;
//初始化操作员对象
this.operatorData = JSON.parse(JSON.stringify(operatorData));
this.pageData.reportTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
//设置对应的参数
this.pageData.orderNo = scheduleData.orderNo;
this.pageData.itemNo = scheduleData.itemNo;
this.pageData.seqNo = scheduleData.seqNo;
this.pageData.rollNo = scheduleData.rollNo;
this.pageData.operatorId = operatorData.operatorId;
this.pageData.newRollNo = '';
this.pageData.newRollQty = 0;
this.pageData.totalQty = 0;
//判断是否启用多语言
this.getMultiLanguageList(); //刷新多语言的信息
//执行获取页面参数的功能
this.refreshPageData();
//自动获取焦点
this.$nextTick(() => {
this.$refs.newRollNo.focus();
});
},
/*刷新页面的参数*/
refreshPageData() {
getMergeRollPageData(this.pageData).then(({data}) => {
//判断是否出现异常
if (data.code == 200) {
this.pageData.rollQty = data.row.resultQty;// 当前卷的数量
this.pageData.totalQty = data.row.resultQty;//总良品数量
} else {
this.pageData.rollQty = 0;// 当前卷的数量
this.pageData.totalQty = 0;//总良品数量
}
});
},
/*关闭modal*/
closeDialog() {
//刷新报工的页面
this.$emit('refreshPageData');
//关闭当前的页面
this.$emit('update:visible', false);
},
/*检验良品的总数量*/
checkValidQty() {
//处理老卷的数量
let rollQty = parseInt(this.pageData.rollQty);
if (rollQty == null || rollQty == '') {
//this.$message.error('请输入新卷数量!');
this.pageData.rollQty = 0;//重新赋值
}
//转换成整数
if (rollQty <= 0) {
//this.$message.error('新卷数量必须是大于零的整数!');
this.pageData.rollQty = 0;//重新赋值
} else {
this.pageData.rollQty = rollQty;
}
//首先判断数值是否通过判断
let newRollQty = parseInt(this.pageData.newRollQty);
if (newRollQty == null || newRollQty == '') {
//this.$message.error('请输入新卷数量!');
this.pageData.newRollQty = 0;//重新赋值
}
if (newRollQty <= 0) {
//this.$message.error('新卷数量必须是大于零的整数!');
this.pageData.newRollQty = 0;//重新赋值
} else {
this.pageData.newRollQty = newRollQty;
}
//计算总的数量
this.pageData.totalQty = newRollQty + rollQty;
},
/*执行是否需要提示的操作*/
warnMergeSfdcRollsConfirm() {
//首先判断数值是否通过判断
let newRollQty = this.pageData.newRollQty;
if (newRollQty == null || newRollQty == '') {
this.$message.error(this.labels.pleaseEnterNewRoll);
this.pageData.newRollQty = 0;//重新赋值
return false;
}
if (newRollQty <= 0 || !Number.isInteger(newRollQty)) {
this.$message.error(this.labels.newRollMustMoreTanZero);
this.pageData.newRollQty = 0;//重新赋值
return false;
}
//判断卷号是否相同
if (this.pageData.rollNo === this.pageData.newRollNo) {
this.$message.error(this.labels.sameRollCantBeMerge);
this.pageData.newRollNo = '';
return false;
}
let requestData = {
'site': this.pageData.site,
'orderNo': this.pageData.orderNo,
'itemNo': this.pageData.itemNo,
'seqNo': this.pageData.seqNo,
'rollNo': this.pageData.rollNo,
'rollQty': this.pageData.rollQty,
'newRollNo': this.pageData.newRollNo,
'newRollQty': this.pageData.newRollQty,
'username': this.pageData.username,
'operatorId': this.pageData.operatorId,
parkFlag: this.rollType == 1 ? 'Y' : 'N',
'newRollFlag': false
};
//先校验当前的卷
checkMergeSfdcRoll(requestData).then(({data}) => {
if (data.code == 500) {
this.$message.error(data.msg);
} else if (data.resultMap.resultCode == 300) {
let msg = data.resultMap.resultMsg;
this.$confirm(msg, '提示', {
confirmButtonText: this.labels.confirmLabel,
cancelButtonText: this.labels.cancelLabel,
type: "warning"
}).then(() => {
//校验参与合并的新卷
requestData.newRollFlag = true;
checkMergeSfdcRoll(requestData).then(({data}) => {
if (data.code == 500) {
this.$message.error(data.msg);
} else if (data.resultMap.resultCode == 300) {
let msg = data.resultMap.resultMsg;
this.$confirm(msg, '提示', {
confirmButtonText: this.labels.confirmLabel,
cancelButtonText: this.labels.cancelLabel,
type: "warning"
}).then(() => {
//执行合并卷的操作
processMergeSfdcRoll(requestData).then(({data}) => {
if (data.code == 500) {
this.$message.error(data.msg);
} else {
this.$message.success(data.msg);
// //先打印再继续关闭
// this.$nextTick(() => {
// this.$refs.comRollLabel.init(data.rollNo)
// });
if (this.isFinishItemNo) {
// 流程标签
let dto ={
site: this.$store.state.user.site,
orderNo : this.scheduleData.orderNo,
rollNos: data.rollNo
}
getRollInfList(dto).then(({data})=>{
if (data && data.code == 0){
let rollList = data.data
printSfdcLabel(rollList)
}else {
this.$message.warning(data.msg)
}
})
} else {
// 出货标签
this.$nextTick(() => {
this.$refs.comRollLabel.init(data.rollNo)
});
}
//延时一秒关闭 --预防没有出标签
setTimeout(() => {
this.closeDialog();
}, 1000);
}
});
});
} else {
//执行合并卷的操作
processMergeSfdcRoll(requestData).then(({data}) => {
if (data.code == 500) {
this.$message.error(data.msg);
} else {
this.$message.success(data.msg);
//先打印再继续关闭
// this.$nextTick(() => {
// this.$refs.comRollLabel.init(data.rollNo)
// });
if (this.isFinishItemNo) {
// 获取批量打印数据 data.rollNo
// 流程标签
let dto ={
site: this.$store.state.user.site,
orderNo : this.scheduleData.orderNo,
rollNos: data.rollNo
}
getRollInfList(dto).then(({data})=>{
if (data && data.code == 0){
let rollList = data.data
printSfdcLabel(rollList)
}else {
this.$message.warning(data.msg)
}
})
} else {
// 出货标签
this.$nextTick(() => {
this.$refs.comRollLabel.init(data.rollNo)
});
}
setTimeout(() => {
this.closeDialog();
}, 1000);
}
});
}
});
});
//校验通过的情况
} else {
//校验参与合并的新卷
requestData.newRollFlag = true;
checkMergeSfdcRoll(requestData).then(({data}) => {
if (data.code == 500) {
this.$message.error(data.msg);
} else if (data.resultMap.resultCode == 300) {
let msg = data.resultMap.resultMsg;
this.$confirm(msg, '提示', {
confirmButtonText: this.labels.confirmLabel,
cancelButtonText: this.labels.cancelLabel,
type: "warning"
}).then(() => {
//执行合并卷的操作
processMergeSfdcRoll(requestData).then(({data}) => {
if (data.code == 500) {
this.$message.error(data.msg);
} else {
this.$message.success(data.msg);
//先打印再继续关闭
// let printRow = {
// site: this.pageData.site, orderNo: this.pageData.orderNo,
// rollNo: data.rollNo
// };
// this.printSfdcFlowLabel(printRow);
//先打印再继续关闭
// this.$nextTick(() => {
// this.$refs.comRollLabel.init(data.rollNo)
// });
if (this.isFinishItemNo) {
// 流程标签
let dto ={
site: this.$store.state.user.site,
orderNo : this.scheduleData.orderNo,
rollNos: data.rollNo
}
getRollInfList(dto).then(({data})=>{
if (data && data.code == 0){
let rollList = data.data
printSfdcLabel(rollList)
}else {
this.$message.warning(data.msg)
}
})
} else {
// 出货标签
this.$nextTick(() => {
this.$refs.comRollLabel.init(data.rollNo)
});
}
//延时一秒关闭 --预防没有出标签
setTimeout(() => {
this.closeDialog();
}, 1000);
}
});
});
} else {
//执行合并卷的操作
processMergeSfdcRoll(requestData).then(({data}) => {
if (data.code == 500) {
this.$message.error(data.msg);
} else {
this.$message.success(data.msg);
//先打印再继续关闭
// let printRow = {
// site: this.pageData.site, orderNo: this.pageData.orderNo,
// rollNo: data.rollNo
// };
// this.printSfdcFlowLabel(printRow);
//先打印再继续关闭
// this.$nextTick(() => {
// this.$refs.comRollLabel.init(data.rollNo)
// });
if (this.isFinishItemNo) {
// 流程标签
let dto ={
site: this.$store.state.user.site,
orderNo : this.scheduleData.orderNo,
rollNos: data.rollNo
}
getRollInfList(dto).then(({data})=>{
if (data && data.code == 0){
let rollList = data.data
printSfdcLabel(rollList)
}else {
this.$message.warning(data.msg)
}
})
} else {
// 出货标签
this.$nextTick(() => {
this.$refs.comRollLabel.init(data.rollNo)
});
}
//延时一秒关闭 --预防没有出标签
setTimeout(() => {
this.closeDialog();
}, 1000);
}
});
}
});
}
});
},
/*打印流转标签*/
printSfdcFlowLabel(sfdcRow) {
//先查询打印的卷信息
getSfdcFlowLabelData(sfdcRow).then(({data}) => {
//开始打印标签
if (data.code === 200) {
let printList = data.printList;
printSfdcLabel(printList);
} else {
this.$message.error(data.msg);
}
});
},
// 保存 默认配置 列
async saveMultiLanguage() {
// 保存页面 button label title 属性
let buttons = this.buttonList;
let labels = this.labelsList;
await saveButtonList(buttons)
await saveButtonList(labels)
},
getMultiLanguageList() {
//首先查询当前按钮的多语言
searchFunctionButtonList(this.queryButton).then(({data}) => {
if (data && data.code == 0 ) {
this.buttons = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
//其次查询当前标签的多语言
searchFunctionButtonList(this.queryLabel).then(({data}) => {
if (data && data.code == 0 ) {
this.labels = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
},
},
created() {
// this.factoryList()
// this.getLanguageList()
}
}
</script>
<style scoped lang="scss">
/*调节页面button和input的上下间距*/
.customer-css .customer-button {
margin-top: 25px;
}
/*调节fieldset下的样式*/
.customer-fieldset .customer-item {
margin-top: -15px;
}
/*fieldset下table的样式*/
.customer-fieldset /deep/ .el-table__header th.is-leaf {
line-height: 16px;
}
/deep/ .customer-tab .el-tabs__content {
padding: 0px !important;
}
</style>

4297
src/views/modules/scheduleReport/otherReport/fqc_produce_report_normal.vue
File diff suppressed because it is too large
View File

3928
src/views/modules/scheduleReport/otherReport/fqc_split_roll_report.vue
File diff suppressed because it is too large
View File

329
src/views/modules/scheduleReport/otherReport/other_switch_roll.vue
View File

@ -1,329 +0,0 @@
<template>
<div class="customer-css">
<el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
width="210px" style="height: 680px;" class="customer-dialog">
<el-form :inline="true" label-position="top" style="height: 60px;"
@submit.native.prevent
label-width="80px">
<!-- 半成品卷卷号 -->
<el-row>
<el-col :span="24" style="margin-left: 35px;">
<el-form-item :label=labels.sfdcRoll>
<el-input ref="newRollNo" v-model="pageData.newRollNo" style="width: 120px;" ></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="switchRollBun">{{ buttons.confirmButton }}</el-button>
<el-button type="primary" @click="closeDialog" style="margin-bottom: 10px;">{{ buttons.closeButton }}</el-button>
<el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
/*添加组件*/
import comExceptionReason from "../com_exception_reason";//异常远远
/*添加js的方法和请求*/
import {
otherCheckSwitchSfdcRoll,/*校验是否可以切换卷*/
otherSwitchSfdcRoll,/*执行切换卷的操作*/
} from '@/api/yieldReport/com_switch_roll.js';
import {
searchSysLanguagePackList,
searchSysLanguageParam,
searchFunctionButtonList,
saveButtonList,
searchSysLanguage,
searchLanguageListByLanguageCode,
saveSysLanguageOne,
searchPageLanguageData,
removerLanguage,
saveSysLanguageList
} from "@/api/sysLanguage.js";
var functionId = 'C10000026';
export default {
name: "com_merge_roll",
data() {
return {
titleCon: '切换卷',
showDefault: false,
scheduleData: {
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
seqNo: '',
orderNo: '',
itemNo: 0,
resourceId: '',
scheduledDate: '',
shiftNo: '',
partNo: '',
workCenterNo: '',
workCenterDesc: '',
resourceDesc: '',
rollNo: '',
partDesc: '',
planStartTime: '',
planFinishTime: '',
qtyRequiredOriginal: 0,
preItemDesc: '',
nextItemDesc: '',
nextItemNo: 0,
operatorId: '',
functionName: '',
currentRollFlag: false
},
pageData: {
site: this.$store.state.user.site,
userName: this.$store.state.user.name,
seqNo: '',
orderNo: '',
itemNo: '',
newRollNo: '',
operatorId: '',
// fqc , 切换卷参数
repairOrderFlag: 'N',
checkMultipleRoll: 'Y',
directPass: 'N'
},
operatorData: {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
operatorId: '',
operatorName: '',
status: '',
seqNo: '',
showFlag: false
},
buttons: {
confirmButton: '确定',
closeButton: '关闭',
},
buttonList: [
{
functionId: functionId,
languageValue: '确定',
objectId: 'confirmButton',
objectType: 'button',
tableId: '*'
}, {
functionId: functionId,
languageValue: '关闭',
objectId: 'closeButton',
objectType: 'button',
tableId: '*'
},
],
queryButton: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'button'
},
labels: {
titleCon: '切换卷',
sfdcRoll: '半成品卷卷号:',
pleaseSwitchOperator: '请先切换人员!',
pleaseEnterSfdcRoll: '请输入半成品卷号!',
confirmLabel: '确认',
cancelLabel: '取消',
},
labelsList: [
{
functionId: functionId,
languageValue: '切换卷',
objectId: 'titleCon',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '半成品卷卷号:',
objectId: 'sfdcRoll',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '请先切换人员!',
objectId: 'pleaseSwitchOperator',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '请输入半成品卷号!',
objectId: 'pleaseEnterSfdcRoll',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '确认',
objectId: 'confirmLabel',
objectType: 'label',
tableId: '*'
}, {
functionId: functionId,
languageValue: '取消:',
objectId: 'cancelLabel',
objectType: 'label',
tableId: '*'
},
],
queryLabel: {
functionId: functionId,
table_id: '*',
languageCode: this.$i18n.locale,
objectType: 'label'
},
}
},
components: {
comExceptionReason,/*异常原因的组件*/
},
methods: {
//页面的初始化的方法
init(scheduleData, operatorData) {
this.pageData.newRollNo = ''
//初始化参数
this.scheduleData = scheduleData;
//初始化操作员对象
this.operatorData = JSON.parse(JSON.stringify(operatorData));
//设置对应的参数
this.pageData.orderNo = scheduleData.orderNo;
this.pageData.itemNo = scheduleData.itemNo;
this.pageData.seqNo = scheduleData.seqNo;
this.pageData.operatorId = operatorData.operatorId;
this.pageData.repairOrderFlag = scheduleData.repairOrderFlag;
this.pageData.checkMultipleRoll = scheduleData.checkMultipleRoll;
this.pageData.directPass = scheduleData.directPass;
//判断是否启用多语言
this.getMultiLanguageList(); //刷新多语言的信息
//自动获取焦点
this.$nextTick(() => {
this.$refs.newRollNo.focus();
});
this.titleCon = this.labels.titleCon;//重置标题
},
/*关闭modal*/
closeDialog(){
this.$emit('update:visible', false);
},
switchRollBun() {
//人员判断
if (this.pageData.operatorId == '' || this.pageData.operatorId == null) {
this.$message.error(this.labels.pleaseSwitchOperator);
return false;
}
//首先判断数值是否通过判断
let newRollNo = this.pageData.newRollNo;
if (newRollNo == null || newRollNo == '') {
this.$message.error(this.labels.pleaseEnterSfdcRoll);
return false;
}
//校验是否继续
otherCheckSwitchSfdcRoll(this.pageData).then(({data}) => {
//判断是否成功
if (data.code == 400) {
this.$message.error(data.msg);
} else if (data.code == 500){
this.$message.error(data.msg);
} else if (data.resultMap.resultCode == '201') {
//打开异常原因录入的界面
this.$confirm(data.resultMap.resultMsg, '提示', {
confirmButtonText: this.labels.confirmButton,
celButtonText: this.labels.cancelLabel,
type: 'warning'
}).then(() => {
//执行切换卷的操作
this.switchRollOperation();
});
} else { //执行切换卷的操作
this.switchRollOperation();
}
});
},
/*执行切换卷的操作*/
switchRollOperation() {
//处理信息
otherSwitchSfdcRoll(this.pageData).then(({data}) => {
//判断操作是否成功
if (data.code == 400) {
this.$message.error(data.msg);
} else {
//刷新报工的页面
this.$emit('refreshPageData');
//关闭当前的页面
this.closeDialog();
}
})
},
// 保存 默认配置 列
async saveMultiLanguage() {
// 保存页面 button label title 属性
let buttons = this.buttonList;
let labels = this.labelsList;
await saveButtonList(buttons)
await saveButtonList(labels)
},
getMultiLanguageList() {
//首先查询当前按钮的多语言
searchFunctionButtonList(this.queryButton).then(({data}) => {
if (data && data.code == 0 ) {
this.buttons = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
//其次查询当前标签的多语言
searchFunctionButtonList(this.queryLabel).then(({data}) => {
if (data && data.code == 0 ) {
this.labels = data.data
} else {
// saveButtonList(this.buttonList).then(({data}) => {
// })
}
});
},
},
created() {
// this.factoryList()
// this.getLanguageList()
}
}
</script>
<style scoped lang="scss">
/*调节页面button和input的上下间距*/
.customer-css .customer-button{
margin-top: 25px;
}
/*调节fieldset下的样式*/
.customer-fieldset .customer-item{
margin-top: -15px;
}
/*fieldset下table的样式*/
.customer-fieldset /deep/ .el-table__header th.is-leaf{
line-height: 16px;
}
/deep/ .customer-tab .el-tabs__content{
padding: 0px !important;
}
</style>

4198
src/views/modules/scheduleReport/otherReport/rework_inspect_report.vue
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save