Skip to content

M
mes-ui
Commit afb74e0a authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

问题清单

parent 1f54f3a2
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 114 deletions
src/i18n/lang/th_TH.json
View file @ afb74e0a
......@@ -2965,9 +2965,9 @@
"开始": "เริ่ม",
"标签模板": "เทมเพลตแท็ก",
"请选择标签模板": "โปรดเลือกแม่แบบฉลาก",
"没有配置标签模版": "ไม่มีการกำหนดค่าลายฉลุฉลาก",
"是否允许超报": "ไม่ว่าจะเป็นการอนุญาตให้มีการโอเวอร์พาร์",
"工艺路线更新": "การปรับปรุงเส้นทางกระบวนการ",
"工艺路线更新成功": "การปรับปรุงเส้นทางกระบวนการประสบความสำเร็จ",
"工序序号": "หมายเลขลำดับขั้นตอน",
"订单单别": "ใบสั่งซื้อ",
"订单单号": "หมายเลขใบสั่ง",
......@@ -2982,5 +2982,8 @@
"生产版本号必填且应为数字": "หมายเลขรุ่นการผลิต จำเป็นและควรเป็นตัวเลข",
"请输入整数": "กรุณาใส่จำนวนเต็ม",
"输入的不是整数": "ไม่ใช่จำนวนเต็มที่ป้อน",
"选择生产工单": "เลือกสั่งงานผลิต"
"选择生产工单": "เลือกสั่งงานผลิต",
"该工单当前状态为": "สถานะปัจจุบันของใบสั่งงานคือ",
", 不允许修改": ", ไม่อนุญาตให้แก้ไข",
"是否故障": "ไม่ว่าจะเป็นความล้มเหลว"
}
src/i18n/lang/zh_CN.json
View file @ afb74e0a
......@@ -2965,9 +2965,9 @@
"开始": "开始",
"标签模板": "标签模板",
"请选择标签模板": "请选择标签模板",
"没有配置标签模版": "没有配置标签模版",
"是否允许超报": "是否允许超报",
"工艺路线更新": "工艺路线更新",
"工艺路线更新成功": "工艺路线更新成功",
"工序序号": "工序序号",
"订单单别": "订单单别",
"订单单号": "订单单号",
......@@ -2982,5 +2982,8 @@
"生产版本号必填且应为数字": "生产版本号必填且应为数字",
"请输入整数": "请输入整数",
"输入的不是整数": "输入的不是整数",
"选择生产工单": "选择生产工单"
"选择生产工单": "选择生产工单",
"该工单当前状态为": "该工单当前状态为",
", 不允许修改": ", 不允许修改",
"是否故障": "是否故障"
}
src/views/mes/md/product/index.vue
View file @ afb74e0a
......@@ -19,8 +19,8 @@
<el-col :span="20" :xs="24">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px">
<el-form-item :label="$t('物料编码')" prop="sapItemCode">
<el-input v-model="queryParams.sapItemCode" clearable style="width: 240px"
<el-form-item :label="$t('物料编码')" prop="itemCode">
<el-input v-model="queryParams.itemCode" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item :label="$t('物料名称')" prop="itemName">
......@@ -441,7 +441,6 @@ export default {
itemId: undefined,
itemTypeId: undefined,
itemCode: undefined,
sapItemCode: undefined,
message: undefined,
itemName: undefined,
specification: undefined,
......
src/views/mes/md/workunit/index.vue
View file @ afb74e0a
......@@ -18,6 +18,11 @@
<el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item :label="$t('是否故障')" prop="faultFlag">
<el-select v-model="queryParams.faultFlag" clearable>
<el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
......@@ -59,6 +64,11 @@
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag" />
</template>
</el-table-column>
<el-table-column :label="$t('是否故障')" align="center" prop="faultFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.faultFlag" />
</template>
</el-table-column>
<el-table-column :label="$t('common.remark')" align="center" prop="remark" />
<el-table-column :label="$t('common.option')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
......@@ -87,7 +97,7 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('common.workunit_code')" label-width="120px" prop="workunitCode">
<el-input v-model="form.workunitCode" readonly="readonly">
<el-input v-model="form.workunitCode" :disabled="form.workunitId">
</el-input>
</el-form-item>
</el-col>
......@@ -113,7 +123,15 @@
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="12">
<el-form-item :label="$t('是否故障')" label-width="120px">
<el-radio-group v-model="form.faultFlag" :disabled="optType == 'view'">
<el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('common.remark')" label-width="120px" prop="remark">
<el-input v-model="form.remark" />
</el-form-item>
......
src/views/mes/pro/process/index.vue
View file @ afb74e0a
......@@ -144,8 +144,8 @@
<el-col :span="12">
<el-form-item :label="$t('工序编码')" prop="processCode">
<div style="display:flex;align-items: center;">
<el-input v-model="form.processCode" />
<el-switch v-model="autoGenFlag"
<el-input v-model="form.processCode" :disabled="form.processId" />
<el-switch v-model="autoGenFlag" :disabled="form.processId"
active-color="#13ce66"
style="width:175px;margin-left:10px;"
:active-text="$t('自动生成')"
......
src/views/mes/pro/productionSolution/components/ProogingProcess.vue
View file @ afb74e0a
......@@ -67,6 +67,15 @@
</el-select>
</template>
</el-table-column>
<el-table-column :label="$t('工序备注')" prop="remark" align="center" width="140">
<template slot-scope="scope">
<el-input
v-model="scope.row.remark"
:disabled="mode == 'info'"
clearable
/>
</template>
</el-table-column>
<el-table-column :label="$t('common.workstation_code')" prop="workstationCode" align="center" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.workstationId" :disabled="mode == 'info'" filterable @change="(v) => chooseworkstationName(v, scope.row, scope.$index)">
......@@ -220,7 +229,7 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('工序备注')" prop="processRemark" align="center" width="140">
<el-table-column :label="$t('工艺要求')" prop="processRemark" align="center" width="140">
<template slot-scope="scope">
<el-input
v-model="scope.row.processRemark"
......@@ -230,7 +239,7 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('图纸上传')" prop="processRemark" align="center" >
<el-table-column :label="$t('图纸上传')" align="center" >
<template slot-scope="scope">
<el-button
size="mini"
......@@ -554,6 +563,8 @@ export default {
unitOfMeasure: null,
keyFlag: 'N',
isCheck: 'N',
remark: null,
processRemark: null,
drawingList: []
},
processOptions: [],
......
src/views/mes/pro/qrcodeRecord/index.vue
View file @ afb74e0a
......@@ -62,12 +62,12 @@
/>
<el-table-column
:label="$t('客户名称')"
width="130"
align="center"
prop="clientName"
/>
<el-table-column
:label="$t('产品名称')"
width="80"
align="center"
prop="productName"
/>
......@@ -190,11 +190,6 @@
align="center"
prop="itemCode"
/>
<el-table-column
:label="$t('产品描述')"
align="center"
prop="itemDesc"
/>
<el-table-column
:label="$t('标签模板')"
align="center"
......@@ -267,9 +262,9 @@
<el-form-item :label="$t('客户名称')" prop="clientName">
<el-input v-model="form.clientName" />
</el-form-item>
<el-form-item :label="$t('产品描述')" prop="itemDesc">
<!-- <el-form-item :label="$t('产品描述')" prop="itemDesc">
<el-input v-model="form.itemDesc" type="textarea" />
</el-form-item>
</el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{
......@@ -418,7 +413,6 @@ export default {
let detail = []
const templateName = this.selectRow[0].templateName || this.selectRow[0].templateName1
if(!templateName) {
this.$message.warning(this.$t('没有配置标签模版'))
this.printVisible = true
return
}
......
src/views/mes/pro/workorder/indexApply.vue
View file @ afb74e0a
......@@ -250,7 +250,7 @@
<el-table-column :label="$t('common.option')" width="220px" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.status == 'PREPARE'"
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.status == 'PUBLISHED'"
@click="handleUpdate(scope.row)" v-hasPermi="['mes:pro:workorder:edit']">{{$t('修改')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-search" @click="handleViewRecord(scope.row)">{{$t('查看更新记录')}}</el-button>
......@@ -746,7 +746,8 @@ export default {
return item;
});
});
await updateWorkorder(form).then(({ rows }) => {
await updateWorkorder(form).then(({ code }) => {
if (code === 200) this.$message.success(this.$t('工艺路线更新成功'))
this.getList()
});
}
......@@ -821,96 +822,6 @@ export default {
}
this.arrangeCode = arrangeCode;
},
async handleArrange(type) {
if(type === 'del') {
if(this.ids.length === 0) return this.$message.warning(this.$t('请勾选要取消编排的工单'))
this.$modal.confirm(this.$t('确认取消编排？')).then(() => {
return delArrange(this.ids)//执行报工
}).then(() => {
this.getList();
this.$modal.msgSuccess(this.$t('取消成功'));
}).catch(() => {});
return
}
// status: "COMBINED"
let params = []
// for(const item in this.selectedRows){
// if (item.arrangeCode != '' && item.arrangeCode != null) {
// this.$modal.msgWarning(`${item.workorderCode}生产单已绑定编排单，不能再绑定！`);
// return false;
// }
// }
let workorderCode = []
this.selectedRows.forEach(item => {
if (item.status !== 'COMBINED') {
workorderCode.push(item.workorderCode)
return
}
})
if (workorderCode.length > 0) {
this.$modal.msgWarning(this.$t('{0}只允许操作单据状态为已组合数据！', [workorderCode[0]]));
return
}
this.selectedRows.forEach((item, index) => {
params.push({
arrangeSort: index + 1,
workorderId: item.workorderId,
workorderCode: item.workorderCode,
arrangeCode: null
})
});
batchAddArrange(params).then(response => {
this.arrangeOpen2 = true;
this.groupCode = response;
this.$modal.msgSuccess(this.$t('新增编排单成功'));
this.getList();
});
},
async handleCombination(type) {
if(type === 'del') {
if(this.ids.length === 0) return this.$message.warning(this.$t('请勾选要取消组合的工单'))
this.$modal.confirm(this.$t('确认取消组合？')).then(() => {
return delCombination(this.ids)//执行报工
}).then(() => {
this.getList();
this.$modal.msgSuccess(this.$t('取消成功'));
}).catch(() => {});
return
}
let params = []
let hasNonEmptyCombination = false;
this.selectedRows.every((item, index) => {
if (item.combinationCode != '' && item.combinationCode != null) {
this.$modal.msgWarning(this.$t('{0}生产单已绑定组合单，不能再绑定！', [item.workorderCode]));
hasNonEmptyCombination = true;
return false; // 结束every循环
}
return true; // 继续检查下一个项
});
if (!hasNonEmptyCombination) {
this.selectedRows.forEach((item, index) => {
params.push({
combinationSort: index + 1,
workorderId: item.workorderId,
workorderCode: item.workorderCode,
salesOrderId: 0,
combinationCode: null
})
});
batchAddCombination(params).then(response => {
if (response && response.length > 0) {
this.combOpen = true
this.combinationCodes = response
this.$modal.msgSuccess(this.$t('新增组合单成功'));
} else {
this.$modal.msgError(this.$t('新增组合单失败，组合规则不同，不允许组合！'));
}
this.getList();
});
}
},
/** 查询生产工单列表 */
getList() {
this.loading = true;
......@@ -1116,6 +1027,11 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
if (!row.workorderId) {
const item = this.dict.type.mes_workorder_status.find(v => v.value === this.selectedRows[0].status)
if (this.selectedRows[0].status !== "PUBLISHED") return this.$modal.msgWarning(this.$t('该工单当前状态为')+ item.label + this.$t(', 不允许修改'))
}
this.reset();
const workorderId = row.workorderId || this.ids;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment