20231121

src/views/salary/Reimburse/ReimburseFrom.vue

@@ -87,6 +87,11 @@
                 {{ scope.row.T_money }}
               </template>
             </el-table-column>
+            <el-table-column label="审批金额" width="100">
+              <template #default="scope">
+                <el-input v-model="scope.row.T_approval_money" :disabled="data.drawerTiti=='详情'?true:false" placeholder="审批金额" />
+              </template>
+            </el-table-column>
             <el-table-column label="费用事由" width="150">
               <template #default="scope">
                 {{ scope.row.T_reasons }}
@@ -177,12 +182,13 @@ const data = reactive({
     T_State:null,
     T_date:null,
     T_money:null,
-    T_approval_money:null,
+    T_approval_money:0,
     T_reimburse_details:[{
       Id:null,
       T_State:null,
       T_fee_details:null,
       T_fee_details_name:null,
+      T_approval_money:null,
       T_fee_type:null,
       T_fee_type_name:null,
       T_img:null,
@@ -215,6 +221,11 @@ watch(() => props.fromDatas,cur => {
   Reimburse_GetApi()
 },{deep:true})
 
+watch(() => data.formData.T_reimburse_details,cur => {
+  data.formData.T_approval_money = cur.reduce((sum, e) => sum + Number(e.T_approval_money || 0), 0)
+},{deep:true})
+
+
 const Reimburse_GetApi = async ()=>{
   const res:any = await Reimburse_List({
     T_uuid:props.fromDatas.T_uuid,
@@ -236,12 +247,22 @@ const changeState = async (id: number, row: any) => {
 //函数
 const subFun = async ()=>{
   const arr = [...data.formData.T_remit_detail]
+  const arrObj = [...data.formData.T_reimburse_details]
+
+  
   const arrMap:any = []
   arr.forEach((item:any)=>{
     arrMap.push(item.T_time + ',' + item.T_money)
   })
+
+  const arrObjMap:any = []
+  arrObj.forEach((item:any)=>{
+    arrObjMap.push(item.Id + ',' + item.T_approval_money)
+  })
+
   const resIt:any = await Reimburse_Edit({
     T_id:data.Id,
+    T_approval_details:arrObjMap.length==0?'':arrObjMap.join('|')+'|',
     T_approval_money:data.formData.T_approval_money,
     T_remit_detials:arrMap.length==0?'':arrMap.join('|')+'|'
   }) 

src/views/salary/ReimburseMy.vue

@@ -45,7 +45,7 @@
             <el-form :model="data.fromData" label-position="top">
                 <el-form-item label="报销总金额">
                     <div style="display: flex;">
-                        <el-input v-model.number="T_money" style="flex: 1;"
+                        <el-input v-model.number="data.fromData.T_money" style="flex: 1;"
                             :disabled="data.drawerTiti == '详情' ? true : false" />
                         <span style="padding-left: 20px;">元</span>
                     </div>
@@ -104,16 +104,23 @@
                                     :disabled="data.disabledNum == scope.$index ? false : true" />
                             </template>
                         </el-table-column>
+                        <el-table-column label="审批金额" width="100">
+                        <template #default="scope">
+                            <el-input v-model="scope.row.T_approval_money" :disabled="data.drawerTiti=='详情'?true:false" placeholder="审批金额" />
+                        </template>
+                        </el-table-column>
                         <el-table-column label="费用事由" width="150">
                             <template #default="scope">
                                 <el-input v-model="scope.row.T_reasons" placeholder="费用事由"
                                     :disabled="data.disabledNum == scope.$index ? false : true" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="涉及项目" width="150">
-
+                        <el-table-column label="涉及项目" width="150" :show-overflow-tooltip="true">
                             <template #default="scope">
-                                <el-input v-model="scope.row.T_project" placeholder="涉及项目"
+                                <div v-if="data.drawerTiti == '详情'" style="width: 130px;overflow-x: hidden;">
+                                    {{ scope.row.T_project }}
+                                </div>
+                                <el-input v-else v-model="scope.row.T_project" placeholder="涉及项目"
                                     :disabled="data.disabledNum == scope.$index ? false : true" />
                             </template>
                         </el-table-column>
@@ -194,6 +201,7 @@ const data = reactive({
         ReimburseDetails:[{
             mapPick: [],
             selectData:[],
+            T_approval_money:"",
             T_trip_start_time: "",
             T_trip_end_time: "",
             T_trip_origin: "",
@@ -349,6 +357,7 @@ const showDrawer = (e: string, datas: any) => {
                 ReimburseDetails: [{
                     mapPick: [],
                     selectData:[],
+                    T_approval_money:"",
                     T_trip_start_time: "",
                     T_trip_end_time: "",
                     T_trip_origin: "",
@@ -430,6 +439,7 @@ const newAdd = () => {
     data.fromData.ReimburseDetails.push({
         mapPick: [],
         selectData:[],
+        T_approval_money:"",
         T_trip_start_time: "",
         T_trip_end_time: "",
         T_trip_origin: "",