|
@@ -1331,17 +1331,17 @@
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="工序方案:" prop="address" class="mab">
|
|
<el-form-item label="工序方案:" prop="address" class="mab">
|
|
|
- <el-input v-model="ybformDataTest['YB_方案']" clearable placeholder="" style="width: 100px;" id="YB_方案" @keydown="ent($event, 'gy0_site', 'YB_方案', 'YB_Yjno')"/>
|
|
|
|
|
|
|
+ <el-input v-model="ybformDataTest['YB_方案']" placeholder="" style="width: 100px;" id="YB_方案" @keydown="ent($event, 'gy0_site', 'YB_方案', 'YB_Yjno')"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="印件号:" prop="address" class="mab">
|
|
<el-form-item label="印件号:" prop="address" class="mab">
|
|
|
- <el-input v-model="ybformDataTest['YB_Yjno']" clearable placeholder="" style="width: 100px;" id="YB_Yjno" @keydown="ent($event, 'YB_方案', 'YB_Yjno', '工序编号')"/>
|
|
|
|
|
|
|
+ <el-input v-model="ybformDataTest['YB_Yjno']" placeholder="" style="width: 100px;" id="YB_Yjno" @keydown="ent($event, 'YB_方案', 'YB_Yjno', '工序编号')"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="工序编号:" prop="address" class="mab">
|
|
<el-form-item label="工序编号:" prop="address" class="mab">
|
|
|
- <el-input v-model="ybformDataTest['']" clearable placeholder="" style="width: 100px;" id="工序编号" @keydown="ent($event, 'YB_Yjno', '工序编号', '工艺名称')"/>
|
|
|
|
|
|
|
+ <el-input v-model="ybformDataTest['']" placeholder="" style="width: 100px;" id="工序编号" @keydown="ent($event, 'YB_Yjno', '工序编号', '工艺名称')"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
@@ -1349,35 +1349,35 @@
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
|
<el-form-item label="工艺名称:" prop="address" class="mab">
|
|
<el-form-item label="工艺名称:" prop="address" class="mab">
|
|
|
- <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;" id="工艺名称" @keydown="ent($event, '工序编号', '工艺名称', '工序名称')"/>
|
|
|
|
|
|
|
+ <el-input v-model="ybformDataTest['gy0_site']" placeholder="" style="width: 100%;" id="工艺名称" @keydown="ent($event, '工序编号', '工艺名称', '工序名称')"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
|
<el-form-item label="工序名称:" prop="address" class="mab">
|
|
<el-form-item label="工序名称:" prop="address" class="mab">
|
|
|
- <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;" id="工序名称" @keydown="ent($event, '工艺名称', '工序名称', '存货编码')"/>
|
|
|
|
|
|
|
+ <el-input v-model="ybformDataTest['gy0_site']" placeholder="" style="width: 100%;" id="工序名称" @keydown="ent($event, '工艺名称', '工序名称', '存货编码')"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="10 ">
|
|
<el-col :span="10 ">
|
|
|
<el-form-item label="存货编码:" prop="address" class="mab">
|
|
<el-form-item label="存货编码:" prop="address" class="mab">
|
|
|
- <el-input v-model="ybformDataTest['存货编码']" clearable placeholder="" style="width: 140px;" id="存货编码" @keydown="ent($event, '工序名称', '存货编码', '印版名称')"/>
|
|
|
|
|
|
|
+ <el-input v-model="ybformDataTest['存货编码']" placeholder="" style="width: 140px;" id="存货编码" @keydown="ent($event, '工序名称', '存货编码', '印版名称')"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
|
<el-form-item label="存货名称:" prop="address" class="mab">
|
|
<el-form-item label="存货名称:" prop="address" class="mab">
|
|
|
- <el-input v-model="ybformDataTest['印版名称']" clearable placeholder="" style="width: 100%;" id="印版名称" @keydown="ent($event, '存货编码', '印版名称', 'gy0_site')"/>
|
|
|
|
|
|
|
+ <el-input v-model="ybformDataTest['印版名称']" placeholder="" style="width: 100%;" id="印版名称" @keydown="ent($event, '存货编码', '印版名称', 'gy0_site')"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
|
<el-form-item label="印版备注:" prop="address" class="mab">
|
|
<el-form-item label="印版备注:" prop="address" class="mab">
|
|
|
- <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;" id="gy0_site" @keydown="ent($event, '印版名称', 'gy0_site', 'YB_方案')"/>
|
|
|
|
|
|
|
+ <el-input v-model="ybformDataTest['gy0_site']" placeholder="" style="width: 100%;" id="gy0_site" @keydown="ent($event, '印版名称', 'gy0_site', 'YB_方案')"/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
@@ -1938,11 +1938,11 @@ const cpgyfzclick = async () => {
|
|
|
await _getGyTotal();
|
|
await _getGyTotal();
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
-//取消
|
|
|
|
|
|
|
+//产品工艺复制取消
|
|
|
const cpgyfzhandleCancel = async () => {
|
|
const cpgyfzhandleCancel = async () => {
|
|
|
cpgyfzlist.value = false;
|
|
cpgyfzlist.value = false;
|
|
|
};
|
|
};
|
|
|
-//确定
|
|
|
|
|
|
|
+//产品工艺复制确定
|
|
|
const is_copy_gy = ref(0);
|
|
const is_copy_gy = ref(0);
|
|
|
const is_copy_yb = ref(0);
|
|
const is_copy_yb = ref(0);
|
|
|
const toProUpperCase = ref('');
|
|
const toProUpperCase = ref('');
|
|
@@ -2439,6 +2439,7 @@ const treeData = ref({})
|
|
|
const getCustomdata = async () => {
|
|
const getCustomdata = async () => {
|
|
|
try {
|
|
try {
|
|
|
const data = await getCustom()
|
|
const data = await getCustom()
|
|
|
|
|
+ console.log("左侧菜单列表↓")
|
|
|
console.log(data)
|
|
console.log(data)
|
|
|
treeData.value = data.data;
|
|
treeData.value = data.data;
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
@@ -2476,6 +2477,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("点击表格行 下方表格获取数据")
|
|
|
console.log(res)
|
|
console.log(res)
|
|
|
yjtableData.splice(0, yjtableData.length, ...res.data.yjData);
|
|
yjtableData.splice(0, yjtableData.length, ...res.data.yjData);
|
|
|
gytableData.splice(0, gytableData.length, ...res.data.gyData);
|
|
gytableData.splice(0, gytableData.length, ...res.data.gyData);
|
|
@@ -2507,15 +2509,14 @@ const _getProduct = async ()=>{
|
|
|
params.custom_code = _custom_code.value;
|
|
params.custom_code = _custom_code.value;
|
|
|
params.limit = pageSize.value;
|
|
params.limit = pageSize.value;
|
|
|
params.page = page.value;
|
|
params.page = page.value;
|
|
|
- console.log(params)
|
|
|
|
|
try {
|
|
try {
|
|
|
const WorkListdata = await getProduct(params);
|
|
const WorkListdata = await getProduct(params);
|
|
|
|
|
+ console.log("通过左侧菜单列表获取数据↓")
|
|
|
console.log(WorkListdata.data.data)
|
|
console.log(WorkListdata.data.data)
|
|
|
if(WorkListdata.data.data === []){
|
|
if(WorkListdata.data.data === []){
|
|
|
ElMessage({type: 'warning',message: '未查询到搜索条件'})
|
|
ElMessage({type: 'warning',message: '未查询到搜索条件'})
|
|
|
}else{
|
|
}else{
|
|
|
tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
|
|
tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
|
|
|
- console.log(WorkListdata)
|
|
|
|
|
total.value = WorkListdata.data.total;//共多少条
|
|
total.value = WorkListdata.data.total;//共多少条
|
|
|
}
|
|
}
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
@@ -2534,7 +2535,6 @@ const handleCurrentChange = (val) => {
|
|
|
|
|
|
|
|
// 修改页面容量 点击多少条/页
|
|
// 修改页面容量 点击多少条/页
|
|
|
const handleSizeChange = (val) => {
|
|
const handleSizeChange = (val) => {
|
|
|
-
|
|
|
|
|
pageSize.value = val;
|
|
pageSize.value = val;
|
|
|
_getProduct();
|
|
_getProduct();
|
|
|
};
|
|
};
|
|
@@ -3219,22 +3219,25 @@ const ybupdateCompanyFunc = async (row) => {
|
|
|
// 弹窗
|
|
// 弹窗
|
|
|
const ybdialogFormVisible = ref(false)
|
|
const ybdialogFormVisible = ref(false)
|
|
|
// 印版资料确定
|
|
// 印版资料确定
|
|
|
-const ybenterDialog = () => {
|
|
|
|
|
|
|
+const ybenterDialog = async () => {
|
|
|
const formattedData = {
|
|
const formattedData = {
|
|
|
- '工序方案': ybformDataTest['YB_方案'],
|
|
|
|
|
- '印件号': ybformDataTest['YB_Yjno'],
|
|
|
|
|
|
|
+ 'UniqId': _UniqID.value,
|
|
|
|
|
+ 'YB_方案': ybformDataTest['YB_方案'],
|
|
|
|
|
+ 'YB_Yjno': ybformDataTest['YB_Yjno'],
|
|
|
|
|
+ // 'YB_gxh': ybformDataTest['YB_gxh'],
|
|
|
'存货编码': ybformDataTest['存货编码'],
|
|
'存货编码': ybformDataTest['存货编码'],
|
|
|
'印版名称': ybformDataTest['印版名称'],
|
|
'印版名称': ybformDataTest['印版名称'],
|
|
|
};
|
|
};
|
|
|
console.log(formattedData)
|
|
console.log(formattedData)
|
|
|
- // const editdata = await 修改印版接口函数(formattedData);
|
|
|
|
|
|
|
+ const editdata = await editProductYbInfo(formattedData);
|
|
|
// if (editdata.code === 0) {
|
|
// if (editdata.code === 0) {
|
|
|
// ybdialogFormVisible.value = true
|
|
// ybdialogFormVisible.value = true
|
|
|
|
|
+ // const res = await getProductData({product_code:_product_code.value});
|
|
|
|
|
+ // ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
|
|
|
// ElMessage({type: 'success',message: '更新成功'})
|
|
// ElMessage({type: 'success',message: '更新成功'})
|
|
|
// } else {
|
|
// } else {
|
|
|
// ElMessage({ type: 'error',message: '更新失败'})
|
|
// ElMessage({ type: 'error',message: '更新失败'})
|
|
|
// }
|
|
// }
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
// 关闭弹窗
|
|
// 关闭弹窗
|
|
|
const ybcloseDialog = () => {
|
|
const ybcloseDialog = () => {
|
|
@@ -3244,10 +3247,11 @@ const ybcloseDialog = () => {
|
|
|
//===========改变按钮中表格修改背景颜色=========
|
|
//===========改变按钮中表格修改背景颜色=========
|
|
|
//计损色数修正表格修改颜色 :cell-style="setInputCellStyle"
|
|
//计损色数修正表格修改颜色 :cell-style="setInputCellStyle"
|
|
|
const setInputCellStyle = (data) => {
|
|
const setInputCellStyle = (data) => {
|
|
|
|
|
+ console.log(data)
|
|
|
const jiSun = ['ms_coe', 'Gy0_Ks', 'Gy0_ls', 'Add_gxmc', 'remark']
|
|
const jiSun = ['ms_coe', 'Gy0_Ks', 'Gy0_ls', 'Add_gxmc', 'remark']
|
|
|
let style = { padding: 0 }
|
|
let style = { padding: 0 }
|
|
|
if (data.column?.property && jiSun.includes(data.column?.property)) {
|
|
if (data.column?.property && jiSun.includes(data.column?.property)) {
|
|
|
- Object.assign(style, { backgroundColor: '#42b983'})
|
|
|
|
|
|
|
+ Object.assign(style, { backgroundColor: '#80FA80'})
|
|
|
}
|
|
}
|
|
|
return style
|
|
return style
|
|
|
}
|
|
}
|
|
@@ -3318,6 +3322,11 @@ const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
//点击技术附件按钮
|
|
//点击技术附件按钮
|
|
|
const jsfjClick = () => {
|
|
const jsfjClick = () => {
|
|
|
if(_Gd_gdbh.value == null){
|
|
if(_Gd_gdbh.value == null){
|