Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/assets/css/common.css

@@ -289,4 +289,9 @@
   }
   .el-table--border td.lastColumn{
     border-right: 0!important;
+  }
+  .el-table__fixed,
+  .el-table__fixed-right {
+  height: 100% !important;
+  bottom:17px;
   }
\ No newline at end of file

src/model/Diasel/Event.js

@@ -102,6 +102,7 @@ export default {
                 this.executeDefault("dspstm").then(res => {
                     //TODO 处理数据逻辑
                     this.stmData.data = res.data.dspstm.rows;
+                    this.$store.commit("setTaskList", {key: "diasel", val: this.stmData.data.length});
                 })
             },
         

src/model/Sptsel/Event.js

@@ -114,6 +114,7 @@ export default {
            const res = await this.executeDefault("sptstm")
            //TODO 处理数据逻辑
            this.stmData.data = res.data.sptstm.rows;
+           this.$store.commit("setTaskList", {key: "sptsel", val: this.stmData.data.length});
         //    if(res.data.sptstm.rows.length == 0){
         //     this.$notify({
         //         title: '成功',
@@ -150,6 +151,7 @@ export default {
                 // })
                 const res = await this.executeDefault("sptstm")
                 this.stmData.data = res.data.sptstm.rows;
+                this.$store.commit("setTaskList", {key: "sptbrk", val: this.stmData.data.length});
                 // if(res.data.sptstm.rows.length == 0){
                 //     this.$notify({
                 //         title: '成功',

src/model/Trnrel/Event.js

@@ -391,6 +391,7 @@ export default {
         const res = await this.executeRule("searow")
         that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
         this.model.trncorco.trnstm = res.data.trncorco_trnstm;
+        this.$store.commit("setTaskList", {key: "trnrel", val: this.stmData.data.length});
         // if (res.data.trncorco_trnstm.rows.length == 0) {
         //     this.$notify({
         //         title: '成功',
@@ -401,6 +402,16 @@ export default {
         this.$refs.paramsForm.clearValidate();
         Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
     },
+    async trnfndhandleSearch() {
+        const that = this.root;
+        const res = await this.executeRule("searow")
+        that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
+        this.model.trncorco.trnstm = res.data.trncorco_trnstm;
+        this.$store.commit("setTaskList", {key: "trnfnd", val: this.stmData.data.length});
+ 
+        this.$refs.paramsForm.clearValidate();
+        Utils.positioningErrorMsg(res.fieldErrors, this.$refs.paramsForm.fields)
+    },
 
     async handleReset() {
         this.model.bchcon = "";

src/store/Status.js

@@ -26,6 +26,7 @@ const Status = {
 		taskList: {
 			sptsel: 0,
 			trnrel: 0,
+			trnfnd: 0,
 			bopsel: 0,
 			sptbrk: 0,
 			diasel: 0,

src/views/Business/Diasel/index.vue

@@ -18,6 +18,7 @@ import Api from "~/service/Api"
 import CodeTable from "~/config/CodeTable"
 import Diasel from "~/model/Diasel"
 import CommonProcess from "~/mixin/CommonProcess"
+import Utils from "~/utils/index"
 import Check from "~/model/Diasel/Check"
 import Default from "~/model/Diasel/Default"
 import Pattern from "~/model/Diasel/Pattern"
@@ -70,7 +71,7 @@ export default {
                 }
             });
          
-        let rtnmsg = await this.init({})
+        /* let rtnmsg = await this.init({})
         if(rtnmsg.respCode == SUCCESS)
         {
 
@@ -80,7 +81,13 @@ export default {
         else
         {
             this.$notify.error({title: '错误',message: '服务请求失败！'});
-        }
+        } */
+        const that = this;
+        that.init(that.model).then(res => {
+            //TODO 处理数据逻辑
+            that.model = Utils.copyValueFromVO(that.model, res.data)
+            this.$refs.diaselp.handleSearch();
+        })
     }
 }
 </script>

src/views/Business/Infdid/Infsea.vue

@@ -302,7 +302,7 @@
     <!-- <el-row> -->
       <c-col :span="24">
         <c-istream-table :list="stmData.data" :columns="stmData.columns">
-          <el-table-column fixed="right" prop="op" label="操作" width="200px">
+          <el-table-column fixed="right" prop="op" label="操作" width="150px">
             <template slot="header">
               <c-col :span="11" style="text-align: left"
                 ><span>操作</span></c-col

src/views/Business/Sptsel/index.vue

@@ -60,7 +60,7 @@ export default {
             //TODO 处理数据逻辑
              that.model = Utils.copyValueFromVO(that.model, res.data)
             //  that.$refs.Menu.stmData.columns = res.data.sptstm.rows;
-            this.$refs.Menu.handleSearch()
+            this.$refs.Menu.handleSearch();
         })
     }
 }

src/views/Business/Trnrel/Inftrnps.vue

@@ -401,7 +401,7 @@
             fixed="right"
             prop="display"
             label="操作"
-            width="auto"
+            width="150px"
           >
           <template slot="header">
               <c-col :span="11" style="text-align:left"><span>操作</span></c-col>

src/views/Business/Trnrel/Trnfnd/Inftrnps.vue

@@ -189,7 +189,7 @@
               type="primary"
               icon="el-icon-search"
               size="small"
-              @click="handleSearch"
+              @click="trnfndhandleSearch"
               >查询</el-button
             >
           </c-col>
@@ -390,7 +390,7 @@
             fixed="right"
             prop="display"
             label="操作"
-            width="auto"
+            width="150px"
           >
           <template slot="header">
               <c-col :span="11" style="text-align:left"><span>操作</span></c-col>

src/views/TaskList/index.vue

@@ -3,27 +3,33 @@
     <c-tabs :value="tabVal" type="card" @tab-click="tabClick">
       <el-tab-pane label="待经办列表" name="sptsel">
         <!-- <c-table :columnsConfig="tableColumns" :list="tableData"></c-table> -->
-        <c-content :height="160">
         <span slot="label">
           待经办列表
           <el-badge v-if="$store.state.Status.taskList.sptsel>0" :value="$store.state.Status.taskList.sptsel" :max="99"/>
         </span>
+        <c-content :height="120">
         <t-sptsel />
         </c-content>
       </el-tab-pane>
       
       <el-tab-pane label="待复核列表" name="trnrel">
-        <c-content :height="160">
         <span slot="label">
           待复核列表
           <el-badge v-if="$store.state.Status.taskList.trnrel>0" :value="$store.state.Status.taskList.trnrel" :max="99"/>
         </span>
+        <c-content :height="120">
          <t-trnrel />
          </c-content>
       </el-tab-pane>
       
        <el-tab-pane label="已完成列表" name="trnfnd">
+         <span slot="label">
+          已完成列表
+          <el-badge v-if="$store.state.Status.taskList.trnfnd>0" :value="$store.state.Status.taskList.trnfnd" :max="99"/>
+        </span>
+        <c-content :height="120">
           <t-trnfnd  />
+        </c-content>
       </el-tab-pane>
       <el-tab-pane label="待申报列表" name="bopsel">
          <t-bopsel />
@@ -36,7 +42,11 @@
        <t-sptbrk />
       </el-tab-pane>
       <el-tab-pane label="到期提示" name="diasel">
-        <c-content :height="160">
+        <span slot="label">
+          到期提示
+          <el-badge v-if="$store.state.Status.taskList.diasel>0" :value="$store.state.Status.taskList.diasel" :max="99"/>
+        </span>
+        <c-content :height="120">
        <t-diasel/>
         </c-content>
       </el-tab-pane>