suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改问题

Browse Source
dev-scheduling
zhangdi 2 months ago
parent 956c222f0d
commit 5ad03e9304
2 changed files with 283 additions and 254 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      src/components/jh-select/index.vue
  2. 120
      src/views/oem/oemCustomer/setCraftAbility.vue

37
src/components/jh-select/index.vue
Unescape View File

@ -54,8 +54,8 @@ export default {
},
title: {
type: String,
default: '新增'
}
default: '新增',
},
},
data() {
return {
@ -69,6 +69,7 @@ export default {
dropdownVisible: false,
bindTimer: null,
total: 0,
isSearching: false, // 加这一行
};
},
watch: {
@ -100,7 +101,14 @@ export default {
let timeout = null;
return (...args) => {
clearTimeout(timeout);
timeout = setTimeout(() => func.apply(this, args), wait);
// 过滤无效参数，只保留字符串/数字类型
const validArgs = args
.map(arg => {
if (arg && arg.target) return arg.target.value; // 兼容事件对象
return arg;
})
.filter(arg => arg != null);
timeout = setTimeout(() => func.apply(this, validArgs), wait);
};
},
@ -172,7 +180,25 @@ export default {
},
handleSearch(val) {
this.searchText = val;
// 万能处理：不管传什么，最终一定拿到纯字符串
let searchVal = '';
// 处理 InputEvent 事件对象
if (val && typeof val === 'object' && val.target) {
searchVal = (val.target.value || '').trim();
}
// 处理正常字符串
else {
searchVal = String(val || '').trim();
}
// 赋值搜索文本
this.searchText = searchVal;
this.localValue = searchVal;
// 关键：只要执行了搜索，永远禁止回显！
this.isSearching = true;
this.reset();
this.debounceSearch();
},
@ -229,9 +255,10 @@ export default {
},
async initEcho() {
if (this.isSearching || this.searchText) return;
const val = this.localValue;
// (!val || !this.echoApi)&&
if (this.title=='新增') return;
if (this.title === '新增' || !val) return;
// 处理多选（数组）
if (this.multiple && Array.isArray(val)) {

120
src/views/oem/oemCustomer/setCraftAbility.vue
Unescape View File

@ -1,6 +1,12 @@
<template>
<div>
<el-dialog title="设置工艺能力" v-model="setCrewShow" :before-close="cancel" width="60%" @open="open">
<el-dialog
title="设置工艺能力"
v-model="setCrewShow"
:before-close="cancel"
width="60%"
@open="open"
>
<!-- <avue-crud ref="crud" :option="option" :data="data" @row-update="rowUpdate" @row-save="rowSave"
@row-click="handleRowClick">
<template #menu="{ row, index }">
@ -15,22 +21,22 @@
</template>
</avue-crud> -->
<div>
<el-button type="primary" @click="insertEvent()"
>插入一行</el-button
>
<el-button type="primary" @click="insertEvent()">插入一行</el-button>
<el-button plain type="danger" @click="remove">删除选择行</el-button>
<!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
</div>
<div style="margin-top: 20px">
<el-table
:data="capacityList"
@select="selectChange"
>
<el-table :data="capacityList" @select="selectChange">
<el-table-column type="selection" width="55px"></el-table-column>
<el-table-column align="center" label="工艺能力" prop="id">
<template #default="scope">
<el-select v-model="scope.row.id">
<el-option v-for="item in abilityList" :key="item.id" :label="item.caName" :value="item.id"></el-option>
<el-option
v-for="item in abilityList"
:key="item.id"
:label="item.caName"
:value="item.id"
></el-option>
</el-select>
</template>
</el-table-column>
@ -38,7 +44,6 @@
<template #default="scope">
<jhSelect
:value="scope.row.planner"
@input="val => (scope.row.planner = val)"
placeholder="请搜索选择"
api-url="/blade-system/user/page"
echo-api="/blade-system/user/page"
@ -49,9 +54,8 @@
total-key="total"
label-key="realName"
value-key="id"
search-key="id"
search-key="realName"
:debounce-time="500"
@change="changeTeacher"
:title="'修改'"
/>
<!-- <el-select v-model="scope.row.planner" remote filterable :remote-method="getPlanner">
@ -66,7 +70,6 @@
</el-select> -->
<jhSelect
:value="scope.row.dispatcher"
@input="val => (scope.row.dispatcher = val)"
placeholder="请搜索选择"
api-url="/blade-system/user/page"
echo-api="/blade-system/user/page"
@ -77,9 +80,8 @@
total-key="total"
label-key="realName"
value-key="id"
search-key="id"
search-key="realName"
:debounce-time="500"
@change="changeTeacher"
:title="'修改'"
/>
</template>
@ -101,21 +103,21 @@
</div>
</template>
<script>
import {getCraftAbility,getAbility,getAllUser,saveCraft} from "@/api/basicData/oemCustomer"
import { getCraftAbility, getAbility, getAllUser, saveCraft } from '@/api/basicData/oemCustomer';
import jhSelect from '@/components/jh-select/index.vue';
export default {
props: {
setCraftAbilityOpen: {
type: Boolean,
default: false
default: false,
},
ocId: {
type: Number,
default: null
}
default: null,
},
},
components: {
jhSelect
jhSelect,
},
data() {
return {
@ -130,28 +132,29 @@ export default {
};
},
mounted() {
this.getAbilityData()
this.getAbilitySelect()
this.getAbilityData();
this.getAbilitySelect();
},
methods: {
getAbilitySelect() {
getAbility().then(res => {
this.abilityList = res.data.data
})
this.abilityList = res.data.data;
});
},
async getAbilityData() {
const res = await getCraftAbility({
id:this.ocId
})
this.capacityList = res.data.data
id: this.ocId,
});
this.capacityList = res.data.data;
// const user = await getAllUser({current:1,size:9999})
// this.plannerList = user.data.data.records
// this.dispatcherList = user.data.data.records
this.capacityList.map(item => {
item.dispatcher = item.dispatcher==null||item.dispatcher==-1?'':item.dispatcher + ''
item.planner = item.planner==null||item.planner==-1?'':item.planner + ''
item.isBatch = item.isBatch == '1' ? true : false
item._select = false
item.dispatcher =
item.dispatcher == null || item.dispatcher == -1 ? '' : item.dispatcher + '';
item.planner = item.planner == null || item.planner == -1 ? '' : item.planner + '';
item.isBatch = item.isBatch == '1' ? true : false;
item._select = false;
// if(item.dispatcherName != ''){
// getAllUser({realName:item.dispatcherName}).then(res =>{
// const mergedData = [...this.dispatcherList, ...res.data.data.records];
@ -170,8 +173,8 @@ export default {
// this.plannerList = uniqueData
// })
// }
})
this.setCrewShow = this.setCraftAbilityOpen
});
this.setCrewShow = this.setCraftAbilityOpen;
},
getPlanner(query) {
// if(query == ''){
@ -207,36 +210,36 @@ export default {
},
insertEvent() {
const record = { _select: false };
this.capacityList.push(record)
this.capacityList.push(record);
},
selectChange(list, row) {
row._select = !row._select;
},
remove() {
let arr = this.capacityList.filter((item) => item._select);
let arr = this.capacityList.filter(item => item._select);
if (arr.length != 0) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
if (this.rowId) {
let deleteData = this.capacityList.filter((item) => item._select);
this.deleteTidArr = deleteData.filter((item) => item.tidId);
let deleteData = this.capacityList.filter(item => item._select);
this.deleteTidArr = deleteData.filter(item => item.tidId);
}
let deleteArr = this.capacityList.filter((item) => !item._select);
let deleteArr = this.capacityList.filter(item => !item._select);
this.capacityList = deleteArr;
});
} else {
this.$message.error("请至少选择一条数据进行操作！");
this.$message.error('请至少选择一条数据进行操作！');
}
},
handleRowClick(row) {
this.$message({
showClose: true,
message: '序号: ' + row.id,
type: 'success'
})
type: 'success',
});
},
open() {
// this.formData.ocId = this.id;
@ -249,31 +252,31 @@ export default {
// }
},
submit() {
console.log('ca----------',this.capacityList)
console.log('ca----------', this.capacityList);
if (this.capacityList.length == 0) {
this.$message.error('请至少新增一条数据')
return
this.$message.error('请至少新增一条数据');
return;
}
let data = []
let data = [];
this.capacityList.map(item => {
data.push({
id: item.id,
planner: item.planner,
dispatcher: item.dispatcher,
isBatch:item.isBatch ? '1' : '0'
})
})
isBatch: item.isBatch ? '1' : '0',
});
});
let params = {
id: this.ocId,
crafs:data
}
crafs: data,
};
saveCraft(params).then(res => {
if (res.data.code === 200) {
this.$message.success('工艺能力设置成功');
this.cancel(true)
this.cancel(true);
}
})
});
// this.cancel(false)
// this.$refs.form.validate((valid) => {
@ -294,13 +297,12 @@ export default {
this.cancel(false);
},
cancel(isRefresh) {
this.setCrewShow = false
this.setCrewShow = false;
this.formData = { ocId: null };
// this.$refs.form.resetFields();
this.$emit('cancel', typeof isRefresh === 'boolean' && isRefresh);
}
},
},
};
</script>

Write Preview
Loading…
Cancel
Save