|
|
@@ -57,9 +57,42 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
+ <el-form-item label="选择工序" prop="operations">
|
|
|
+ <el-select
|
|
|
+ v-model="formLabelAlign.operations"
|
|
|
+ multiple
|
|
|
+ placeholder="请选择连续的工序"
|
|
|
+ value-key="value"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in processOps"
|
|
|
+ :key="item"
|
|
|
+ :label="item.operationName"
|
|
|
+ :value="item.operationId"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="供应商" prop="manufacturers">
|
|
|
<el-input v-model="formLabelAlign.manufacturers" />
|
|
|
</el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="审核人" prop="auditUser">
|
|
|
+ <el-select
|
|
|
+ v-model="formLabelAlign.auditUser"
|
|
|
+ filterable
|
|
|
+ placeholder="请选择人员"
|
|
|
+ value-key="id"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in dictStroe.allUsers"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.userName"
|
|
|
+ :value="item.userName"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input v-model="formLabelAlign.remark" :rows="3" type="textarea" />
|
|
|
</el-form-item>
|
|
|
@@ -77,8 +110,11 @@
|
|
|
<script lang="ts" setup>
|
|
|
import { breakReportInfoById } from "@/api/process/reportBreak";
|
|
|
import { useProcessStore } from "@/store/modules/processView";
|
|
|
-import { addAppointOut } from "@/api/process/appointOut";
|
|
|
+import { addAppointOut, getProcessOpInfo } from "@/api/process/appointOut";
|
|
|
import { emitter, EventsNames } from "@/utils/common";
|
|
|
+import { useDictionaryStore } from "@/store";
|
|
|
+
|
|
|
+const dictStroe = useDictionaryStore();
|
|
|
|
|
|
const processStore = useProcessStore();
|
|
|
|
|
|
@@ -88,12 +124,14 @@ const formLabelAlign = reactive({
|
|
|
details: [],
|
|
|
manufacturers: "",
|
|
|
remark: "",
|
|
|
+ operations: [],
|
|
|
+ auditUser: "",
|
|
|
});
|
|
|
const rules = reactive({
|
|
|
manufacturers: [
|
|
|
{ required: true, message: "请输入 委外厂商", trigger: "blur" },
|
|
|
],
|
|
|
- details: [{ required: true, message: "请选择 ", trigger: "blur" }],
|
|
|
+ auditUser: [{ required: true, message: "请选择 ", trigger: "blur" }],
|
|
|
});
|
|
|
|
|
|
const processWorkSeq = ref<any>([]);
|
|
|
@@ -102,10 +140,15 @@ const cancelClick = () => {
|
|
|
formRef.value && formRef.value.resetFields();
|
|
|
};
|
|
|
|
|
|
+const processOps = ref<any[]>([]); //工序列表
|
|
|
+
|
|
|
onMounted(() => {
|
|
|
- breakReportInfoById(processStore.scanInfo.id).then((res) => {
|
|
|
+ breakReportInfoById(processStore.scanInfo.id).then((res: any) => {
|
|
|
processWorkSeq.value = res.data.processWorkSeq || [];
|
|
|
});
|
|
|
+ getProcessOpInfo(processStore.scanInfo.id).then((res: any) => {
|
|
|
+ processOps.value = res.data || [];
|
|
|
+ });
|
|
|
});
|
|
|
|
|
|
const confirmClick = () => {
|
|
|
@@ -121,6 +164,8 @@ const confirmClick = () => {
|
|
|
processId: processStore.scanInfo.id,
|
|
|
outNum: formLabelAlign.details.length,
|
|
|
details: seqs,
|
|
|
+ operations: formLabelAlign.operations,
|
|
|
+ auditUser: formLabelAlign.auditUser,
|
|
|
manufacturers: formLabelAlign.manufacturers,
|
|
|
remark: formLabelAlign.remark,
|
|
|
};
|
|
|
@@ -129,8 +174,6 @@ const confirmClick = () => {
|
|
|
ElMessage.success("申请成功");
|
|
|
emitter.emit(EventsNames.APPOINT_OUT);
|
|
|
});
|
|
|
- } else {
|
|
|
- return false;
|
|
|
}
|
|
|
});
|
|
|
};
|
