sunlupeng 1 jaar geleden
bovenliggende
commit
44b0c71d74

+ 1 - 1
src/views/oa/expense/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-form :model="form" label-position="top" :rules="rules" ref="form" label-width="80px">
-      <el-form-item label="申请人">
+      <el-form-item label="报销人">
         <el-input v-model="form.employeeName" disabled></el-input>
       </el-form-item>
       <el-form-item label="部门">

+ 5 - 5
src/views/oa/purchase/DataList.vue

@@ -19,8 +19,8 @@
         <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="供应商" prop="supplier">
-        <el-input v-model="queryParams.supplier" placeholder="请输入预期供应商" clearable style="width: 250px"
+      <el-form-item label="供应商" prop="supplierName">
+        <el-input v-model="queryParams.supplierName" placeholder="请输入预期供应商" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
           <el-form-item label="申请时间" prop="createTime">
@@ -53,8 +53,8 @@
       <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
       <el-table-column label="职位" align="center" prop="position" min-width="100" />
       <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
-      <el-table-column label="总预算金额(元)" align="center" prop="sunMoney" min-width="100" />
-      <el-table-column label="预期供应商" align="center" prop="supplier" min-width="150" />
+      <el-table-column label="总预算金额(元)" align="center" prop="totalBudget" min-width="100" />
+      <el-table-column label="预期供应商" align="center" prop="supplierName" min-width="150" />
       <el-table-column label="申请时间"  align="center" prop="createTime" min-width="150">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -124,7 +124,7 @@ export default {
         deptId: undefined,
         position: undefined,
         employeePhone: undefined,
-        supplier: undefined,
+        supplierName: undefined,
         auditStatus: undefined,
         createTime: []
       },

+ 4 - 4
src/views/oa/purchase/detail.vue

@@ -39,10 +39,10 @@
           <div class="field-name">领用清单</div>
         </div> -->
         <el-table border :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
-          :data="form.oaReceiveObjs" ref="table" style="width: 100%">
+          :data="form.oaPurchaseObjs" ref="table" style="width: 100%">
           <el-table-column label="采购物资名称" prop="name" />
           <el-table-column label="采购数量" prop="amount" width="150" />
-          <el-table-column label="预算金额(元)" prop="money" />
+          <el-table-column label="预算金额(元)" prop="budget" />
         </el-table>
       </div>
 
@@ -51,7 +51,7 @@
           <div class="field-name">总预算金额(元)</div>
         </div>
         <div class="field-component">
-          <span :title="form.sunMoney">{{ form.sunMoney }}</span>
+          <span :title="form.totalBudget">{{ form.totalBudget }}</span>
         </div>
       </div>
 
@@ -60,7 +60,7 @@
           <div class="field-name">预期供应商</div>
         </div>
         <div class="field-component">
-          <span :title="form.supplier">{{ form.supplier }}</span>
+          <span :title="form.supplierName">{{ form.supplierName }}</span>
         </div>
       </div><div class="fx-field x-grid-col-12">
         <div class="field-label">

+ 12 - 12
src/views/oa/purchase/edit.vue

@@ -40,9 +40,9 @@
 
         <el-table-column label="预算金额(元)">
           <template slot-scope="scope">
-            <el-form-item  :prop="'oaPurchaseObjs.' + scope.$index + '.money'"
+            <el-form-item  :prop="'oaPurchaseObjs.' + scope.$index + '.budget'"
               :rules="{ required: true, message: '预算金额不能为空', trigger: 'blur' }">
-              <el-input v-model="form.oaPurchaseObjs[scope.$index].money" autocomplete="off" size="small"
+              <el-input v-model="form.oaPurchaseObjs[scope.$index].budget" autocomplete="off" size="small"
                 placeholder="预算金额" onblur="value=value.match(/\d+\.?\d{0,2}/,'')"  @change="changeMoney()"></el-input>
             </el-form-item>
           </template>
@@ -56,11 +56,11 @@
         </el-table-column>
 
       </el-table>
-      <el-form-item label="总预算金额(元)" prop="sunMoney">
-        <el-input type="number" v-model="form.sunMoney" placeholder='总预算金额' disabled></el-input>
+      <el-form-item label="总预算金额(元)" prop="totalBudget">
+        <el-input type="number" v-model="form.totalBudget" placeholder='总预算金额' disabled></el-input>
       </el-form-item>
-      <el-form-item label="预期供应商" prop="supplier">
-        <el-input maxlength="50" show-word-limit type="textarea" v-model="form.supplier"
+      <el-form-item label="预期供应商" prop="supplierName">
+        <el-input maxlength="50" show-word-limit type="textarea" v-model="form.supplierName"
         placeholder='请输入预期供应商'></el-input>
       </el-form-item>
       <el-form-item label="采购事由" prop="reason">
@@ -182,8 +182,8 @@ export default {
         position: undefined,
         employeePhone: undefined,
         oaPurchaseObjs: [],
-        sunMoney: undefined,
-        supplier:undefined,
+        totalBudget: undefined,
+        supplierName:undefined,
         reason: undefined,
         fileIdList: undefined,
         remarks: undefined,
@@ -228,12 +228,12 @@ export default {
   methods: {
     changeMoney(){
       let arr = this.form.oaPurchaseObjs;
-      this.form.sunMoney = this.sum(arr);
+      this.form.totalBudget = this.sum(arr);
     },
     //求和
     sum(arr){
       return arr.reduce((prev,cur)=>{
-        return ((prev* 100) + (cur.money * 100))/100
+        return ((prev* 100) + (cur.budget * 100))/100
       },0)
     },
     /**
@@ -244,7 +244,7 @@ export default {
       this.form.oaPurchaseObjs.push({
         name: '',
         amount: '',
-        money: '',
+        budget: '',
       });
     },
 
@@ -255,7 +255,7 @@ export default {
     handleDeleteRow(index) {
       this.form.oaPurchaseObjs.splice(index, 1);
       let arr = this.form.oaPurchaseObjs;
-        this.form.sunMoney = this.sum(arr);
+        this.form.totalBudget = this.sum(arr);
     },
     getDateStar(ms) {
       return getDate(ms);