Explorar el Código

Signed-off-by: 1004749546@qq.com <1004749546@qq.com>
考评管理 提交

1004749546@qq.com hace 4 años
padre
commit
d269253882

+ 1 - 1
src/components/Table/index.js

@@ -159,7 +159,7 @@ export default {
           // console.log(r, 'rrrrrrrrrr')
           this.localPagination = this.showPagination && Object.assign({}, this.localPagination, {
             current: r.pageNo, // 返回结果中的当前分页数
-            total: r.count, // 返回结果中的总记录数
+            total: Number(r.count), // 返回结果中的总记录数
             showSizeChanger: this.showSizeChanger,
             pageSize: (pagination && pagination.pageSize) ||
               this.localPagination.pageSize

+ 2 - 2
src/views/evaluation/evaluationItem/EvaluationItem.vue

@@ -16,7 +16,7 @@
                 allowClear
                 placeholder="状态"
                 v-model="queryParam.status"
-                code="CHECK_ENABLE_STATE"></v-select>
+                code="ENABLE_FLAG"></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -49,7 +49,7 @@
       </template>
     </s-table>
     <!-- 新增/编辑 弹窗 -->
-    <add-evaItemModal :itemId="itemId" :visible="openAddModal" @refresh="$refs.table.refresh()" @close="openAddModal=false"></add-evaItemModal>
+    <add-evaItemModal :itemId="itemId" :visible="openAddModal" @refresh="reset" @close="openAddModal=false"></add-evaItemModal>
     <!-- 设置弹窗 -->
     <set-evaItemModal :itemId="itemId" :itemName="itemName" :visible="openSetting" @close="openSetting=false"></set-evaItemModal>
   </a-card>

+ 2 - 17
src/views/evaluation/evaluationPlan/AddEvaModal.vue

@@ -24,7 +24,7 @@
           <a-col :span="20">
             <!-- 适用模式 -->
             <a-form-item label="适用模式:" :label-col="{ span: 6 }" :wrapper-col="{ span: 18 }">
-              <!-- <v-select
+              <v-select
                 ref="orgType"
 				id="addEvaModal-scopeType"
                 allowClear
@@ -35,22 +35,7 @@
                   { initialValue: formData.scopeType,
                     rules: [{ required: true, message: '请选择适用模式!' }] },
                 ]"
-                code="STORE_AUTH_TYPE"></v-select> -->
-              <a-select
-                mode="multiple"
-                allowClear
-                id="addEvaModal-scopeType"
-                placeholder="请选择适用模式"
-                @change="scopeTypeChange"
-                v-decorator="[
-                  'formData.scopeType',
-                  { initialValue: formData.scopeType,
-                    rules: [{ required: true, message: '请选择适用模式!' }] },
-                ]">
-                <a-select-option v-for="item in options" :key="item.code" :value="item.code">
-                  {{ item.dispName }}
-                </a-select-option>
-              </a-select>
+                code="TASK_TYPE"></v-select>
             </a-form-item>
           </a-col>
         </a-row>

+ 1 - 1
src/views/evaluation/evaluationPlan/EvaluationPlan.vue

@@ -16,7 +16,7 @@
                 allowClear
                 placeholder="状态"
                 v-model="queryParam.status"
-                code="CHECK_ENABLE_STATE"></v-select>
+                code="ENABLE_FLAG"></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">