|
|
@@ -1198,7 +1198,7 @@
|
|
|
<el-input v-model="add_gyformData.Gy0_方案" placeholder="" style="width: 90px;" id="方案" @keydown="ent($event, '备注', '方案', '加工开数')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="印件编号:" prop="address" class="mab" label-width="90">
|
|
|
- <el-input v-model="add_gyformData.Gy0_cpdh" placeholder="" style="width: 90px;" id="Gy0_yjno"/>
|
|
|
+ <el-input v-model="add_gyformData.Gy0_yjno" placeholder="" style="width: 90px;" id="Gy0_yjno"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="工序编号:" prop="address" class="mab" >
|
|
|
<el-input v-model="add_gyformData.Gy0_gxh" placeholder="" style="width: 90px;" id="Gy0_gxh" />
|
|
|
@@ -1219,7 +1219,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="工艺名称:" prop="address" class="mab" label-width="100">
|
|
|
- <el-input v-model="add_gyformData.Add_gxmc" placeholder="" style="width: 140px;" id="gy0_gxmc" @keydown="ent($event, 'gy0_site', 'gy0_gxmc', 'add_gxmc')"/>
|
|
|
+ <el-input v-model="add_gyformData.gy0_gxmc" placeholder="" style="width: 140px;" id="gy0_gxmc" @keydown="ent($event, 'gy0_site', 'gy0_gxmc', 'add_gxmc')"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -1227,7 +1227,7 @@
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="工序名称:" prop="address" class="mab">
|
|
|
- <el-input v-model="add_gyformData.gy0_gxmc" placeholder="" style="width: 100%;" id="add_gxmc" @keydown="ent($event, 'gy0_gxmc', 'add_gxmc', 'Gy0_sbbh')"/>
|
|
|
+ <el-input v-model="add_gyformData.Add_gxmc" placeholder="" style="width: 100%;" id="add_gxmc" @keydown="ent($event, 'gy0_gxmc', 'add_gxmc', 'Gy0_sbbh')"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -1387,7 +1387,7 @@
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer">
|
|
|
<el-button @click="ybcloseDialog">取 消</el-button>
|
|
|
- <el-button type="primary" disabled @click="ybenterDialog">确 定</el-button>
|
|
|
+ <el-button type="primary" @click="ybenterDialog">确 定</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
@@ -1466,7 +1466,7 @@
|
|
|
</el-form>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <!-- 技术附件 -->
|
|
|
+ <!-- 技术附件 -->
|
|
|
<el-dialog v-model="jsfjdialogFormVisible" :before-close="jsfjcloseDialog" :title="产品技术附件资料" style="margin-top: 40px" height="500px" width="800px" destroy-on-close>
|
|
|
<el-form :model="jsfjformdata" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
|
|
|
<el-row :gutter="24">
|
|
|
@@ -1513,9 +1513,9 @@
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
|
|
|
-<el-dialog v-model="luckyexcelVisible" :before-close="luckyexcelCloseDialog" width="100%" top="0vh">
|
|
|
- <div id="luckyexcel" style="width: 100%;height: 90vh;"></div>
|
|
|
-</el-dialog>
|
|
|
+ <el-dialog v-model="luckyexcelVisible" :before-close="luckyexcelCloseDialog" width="100%" top="0vh">
|
|
|
+ <div id="luckyexcel" style="width: 100%;height: 90vh;"></div>
|
|
|
+ </el-dialog>
|
|
|
|
|
|
</layout-content>
|
|
|
|
|
|
@@ -2476,6 +2476,7 @@ const tableRowClick = async (row) => {
|
|
|
_product_code.value = row.产品编号;
|
|
|
_kehu_code.value = row.产品名称;
|
|
|
const res = await getProductData({product_code:_product_code.value});
|
|
|
+ console.log(res)
|
|
|
yjtableData.splice(0, yjtableData.length, ...res.data.yjData);
|
|
|
gytableData.splice(0, gytableData.length, ...res.data.gyData);
|
|
|
ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
|
|
|
@@ -2833,22 +2834,10 @@ const add_yinjian_ent = (event,id1,id2,id3) => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
//===============新增工艺资料=======================
|
|
|
const addgydialogFormVisible = ref(false)
|
|
|
const searchCJModel = ref(false)
|
|
|
-const searchSHModel = ref(false)
|
|
|
-
|
|
|
-const addcpgy_onclick = () => {
|
|
|
- addgydialogFormVisible.value=true
|
|
|
- // add_yjdialogFormVisible.value = true
|
|
|
- // console.log(yjtableData.length)
|
|
|
-}
|
|
|
+const searchSHModel = ref(false);
|
|
|
const add_gyformData = reactive({
|
|
|
Gy0_方案: '',
|
|
|
Gy0_cpdh: '',
|
|
|
@@ -2863,20 +2852,31 @@ const add_gyformData = reactive({
|
|
|
Gy0_sbbh: '',
|
|
|
Gy0_shdh: '',
|
|
|
工价系数: '',
|
|
|
- 难度系数:'1.000',
|
|
|
- 损耗率:'0.00140',
|
|
|
- 损耗系数: '1.000',
|
|
|
+ 难度系数:'',
|
|
|
+ 损耗率:'',
|
|
|
+ 损耗系数: '',
|
|
|
工序备注: '',
|
|
|
质量要求: '',
|
|
|
质量隐患: '',
|
|
|
Sys_id: _username.value,
|
|
|
标准损耗2:'',
|
|
|
});
|
|
|
+//新增工艺资料按钮
|
|
|
+const addcpgy_onclick = () => {
|
|
|
+ //打开弹窗
|
|
|
+ addgydialogFormVisible.value=true
|
|
|
+ //清空input数据
|
|
|
+ Object.keys(add_gyformData).forEach(key => {
|
|
|
+ add_gyformData[key] = '';
|
|
|
+ });
|
|
|
+ add_gyformData['难度系数'] = '1.000';
|
|
|
+ add_gyformData['损耗率'] = '0.00140';
|
|
|
+ add_gyformData['损耗系数'] = '1.000';
|
|
|
+}
|
|
|
const getcjmc = (code) => {
|
|
|
// if (code.key==='Tab') {
|
|
|
// setTimeout(() =>document.querySelector('#yjdhId').focus(), 50)
|
|
|
// _getCJList();
|
|
|
-
|
|
|
// }
|
|
|
_getCJList()
|
|
|
}
|
|
|
@@ -2910,7 +2910,6 @@ const _getCJList = async () => {
|
|
|
};
|
|
|
const selectCJNode = (nodeData) => {
|
|
|
console.log(nodeData.level)
|
|
|
-
|
|
|
if(nodeData.level==2){
|
|
|
console.log(nodeData.label)
|
|
|
add_gyformData.Gy0_site=nodeData.label
|
|
|
@@ -2933,35 +2932,7 @@ const _getSH = async () => {
|
|
|
add_gyformData.标准损耗2=response.data[0].sys_mc
|
|
|
console.log(getSHListdata.value);
|
|
|
};
|
|
|
-// const processData = (data) => {
|
|
|
-// const map = {};
|
|
|
-// const tree = [];
|
|
|
-// console.log(data)
|
|
|
-// data.forEach(item => {
|
|
|
-// map[item.sys_bh] = { label: `${item.sys_bh} ${item.sys_mc}`, level: 1, children: [] };
|
|
|
-
|
|
|
-// });
|
|
|
-
|
|
|
-
|
|
|
-// data.forEach(item => {
|
|
|
-// if (item.Parent !== "0_") {
|
|
|
-// map[item.Parent].children.push(map[item.sys_bh]); console.log(item) }
|
|
|
-// // } else {
|
|
|
-// // tree.push(map[item.sys_bh]);
|
|
|
-// // console.log(item)
|
|
|
-// // }
|
|
|
-// });
|
|
|
-
|
|
|
-// tree.forEach(item => {
|
|
|
-// // console.log(item)
|
|
|
-// // if (item.children.length === 0) {
|
|
|
-// // item.children.push({ label: `${item.sys_bh} ${item.sys_mc}`, level: 2 });
|
|
|
-// // }
|
|
|
-// });
|
|
|
-
|
|
|
-// return tree;
|
|
|
-// };
|
|
|
-//工艺新增确定
|
|
|
+//新增工艺资料确定
|
|
|
const addgyenterDialog = () => {
|
|
|
console.log(add_yjzlformdata)
|
|
|
const formattedData = {
|
|
|
@@ -2983,19 +2954,18 @@ const addgyenterDialog = () => {
|
|
|
质量要求: add_gyformData['质量要求'],
|
|
|
质量隐患: add_gyformData['质量隐患'],
|
|
|
Sys_id : _username.value,
|
|
|
- // 万小张: add_yjzlformdata['万小张'],
|
|
|
};
|
|
|
console.log(formattedData)
|
|
|
const res=addProductGyInfo(formattedData)
|
|
|
console.log(res)
|
|
|
- if(res.code==0){
|
|
|
-
|
|
|
- }else{
|
|
|
-
|
|
|
- }
|
|
|
- addgydialogFormVisible.value = false
|
|
|
+ // if(res.code === 0){
|
|
|
+ // ElMessage({type: 'success',message: '更新成功'})
|
|
|
+ // addgydialogFormVisible.value = false
|
|
|
+ // } else {
|
|
|
+ // ElMessage({type: 'error',message: '更新失败' })
|
|
|
+ // }
|
|
|
}
|
|
|
-//工艺新增取消
|
|
|
+//新增工艺资料取消
|
|
|
const addgycloseDialog = () => {
|
|
|
addgydialogFormVisible.value = false
|
|
|
}
|
|
|
@@ -3014,20 +2984,24 @@ const add_ybformDataTest = reactive({
|
|
|
})
|
|
|
//点击新增印版资料
|
|
|
const addyb_onclick = async () => {
|
|
|
- console.log(_UniqID)
|
|
|
+ addybdialogFormVisible.value = true;
|
|
|
+ console.log(_UniqID.value)
|
|
|
if(_UniqID.value === '' || _UniqID.value === undefined || _UniqID.value === null){
|
|
|
ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'})
|
|
|
return false;
|
|
|
}else{
|
|
|
const getProductYbInfo_list = await getProductYbInfo({UniqID:_UniqID.value});
|
|
|
- console.log(getProductYbInfo_list.data.gy_data)
|
|
|
+ console.log(getProductYbInfo_list)
|
|
|
+ if(getProductYbInfo_list.message === 'Request failed with status code 500'){
|
|
|
+ console.log("新增印版资料-->后台接口错误")
|
|
|
+ }
|
|
|
//默认取第一个数据
|
|
|
// add_ybformDataTest.gongxu = getProductYbInfo_list.data.gy_data[0]['gy'];
|
|
|
add_ybformDataTest.gxmc1 = getProductYbInfo_list.data['印版名称'];
|
|
|
addybdisplaydata.gongxuNameOptions = getProductYbInfo_list.data.gy_data.map(item=>{
|
|
|
return item.gy
|
|
|
});
|
|
|
- addybdialogFormVisible.value = true;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
};
|
|
|
@@ -3065,6 +3039,8 @@ const addtbenterDialog = async () => {
|
|
|
console.log(formattedData)
|
|
|
const addProductYbInfo_add = await addProductYbInfo(formattedData);
|
|
|
if(addProductYbInfo_add.code === 0) {
|
|
|
+ const res = await getProductData({product_code:_product_code.value});
|
|
|
+ ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
|
|
|
ElMessage({type: 'success',message: '更新成功'})
|
|
|
addybdialogFormVisible.value = false;
|
|
|
} else {
|
|
|
@@ -3190,7 +3166,6 @@ const gyenterDialog = () => {
|
|
|
工序备注: gyformDataTest['工序备注'],
|
|
|
质量要求: gyformDataTest['质量要求'],
|
|
|
质量隐患: gyformDataTest['质量隐患'],
|
|
|
-
|
|
|
};
|
|
|
console.log(formattedData)
|
|
|
// const editdata = await 修改工艺接口函数(formattedData);
|
|
|
@@ -3208,20 +3183,43 @@ const gycloseDialog = () => {
|
|
|
}
|
|
|
|
|
|
//=========印版修改========
|
|
|
+const editybdisplaydata = reactive({
|
|
|
+ chbm:'',
|
|
|
+ chbmNameOptions:[],
|
|
|
+})
|
|
|
+const edit_ybformDataTest = reactive({
|
|
|
+ gongxu:'',
|
|
|
+ gongxuNameOptions:[],
|
|
|
+})
|
|
|
+
|
|
|
let ybformDataTest = reactive({})
|
|
|
-//双击修改
|
|
|
+//双击修改印版资料
|
|
|
const ybupdateCompanyFunc = async (row) => {
|
|
|
- console.log(ybformDataTest)
|
|
|
console.log(row)
|
|
|
- Object.assign(ybformDataTest,row);
|
|
|
- // ybformDataTest = row;
|
|
|
+ //打开弹窗
|
|
|
ybdialogFormVisible.value = true;
|
|
|
+ //清空input数据
|
|
|
+ Object.keys(ybformDataTest).forEach(key => {
|
|
|
+ ybformDataTest[key] = '';
|
|
|
+ });
|
|
|
+ // const getProductYbInfo_list = await getProductYbInfo({UniqID:_UniqID.value});
|
|
|
+ // console.log(getProductYbInfo_list)
|
|
|
+ // if(getProductYbInfo_list.message === 'Request failed with status code 500'){
|
|
|
+ // console.log("新增印版资料-->后台接口错误")
|
|
|
+ // }
|
|
|
+ // //默认取第一个数据
|
|
|
+ // // add_ybformDataTest.gongxu = getProductYbInfo_list.data.gy_data[0]['gy'];
|
|
|
+ // edit_ybformDataTest.gxmc1 = getProductYbInfo_list.data['印版名称'];
|
|
|
+ // editybdisplaydata.gongxuNameOptions = getProductYbInfo_list.data.gy_data.map(item=>{
|
|
|
+ // return item.gy
|
|
|
+ // });
|
|
|
+
|
|
|
+ Object.assign(ybformDataTest,row);
|
|
|
};
|
|
|
// 弹窗
|
|
|
const ybdialogFormVisible = ref(false)
|
|
|
-// 打开修改弹窗
|
|
|
+// 印版资料确定
|
|
|
const ybenterDialog = () => {
|
|
|
- console.log(ybformDataTest)
|
|
|
const formattedData = {
|
|
|
'工序方案': ybformDataTest['YB_方案'],
|
|
|
'印件号': ybformDataTest['YB_Yjno'],
|
|
|
@@ -3231,11 +3229,12 @@ const ybenterDialog = () => {
|
|
|
console.log(formattedData)
|
|
|
// const editdata = await 修改印版接口函数(formattedData);
|
|
|
// if (editdata.code === 0) {
|
|
|
+ // ybdialogFormVisible.value = true
|
|
|
// ElMessage({type: 'success',message: '更新成功'})
|
|
|
// } else {
|
|
|
// ElMessage({ type: 'error',message: '更新失败'})
|
|
|
// }
|
|
|
- // ybdialogFormVisible.value = true
|
|
|
+
|
|
|
}
|
|
|
// 关闭弹窗
|
|
|
const ybcloseDialog = () => {
|