diff --git a/.drone.yml b/.drone.yml index e0b66f4..5e7f6bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,9 +25,9 @@ steps: - npm -v - mkdir -p ./node_modules - export NODE_MODULES_PATH=`pwd`/node_modules - - npm config set registry https://registry.npmmirror.com - - set NODE_OPTIONS=--openssl-legacy-provider - - npm install + # - npm config set registry https://registry.npmmirror.com + # - set NODE_OPTIONS=--openssl-legacy-provider + # - npm install - npm run build - ls /app/build/$DRONE_REPO_NAME/ - echo $NODE_MODULES_PATH diff --git a/src/api/project-manage/index.js b/src/api/project-manage/index.js index ef1cd84..c457e8d 100644 --- a/src/api/project-manage/index.js +++ b/src/api/project-manage/index.js @@ -152,3 +152,9 @@ export const updateLedger = (data) => { data: data }); }; +export const searchUpdateLedgerData = (projectId) => { + return request({ + url: `/workflow/mosr/expense/ledger/${projectId}`, + method: "get" + }); +}; diff --git a/src/api/workflow/process-user.js b/src/api/workflow/process-user.js index fd623f9..733d39c 100644 --- a/src/api/workflow/process-user.js +++ b/src/api/workflow/process-user.js @@ -22,7 +22,7 @@ export function getDepartmentTree() { method: 'get' }) } -export function getMosrDept(params) { +export function getMosrUser(params) { return request({ url: '/admin/mosr/user/choose', method: 'get', diff --git a/src/components/DetailComponent/AllocationSummaryDetail.vue b/src/components/DetailComponent/AllocationSummaryDetail.vue index 2df5099..ccd1b78 100644 --- a/src/components/DetailComponent/AllocationSummaryDetail.vue +++ b/src/components/DetailComponent/AllocationSummaryDetail.vue @@ -1,6 +1,6 @@ 导出 - @@ -24,7 +24,8 @@ - {{ toThousands(scope.row.afterTax) }} + + {{ scope.row.afterTax }} @@ -70,7 +71,7 @@ const getSummaries = (param) => { return prev } }, 0)}` - sums[index] = toThousands(sums[index]) + // sums[index] = toThousands(sums[index]) } else { sums[index] = '-' } diff --git a/src/router/index.js b/src/router/index.js index 39d999e..d0b07f3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -25,6 +25,11 @@ const router = createRouter({ name: 'casLogin', component: () => import('@/views/cas-login/index.vue'), }, + { + path: '/projectdetail/mobile', + name: 'projectDetailMobile', + component: () => import('@/views/project-management/mobledetail/index.vue') + }, { path: '/', name: 'layout', diff --git a/src/views/project-management/implementation/account.vue b/src/views/project-management/implementation/account.vue index f6fa102..fa6a2e9 100644 --- a/src/views/project-management/implementation/account.vue +++ b/src/views/project-management/implementation/account.vue @@ -12,32 +12,105 @@ diff --git a/src/views/project-management/mobledetail/CollectionDetailMoblie.vue b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue new file mode 100644 index 0000000..83b15c6 --- /dev/null +++ b/src/views/project-management/mobledetail/CollectionDetailMoblie.vue @@ -0,0 +1,192 @@ + + + + + + + {{ formData.requirementName }} + + + + + {{ formData.collectType }} + + + + + {{ formData.deadline }} + + + + + {{ + getCompanyName(formData.companyIds) + }} + {{ showExpendText }} + + + + + + {{ formData.specialFund }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 流程图 + + + + + + + + + + + + + + + diff --git a/src/views/project-management/mobledetail/OpinionMoblie.vue b/src/views/project-management/mobledetail/OpinionMoblie.vue new file mode 100644 index 0000000..9b775e6 --- /dev/null +++ b/src/views/project-management/mobledetail/OpinionMoblie.vue @@ -0,0 +1,168 @@ + + + + + 驳回 + 同意 + + + + + + diff --git a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue new file mode 100644 index 0000000..28e4403 --- /dev/null +++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue @@ -0,0 +1,429 @@ + + + + + + + + {{ item.requestName }} + + + {{ localFormData.preProcess ? '更改' : '请选择' }} + + + + + + + + + + + + + 流程图 + + + + + + + + + + + 提交 + 重新提交 + 返回 + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + 查看流程 + + + + + + 确定 + 取消 + + + + + + + + diff --git a/src/views/project-management/mobledetail/StepsMoblie.vue b/src/views/project-management/mobledetail/StepsMoblie.vue new file mode 100644 index 0000000..a42e83b --- /dev/null +++ b/src/views/project-management/mobledetail/StepsMoblie.vue @@ -0,0 +1,314 @@ + + + baseForm = e"> + + + + + + + + + + + + + + + + + diff --git a/src/views/project-management/mobledetail/SummaryDetailMoblie.vue b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue new file mode 100644 index 0000000..9706b26 --- /dev/null +++ b/src/views/project-management/mobledetail/SummaryDetailMoblie.vue @@ -0,0 +1,289 @@ + + + + + + + {{ localFormData.projectName }} + + + + + {{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }} + + + + + {{ localFormData.startTime }} + + + + + {{ localFormData.endTime }} + + + + + {{ filterDict(cacheStore.getDict('project_type'), localFormData.projectType) }} + + + + + {{ filterDict(cacheStore.getDict('rd_subject'), localFormData.rdSubject) }} + + + + + {{ filterDict(cacheStore.getDict('invest_type'), localFormData.investmentType) }} + + + + + {{ filterDict(cacheStore.getDict('project_impact'), localFormData.projectImpact) }} + + + + + {{ filterDict(cacheStore.getDict('business_segment'), localFormData.businessSegment) }} + + + + + {{ filterDict(cacheStore.getDict('result_form'), localFormData.resultForm) }} + + + + + {{ filterDict(cacheStore.getDict('technical_standard'), localFormData.technicalStandard) }} + + + + + {{ + filterDict(cacheStore.getDict('industry_university'), localFormData.industryUniversityResearch) + }} + + + + + {{ + filterDict(cacheStore.getDict('government_declaration'), localFormData.governmentDeclaration) + }} + + + + + {{ + filterDict(cacheStore.getDict('intellectual_property'), localFormData.intellectualProperty) + }} + + + + + {{ localFormData.inventionPatent }} + + + + + {{ localFormData.newPatent }} + + + + + {{ localFormData.softwareCopyright }} + + + + + {{ localFormData.copyright }} + + + + + {{ localFormData.other }} + + + + + {{toThousands( localFormData.economicEstimate )}} + + + + + {{ toThousands(localFormData.specialFundAmount) }} + + + + + {{ localFormData.serviceDescription }} + + + + + {{ localFormData.contentDescription }} + + + + + + {{ localFormData.singleFile?.originalFileName }} + + + + + + + + + + + + + + + + + + + + 流程图 + + + + + + + + + + + + + + + diff --git a/src/views/project-management/mobledetail/api/index.js b/src/views/project-management/mobledetail/api/index.js new file mode 100644 index 0000000..a6d331c --- /dev/null +++ b/src/views/project-management/mobledetail/api/index.js @@ -0,0 +1,15 @@ +import request from '@/utils/request' + +export const getBaseInfoApi = (projectId) => { + return request({ + url: '/workflow/details/info/'+projectId, + method: 'get', + }) +} + +export const getMapProjectStateInfo = (projectId, state) => { + return request({ + url: `/workflow/details/${projectId}/${state}`, + method: 'get' + }) +} \ No newline at end of file diff --git a/src/views/project-management/mobledetail/index.vue b/src/views/project-management/mobledetail/index.vue new file mode 100644 index 0000000..d24040b --- /dev/null +++ b/src/views/project-management/mobledetail/index.vue @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/workflow/process/common/UserPicker.vue b/src/views/workflow/process/common/UserPicker.vue index f20744a..ad0e711 100644 --- a/src/views/workflow/process/common/UserPicker.vue +++ b/src/views/workflow/process/common/UserPicker.vue @@ -70,9 +70,8 @@