diff --git a/src/api/expense-manage/index.js b/src/api/expense-manage/index.js
index bed3ba4..2bd970d 100644
--- a/src/api/expense-manage/index.js
+++ b/src/api/expense-manage/index.js
@@ -15,7 +15,7 @@ export const getAllocationDetail = (allocationId) => {
};
export const getAllocationDetails = (allocationId) => {
return request({
- url: `/workflow/mosr/cost/allocation/usr/detail`,
+ url: `/workflow/mosr/cost/allocation/usr/detail/${allocationId}`,
method: "get"
});
};
diff --git a/src/components/DetailComponent/ExpenseDetail.vue b/src/components/DetailComponent/ExpenseDetail.vue
index d8d67cf..e431fe6 100644
--- a/src/components/DetailComponent/ExpenseDetail.vue
+++ b/src/components/DetailComponent/ExpenseDetail.vue
@@ -207,7 +207,7 @@ const concatColumn = (columnIndex, length) => {
}
const init = () => {
loading.value = true
- getAllocationDetails().then(res => {
+ getAllocationDetails(route.query.id).then(res => {
columnInfo.value = res.data.columns
let tableDataLet = res.data.tableData;
tableData.value = []
diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index 02215e4..37567de 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -3,13 +3,13 @@
-
+
-
+
{{ chooseUserInfo() }}
-
+
{{ chooseUserInfo() == null ? '请选择研发人员' : '更改' }}
@@ -64,8 +64,8 @@
-
-
+
+
@@ -104,18 +104,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
复制
@@ -125,7 +113,7 @@
-
+
添加一行
@@ -173,24 +161,22 @@ import {
import {useProcessStore} from '@/stores/processStore.js';
import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
import OperationRender from '@/views/workflow/common/OperationRender.vue'
-import {ref} from "vue";
-
import UserPicker from "@/views/workflow/process/common/UserPicker.vue";
const userList = ref([])
const changeDiagram = ref(false)
const rules = reactive({
- shareName: [{required: true, message: '请输入分摊名称', trigger: 'blur'}],
- apportionmentMonth: [{required: true, message: '请选择月份', trigger: 'blur'}],
- projectId: [{required: true, message: '请选择项目名称', trigger: 'blur'}],
- researchPersonnel: [{required: true, message: '请选择研发人员', trigger: 'blur'}],
- wagesPayable: [{required: true, message: '请输入应发工资', trigger: 'blur'}],
- performance: [{required: true, message: '请输入绩效', trigger: 'blur'}],
- reserveFund: [{required: true, message: '请输入公积金', trigger: 'blur'}],
- socialSecurity: [{required: true, message: '请输入社保', trigger: 'blur'}],
- annuity: [{required: true, message: '请输入年金', trigger: 'blur'}],
- workday: [{required: true, message: '请输入工作日', trigger: 'blur'}],
- researchDuration: [{required: true, message: '请输入研发时长', trigger: 'blur'}],
+ shareName: [{required: true, message: '请输入分摊名称', trigger: ['blur', 'change']}],
+ apportionmentMonth: [{required: true, message: '请选择月份', trigger: ['blur', 'change']}],
+ projectId: [{required: true, message: '请选择项目名称', trigger: ['blur', 'change']}],
+ researchPersonnel: [{required: true, message: '请选择研发人员', trigger: ['blur', 'change']}],
+ wagesPayable: [{required: true, message: '请输入应发工资', trigger: ['blur', 'change']}],
+ performance: [{required: true, message: '请输入绩效', trigger: ['blur', 'change']}],
+ reserveFund: [{required: true, message: '请输入公积金', trigger: ['blur', 'change']}],
+ socialSecurity: [{required: true, message: '请输入社保', trigger: ['blur', 'change']}],
+ annuity: [{required: true, message: '请输入年金', trigger: ['blur', 'change']}],
+ workday: [{required: true, message: '请输入工作日', trigger: ['blur', 'change']}],
+ researchDuration: [{required: true, message: '请输入研发时长', trigger: ['blur', 'change']}],
})
const processStore = useProcessStore()
const opentionData = ref()
@@ -220,9 +206,13 @@ const formData = ref({
})
const userPicker = ref()
const form = ref()
+const currentRow = ref()
+const currentIndex= ref()
const nameOptions = ref([])
const researchOptions = ref([])
-const showPersonnelPicker = () => {
+const showPersonnelPicker = (row,index) => {
+ currentRow.value=row
+ currentIndex.value=index
userPicker.value.showUserPicker()
}
const chooseUserInfo = () => {
@@ -235,7 +225,10 @@ const chooseUserInfo = () => {
}
}
const selected = (select) => {
- userList.value = select
+ console.log('select',select)
+ console.log('currentRow.value',currentRow.value)
+ console.log('currentRow.value',currentIndex.value)
+ // userList.value = select
}
const getResearchOptions = async () => {
const res = await getResearchUser()
@@ -288,18 +281,25 @@ const handleDelete = (index) => {
formData.value.tableData.splice(index, 1)
}
const handleSubmit = (instance) => {
- // if (!instance) return
- // instance.validate(async (valid) => {
- // if (!valid) {
- // return ElNotification({
- // title: '提示',
- // message: '请完善数据,再提交!',
- // type: 'error'
- // })
- // }
+ if (!instance) return
+ instance.validate(async (valid) => {
+ if (!valid) {
+ return ElNotification({
+ title: '提示',
+ message: '请完善数据,再提交!',
+ type: 'error'
+ })
+ }
+ let researchPersonId = ''
+ userList.value.forEach(item => {
+ researchPersonId = item.id
+ })
formData.value.tableData.forEach(item => {
item.projectName = getProjectName(item.projectId)
- // item.researchPersonnel
+ item.researchPersonnel = researchPersonId
+ if (item.performance == 0) {
+ item.performance = null
+ }
})
let params = {
shareName: formData.value.shareName,
@@ -307,20 +307,20 @@ const handleSubmit = (instance) => {
usrAllocations: formData.value.tableData,
deploymentId: processInstanceData.value.deploymentId,
}
- console.log('params',params,formData.value.tableData)
- // const {code, msg} = await addAllocation(params)
- // ElNotification({
- // title: '提示',
- // message: msg,
- // type: code === 1000 ? 'success' : 'error'
- // })
- // if (code === 1000) {
- // tagsViewStore.delVisitedViews(router.currentRoute.value.path)
- // router.push({
- // name: 'Expense/share'
- // })
- // }
- // })
+ console.log('params', params, formData.value.tableData)
+ const {code, msg} = await addAllocation(params)
+ ElNotification({
+ title: '提示',
+ message: msg,
+ type: code === 1000 ? 'success' : 'error'
+ })
+ if (code === 1000) {
+ tagsViewStore.delVisitedViews(router.currentRoute.value.path)
+ router.push({
+ name: 'Expense/share'
+ })
+ }
+ })
}
const handleResubmit = (instance) => {
if (!instance) return
@@ -332,9 +332,17 @@ const handleResubmit = (instance) => {
type: 'error'
})
}
+ let researchPersonId = ''
+ userList.value.forEach(item => {
+ researchPersonId = item.id
+ })
formData.value.tableData.forEach(item => {
item.allocationId = formData.value.allocationId
item.projectName = getProjectName(item.projectId)
+ item.researchPersonnel = researchPersonId
+ if (item.performance == 0) {
+ item.performance = null
+ }
})
let params = {
allocationId: formData.value.allocationId,
diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue
index 0639477..9a4dc64 100644
--- a/src/views/workflow/process/common/UserPicker.vue
+++ b/src/views/workflow/process/common/UserPicker.vue
@@ -88,6 +88,11 @@ const props = defineProps({
showCheckbox: { //是否显示左侧选择框
default: true,
type: Boolean
+ },
+ //打开弹窗时是否重置选中数据
+ setNullToSelectList: {
+ default: false,
+ type: Boolean
}
});
const radio = ref(0);
@@ -189,12 +194,14 @@ const showUserPicker = () => {
value: "0"
};
dataList.value = [];
- // selectList.value = []
+ if(props.setNullToSelectList){
+ selectList.value = []
+ }
chooseId.value = 0;
radio.value = 0;
visible.value = true;
expandedKeys.value = [];
- filterText.value=''
+ filterText.value = ''
getList();
};
const handleChange = (item, data) => {