|
|
@@ -239,9 +239,9 @@
|
|
|
<el-table-column align="left" label="定额用料" prop="定额用料" width="90"/>
|
|
|
<el-table-column align="left" label="定额门幅" prop="定额门幅" width="115"/>
|
|
|
<!-- <el-table-column align="left" label="实际门幅" prop="实际门幅" width="115"/> -->
|
|
|
- <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料" width="120"/>
|
|
|
- <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料" width="120"/>
|
|
|
- <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料" width="140"/>
|
|
|
+ <!-- <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料" width="120"/> -->
|
|
|
+ <!-- <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料" width="120"/> -->
|
|
|
+ <!-- <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料" width="140"/> -->
|
|
|
<el-table-column align="left" label="入库总量" prop="入库总量" width="115"/>
|
|
|
<el-table-column align="left" label="面料结余" prop="面料结余" width="115"/>
|
|
|
<el-table-column align="left" label="单位" prop="投料单位" width="60"/>
|
|
|
@@ -584,7 +584,7 @@
|
|
|
:show-overflow-tooltip="true"
|
|
|
:cell-class-name="planUsageCellClass"
|
|
|
highlight-current-row="true"
|
|
|
- @row-dblclick="bombomupdateCompanyFunc2"
|
|
|
+ @row-dblclick="updateCompanyFunc2"
|
|
|
@selection-change="glddSelectionChange"
|
|
|
style="width: 100%;height: 65vh" border tooltip-effect="dark" :data="glddtableData" row-key="ID">
|
|
|
<el-table-column type="selection" width="50" />
|
|
|
@@ -653,7 +653,7 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 批量修改BOM资料弹窗 -->
|
|
|
- <el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="批量新增或修改BOM资料" width="60%" top="1%" destroy-on-close>
|
|
|
+ <el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="批量新增或修改BOM资料" width="63%" top="1%" destroy-on-close>
|
|
|
|
|
|
<el-descriptions class="margin-top" :column="4" :size="size" border>
|
|
|
<el-descriptions-item label="订单编号" class="ddh">{{ ddhformData['ddh'] }}</el-descriptions-item>
|
|
|
@@ -669,26 +669,56 @@
|
|
|
<div style="margin-top: 5px;">
|
|
|
<el-table ref="paichengRef"
|
|
|
:show-overflow-tooltip="true"
|
|
|
- highlight-current-row="true"
|
|
|
+ highlight-current-row="true"
|
|
|
:row-style="{ height: '0px' }"
|
|
|
- :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
|
|
|
+ :cell-style="{ padding: '0px' }"
|
|
|
+ :header-row-style="{ height: '0px' }"
|
|
|
:header-cell-style="{ padding: '0px' }"
|
|
|
- style="width: 100%;height: 58vh" border tooltip-effect="dark"
|
|
|
+ style="width: 100%;height: 58vh"
|
|
|
+ border tooltip-effect="dark"
|
|
|
:data="resbomtableData" row-key="ID"
|
|
|
:cell-class-name="scfjfpxsCellClass">
|
|
|
+
|
|
|
<template v-for="(item, idx) in resbom_tableColumns">
|
|
|
- <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
|
|
|
- <div v-if="['物料名称', '计划用料', '定额用料','计划门幅','定额门幅', '备注'].includes(item.prop)">
|
|
|
- <el-input
|
|
|
- v-model="row[item.prop]"
|
|
|
- :clearable="false"
|
|
|
- :id="`input${idx}${$index}`"
|
|
|
- @input="handleInput($event, row, item.prop)"
|
|
|
- />
|
|
|
+ <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width">
|
|
|
+
|
|
|
+ <!-- 如果是物料名称且UNIQID没有值，则显示输入框，否则显示内容 -->
|
|
|
+ <div v-if="item.prop === '物料名称'">
|
|
|
+ <el-input
|
|
|
+ v-if="!row.UNIQID"
|
|
|
+ v-model="row[item.prop]"
|
|
|
+ :clearable="false"
|
|
|
+ :id="`input${idx}${$index}`"
|
|
|
+ @input="handleInput($event, row, item.prop)"
|
|
|
+ />
|
|
|
+ <span v-else>{{ row[item.prop] }}</span> <!-- 如果UNIQID有值，则直接显示内容 -->
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <!-- 其他列的处理 -->
|
|
|
+ <div v-else-if="['计划用料', '定额用料', '计划门幅', '定额门幅', '备注'].includes(item.prop)">
|
|
|
+ <el-input
|
|
|
+ v-model="row[item.prop]"
|
|
|
+ :clearable="false"
|
|
|
+ :id="`input${idx}${$index}`"
|
|
|
+ @input="handleInput($event, row, item.prop)"
|
|
|
+ />
|
|
|
</div>
|
|
|
+
|
|
|
+ <!-- 非输入框列 -->
|
|
|
<div v-else>{{ row[item.prop] }}</div>
|
|
|
+
|
|
|
</el-table-column>
|
|
|
</template>
|
|
|
+
|
|
|
+ <!-- <el-table-column fixed="right" label="操作" width="80">
|
|
|
+ <template #default="{ row, $index }">
|
|
|
+ <el-button @click="record_deleteRow(row,$index)" type="danger" size="small"
|
|
|
+ style="font-size: 16px;padding: 0px;width: 60px;background-color: red;">
|
|
|
+ 删除
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column> -->
|
|
|
+
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<div class="dialog-footer" style="text-align: right;margin-top: 5px;">
|
|
|
@@ -2456,7 +2486,6 @@ const resbom_handleKeyDown = (event, x, y, prop) => {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-//质检废品系数颜色
|
|
|
const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
|
if (
|
|
|
column.label === '计划门幅' ||
|
|
|
@@ -2490,6 +2519,25 @@ const add_bomenterDialog = async() => {
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
+// BOM删除
|
|
|
+const record_deleteRow = async(row, index) => {
|
|
|
+ console.log(row.UNIQID)
|
|
|
+ if(row.UNIQID === '' || row.UNIQID === null || row.UNIQID === undefined){
|
|
|
+ // 删除当前行数据
|
|
|
+ resbomtableData.value.splice(index, 1);
|
|
|
+ }else{
|
|
|
+ // 调用接口删除
|
|
|
+ // const add_FabricEditdata = await FabricEdit({row.UNIQID});
|
|
|
+ // if (add_FabricEditdata.code === 0) {
|
|
|
+ // ElMessage({type: 'success',message: '删除成功'})
|
|
|
+ // } else {
|
|
|
+ // ElMessage({ type: 'error',message: '删除失败'})
|
|
|
+ // }
|
|
|
+ }
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
//修改
|
|
|
const res_bomenterDialog = async () => {
|
|
|
const rawValueArray = resbomtableData._rawValue;
|
|
|
@@ -2553,15 +2601,15 @@ const edit_resbom_tableColumns = ref(
|
|
|
)
|
|
|
|
|
|
const UNIQID = ref('')
|
|
|
-const bombomupdateCompanyFunc = async (row) => {
|
|
|
- edit_bomdialogFormVisible.value = true
|
|
|
- ddhformData.ddh = _Gd_gdbh.value
|
|
|
- ddhformData.kh = _Gd_kh.value
|
|
|
- ddhformData.sckh = _Gd_sckh.value
|
|
|
- ddhformData.ks = _Gd_ks.value
|
|
|
- UNIQID.value = row.UNIQID
|
|
|
- _editTestCoefficient()
|
|
|
-}
|
|
|
+// const bombomupdateCompanyFunc = async (row) => {
|
|
|
+// edit_bomdialogFormVisible.value = true
|
|
|
+// ddhformData.ddh = _Gd_gdbh.value
|
|
|
+// ddhformData.kh = _Gd_kh.value
|
|
|
+// ddhformData.sckh = _Gd_sckh.value
|
|
|
+// ddhformData.ks = _Gd_ks.value
|
|
|
+// UNIQID.value = row.UNIQID
|
|
|
+// _editTestCoefficient()
|
|
|
+// }
|
|
|
|
|
|
|
|
|
// BOM数据获取
|
