diff --git a/src/components/ChooseList/ChooseNJBAY/index.vue b/src/components/ChooseList/ChooseNJBAY/index.vue index 64e4ac7..8266441 100644 --- a/src/components/ChooseList/ChooseNJBAY/index.vue +++ b/src/components/ChooseList/ChooseNJBAY/index.vue @@ -95,7 +95,7 @@ watch(()=>props.modelValue, (val) => { nextTick(() => { getListData(); }); - } + } },{immediate: true}); const keyid = (row) => { @@ -104,14 +104,14 @@ const keyid = (row) => { // 列表数据 const getListData = () => { - let params = { + let params = { ...listQuery, - pxgsShzt: "1",//培训公司已通过 + // pxgsShzt: "1",//培训公司已通过 sptz: "1",//已送培 - ssbakk:userInfo.pxgs, - ssbakkId:userInfo.pxgsid, + sptzCompanyName:userInfo.pxgs, + sptzCompanyId:userInfo.pxgsid, pxgsShzt:'1',//保安公司已通过 - + } loading.value = true; qcckPost(params,"/mosty-base/bans/njxx/page").then((res) => { @@ -184,7 +184,7 @@ const handleSelectionChange = (val) => { if (props.data.Single && val.length > 1) { let del_row = val.shift(); multipleUserRef.value.toggleRowSelection(del_row, false); - } + } multipleSelectionUser.value = val; }; diff --git a/src/components/steps.vue b/src/components/steps.vue index 4fec028..63e0755 100644 --- a/src/components/steps.vue +++ b/src/components/steps.vue @@ -25,7 +25,7 @@ :class="{ 'status-pending': dataForm.pxgsShzt == 0, 'status-pass': dataForm.pxgsShzt == 1, 'status-reject': dataForm.pxgsShzt == 2 }">{{ dataForm.pxgsShzt == 0 ? '待审核' : dataForm.pxgsShzt == 1 ? '通过' : '驳回' }} -
+
驳回原因: {{ dataForm.pxgsBhyy || '未审核' }}
@@ -40,7 +40,7 @@ :class="{ 'status-pending': dataForm.gonganShzt == 0, 'status-pass': dataForm.gonganShzt == 1, 'status-reject': dataForm.gonganShzt == 2 }">{{ dataForm.gonganShzt == 0 ? '待审核' : dataForm.gonganShzt == 1 ? '通过' : '驳回' }}
-
+
驳回原因: {{ dataForm.gonganBhyy || '未审核' }}
diff --git a/src/views/Training/securityNjgl/index.vue b/src/views/Training/securityNjgl/index.vue index c0db7ef..f115971 100644 --- a/src/views/Training/securityNjgl/index.vue +++ b/src/views/Training/securityNjgl/index.vue @@ -162,9 +162,10 @@ const getList = () => { const promes = { ...pageData.pageConfiger, ...queryFrom.value, - ssbakk:userInfo.pxgs, - ssbakkId:userInfo.pxgsid + ssbakk:userInfo.pxgs, + ssbakkId:userInfo.pxgsid, } + qcckPost(promes,'/mosty-base/bans/njxx/page').then(res => { pageData.tableData = res.records || []; pageData.total = res.total; diff --git a/src/views/Training/securityNjsp/components/addSp.vue b/src/views/Training/securityNjsp/components/addSp.vue index 44fac6d..80cbf94 100644 --- a/src/views/Training/securityNjsp/components/addSp.vue +++ b/src/views/Training/securityNjsp/components/addSp.vue @@ -81,7 +81,7 @@ const trainingCompany=ref() const onBatchAudit = (val) => { if (ids.value.length === 0) return ElMessage.warning("请选择要送培的人员"); proxy.$modal.confirm("是否确认送培?").then(() => { - let params = { ids:ids.value ,...val} + let params = { ids: ids.value, ...val } qcckPost(params,'/mosty-base/bans/njxx/sendTraining').then(res=>{ ElMessage.success("送培成功"); emit('refresh'); diff --git a/src/views/Training/securityNjsp/components/detailForm.vue b/src/views/Training/securityNjsp/components/detailForm.vue index 7e4b4aa..5851e18 100644 --- a/src/views/Training/securityNjsp/components/detailForm.vue +++ b/src/views/Training/securityNjsp/components/detailForm.vue @@ -6,12 +6,12 @@
-