Merge pull request 'dj' (#303) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/303

src/api/project-demand/summary/index.js

@@ -18,9 +18,10 @@ export const requirementReported = (data) => {
     data: data
   });
 };
-export const getProcessInfo = () => {
+//获取需求上报 流程信息
+export const getProcessInfo = (specialFund) => {
   return request({
-    url: '/workflow/mosr/requirement/collect/process',
+    url: `/workflow/mosr/requirement/collect/process/${specialFund}`,
     method: "get"
   });
 };

src/components/DetailComponent/SpecialFundDetail.vue

@@ -10,12 +10,12 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="金额(元)">
-            <span>{{ formData.fundAmount }}</span>
+            <span>{{ toThousands(formData.fundAmount) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="剩余金额(元)">
-            <span>{{ formData.residualAmount }}</span>
+            <span>{{ toThousands(formData.residualAmount) }}</span>
           </el-form-item>
         </el-col>
         <baseTitle title="介绍"></baseTitle>
@@ -72,16 +72,18 @@
         </div>
       </div>
     </el-form>
-    <opinion v-if="data.taskId" :formData="data.formData" :taskId="data.taskId" v-model:value="formData.auditOpinion"></opinion>
+    <opinion v-if="data.taskId" :formData="data.formData" :taskId="data.taskId"
+             v-model:value="formData.auditOpinion"></opinion>
   </div>
 </template>
 
 <script setup lang="jsx">
+import {toThousands} from '@/utils/changePrice.js'
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {downloadFile} from "@/api/project-demand";
 
-const emit = defineEmits(['getInfo',"update:formData"])
+const emit = defineEmits(['getInfo', "update:formData"])
 const form = ref()
 
 const props = defineProps({
@@ -122,7 +124,10 @@ const projectTable = reactive({
     {
       prop: 'specialFundAmount',
       label: '项目金额',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.specialFundAmount)}</span>
+      }
     },
     {
       prop: 'startTime',
@@ -201,7 +206,7 @@ watch(() => props.showTable, (newVal) => {
 </script>
 
 <style scoped lang="scss">
-:deep(.el-table--fit ){
+:deep(.el-table--fit ) {
-  height: 300px!important;
+  height: 300px !important;
 }
 </style>

src/components/DetailComponent/SummaryDetail.vue

@@ -8,7 +8,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.specialFund">
+          <el-form-item label="专项资金" prop="specialFund" v-if="localFormData.isSpecialFund">
             <span>{{localFormData.specialFund }}</span>
           </el-form-item>
         </el-col>
@@ -105,13 +105,13 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="经济概算(元)" prop="economicEstimate">
-            <span>{{ localFormData.economicEstimate }}</span>
+            <span>{{toThousands( localFormData.economicEstimate )}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
-                        v-if="localFormData.specialFundAmount">
+                        v-if="localFormData.isSpecialFund">
-            <span>{{ localFormData.specialFundAmount }}</span>
+            <span>{{ toThousands(localFormData.specialFundAmount) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -163,6 +163,7 @@
 </template>
 
 <script setup lang="jsx">
+import {toThousands} from '@/utils/changePrice.js'
 import {downloadFile, deleteFile} from "@/api/project-demand";
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'

src/utils/changePrice.js

@@ -0,0 +1,8 @@
+export const toThousands = (num) => {
+    if(num==undefined||num==null)return '--';
+    const options = {
+      style: 'currency',
+      currency: 'CNY',
+    };
+    return (num).toLocaleString('zh-CN', options)
+}

src/views/expense-management/ledger/index.vue

@@ -9,7 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-
+import {toThousands} from '@/utils/changePrice.js'
 const router = useRouter()
 const route = useRoute()
 const searchConfig = reactive([
@@ -130,8 +130,23 @@ const tableConfig = reactive({
     {
       prop: 'afterTax',
       label: '税后余额(元)',
-      align: 'center'
+      align: 'center',
-    }
+      currentRender:({row})=>{
+        return <span>{toThousands(row.afterTax)}</span>
+      }
+    },
+    {
+      prop: 'source',
+      label: '来源',
+      align: 'center',
+      currentRender: ({row, index}) => {
+        if (row.source&&row.source !== null&&row.source!==undefined) {
+          return (<Tag dictType={'ledger_source'} value={row.source}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
   ],
   api: '/workflow/mosr/expense/ledger',
   params: {}

src/views/expense-management/share/detail.vue

@@ -48,6 +48,7 @@
 </template>
 
 <script setup lang="jsx">
+import {toThousands} from '@/utils/changePrice.js'
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {ElNotification} from "element-plus";
@@ -104,12 +105,10 @@ const tableConfig = reactive({
     {
       prop: 'afterTax',
       label: '分摊金额',
-      align: 'center'
+      align: 'center',
-    },
+      currentRender:({row})=>{
-    {
+        return <span>{toThousands(row.specialFundAmount)}</span>
-      prop: 'digest',
+      }
-      label: '摘要',
-      align: 'center'
     }
   ],
   api:'/workflow/mosr/cost/allocation/collect',

src/views/project-demand/summary/add.vue

@@ -16,12 +16,12 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="route.query.id&&formData.specialFund">
+        <el-col :span="6" v-if="route.query.id&&formData.isSpecialFund">
           <el-form-item label="专项资金" prop="specialFundId">
             <span>{{ formData.specialFund }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6" v-if="!route.query.id&&formData.isSpecialFund">
+        <el-col :span="6" v-if="!route.query.id">
           <el-form-item label="专项资金" prop="specialFundId">
             <el-select v-model="formData.specialFundId" placeholder="请选择专项资金" clearable filterable>
               <el-option
@@ -213,13 +213,8 @@
             <el-input-number v-model="formData.economicEstimate" placeholder="请输入经济概算" :controls="false"/>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="formData.isSpecialFund!==false">
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
+          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount">
-                        v-if="!route.query.id&&formData.isSpecialFund">
-            <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
-          </el-form-item>
-          <el-form-item label="其中申请公司总部科技创新专项资金(元)" prop="specialFundAmount"
-                        v-if="route.query.id&&formData.specialFundAmount">
             <el-input-number v-model="formData.specialFundAmount" placeholder="请输入专项资金" :controls="false"/>
           </el-form-item>
         </el-col>
@@ -486,7 +481,7 @@ const init = async () => {
   specialFundOption.value = resFund.data
   const res = await getSubCompOpt()
   companyOption.value = res.data
-  getProcessInfo().then(res => {
+  getProcessInfo(formData.value.isSpecialFund).then(res => {
     if (res.code === 1000) {
       let data = res.data
       deploymentId.value = data.deploymentId

src/views/project-demand/summary/index.vue

@@ -156,7 +156,6 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
-      fixed:'right',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []

src/views/project-management/filing/index.vue

@@ -9,7 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import {reactive, shallowRef} from "vue";
+import {toThousands} from '@/utils/changePrice.js'
 
 const router = useRouter()
 const shortcuts = [
@@ -192,7 +192,10 @@ const tableConfig = reactive({
     {
       prop: 'economicEstimate',
       label: '经济概算(元)',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.economicEstimate)}</span>
+      }
     },
     {
       prop: 'startTime',

src/views/project-management/implementation/index.vue

@@ -9,7 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import {reactive, shallowRef} from "vue";
+import {toThousands} from '@/utils/changePrice.js'
 
 const router = useRouter()
 const shortcuts = [
@@ -210,7 +210,10 @@ const tableConfig = reactive({
     {
       prop: 'economicEstimate',
       label: '经济概算(元)',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.economicEstimate)}</span>
+      }
     },
     {
       prop: 'startTime',

src/views/project-management/initiation/index.vue

@@ -9,7 +9,7 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-
+import {toThousands} from '@/utils/changePrice.js'
 const router = useRouter()
 const shortcuts = [
   {
@@ -191,7 +191,10 @@ const tableConfig = reactive({
     {
       prop: 'economicEstimate',
       label: '经济概算(元)',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.economicEstimate)}</span>
+      }
     },
     {
       prop: 'startTime',

src/views/special-fund/index.vue

@@ -12,7 +12,7 @@
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import { ElNotification} from "element-plus";
 import {deleteFund} from "@/api/special-fund";
-
+import {toThousands} from '@/utils/changePrice.js'
 const router = useRouter()
 const searchConfig = reactive([
   {
@@ -75,12 +75,18 @@ const tableConfig = reactive({
     {
       prop: 'fundAmount',
       label: '资金金额(元)',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.fundAmount)}</span>
+      }
     },
     {
       prop: 'residualAmount',
       label: '剩余金额(元)',
-      align: 'center'
+      align: 'center',
+      currentRender:({row})=>{
+        return <span>{toThousands(row.residualAmount)}</span>
+      }
     },
     {
       prop: 'projectNumber',
@@ -153,6 +159,7 @@ const tableConfig = reactive({
   ]
 })
 const tableIns = ref()
+
 const search = (val) => {
   tableConfig.params = {...val}
   tableIns.value.refresh()