收支分析

web/src/view/finance/borrowing/borrowing.vue

@@ -183,12 +183,12 @@
                     </template>
                   </el-table-column>
                   <el-table-column
-                    property="price"
+                    property="feePrice"
                     label="报销金额"
                   >
                     <template #default="scope">
                       <el-input-number
-                        v-model.number="scope.row.price"
+                        v-model.number="scope.row.feePrice"
                         :precision="2"
                         :min="0"
                         @change="sumExpenses"
@@ -372,7 +372,7 @@
               label="负责人"
             />
             <el-table-column
-              prop="price"
+              prop="borrowingPrice"
               label="支借金额"
             />
             <el-table-column
@@ -429,7 +429,7 @@
                 </el-form-item>
                 <el-form-item label="支借金额">
                   <el-input-number
-                    v-model="borrowingData.price"
+                    v-model="borrowingData.borrowingPrice"
                     :min="0.00"
                     :precision="2"
                   />
@@ -561,7 +561,7 @@ const dailyExpensesOpen = () => {
       id: 1,
       feeTime: '',
       illustrate: '',
-      price: 0
+      feePrice: 0
     }]
   }
   openDailyExpenses.value = true
@@ -578,7 +578,7 @@ const dailyExpensesData = ref({
     id: 1,
     feeTime: '',
     illustrate: '',
-    price: 0
+    feePrice: 0
   }]
 })
 
@@ -587,7 +587,7 @@ const addLineData = () => {
     id: dailyExpensesData.value.dailyFeeDetails.length + 1,
     feeTime: '',
     illustrate: '',
-    price: 0
+    feePrice: 0
   }
   dailyExpensesData.value.dailyFeeDetails.push(newData)
 }
@@ -609,7 +609,7 @@ const handleDelete = (val) => {
 const sumExpenses = () => {
   let sum = 0
   for (const key in dailyExpensesData.value.dailyFeeDetails) {
-    sum += dailyExpensesData.value.dailyFeeDetails[key].price
+    sum += dailyExpensesData.value.dailyFeeDetails[key].feePrice
   }
   dailyExpensesData.value.totalAmount = sum
 }
@@ -689,7 +689,7 @@ const borrowingData = ref({
   applicant: '',
   applicationTime: '',
   charge: null,
-  price: 0
+  borrowingPrice: 0
 })
 
 const openBorrowing = (val) => {
@@ -704,7 +704,7 @@ const addBorrowing = () => {
     applicant: '',
     applicationTime: '',
     charge: null,
-    price: 0
+    borrowingPrice: 0
   }
   borrowingDialog.value = true
 }

web/src/view/finance/components/hour.vue

@@ -128,6 +128,16 @@
         <el-form-item label="人天单价：">
           <el-input-number v-model="addCondition.price" />
         </el-form-item>
+        <el-form-item label="报工时间：">
+          <el-date-picker
+            v-model="addCondition.peopleTime"
+            placeholder="请选择报工时间"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            clearable
+            @clear="addCondition.peopleTime = ''"
+          />
+        </el-form-item>
       </el-form>
       <template #footer>
         <el-button
@@ -168,7 +178,8 @@ const addCondition = reactive({
   projectCode: '',
   people: '',
   days: 0,
-  price: 0
+  price: 0,
+  peopleTime: ''
 })
 const peopleId = ref('')
 const peopleList = reactive([])
@@ -209,6 +220,7 @@ const addTime = () => {
       addCondition.days = 0
       addCondition.people = ''
       addCondition.price = 0
+      addCondition.peopleTime = ''
     }
   })
 }