Przeglądaj źródła

汇总表累计收入显示负数问题
汇总表增加一列显示超额完成收入

yanliming 11 miesięcy temu
rodzic
commit
a1c105092a

+ 6 - 1
src/views/base/sectionsSummary-list.vue

@@ -83,12 +83,17 @@
             {{formaNum(scope.row.accumulatedArrears)}}
           </template>
         </el-table-column>
+        <el-table-column  prop="overIncome"  label="超额完成收入">
+            <template slot-scope="scope">
+            {{formaNum(scope.row.overIncome)}}
+          </template>
+        </el-table-column>
         <el-table-column  prop="percentage"  label="收入完成比率">
           <template slot-scope="scope">
             <span v-if="scope.row.percentage<50" style="color:#F56C6C">
               {{scope.row.percentage}}%
             </span>
-            <span v-if="scope.row.percentage>50&&scope.row.percentage<100" style="color:#E6A23C">
+            <span v-if="scope.row.percentage>=50&&scope.row.percentage<100" style="color:#E6A23C">
               {{scope.row.percentage}}%
             </span>
             <span v-if="scope.row.percentage==100" style="color:#67C23A">

+ 6 - 0
src/views/base/templateDepartName-edit.vue

@@ -18,6 +18,9 @@
           :label-width="'100px'"
           :inline="true"
         >
+        <el-form-item label="序号" prop="serialNum">
+            <el-input v-model="formModel.serialNum" placeholder="请输入序号" style="width: 300px"></el-input>
+          </el-form-item>
           <el-form-item label="名称" prop="name">
             <el-input v-model="formModel.name" placeholder="请输入名称" style="width: 300px"></el-input>
           </el-form-item>
@@ -41,6 +44,9 @@
       return {
           showPwd: true,
           ruleValidate: {
+            serialNum: [
+              { required: true, message: "序号不能为空", trigger: "blur" },
+              ],
               name: [
               { required: true, message: "名称不能为空", trigger: "blur" },
               ],