20231120

src/api/Reimburse/index.ts

@@ -10,7 +10,7 @@ export const Reimburse_List = (params: any) => $http.post('/salary/Reimburse/Lis
 //报销详情
 export const Reimburse_Get = (params: any) => $http.post('/salary/Reimburse/Get', params)
 
-export const Reimburse_Edit = (params: any) => $http.post('/salary/Reimburse/Edit_Remit', params)
+export const Reimburse_Edit = (params: any) => $http.post('/salary/Reimburse/Edit_Finance', params)
 
 export const Reimburse_Audit = (params: any) => $http.post('/salary/Reimburse/Edit_Audit', params)
 

src/components/echart/echart-line.vue

@@ -74,7 +74,7 @@ const initEcharts = () => {
         },
         title: {
             // text: 'Rainfall vs Evaporation',
-            subtext: echartData.titles
+            // subtext: echartData.titles
         },
         // grid: {
         //     left: '3%',
@@ -86,7 +86,7 @@ const initEcharts = () => {
             {
                 boundaryGap: false,
                 type: 'category',
-                data: echartData.xAxisArr
+                // data: echartData.xAxisArr
             }
         ],
         yAxis: {
@@ -94,7 +94,7 @@ const initEcharts = () => {
         },
         series: [
             {
-                name: echartData.tooltip,
+                // name: echartData.tooltip,
                 type: 'line',
                 smooth: true,
                 stack: 'Total',
@@ -122,7 +122,7 @@ const initEcharts = () => {
                         globalCoord: false // 缺省为 false
                     }
                 },
-                data:echartData.seriesArr,
+                data:[2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3],
             }
         ]
     }

src/views/salary/Reimburse/ReimburseFrom.vue

@@ -5,6 +5,7 @@
         <el-table-column :show-overflow-tooltip="true" type="index" width="50" />
         <el-table-column :show-overflow-tooltip="true" prop="Id" label="ID" width="80" />
         <el-table-column :show-overflow-tooltip="true" prop="T_money" label="报销总金额" width="100" />
+        <el-table-column :show-overflow-tooltip="true" prop="T_approval_money" label="审批总金额" width="100" />
         <el-table-column :show-overflow-tooltip="true" prop="T_remit" label="打款金额" width="100" />
         <el-table-column :show-overflow-tooltip="true" prop="T_State" label="状态" width="150">
           <template #default="scope">
@@ -91,7 +92,7 @@
                 {{ scope.row.T_reasons }}
               </template>
             </el-table-column>
-            <el-table-column label="涉及项目" width="150">
+            <el-table-column label="涉及项目" width="150"  :show-overflow-tooltip="true">
               <template #default="scope">
                 {{ scope.row.T_project }}
               </template>
@@ -108,6 +109,11 @@
             <el-input v-model="data.formData.T_money" disabled style="flex: 1;" /><span style="padding-left: 20px;">元</span>
           </div>
         </el-form-item>
+        <el-form-item label="审批总金额">
+          <div style="display: flex;">
+            <el-input v-model="data.formData.T_approval_money" :disabled="data.drawerTiti=='详情'?true:false" style="flex: 1;" /><span style="padding-left: 20px;">元</span>
+          </div>
+        </el-form-item>
         <el-form-item label="打款明细">
           <el-table :data="data.formData.T_remit_detail" :header-cell-style="{ background: '#f5f7fa' }" border>
             <el-table-column type="index" label="序号" fixed width="70" />
@@ -171,6 +177,7 @@ const data = reactive({
     T_State:null,
     T_date:null,
     T_money:null,
+    T_approval_money:null,
     T_reimburse_details:[{
       Id:null,
       T_State:null,
@@ -214,7 +221,6 @@ const Reimburse_GetApi = async ()=>{
     ...data.pages
   })
   data.tableData = res.Data.Data
-  
   data.total = res.Data.Num
 }
 //函数
@@ -234,9 +240,14 @@ const subFun = async ()=>{
   arr.forEach((item:any)=>{
     arrMap.push(item.T_time + ',' + item.T_money)
   })
-  const resIt:any = await Reimburse_Edit({T_id:data.Id,T_remit_detials:arrMap.join('|')+'|'}) 
+  const resIt:any = await Reimburse_Edit({
+    T_id:data.Id,
+    T_approval_money:data.formData.T_approval_money,
+    T_remit_detials:arrMap.length==0?'':arrMap.join('|')+'|'
+  }) 
   if (resIt.Code==200){
     ElMessage.success('ok，编辑成功')
+    Reimburse_GetApi()
     ReimburseGet(data.Id)
     data.drawer = false
   }

src/views/salary/ReimburseMy.vue

@@ -7,6 +7,7 @@
                 <el-table-column :show-overflow-tooltip="true" label="序号" type="index" width="70" />
                 <!-- <el-table-column :show-overflow-tooltip="true" prop="Id" label="ID" width="180" /> -->
                 <el-table-column :show-overflow-tooltip="true" prop="T_money" label="报销总金额" width="180" />
+                <el-table-column :show-overflow-tooltip="true" prop="T_approval_money" label="审批总金额" width="100" />
                 <el-table-column :show-overflow-tooltip="true" prop="T_remit" label="打款金额" width="180" />
                 <el-table-column :show-overflow-tooltip="true" label="状态" width="150">
                     <!-- 0 删除 1 未提交审核 2待审核  审核通过  审核不通过 5 已部分打款 6已全部打款 -->
@@ -49,6 +50,11 @@
                         <span style="padding-left: 20px;">元</span>
                     </div>
                 </el-form-item>
+                <el-form-item label="审批总金额" v-if="data.drawerTiti=='详情'">
+                    <div style="display: flex;">
+                        <el-input v-model="data.fromData.T_approval_money" disabled style="flex: 1;" /><span style="padding-left: 20px;">元</span>
+                    </div>
+                </el-form-item>
                 <el-form-item label="报销明细">
                     <el-table :data="data.fromData.ReimburseDetails" style="width: 100%">
                         <el-table-column type="index" label="序号" width="70" />
@@ -184,6 +190,7 @@ const data = reactive({
         User_tokey: GlobalStore().GET_User_tokey,
         T_money: 0,
         T_id:'',
+        T_approval_money:'',
         ReimburseDetails:[{
             mapPick: [],
             selectData:[],
@@ -338,6 +345,7 @@ const showDrawer = (e: string, datas: any) => {
                 User_tokey: GlobalStore().GET_User_tokey,
                 T_id:'',
                 T_money: 0,
+                T_approval_money:'',
                 ReimburseDetails: [{
                     mapPick: [],
                     selectData:[],
@@ -397,6 +405,7 @@ const GetdetAPi = async (Id: any) => {
         const arr = resIt.Data.T_reimburse_details
         data.tableRemit = resIt.Data.T_remit_detail
         data.fromData.T_money = resIt.Data.T_money
+        data.fromData.T_approval_money = resIt.Data.T_approval_money
         data.fromData.ReimburseDetails = []
         console.log('datas',uploadRef.value)
         arr.forEach((item: any) => {