|
@@ -20,6 +20,24 @@
|
|
|
label-width="auto"
|
|
|
size="large"
|
|
|
>
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="10">
|
|
|
+ <el-select
|
|
|
+ v-model="selectedSign"
|
|
|
+ :filterable="true"
|
|
|
+ placeholder="请选择检验人"
|
|
|
+ style="margin-bottom: 20px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in signNameList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.signUser"
|
|
|
+ :value="item.id"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
<el-select
|
|
|
v-if="processStore.scanInfo.batchReport == 1"
|
|
|
v-model="selectedProcess"
|
|
@@ -124,7 +142,7 @@ import { getProcessInfo, getunProcessedList } from "@/api/prosteps";
|
|
|
import { emitter, EventsNames } from "@/utils/common";
|
|
|
import { CirclePlus, Remove } from "@element-plus/icons-vue";
|
|
|
import { useUserStore } from "@/store/modules/user";
|
|
|
-import { reportWork } from "@/api/process/reportBreak";
|
|
|
+import { reportWork, signList } from "@/api/process/reportBreak";
|
|
|
|
|
|
const processStore = useProcessStore();
|
|
|
const dictStroe = useDictionaryStore();
|
|
@@ -135,6 +153,9 @@ const router = useRouter();
|
|
|
const drawerVisible = ref(false);
|
|
|
const formDisabled = ref(true);
|
|
|
|
|
|
+const signNameList = ref<any[]>([]);
|
|
|
+const selectedSign = ref("");
|
|
|
+
|
|
|
const formRef = ref<InstanceType<typeof ElForm>>();
|
|
|
|
|
|
const persons = ref<
|
|
@@ -165,6 +186,10 @@ const openReportWorkDrawer = () => {
|
|
|
processList.value = res.data ?? [];
|
|
|
});
|
|
|
}
|
|
|
+
|
|
|
+ signList({ signatureType: "3" }).then((res) => {
|
|
|
+ signNameList.value = res.data ?? [];
|
|
|
+ });
|
|
|
};
|
|
|
|
|
|
const cancelClick = () => {
|
|
@@ -185,6 +210,7 @@ const confirmClick = () => {
|
|
|
processId: processStore.scanInfo.id,
|
|
|
processUserReportList: persons.value,
|
|
|
seqList: selectedProcess.value,
|
|
|
+ signatureId: selectedSign,
|
|
|
};
|
|
|
|
|
|
reportWork(params).then((res: any) => {
|