Browse Source

bug修改

ljb 5 months ago
parent
commit
692428d220

+ 8 - 2
src/components/project-select/index.vue

@@ -27,7 +27,10 @@ export default {
   props: {
     value: [String, Number],
     // 搜索条件
-    params: Object,
+    params: {
+      type: Object,
+      default: () => {}
+    },
     disabled: {
       type: Boolean,
       default: false
@@ -86,7 +89,10 @@ export default {
       })
     },
     getProjectList(succCallback) {
-      getAllProjectList(1, 99999, { ...this.params, use : 1 }).then(({ data }) => {
+      getAllProjectList(1, 99999, {
+        ...this.params,
+        use : this.params && this.params.yearAndMonth ? 1 : 0,
+      }).then(({ data }) => {
         if (data.success) {
           this.projectList = data.data.records;
           succCallback && succCallback(this.projectList);

+ 2 - 2
src/option/projectManage/projectList.js

@@ -126,7 +126,7 @@ export default {
           label: '总预算(万元)',
           prop: 'xmysze',
           type: 'number',
-          width: 90,
+          width: 100,
           align: 'center',
           showOverflowTooltip: true,
         }, {
@@ -222,7 +222,7 @@ export default {
       label: '委外支出金额(万元)',
       prop: 'wwAmount',
       type: 'number',
-      width: 70,
+      width: 100,
       align: 'center',
       showOverflowTooltip: true,
     }

+ 1 - 0
src/page/lock/index.vue

@@ -53,6 +53,7 @@ export default {
           // 清除token信息
           removeToken();
           removeRefreshToken();
+          
           this.$router.push({ path: "/login" });
         });
       });

+ 1 - 1
src/page/login/userlogin.vue

@@ -333,7 +333,7 @@
               text: '登录中,请稍后。。。',
               spinner: "el-icon-loading"
             });
-            console.log(this.loginForm)
+            this.$store.commit("SET_PAGEYEAR", '');
             this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
               if (this.website.switchMode) {
                 const deptId = this.userInfo.dept_id;

+ 5 - 0
src/views/project-manage/project-list.vue

@@ -208,6 +208,11 @@ export default window.$crudCommon({
       item.jdxbg = item.jdxbgCount > 0 ? '已提交' : '未提交';
       item.ysbg = item.ysbgCount > 0 ? '已提交' : '未提交';
       item.status = String(item.status);
+      item.xmysze = Number(item.xmysze || 0).toFixed(4);
+      item.qzqygj = Number(item.qzqygj || 0).toFixed(4)
+      item.xmyszeCurrentYear = Number(item.xmyszeCurrentYear || 0).toFixed(4)
+      item.ndygjyffy = Number(item.ndygjyffy || 0).toFixed(4)
+      item.wwAmount = Number(item.wwAmount || 0).toFixed(4)
       return item;
     });
     return data;

+ 1 - 1
src/views/wel/index.vue

@@ -93,7 +93,7 @@
           </el-col>
         </el-row>
 
-        <el-empty description="暂无数据"></el-empty>
+        <el-empty v-else description="暂无数据"></el-empty>
       </basic-card>
     </div>