|
@@ -2576,7 +2576,7 @@ const tableRowClick = async (row) => {
|
|
|
_product_code.value = row.产品编号;
|
|
_product_code.value = row.产品编号;
|
|
|
_kehu_code.value = row.产品名称;
|
|
_kehu_code.value = row.产品名称;
|
|
|
const res = await getProductData({product_code:_product_code.value});
|
|
const res = await getProductData({product_code:_product_code.value});
|
|
|
- console.log(row.产品编号 + "--->下方表格获取数据")
|
|
|
|
|
|
|
+ console.log(_product_code.value + "--->下方表格获取数据")
|
|
|
console.log(res)
|
|
console.log(res)
|
|
|
console.log(res.data.gyData)
|
|
console.log(res.data.gyData)
|
|
|
const processedData = res.data.gyData.map(item => {
|
|
const processedData = res.data.gyData.map(item => {
|
|
@@ -3386,8 +3386,9 @@ const addgyenterDialog = async () =>{
|
|
|
Add_gxmc: add_gyformData['gy0_gxmc'],
|
|
Add_gxmc: add_gyformData['gy0_gxmc'],
|
|
|
Gy0_Ms: add_gyformData['Gy0_Ms'],
|
|
Gy0_Ms: add_gyformData['Gy0_Ms'],
|
|
|
Gy0_sbbh: add_gyformData['Gy0_sbbh'],
|
|
Gy0_sbbh: add_gyformData['Gy0_sbbh'],
|
|
|
- Gy0_shdh: add_gyformData['Gy0_shdh'],
|
|
|
|
|
- 工价系数: add_gyformData['损耗率'],
|
|
|
|
|
|
|
+ Gy0_shdh: add_gyformData['标准损耗'],
|
|
|
|
|
+ // 工价系数: add_gyformData['损耗率'],
|
|
|
|
|
+ 工价系数: add_gyformData['难度系数'],
|
|
|
损耗系数: add_gyformData['损耗系数'],
|
|
损耗系数: add_gyformData['损耗系数'],
|
|
|
工序备注:add_gyformData['工序备注'],
|
|
工序备注:add_gyformData['工序备注'],
|
|
|
质量要求: add_gyformData['质量要求'],
|
|
质量要求: add_gyformData['质量要求'],
|
|
@@ -3396,17 +3397,17 @@ const addgyenterDialog = async () =>{
|
|
|
// 万小张: add_yjzlformdata['万小张'],
|
|
// 万小张: add_yjzlformdata['万小张'],
|
|
|
};
|
|
};
|
|
|
console.log(formattedData)
|
|
console.log(formattedData)
|
|
|
- const res=addProductGyInfo(formattedData)
|
|
|
|
|
- console.log(_Gd_gdbh.value)
|
|
|
|
|
- const getProductData_data = await getProductData({product_code:_Gd_gdbh.value});
|
|
|
|
|
- gytableData.splice(0, gytableData.length, ...getProductData_data.data.gyData);
|
|
|
|
|
|
|
+ // return false;
|
|
|
|
|
+ const res=addProsductGyInfo(formattedData)
|
|
|
|
|
+ console.log(_product_code.value + "--->工艺添加后获取产品编号")
|
|
|
res.then(result => {
|
|
res.then(result => {
|
|
|
if(result.code===0){
|
|
if(result.code===0){
|
|
|
ElMessage({
|
|
ElMessage({
|
|
|
type: 'success',
|
|
type: 'success',
|
|
|
message: '成功'
|
|
message: '成功'
|
|
|
})
|
|
})
|
|
|
- addgydialogFormVisible.value = false
|
|
|
|
|
|
|
+ GetInfo();
|
|
|
|
|
+ addgydialogFormVisible.value = false
|
|
|
Object.keys(add_gyformData).forEach(key => {
|
|
Object.keys(add_gyformData).forEach(key => {
|
|
|
add_gyformData[key] = '';
|
|
add_gyformData[key] = '';
|
|
|
});
|
|
});
|
|
@@ -3420,9 +3421,28 @@ const addgyenterDialog = async () =>{
|
|
|
}
|
|
}
|
|
|
//新增后刷新
|
|
//新增后刷新
|
|
|
const GetInfo = async () => {
|
|
const GetInfo = async () => {
|
|
|
- const getProductData_data = await getProductData({product_code:_Gd_gdbh.value});
|
|
|
|
|
- yjtableData.splice(0, yjtableData.length, ...getProductData_data.data.yjData);
|
|
|
|
|
- gytableData.splice(0, gytableData.length, ...getProductData_data.data.gyData);
|
|
|
|
|
|
|
+ const res = await getProductData({product_code:_product_code.value});
|
|
|
|
|
+ console.log(res)
|
|
|
|
|
+ console.log(res.data.gyData)
|
|
|
|
|
+ const processedData = res.data.gyData.map(item => {
|
|
|
|
|
+ return {
|
|
|
|
|
+ ...item,
|
|
|
|
|
+ combinedProp: item.Gy0_yjno + '--'+item.Gy0_gxh,
|
|
|
|
|
+ combinedProp2: item.gy0_gxmc + '-'+item.add_gxmc,
|
|
|
|
|
+ combinedProp3: item.Gy0_Ks + '*'+item.Gy0_ls
|
|
|
|
|
+ };
|
|
|
|
|
+ });
|
|
|
|
|
+ yjtableData.splice(0, yjtableData.length, ...res.data.yjData);
|
|
|
|
|
+ gytableData.splice(0, gytableData.length, ...processedData);
|
|
|
|
|
+ ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
|
|
|
|
|
+ jstableData.splice(0, jstableData.length, ...res.data.jsData);
|
|
|
|
|
+ if(yjtableData.length==0){
|
|
|
|
|
+ yjzuidahaoma.value = 1
|
|
|
|
|
+ }else{
|
|
|
|
|
+ let tmp = yjtableData.map(item => item.yj_yjno)
|
|
|
|
|
+ tmp = tmp.sort((a,b)=>b-a)
|
|
|
|
|
+ yjzuidahaoma.value = Number(tmp[0]) + 1
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
//工艺新增取消
|
|
//工艺新增取消
|
|
|
const addgycloseDialog = () => {
|
|
const addgycloseDialog = () => {
|