Merge branch 'master' of git.taauav.net:gitadmin/jndz_admin_web

src/views/summary/basicTarget.vue

@@ -16,6 +16,18 @@
           align="center"
           label="编号"
         ></el-table-column>
+         <el-table-column
+            label="一级指标"
+            min-width="150"
+            align="center"
+            prop="quota1"
+          ></el-table-column>
+          <el-table-column
+            label="二级指标"
+            min-width="150"
+            align="center"
+            prop="quota2"
+          ></el-table-column>
         <el-table-column
           label="考核内容和计分规则"
           min-width="80"

src/views/summary/constraint.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="constraint ele-body">
     <el-card>
-      <search></search>
+      <search :type="3" /></search>
       <el-table
         highlight-current-row
         :data="dataList"
@@ -15,6 +15,12 @@
           width="50"
           align="center"
           label="编号"
+        ></el-table-column>
+          <el-table-column
+          label="考核指标"
+          min-width="150"
+          align="center"
+          prop="quota"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分规则"

src/views/summary/reward.vue

@@ -16,6 +16,18 @@
           align="center"
           label="编号"
         ></el-table-column>
+         <el-table-column
+            label="一级指标"
+            min-width="150"
+            align="center"
+            prop="quota1"
+          ></el-table-column>
+          <el-table-column
+            label="二级指标"
+            min-width="150"
+            align="center"
+            prop="quota2"
+          ></el-table-column>
         <el-table-column
           label="考核内容和计分规则"
           min-width="80"