|
|
|
@ -57,12 +57,17 @@
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="派工工序" prop="procedureName">
|
|
|
|
|
<el-input
|
|
|
|
|
<!-- <el-input
|
|
|
|
|
v-model="queryParams.procedureName"
|
|
|
|
|
placeholder="请输入派工工序"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/> -->
|
|
|
|
|
<ProcedureSelect
|
|
|
|
|
v-model="queryParams.procedureId"
|
|
|
|
|
@update:newValue="handleSelectedProcedure"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="负责人" prop="ownerName">
|
|
|
|
@ -73,6 +78,8 @@
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
<!-- <UserSelect v-model="queryParams.ownerId" class="!w-240px"
|
|
|
|
|
@update:newValue="handleSelectedUser" /> -->
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="完成状态" prop="procedureStatus">
|
|
|
|
|
<el-select
|
|
|
|
@ -221,6 +228,8 @@ import download from '@/utils/download'
|
|
|
|
|
import * as TaskReportApi from '@/api/biz/taskreport'
|
|
|
|
|
import AssignForm from './assignForm.vue'
|
|
|
|
|
import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
|
|
|
|
|
// import UserSelect from '@/views/biz/hlvuestyle/userSelect.vue'
|
|
|
|
|
import ProcedureSelect from '@/views/biz/hlvuestyle/procedureSelect.vue'
|
|
|
|
|
|
|
|
|
|
defineOptions({ name: 'TaskReport' })
|
|
|
|
|
|
|
|
|
@ -238,8 +247,10 @@ const queryParams = reactive({
|
|
|
|
|
materialNameOrCode: undefined,
|
|
|
|
|
spec: undefined,
|
|
|
|
|
workshopId: undefined,
|
|
|
|
|
procedureId:undefined,
|
|
|
|
|
procedureName: undefined,
|
|
|
|
|
ownerName: undefined,
|
|
|
|
|
ownerId: undefined,
|
|
|
|
|
procedureStatus: undefined
|
|
|
|
|
})
|
|
|
|
|
const statuslist = ref([
|
|
|
|
@ -377,4 +388,14 @@ const handleSelectedWorkshop = (newValue: any) => {
|
|
|
|
|
onMounted(() => {
|
|
|
|
|
getList()
|
|
|
|
|
})
|
|
|
|
|
//接收工序传递的数据
|
|
|
|
|
const handleSelectedProcedure = (newValue: any) => {
|
|
|
|
|
// console.log('接收工序对应的数据:', newValue)
|
|
|
|
|
queryParams.procedureId = newValue?.id
|
|
|
|
|
}
|
|
|
|
|
// //接收职工传递的数据
|
|
|
|
|
// const handleSelectedUser = (newValue: any) => {
|
|
|
|
|
// // console.log('接收职工对应的数据:', newValue)
|
|
|
|
|
// queryParams.ownerId = newValue?.id
|
|
|
|
|
// }
|
|
|
|
|
</script>
|
|
|
|
|