Browse Source

bug修改

ljb 8 months ago
parent
commit
4844e5933c

+ 6 - 1
src/components/project-select/index.vue

@@ -6,6 +6,7 @@
     :loading="loading"
     :disabled="disabled"
     :multiple="multiple"
+    :clearable="clearable"
     style="width: 100%;"
     @change="handleProjectChange"
   >
@@ -36,6 +37,10 @@ export default {
       type: Boolean,
       default: false
     },
+    clearable: {
+      type: Boolean,
+      default: false
+    },
     // 不通过接口获取项目详情
     noDetail: {
       type: Boolean,
@@ -92,7 +97,7 @@ export default {
       this.$emit('input', val);
       if (this.noDetail) {
         let currObj = this.projectList.find(item => item.id === val);
-        this.$emit('change', currObj);
+        this.$emit('change', currObj || {});
       } else {
         if (!this.multiple) {
           this.findProjectObj(val, proData => {

+ 1 - 2
src/components/year-month-select/index.vue

@@ -85,8 +85,7 @@ export default {
   },
   created() {
     this.initMonth();
-  },
-  mounted() {
+
     if (this.vipYearList.length) {
       this.setDefaultValue(this.vipYearList);
       return;

+ 5 - 1
src/mixins/crud.js

@@ -39,6 +39,8 @@ export default (app, option = {}) => {
       onEvent() {
         return {
           // 'on-load': this.getList,
+          'size-change': this.getList,
+          'current-change': this.getList,
           'row-save': this.rowSave,
           'row-update': this.rowUpdate,
           'row-del': this.rowDel,
@@ -61,8 +63,10 @@ export default (app, option = {}) => {
         return { ...this.params, ...this.extraParams };
       },
       loadData() {
+        if (this.year) {}
+        const searchParams = this.getSearchParams();
         this.loading = true;
-        this.api[option.list || 'getList'](this.page.currentPage, this.page.pageSize, this.getSearchParams()).then(res => {
+        this.api[option.list || 'getList'](this.page.currentPage, this.page.pageSize, searchParams).then(res => {
           let data;
           if (option.res) {
             data = option.res(res.data, this);

+ 1 - 1
src/option/achievement/patentAchievement.js

@@ -158,7 +158,7 @@ export default {
       width: 85,
       align: "center",
       search: false,
-      valueFormat: "yyyy-MM-DD",
+      valueFormat: "yyyy-MM-dd",
       showOverflowTooltip: true,
       rules: [
         {

+ 1 - 1
src/store/getters.js

@@ -25,6 +25,6 @@ const getters = {
   logsLen: state => state.logs.logsList.length || 0,
   logsFlag: (state, getters) => getters.logsLen === 0,
   flowRoutes: state => state.dict.flowRoutes,
-  vipYearList: state => state.common.vipYearList
+  vipYearList: state => state.user.vipYearList
 }
 export default getters

+ 0 - 4
src/store/modules/common.js

@@ -28,12 +28,8 @@ const common = {
     themeName: getStore({name: 'themeName'}) || 'theme-bule',
     lockPasswd: getStore({name: 'lockPasswd'}) || '',
     website: website,
-    vipYearList: [],
   },
   mutations: {
-    SET_VIP_YEAR: (state, list) => {
-      state.vipYearList = list
-    },
     SET_LANGUAGE: (state, language) => {
       state.language = language
       setStore({

+ 5 - 0
src/store/modules/user.js

@@ -53,6 +53,7 @@ const user = {
     menuAll: getStore({name: 'menuAll'}) || [],
     token: getStore({name: 'token'}) || '',
     refreshToken: getStore({name: 'refreshToken'}) || '',
+    vipYearList: [],
   },
   actions: {
     //根据用户名登录
@@ -218,6 +219,7 @@ const user = {
           commit('SET_MENU_ALL_NULL', []);
           commit('SET_ROLES', []);
           commit('SET_TAG_LIST', []);
+          commit('SET_VIP_YEAR', []);
           commit('DEL_ALL_TAG');
           commit('CLEAR_LOCK');
           removeToken();
@@ -280,6 +282,9 @@ const user = {
     },
   },
   mutations: {
+    SET_VIP_YEAR: (state, list) => {
+      state.vipYearList = list
+    },
     SET_TOKEN: (state, token) => {
       setToken(token);
       state.token = token;

+ 3 - 0
src/views/basic-resource/comp-basic-info/components/comp-dept-list.vue

@@ -108,6 +108,9 @@ export default window.$crudCommon(
         return tree;
       },
       loadData() {
+        if (!this.yearAndMonth) {
+          return;
+        }
         this.loading = true;
         this.api[this.option.list || "getList"]({
           yearAndMonth: this.yearAndMonth,

+ 1 - 1
src/views/project-manage/change.vue

@@ -3,7 +3,7 @@
     <div style="margin-top: 6px;">
       <el-form :inline="true">
         <el-form-item label="研发项目名称">
-          <project-select v-model="params.xmId" @change="handleProjectChange"></project-select>
+          <project-select v-model="params.xmId" clearable :noDetail="true" @change="handleProjectChange"></project-select>
         </el-form-item>
         <el-form-item label="研发项目编号">
           {{ selProject.xmbh }}

+ 2 - 4
src/views/project-manage/implement.vue

@@ -3,7 +3,7 @@
     <div style="margin-top: 6px;">
       <el-form :inline="true">
         <el-form-item label="研发项目名称">
-          <project-select v-model="params.xmId" @change="handleProjectChange"></project-select>
+          <project-select v-model="params.xmId" clearable :noDetail="true" @change="handleProjectChange"></project-select>
         </el-form-item>
         <el-form-item label="研发项目编号">
           {{ selProject.xmbh }}
@@ -130,9 +130,6 @@ export default window.$crudCommon({
       this.loadData();
     },
     loadData() {
-      if (!this.params.xmId) {
-        return;
-      }
       this.loading = true;
       this.api[this.option.list || 'getList'](this.params.xmId).then(({ data }) => {
         this.data = data.data.map(item => {
@@ -147,6 +144,7 @@ export default window.$crudCommon({
     
     },
     handleProjectChange(data) {
+      console.log(data)
       this.selProject = data;
     },
     handleExport() {

+ 1 - 4
src/views/project-manage/result-table.vue

@@ -3,7 +3,7 @@
     <div style="margin-top: 6px;">
       <el-form :inline="true">
         <el-form-item label="研发项目名称">
-          <project-select v-model="params.xmId" @change="handleProjectChange"></project-select>
+          <project-select v-model="params.xmId" clearable :noDetail="true" @change="handleProjectChange"></project-select>
         </el-form-item>
         <el-form-item label="研发项目编号">
           {{ selProject.xmbh }}
@@ -92,9 +92,6 @@ export default window.$crudCommon({
   },
   methods: {
     getList() {
-      if (!this.params.xmId) {
-        return;
-      }
       this.loadData();
     },
     handleProjectChange(data) {