|
|
@@ -551,7 +551,7 @@
|
|
|
<el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" >
|
|
|
<el-row :gutter="24">
|
|
|
<el-form-item label="重点工单:" prop="keyOrder" class="mab" label-width="90">
|
|
|
- <el-select v-model="add_gdscgdformData['重点工单']" style="width: 110px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
|
|
|
+ <el-select v-model="add_gdscgdformData['重点工单']" @dblclick="handleDoubleClick" style="width: 110px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
|
|
|
<el-option label="" value=""></el-option>
|
|
|
<el-option label="打样工单" value="打样工单"></el-option>
|
|
|
<el-option label="来料加工" value="来料加工"></el-option>
|
|
|
@@ -1695,6 +1695,7 @@ const gd_clearFormData = () => {
|
|
|
};
|
|
|
//新增工单资料按钮
|
|
|
const addgd_onclick = () => {
|
|
|
+ handleDoubleClick();
|
|
|
gd_clearFormData();
|
|
|
add_gdscgdformData['重点工单'] = '';
|
|
|
add_gdscgdformData['订单数量'] = 0;
|
|
|
@@ -1706,6 +1707,9 @@ const addgd_onclick = () => {
|
|
|
add_gdscgdformData['开单日期'] = currentDate;
|
|
|
add_gddialogFormVisible.value = true
|
|
|
}
|
|
|
+const handleDoubleClick = async ()=>{
|
|
|
+ console.log(123)
|
|
|
+}
|
|
|
//新增工单资料确定
|
|
|
const add_gdenterDialog = async ()=>{
|
|
|
console.log(add_gdscgdformData)
|
|
|
@@ -3012,8 +3016,9 @@ const edit_gdyjent = (event,id1,id2,id3,idx) => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-//=========工艺修改========
|
|
|
+//=========修改工艺资料========
|
|
|
const gdgydialogFormVisible = ref(false)
|
|
|
+const _capacityListsbbh = ref(null)
|
|
|
const gdgyformData = reactive({})
|
|
|
const gdzl_MachineList_address = reactive({
|
|
|
data: []
|
|
|
@@ -3021,7 +3026,11 @@ const gdzl_MachineList_address = reactive({
|
|
|
const _cjmc = ref(null);
|
|
|
//双击修改
|
|
|
const gdgyupdateCompanyFunc = async(row) => {
|
|
|
- gdgyformData['设备编号'] = [];
|
|
|
+ // gdgyformData['设备编号'] = [];
|
|
|
+ console.log(row);
|
|
|
+ console.log(row['机台编号']);
|
|
|
+ // gdgyformData['设备编号'] = row['机台编号'];
|
|
|
+
|
|
|
if(row['车间名称']){
|
|
|
_cjmc.value = row['车间名称']
|
|
|
}else{
|
|
|
@@ -3029,6 +3038,12 @@ const gdgyupdateCompanyFunc = async(row) => {
|
|
|
}
|
|
|
//通过车间名称查询机台
|
|
|
const MachineList_jitai = await gdzl_MachineList({address:_cjmc.value});
|
|
|
+ if(MachineList_jitai.data === null || MachineList_jitai.data === ''){
|
|
|
+ ElMessage({type: 'warning', message: '未找到该车间机台'})
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ console.log(MachineList_jitai.data)
|
|
|
+ MachineList_jitai.data.unshift(row['机台编号']);
|
|
|
gdzl_MachineList_address.data = MachineList_jitai.data;
|
|
|
|
|
|
// 示例字符串
|
|
|
@@ -3062,6 +3077,7 @@ const gdgyupdateCompanyFunc = async(row) => {
|
|
|
// 如果没有 "-",则整个字符串是印件,工序为空
|
|
|
yinjian = printProcess.trim();
|
|
|
}
|
|
|
+ // console.log(row)
|
|
|
gdgyformData['印件'] = yinjian;
|
|
|
gdgyformData['工序'] = gongxu;
|
|
|
gdgyformData['工艺名称'] = technologyName;
|
|
|
@@ -3098,6 +3114,7 @@ const gdgyenterDialog = async () => {
|
|
|
UniqId: gdgyformData['UniqId'],
|
|
|
workOrder: _Gd_gdbh.value,
|
|
|
};
|
|
|
+ console.log(formattedData)
|
|
|
const ProcessDetailEdit_edit = await ProcessDetailEdit(formattedData);
|
|
|
if (ProcessDetailEdit_edit.code === 0) {
|
|
|
gdgydialogFormVisible.value = false
|
|
|
@@ -3118,12 +3135,10 @@ const gdgycloseDialog = () => {
|
|
|
}
|
|
|
|
|
|
//点击设备编号
|
|
|
-const _capacityListsbbh = ref(null)
|
|
|
const sbbhclick = () => {
|
|
|
_capacityList();
|
|
|
}
|
|
|
|
|
|
-
|
|
|
const _capacityList = async () => {
|
|
|
if(gdgyformData['设备编号'] === ''){
|
|
|
return false;
|
|
|
@@ -3134,12 +3149,35 @@ const _capacityList = async () => {
|
|
|
}
|
|
|
|
|
|
};
|
|
|
-
|
|
|
//截取印件前两位
|
|
|
const clickybupdate2 = (row,column,event) => {
|
|
|
currentGy0_yjno.value = row['印件-工序'].substr(0, 2)
|
|
|
}
|
|
|
-
|
|
|
+//修改工艺资料弹窗 键盘 input框跳转
|
|
|
+const gyzlent = (event,id1,id2,id3) => {
|
|
|
+ if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
|
|
|
+ if(id3!=''){
|
|
|
+ document.getElementById(id3).focus()
|
|
|
+ }
|
|
|
+ } else if (event.keyCode === 38) { // 向上箭头
|
|
|
+ if(id1!=''){
|
|
|
+ document.getElementById(id1).focus()
|
|
|
+ }
|
|
|
+ }else if (event.keyCode === 8) { // 删除箭头
|
|
|
+ if(id1!='' && document.getElementById(id2).value==''){
|
|
|
+ document.getElementById(id1).focus()
|
|
|
+ }
|
|
|
+ // console.log(document.getElementById(id2).value)
|
|
|
+ }else if (event.keyCode === 37) { // 向左箭头
|
|
|
+ if(id1!='' && document.getElementById(id2).selectionStart==0){
|
|
|
+ document.getElementById(id1).focus()
|
|
|
+ }
|
|
|
+ }else if (event.keyCode === 39) { // 向右箭头
|
|
|
+ if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
|
|
|
+ document.getElementById(id3).focus()
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
//===============颜色==================================
|
|
|
//工艺资料背景颜色变黄
|
|
|
@@ -3233,32 +3271,6 @@ const gdzlent =async (event,id1,id2,id3) => {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-//修改工艺资料弹窗 键盘 input框跳转
|
|
|
-const gyzlent = (event,id1,id2,id3) => {
|
|
|
- if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
|
|
|
- if(id3!=''){
|
|
|
- document.getElementById(id3).focus()
|
|
|
- }
|
|
|
- } else if (event.keyCode === 38) { // 向上箭头
|
|
|
- if(id1!=''){
|
|
|
- document.getElementById(id1).focus()
|
|
|
- }
|
|
|
- }else if (event.keyCode === 8) { // 删除箭头
|
|
|
- if(id1!='' && document.getElementById(id2).value==''){
|
|
|
- document.getElementById(id1).focus()
|
|
|
- }
|
|
|
- // console.log(document.getElementById(id2).value)
|
|
|
- }else if (event.keyCode === 37) { // 向左箭头
|
|
|
- if(id1!='' && document.getElementById(id2).selectionStart==0){
|
|
|
- document.getElementById(id1).focus()
|
|
|
- }
|
|
|
- }else if (event.keyCode === 39) { // 向右箭头
|
|
|
- if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
|
|
|
- document.getElementById(id3).focus()
|
|
|
- }
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
const yjSelection = ref('')
|
|
|
const gySelection = ref('')
|
|
|
// 印件资料多选、工艺资料多选
|