qymljy 2 years ago
parent
commit
907a04bcd3

+ 1 - 0
src/Form/publicCustomer/add.vue

@@ -176,6 +176,7 @@ export default {
           this.$emit('onSuccess')
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
+          this.$router.replace({path:'/PublicCustomerDetail',query:{id:res.data.sa_customersid}})
         })
       })
     },

+ 476 - 471
src/HManagement/personalTarget/personalTargetStatistics/index.vue

@@ -1,475 +1,480 @@
 <template>
 <div>
-  <div class="container normal-panel" style="padding-bottom:0">
-    <el-button type="default" size="small" @click="exportData">导 出</el-button>
-  </div>
-  <div class="container normal-panel">
-    <el-form size="small" inline label-position="right" label-width="50px">
-      <el-form-item label="年度">
-        <el-date-picker
-          v-model="year"
-          type="year"
-          placeholder="选择年"
-          value-format="yyyy"
-          @change="queryData">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="搜索">
-        <el-input v-model="condition" prefix-icon="el-icon-search" placeholder="人员,职位" @input="inputChange" @clear="queryData" @keyup.native.enter="queryData" clearable></el-input>
-      </el-form-item>
-      
-    </el-form>
-    <el-table
-      :data="tableData"
-      style="width: 100%"
-      height="calc(100vh - 182px)"
-      size="small">
-      <el-table-column
-        prop="depfullname"
-        label="部门"
-        width="120"
-        fixed>
-        <template slot-scope="scope">
-          <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.level === 0?'--':scope.row.depfullname}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="人员"
-        width="80"
-        fixed>
-        <template slot-scope="scope">
-          <p>{{scope.row.name?scope.row.name:'--'}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="position"
-        label="职位"
-        width="100"
-        fixed>
-        <template slot-scope="scope">
-          <p>{{scope.row.position?scope.row.position:'--'}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="目标/实际"
-        width="100">
-        <template>
-          <p class="center d-text">目标</p>
-          <p class="border"></p>
-          <p class="center d-text">实际</p>
-        </template>
-      </el-table-column>
-      <el-table-column label="年度(万元)">
-        <el-table-column
-          prop="y1l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.y1l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.y1a}}</p>
-            <p class="center" :class="scope.row.y1pl ===0?'':scope.row.y1pl < 0?'green':'red'">(<i :class="scope.row.y1pl === 0?'':scope.row.y1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.y1pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="y1h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.y1h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.y1a}}</p>
-            <p class="center" :class="scope.row.y1ph ===0?'':scope.row.y1ph < 0?'green':'red'">(<i :class="scope.row.y1ph === 0?'':scope.row.y1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.y1ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="第一季度(万元)">
-        <el-table-column
-          prop="s1l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s1l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s1a}}</p>
-            <p class="center" :class="scope.row.s1pl ===0?'':scope.row.s1pl < 0?'green':'red'">(<i :class="scope.row.s1pl === 0?'':scope.row.s1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s1pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="s1h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s1h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s1a}}</p>
-            <p class="center" :class="scope.row.s1ph ===0?'':scope.row.s1ph < 0?'green':'red'">(<i :class="scope.row.s1ph === 0?'':scope.row.s1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s1ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="一月(万元)">
-        <el-table-column
-          prop="m1l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m1l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m1a}}</p>
-            <p class="center" :class="scope.row.m1pl ===0?'':scope.row.m1pl < 0?'green':'red'">(<i :class="scope.row.m1pl === 0?'':scope.row.m1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m1pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m1h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m1h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m1a}}</p>
-            <p class="center" :class="scope.row.m1ph ===0?'':scope.row.m1ph < 0?'green':'red'">(<i :class="scope.row.m1ph === 0?'':scope.row.m1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m1ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="二月(万元)">
-        <el-table-column
-          prop="m2l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m2l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m2a}}</p>
-            <p class="center" :class="scope.row.m2pl ===0?'':scope.row.m2pl < 0?'green':'red'">(<i :class="scope.row.m2pl === 0?'':scope.row.m2pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m2pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m2h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m2h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m2a}}</p>
-            <p class="center" :class="scope.row.m2ph ===0?'':scope.row.m2ph < 0?'green':'red'">(<i :class="scope.row.m2ph === 0?'':scope.row.m2ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m2ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="三月(万元)">
-        <el-table-column
-          prop="m3l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m3l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m3a}}</p>
-            <p class="center" :class="scope.row.m3pl ===0?'':scope.row.m3pl < 0?'green':'red'">(<i :class="scope.row.m3pl === 0?'':scope.row.m3pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m3pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m3h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m3h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m3a}}</p>
-            <p class="center" :class="scope.row.m3ph ===0?'':scope.row.m3ph < 0?'green':'red'">(<i :class="scope.row.m3ph === 0?'':scope.row.m3ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m3ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="第二季度(万元)">
-        <el-table-column
-          prop="s2l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s2l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s2a}}</p>
-            <p class="center" :class="scope.row.s2pl ===0?'':scope.row.s2pl < 0?'green':'red'">(<i :class="scope.row.s2pl === 0?'':scope.row.s2pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s2pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="s2h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s2h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s2a}}</p>
-            <p class="center" :class="scope.row.s2ph ===0?'':scope.row.s2ph < 0?'green':'red'">(<i :class="scope.row.s2ph === 0?'':scope.row.s2ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s2ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="四月(万元)">
-        <el-table-column
-          prop="m4l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m4l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m4a}}</p>
-            <p class="center" :class="scope.row.m4pl ===0?'':scope.row.m4pl < 0?'green':'red'">(<i :class="scope.row.m4pl === 0?'':scope.row.m4pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m4pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m4h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m4h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m4a}}</p>
-            <p class="center" :class="scope.row.m4ph ===0?'':scope.row.m4ph < 0?'green':'red'">(<i :class="scope.row.m4ph === 0?'':scope.row.m4ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m4ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="五月(万元)">
-        <el-table-column
-          prop="m5l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m5l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m5a}}</p>
-            <p class="center" :class="scope.row.m5pl ===0?'':scope.row.m5pl < 0?'green':'red'">(<i :class="scope.row.m5pl === 0?'':scope.row.m5pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m5pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m5h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m5h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m5a}}</p>
-            <p class="center" :class="scope.row.m5ph ===0?'':scope.row.m5ph < 0?'green':'red'">(<i :class="scope.row.m5ph === 0?'':scope.row.m5ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m5ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="六月(万元)">
-        <el-table-column
-          prop="m6l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m6l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m6a}}</p>
-            <p class="center" :class="scope.row.m6pl ===0?'':scope.row.m6pl < 0?'green':'red'">(<i :class="scope.row.m6pl === 0?'':scope.row.m6pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m6pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m6h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m6h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m6a}}</p>
-            <p class="center" :class="scope.row.m6ph ===0?'':scope.row.m6ph < 0?'green':'red'">(<i :class="scope.row.m6ph === 0?'':scope.row.m6ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m6ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="第三季度(万元)">
-        <el-table-column
-          prop="s3l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s3l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s3a}}</p>
-            <p class="center" :class="scope.row.s3pl ===0?'':scope.row.s3pl < 0?'green':'red'">(<i :class="scope.row.s3pl === 0?'':scope.row.s3pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s3pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="s3h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s3h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s3a}}</p>
-            <p class="center" :class="scope.row.s3ph ===0?'':scope.row.s3ph < 0?'green':'red'">(<i :class="scope.row.s3ph === 0?'':scope.row.s3ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s3ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="七月(万元)">
-        <el-table-column
-          prop="m7l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m7l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m7a}}</p>
-            <p class="center" :class="scope.row.m7pl ===0?'':scope.row.m7pl < 0?'green':'red'">(<i :class="scope.row.m7pl === 0?'':scope.row.m7pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m7pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m7h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m7h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m7a}}</p>
-            <p class="center" :class="scope.row.m7ph ===0?'':scope.row.m7ph < 0?'green':'red'">(<i :class="scope.row.m7ph === 0?'':scope.row.m7ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m7ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="八月(万元)">
-        <el-table-column
-          prop="m8l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m8l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m8a}}</p>
-            <p class="center" :class="scope.row.m8pl ===0?'':scope.row.m8pl < 0?'green':'red'">(<i :class="scope.row.m8pl === 0?'':scope.row.m8pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m8pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m8h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m8h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m8a}}</p>
-            <p class="center" :class="scope.row.m8ph ===0?'':scope.row.m8ph < 0?'green':'red'">(<i :class="scope.row.m8ph === 0?'':scope.row.m8ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m8ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="九月(万元)">
-        <el-table-column
-          prop="m9l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m9l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m9a}}</p>
-            <p class="center" :class="scope.row.m9pl ===0?'':scope.row.m9pl < 0?'green':'red'">(<i :class="scope.row.m9pl === 0?'':scope.row.m9pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m9pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m9h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m9h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m9a}}</p>
-            <p class="center" :class="scope.row.m9ph ===0?'':scope.row.m9ph < 0?'green':'red'">(<i :class="scope.row.m9ph === 0?'':scope.row.m9ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m9ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="第四季度(万元)">
-        <el-table-column
-          prop="s4l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s4l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s4a}}</p>
-            <p class="center" :class="scope.row.s4pl ===0?'':scope.row.s4pl < 0?'green':'red'">(<i :class="scope.row.s4pl === 0?'':scope.row.s4pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s4pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="s4h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s4h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s4a}}</p>
-            <p class="center" :class="scope.row.s4ph ===0?'':scope.row.s4ph < 0?'green':'red'">(<i :class="scope.row.s4ph === 0?'':scope.row.s4ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s4ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="十月(万元)">
-        <el-table-column
-          prop="m10l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m10l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m10a}}</p>
-            <p class="center" :class="scope.row.m10pl ===0?'':scope.row.m10pl < 0?'green':'red'">(<i :class="scope.row.m10pl === 0?'':scope.row.m10pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m10pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m10h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m10h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m10a}}</p>
-            <p class="center" :class="scope.row.m10ph ===0?'':scope.row.m10ph < 0?'green':'red'">(<i :class="scope.row.m10ph === 0?'':scope.row.m10ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m10ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="十一月(万元)">
-        <el-table-column
-          prop="m11l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m11l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m11a}}</p>
-            <p class="center" :class="scope.row.m11pl ===0?'':scope.row.m11pl < 0?'green':'red'">(<i :class="scope.row.m11pl === 0?'':scope.row.m11pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m11pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m11h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m11h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m11a}}</p>
-            <p class="center" :class="scope.row.m11ph ===0?'':scope.row.m11ph < 0?'green':'red'">(<i :class="scope.row.m11ph === 0?'':scope.row.m11ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m11ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="十二月(万元)">
-        <el-table-column
-          prop="m12l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m12l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m12a}}</p>
-            <p class="center" :class="scope.row.m12pl ===0?'':scope.row.m12pl < 0?'green':'red'">(<i :class="scope.row.m12pl === 0?'':scope.row.m12pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m12pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m12h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m12h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m12a}}</p>
-            <p class="center" :class="scope.row.m12ph ===0?'':scope.row.m12ph < 0?'green':'red'">(<i :class="scope.row.m12ph === 0?'':scope.row.m12ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m12ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-    </el-table>
-  </div>
+  <normalLayout  @onRefresh="inputChange">
+    <div slot="content">
+      <div class="container normal-panel" style="padding-bottom:0">
+        <el-button type="default" size="small" @click="exportData">导 出</el-button>
+      </div>
+      <div class="container normal-panel">
+        <el-form size="small" inline label-position="right" label-width="50px">
+          <el-form-item label="年度">
+            <el-date-picker
+                v-model="year"
+                type="year"
+                placeholder="选择年"
+                value-format="yyyy"
+                @change="queryData">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item >
+            <el-input v-model="condition" prefix-icon="el-icon-search" placeholder="人员,职位" @input="inputChange" @clear="queryData" @keyup.native.enter="queryData" clearable></el-input>
+          </el-form-item>
+
+        </el-form>
+        <el-table
+            :data="tableData"
+            style="width: 100%"
+            height="calc(100vh - 182px)"
+            size="small">
+          <el-table-column
+              prop="depfullname"
+              label="部门"
+              width="120"
+              fixed>
+            <template slot-scope="scope">
+              <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.level === 0?'--':scope.row.depfullname}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column
+              prop="name"
+              label="人员"
+              width="80"
+              fixed>
+            <template slot-scope="scope">
+              <p>{{scope.row.name?scope.row.name:'--'}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column
+              prop="position"
+              label="职位"
+              width="100"
+              fixed>
+            <template slot-scope="scope">
+              <p>{{scope.row.position?scope.row.position:'--'}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column
+              label="目标/实际"
+              width="100">
+            <template>
+              <p class="center d-text">目标</p>
+              <p class="border"></p>
+              <p class="center d-text">实际</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="年度(万元)">
+            <el-table-column
+                prop="y1l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.y1l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.y1a}}</p>
+                <p class="center" :class="scope.row.y1pl ===0?'':scope.row.y1pl < 0?'green':'red'">(<i :class="scope.row.y1pl === 0?'':scope.row.y1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.y1pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="y1h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.y1h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.y1a}}</p>
+                <p class="center" :class="scope.row.y1ph ===0?'':scope.row.y1ph < 0?'green':'red'">(<i :class="scope.row.y1ph === 0?'':scope.row.y1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.y1ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="第一季度(万元)">
+            <el-table-column
+                prop="s1l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s1l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s1a}}</p>
+                <p class="center" :class="scope.row.s1pl ===0?'':scope.row.s1pl < 0?'green':'red'">(<i :class="scope.row.s1pl === 0?'':scope.row.s1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s1pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="s1h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s1h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s1a}}</p>
+                <p class="center" :class="scope.row.s1ph ===0?'':scope.row.s1ph < 0?'green':'red'">(<i :class="scope.row.s1ph === 0?'':scope.row.s1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s1ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="一月(万元)">
+            <el-table-column
+                prop="m1l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m1l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m1a}}</p>
+                <p class="center" :class="scope.row.m1pl ===0?'':scope.row.m1pl < 0?'green':'red'">(<i :class="scope.row.m1pl === 0?'':scope.row.m1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m1pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m1h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m1h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m1a}}</p>
+                <p class="center" :class="scope.row.m1ph ===0?'':scope.row.m1ph < 0?'green':'red'">(<i :class="scope.row.m1ph === 0?'':scope.row.m1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m1ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="二月(万元)">
+            <el-table-column
+                prop="m2l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m2l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m2a}}</p>
+                <p class="center" :class="scope.row.m2pl ===0?'':scope.row.m2pl < 0?'green':'red'">(<i :class="scope.row.m2pl === 0?'':scope.row.m2pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m2pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m2h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m2h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m2a}}</p>
+                <p class="center" :class="scope.row.m2ph ===0?'':scope.row.m2ph < 0?'green':'red'">(<i :class="scope.row.m2ph === 0?'':scope.row.m2ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m2ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="三月(万元)">
+            <el-table-column
+                prop="m3l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m3l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m3a}}</p>
+                <p class="center" :class="scope.row.m3pl ===0?'':scope.row.m3pl < 0?'green':'red'">(<i :class="scope.row.m3pl === 0?'':scope.row.m3pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m3pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m3h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m3h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m3a}}</p>
+                <p class="center" :class="scope.row.m3ph ===0?'':scope.row.m3ph < 0?'green':'red'">(<i :class="scope.row.m3ph === 0?'':scope.row.m3ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m3ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="第二季度(万元)">
+            <el-table-column
+                prop="s2l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s2l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s2a}}</p>
+                <p class="center" :class="scope.row.s2pl ===0?'':scope.row.s2pl < 0?'green':'red'">(<i :class="scope.row.s2pl === 0?'':scope.row.s2pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s2pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="s2h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s2h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s2a}}</p>
+                <p class="center" :class="scope.row.s2ph ===0?'':scope.row.s2ph < 0?'green':'red'">(<i :class="scope.row.s2ph === 0?'':scope.row.s2ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s2ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="四月(万元)">
+            <el-table-column
+                prop="m4l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m4l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m4a}}</p>
+                <p class="center" :class="scope.row.m4pl ===0?'':scope.row.m4pl < 0?'green':'red'">(<i :class="scope.row.m4pl === 0?'':scope.row.m4pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m4pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m4h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m4h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m4a}}</p>
+                <p class="center" :class="scope.row.m4ph ===0?'':scope.row.m4ph < 0?'green':'red'">(<i :class="scope.row.m4ph === 0?'':scope.row.m4ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m4ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="五月(万元)">
+            <el-table-column
+                prop="m5l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m5l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m5a}}</p>
+                <p class="center" :class="scope.row.m5pl ===0?'':scope.row.m5pl < 0?'green':'red'">(<i :class="scope.row.m5pl === 0?'':scope.row.m5pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m5pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m5h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m5h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m5a}}</p>
+                <p class="center" :class="scope.row.m5ph ===0?'':scope.row.m5ph < 0?'green':'red'">(<i :class="scope.row.m5ph === 0?'':scope.row.m5ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m5ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="六月(万元)">
+            <el-table-column
+                prop="m6l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m6l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m6a}}</p>
+                <p class="center" :class="scope.row.m6pl ===0?'':scope.row.m6pl < 0?'green':'red'">(<i :class="scope.row.m6pl === 0?'':scope.row.m6pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m6pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m6h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m6h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m6a}}</p>
+                <p class="center" :class="scope.row.m6ph ===0?'':scope.row.m6ph < 0?'green':'red'">(<i :class="scope.row.m6ph === 0?'':scope.row.m6ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m6ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="第三季度(万元)">
+            <el-table-column
+                prop="s3l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s3l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s3a}}</p>
+                <p class="center" :class="scope.row.s3pl ===0?'':scope.row.s3pl < 0?'green':'red'">(<i :class="scope.row.s3pl === 0?'':scope.row.s3pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s3pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="s3h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s3h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s3a}}</p>
+                <p class="center" :class="scope.row.s3ph ===0?'':scope.row.s3ph < 0?'green':'red'">(<i :class="scope.row.s3ph === 0?'':scope.row.s3ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s3ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="七月(万元)">
+            <el-table-column
+                prop="m7l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m7l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m7a}}</p>
+                <p class="center" :class="scope.row.m7pl ===0?'':scope.row.m7pl < 0?'green':'red'">(<i :class="scope.row.m7pl === 0?'':scope.row.m7pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m7pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m7h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m7h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m7a}}</p>
+                <p class="center" :class="scope.row.m7ph ===0?'':scope.row.m7ph < 0?'green':'red'">(<i :class="scope.row.m7ph === 0?'':scope.row.m7ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m7ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="八月(万元)">
+            <el-table-column
+                prop="m8l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m8l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m8a}}</p>
+                <p class="center" :class="scope.row.m8pl ===0?'':scope.row.m8pl < 0?'green':'red'">(<i :class="scope.row.m8pl === 0?'':scope.row.m8pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m8pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m8h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m8h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m8a}}</p>
+                <p class="center" :class="scope.row.m8ph ===0?'':scope.row.m8ph < 0?'green':'red'">(<i :class="scope.row.m8ph === 0?'':scope.row.m8ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m8ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="九月(万元)">
+            <el-table-column
+                prop="m9l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m9l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m9a}}</p>
+                <p class="center" :class="scope.row.m9pl ===0?'':scope.row.m9pl < 0?'green':'red'">(<i :class="scope.row.m9pl === 0?'':scope.row.m9pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m9pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m9h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m9h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m9a}}</p>
+                <p class="center" :class="scope.row.m9ph ===0?'':scope.row.m9ph < 0?'green':'red'">(<i :class="scope.row.m9ph === 0?'':scope.row.m9ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m9ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="第四季度(万元)">
+            <el-table-column
+                prop="s4l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s4l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s4a}}</p>
+                <p class="center" :class="scope.row.s4pl ===0?'':scope.row.s4pl < 0?'green':'red'">(<i :class="scope.row.s4pl === 0?'':scope.row.s4pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s4pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="s4h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s4h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s4a}}</p>
+                <p class="center" :class="scope.row.s4ph ===0?'':scope.row.s4ph < 0?'green':'red'">(<i :class="scope.row.s4ph === 0?'':scope.row.s4ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s4ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="十月(万元)">
+            <el-table-column
+                prop="m10l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m10l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m10a}}</p>
+                <p class="center" :class="scope.row.m10pl ===0?'':scope.row.m10pl < 0?'green':'red'">(<i :class="scope.row.m10pl === 0?'':scope.row.m10pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m10pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m10h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m10h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m10a}}</p>
+                <p class="center" :class="scope.row.m10ph ===0?'':scope.row.m10ph < 0?'green':'red'">(<i :class="scope.row.m10ph === 0?'':scope.row.m10ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m10ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="十一月(万元)">
+            <el-table-column
+                prop="m11l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m11l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m11a}}</p>
+                <p class="center" :class="scope.row.m11pl ===0?'':scope.row.m11pl < 0?'green':'red'">(<i :class="scope.row.m11pl === 0?'':scope.row.m11pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m11pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m11h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m11h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m11a}}</p>
+                <p class="center" :class="scope.row.m11ph ===0?'':scope.row.m11ph < 0?'green':'red'">(<i :class="scope.row.m11ph === 0?'':scope.row.m11ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m11ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="十二月(万元)">
+            <el-table-column
+                prop="m12l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m12l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m12a}}</p>
+                <p class="center" :class="scope.row.m12pl ===0?'':scope.row.m12pl < 0?'green':'red'">(<i :class="scope.row.m12pl === 0?'':scope.row.m12pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m12pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m12h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m12h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m12a}}</p>
+                <p class="center" :class="scope.row.m12ph ===0?'':scope.row.m12ph < 0?'green':'red'">(<i :class="scope.row.m12ph === 0?'':scope.row.m12ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m12ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </normalLayout>
+
 </div>
 </template>
 
@@ -524,7 +529,7 @@ export default {
 }
 .border{
   border:1px solid #c1bfbf;
-  transform: scale(1,.2);
+  transform: scale(2,.2);
 }
 .center{
   text-align: center;

+ 490 - 484
src/HManagement/projectTarget/projectTargetStatistics/index.vue

@@ -1,488 +1,494 @@
 <template>
 <div>
-  <div class="container normal-panel" style="padding-bottom:0">
-    <el-button type="default" size="small" @click="exportData">导 出</el-button>
-  </div>
-  <div class="container normal-panel">
-    <el-form size="small" inline label-position="right" label-width="50px">
-      <el-form-item label="年度">
-        <el-date-picker
-          v-model="year"
-          type="year"
-          placeholder="选择年"
-          value-format="yyyy"
-          @change="queryData">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="搜索">
-        <el-input v-model="condition" prefix-icon="el-icon-search" placeholder="人员,职位" @input="inputChange" @clear="queryData" @keyup.native.enter="queryData" clearable></el-input>
-      </el-form-item>
-      
-    </el-form>
-    <el-table
-      :data="tableData"
-      style="width: 100%"
-      height="calc(100vh - 182px)"
-      size="small">
-      <el-table-column
-        prop="depfullname"
-        label="部门"
-        width="120"
-        fixed>
-        <template slot-scope="scope">
-          <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.level === 0?'--':scope.row.depfullname}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        label="人员"
-        width="80"
-        fixed>
-        <template slot-scope="scope">
-          <p>{{scope.row.name?scope.row.name:'--'}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="position"
-        label="职位"
-        width="100"
-        fixed>
-        <template slot-scope="scope">
-          <p>{{scope.row.position?scope.row.position:'--'}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="projectnum"
-        label="项目数量"
-        width="100">
-      </el-table-column>
-      <el-table-column
-        prop="projectname"
-        label="项目名称"
-        width="150">
-        <template slot-scope="scope">
-          <p>{{scope.row.projectname?scope.row.projectname:'--'}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="目标/实际"
-        width="100">
-        <template>
-          <p class="center d-text">目标</p>
-          <p class="border"></p>
-          <p class="center d-text">实际</p>
-        </template>
-      </el-table-column>
-      <el-table-column label="年度(万元)">
-        <el-table-column
-          prop="y1l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.y1l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.y1a}}</p>
-            <p class="center" :class="scope.row.y1pl ===0?'':scope.row.y1pl < 0?'green':'red'">(<i :class="scope.row.y1pl === 0?'':scope.row.y1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.y1pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="y1h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.y1h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.y1a}}</p>
-            <p class="center" :class="scope.row.y1ph ===0?'':scope.row.y1ph < 0?'green':'red'">(<i :class="scope.row.y1ph === 0?'':scope.row.y1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.y1ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="第一季度(万元)">
-        <el-table-column
-          prop="s1l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s1l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s1a}}</p>
-            <p class="center" :class="scope.row.s1pl ===0?'':scope.row.s1pl < 0?'green':'red'">(<i :class="scope.row.s1pl === 0?'':scope.row.s1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s1pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="s1h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s1h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s1a}}</p>
-            <p class="center" :class="scope.row.s1ph ===0?'':scope.row.s1ph < 0?'green':'red'">(<i :class="scope.row.s1ph === 0?'':scope.row.s1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s1ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="一月(万元)">
-        <el-table-column
-          prop="m1l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m1l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m1a}}</p>
-            <p class="center" :class="scope.row.m1pl ===0?'':scope.row.m1pl < 0?'green':'red'">(<i :class="scope.row.m1pl === 0?'':scope.row.m1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m1pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m1h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m1h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m1a}}</p>
-            <p class="center" :class="scope.row.m1ph ===0?'':scope.row.m1ph < 0?'green':'red'">(<i :class="scope.row.m1ph === 0?'':scope.row.m1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m1ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="二月(万元)">
-        <el-table-column
-          prop="m2l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m2l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m2a}}</p>
-            <p class="center" :class="scope.row.m2pl ===0?'':scope.row.m2pl < 0?'green':'red'">(<i :class="scope.row.m2pl === 0?'':scope.row.m2pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m2pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m2h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m2h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m2a}}</p>
-            <p class="center" :class="scope.row.m2ph ===0?'':scope.row.m2ph < 0?'green':'red'">(<i :class="scope.row.m2ph === 0?'':scope.row.m2ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m2ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="三月(万元)">
-        <el-table-column
-          prop="m3l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m3l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m3a}}</p>
-            <p class="center" :class="scope.row.m3pl ===0?'':scope.row.m3pl < 0?'green':'red'">(<i :class="scope.row.m3pl === 0?'':scope.row.m3pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m3pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m3h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m3h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m3a}}</p>
-            <p class="center" :class="scope.row.m3ph ===0?'':scope.row.m3ph < 0?'green':'red'">(<i :class="scope.row.m3ph === 0?'':scope.row.m3ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m3ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="第二季度(万元)">
-        <el-table-column
-          prop="s2l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s2l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s2a}}</p>
-            <p class="center" :class="scope.row.s2pl ===0?'':scope.row.s2pl < 0?'green':'red'">(<i :class="scope.row.s2pl === 0?'':scope.row.s2pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s2pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="s2h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s2h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s2a}}</p>
-            <p class="center" :class="scope.row.s2ph ===0?'':scope.row.s2ph < 0?'green':'red'">(<i :class="scope.row.s2ph === 0?'':scope.row.s2ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s2ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="四月(万元)">
-        <el-table-column
-          prop="m4l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m4l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m4a}}</p>
-            <p class="center" :class="scope.row.m4pl ===0?'':scope.row.m4pl < 0?'green':'red'">(<i :class="scope.row.m4pl === 0?'':scope.row.m4pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m4pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m4h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m4h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m4a}}</p>
-            <p class="center" :class="scope.row.m4ph ===0?'':scope.row.m4ph < 0?'green':'red'">(<i :class="scope.row.m4ph === 0?'':scope.row.m4ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m4ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="五月(万元)">
-        <el-table-column
-          prop="m5l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m5l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m5a}}</p>
-            <p class="center" :class="scope.row.m5pl ===0?'':scope.row.m5pl < 0?'green':'red'">(<i :class="scope.row.m5pl === 0?'':scope.row.m5pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m5pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m5h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m5h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m5a}}</p>
-            <p class="center" :class="scope.row.m5ph ===0?'':scope.row.m5ph < 0?'green':'red'">(<i :class="scope.row.m5ph === 0?'':scope.row.m5ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m5ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="六月(万元)">
-        <el-table-column
-          prop="m6l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m6l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m6a}}</p>
-            <p class="center" :class="scope.row.m6pl ===0?'':scope.row.m6pl < 0?'green':'red'">(<i :class="scope.row.m6pl === 0?'':scope.row.m6pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m6pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m6h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m6h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m6a}}</p>
-            <p class="center" :class="scope.row.m6ph ===0?'':scope.row.m6ph < 0?'green':'red'">(<i :class="scope.row.m6ph === 0?'':scope.row.m6ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m6ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="第三季度(万元)">
-        <el-table-column
-          prop="s3l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s3l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s3a}}</p>
-            <p class="center" :class="scope.row.s3pl ===0?'':scope.row.s3pl < 0?'green':'red'">(<i :class="scope.row.s3pl === 0?'':scope.row.s3pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s3pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="s3h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s3h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s3a}}</p>
-            <p class="center" :class="scope.row.s3ph ===0?'':scope.row.s3ph < 0?'green':'red'">(<i :class="scope.row.s3ph === 0?'':scope.row.s3ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s3ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="七月(万元)">
-        <el-table-column
-          prop="m7l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m7l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m7a}}</p>
-            <p class="center" :class="scope.row.m7pl ===0?'':scope.row.m7pl < 0?'green':'red'">(<i :class="scope.row.m7pl === 0?'':scope.row.m7pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m7pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m7h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m7h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m7a}}</p>
-            <p class="center" :class="scope.row.m7ph ===0?'':scope.row.m7ph < 0?'green':'red'">(<i :class="scope.row.m7ph === 0?'':scope.row.m7ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m7ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="八月(万元)">
-        <el-table-column
-          prop="m8l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m8l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m8a}}</p>
-            <p class="center" :class="scope.row.m8pl ===0?'':scope.row.m8pl < 0?'green':'red'">(<i :class="scope.row.m8pl === 0?'':scope.row.m8pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m8pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m8h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m8h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m8a}}</p>
-            <p class="center" :class="scope.row.m8ph ===0?'':scope.row.m8ph < 0?'green':'red'">(<i :class="scope.row.m8ph === 0?'':scope.row.m8ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m8ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="九月(万元)">
-        <el-table-column
-          prop="m9l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m9l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m9a}}</p>
-            <p class="center" :class="scope.row.m9pl ===0?'':scope.row.m9pl < 0?'green':'red'">(<i :class="scope.row.m9pl === 0?'':scope.row.m9pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m9pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m9h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m9h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m9a}}</p>
-            <p class="center" :class="scope.row.m9ph ===0?'':scope.row.m9ph < 0?'green':'red'">(<i :class="scope.row.m9ph === 0?'':scope.row.m9ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m9ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="第四季度(万元)">
-        <el-table-column
-          prop="s4l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s4l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s4a}}</p>
-            <p class="center" :class="scope.row.s4pl ===0?'':scope.row.s4pl < 0?'green':'red'">(<i :class="scope.row.s4pl === 0?'':scope.row.s4pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s4pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="s4h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.s4h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.s4a}}</p>
-            <p class="center" :class="scope.row.s4ph ===0?'':scope.row.s4ph < 0?'green':'red'">(<i :class="scope.row.s4ph === 0?'':scope.row.s4ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s4ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="十月(万元)">
-        <el-table-column
-          prop="m10l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m10l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m10a}}</p>
-            <p class="center" :class="scope.row.m10pl ===0?'':scope.row.m10pl < 0?'green':'red'">(<i :class="scope.row.m10pl === 0?'':scope.row.m10pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m10pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m10h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m10h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m10a}}</p>
-            <p class="center" :class="scope.row.m10ph ===0?'':scope.row.m10ph < 0?'green':'red'">(<i :class="scope.row.m10ph === 0?'':scope.row.m10ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m10ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="十一月(万元)">
-        <el-table-column
-          prop="m11l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m11l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m11a}}</p>
-            <p class="center" :class="scope.row.m11pl ===0?'':scope.row.m11pl < 0?'green':'red'">(<i :class="scope.row.m11pl === 0?'':scope.row.m11pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m11pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m11h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m11h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m11a}}</p>
-            <p class="center" :class="scope.row.m11ph ===0?'':scope.row.m11ph < 0?'green':'red'">(<i :class="scope.row.m11ph === 0?'':scope.row.m11ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m11ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="十二月(万元)">
-        <el-table-column
-          prop="m12l"
-          label="基本"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m12l}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m12a}}</p>
-            <p class="center" :class="scope.row.m12pl ===0?'':scope.row.m12pl < 0?'green':'red'">(<i :class="scope.row.m12pl === 0?'':scope.row.m12pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m12pl}}%)</p>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="m12h"
-          label="挑战"
-          width="120">
-          <template slot-scope="scope">
-            <p class="center d-text">{{scope.row.m12h}}</p>
-            <p class="border"></p>
-            <p class="center">{{scope.row.m12a}}</p>
-            <p class="center" :class="scope.row.m12ph ===0?'':scope.row.m12ph < 0?'green':'red'">(<i :class="scope.row.m12ph === 0?'':scope.row.m12ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m12ph}}%)</p>
-          </template>
-        </el-table-column>
-      </el-table-column>
-    </el-table>
-  </div>
+  <normalLayout @onRefresh="inputChange">
+    <div slot="content">
+      <div class="container normal-panel" style="padding-bottom:0">
+        <el-button type="default" size="small" @click="exportData">导 出</el-button>
+      </div>
+      <div class="container normal-panel">
+        <el-form size="small" inline label-position="right" label-width="50px">
+          <el-form-item label="年度">
+            <el-date-picker
+                class="inline-16"
+                v-model="year"
+                type="year"
+                placeholder="选择年"
+                value-format="yyyy"
+                @change="queryData">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item >
+            <el-input v-model="condition" prefix-icon="el-icon-search" placeholder="人员,职位" @input="inputChange" @clear="queryData" @keyup.native.enter="queryData" clearable></el-input>
+          </el-form-item>
+
+        </el-form>
+        <el-table
+            :data="tableData"
+            style="width: 100%"
+            height="calc(100vh - 182px)"
+            size="small">
+          <el-table-column
+              prop="depfullname"
+              label="部门"
+              width="120"
+              fixed>
+            <template slot-scope="scope">
+              <p :style="{textIndent:scope.row.level === 0?'10px':''}">{{scope.row.level === 0?'--':scope.row.depfullname}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column
+              prop="name"
+              label="人员"
+              width="80"
+              fixed>
+            <template slot-scope="scope">
+              <p>{{scope.row.name?scope.row.name:'--'}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column
+              prop="position"
+              label="职位"
+              width="100"
+              fixed>
+            <template slot-scope="scope">
+              <p>{{scope.row.position?scope.row.position:'--'}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column
+              prop="projectnum"
+              label="项目数量"
+              width="100">
+          </el-table-column>
+          <el-table-column
+              prop="projectname"
+              label="项目名称"
+              width="150">
+            <template slot-scope="scope">
+              <p>{{scope.row.projectname?scope.row.projectname:'--'}}</p>
+            </template>
+          </el-table-column>
+          <el-table-column
+              label="目标/实际"
+              width="100">
+            <template>
+              <p class="center d-text">目标</p>
+              <p class="border"></p>
+              <p class="center d-text">实际</p>
+            </template>
+          </el-table-column>
+          <el-table-column label="年度(万元)">
+            <el-table-column
+                prop="y1l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.y1l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.y1a}}</p>
+                <p class="center" :class="scope.row.y1pl ===0?'':scope.row.y1pl < 0?'green':'red'">(<i :class="scope.row.y1pl === 0?'':scope.row.y1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.y1pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="y1h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.y1h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.y1a}}</p>
+                <p class="center" :class="scope.row.y1ph ===0?'':scope.row.y1ph < 0?'green':'red'">(<i :class="scope.row.y1ph === 0?'':scope.row.y1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.y1ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="第一季度(万元)">
+            <el-table-column
+                prop="s1l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s1l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s1a}}</p>
+                <p class="center" :class="scope.row.s1pl ===0?'':scope.row.s1pl < 0?'green':'red'">(<i :class="scope.row.s1pl === 0?'':scope.row.s1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s1pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="s1h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s1h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s1a}}</p>
+                <p class="center" :class="scope.row.s1ph ===0?'':scope.row.s1ph < 0?'green':'red'">(<i :class="scope.row.s1ph === 0?'':scope.row.s1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s1ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="一月(万元)">
+            <el-table-column
+                prop="m1l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m1l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m1a}}</p>
+                <p class="center" :class="scope.row.m1pl ===0?'':scope.row.m1pl < 0?'green':'red'">(<i :class="scope.row.m1pl === 0?'':scope.row.m1pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m1pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m1h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m1h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m1a}}</p>
+                <p class="center" :class="scope.row.m1ph ===0?'':scope.row.m1ph < 0?'green':'red'">(<i :class="scope.row.m1ph === 0?'':scope.row.m1ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m1ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="二月(万元)">
+            <el-table-column
+                prop="m2l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m2l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m2a}}</p>
+                <p class="center" :class="scope.row.m2pl ===0?'':scope.row.m2pl < 0?'green':'red'">(<i :class="scope.row.m2pl === 0?'':scope.row.m2pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m2pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m2h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m2h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m2a}}</p>
+                <p class="center" :class="scope.row.m2ph ===0?'':scope.row.m2ph < 0?'green':'red'">(<i :class="scope.row.m2ph === 0?'':scope.row.m2ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m2ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="三月(万元)">
+            <el-table-column
+                prop="m3l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m3l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m3a}}</p>
+                <p class="center" :class="scope.row.m3pl ===0?'':scope.row.m3pl < 0?'green':'red'">(<i :class="scope.row.m3pl === 0?'':scope.row.m3pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m3pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m3h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m3h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m3a}}</p>
+                <p class="center" :class="scope.row.m3ph ===0?'':scope.row.m3ph < 0?'green':'red'">(<i :class="scope.row.m3ph === 0?'':scope.row.m3ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m3ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="第二季度(万元)">
+            <el-table-column
+                prop="s2l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s2l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s2a}}</p>
+                <p class="center" :class="scope.row.s2pl ===0?'':scope.row.s2pl < 0?'green':'red'">(<i :class="scope.row.s2pl === 0?'':scope.row.s2pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s2pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="s2h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s2h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s2a}}</p>
+                <p class="center" :class="scope.row.s2ph ===0?'':scope.row.s2ph < 0?'green':'red'">(<i :class="scope.row.s2ph === 0?'':scope.row.s2ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s2ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="四月(万元)">
+            <el-table-column
+                prop="m4l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m4l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m4a}}</p>
+                <p class="center" :class="scope.row.m4pl ===0?'':scope.row.m4pl < 0?'green':'red'">(<i :class="scope.row.m4pl === 0?'':scope.row.m4pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m4pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m4h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m4h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m4a}}</p>
+                <p class="center" :class="scope.row.m4ph ===0?'':scope.row.m4ph < 0?'green':'red'">(<i :class="scope.row.m4ph === 0?'':scope.row.m4ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m4ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="五月(万元)">
+            <el-table-column
+                prop="m5l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m5l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m5a}}</p>
+                <p class="center" :class="scope.row.m5pl ===0?'':scope.row.m5pl < 0?'green':'red'">(<i :class="scope.row.m5pl === 0?'':scope.row.m5pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m5pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m5h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m5h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m5a}}</p>
+                <p class="center" :class="scope.row.m5ph ===0?'':scope.row.m5ph < 0?'green':'red'">(<i :class="scope.row.m5ph === 0?'':scope.row.m5ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m5ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="六月(万元)">
+            <el-table-column
+                prop="m6l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m6l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m6a}}</p>
+                <p class="center" :class="scope.row.m6pl ===0?'':scope.row.m6pl < 0?'green':'red'">(<i :class="scope.row.m6pl === 0?'':scope.row.m6pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m6pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m6h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m6h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m6a}}</p>
+                <p class="center" :class="scope.row.m6ph ===0?'':scope.row.m6ph < 0?'green':'red'">(<i :class="scope.row.m6ph === 0?'':scope.row.m6ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m6ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="第三季度(万元)">
+            <el-table-column
+                prop="s3l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s3l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s3a}}</p>
+                <p class="center" :class="scope.row.s3pl ===0?'':scope.row.s3pl < 0?'green':'red'">(<i :class="scope.row.s3pl === 0?'':scope.row.s3pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s3pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="s3h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s3h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s3a}}</p>
+                <p class="center" :class="scope.row.s3ph ===0?'':scope.row.s3ph < 0?'green':'red'">(<i :class="scope.row.s3ph === 0?'':scope.row.s3ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s3ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="七月(万元)">
+            <el-table-column
+                prop="m7l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m7l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m7a}}</p>
+                <p class="center" :class="scope.row.m7pl ===0?'':scope.row.m7pl < 0?'green':'red'">(<i :class="scope.row.m7pl === 0?'':scope.row.m7pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m7pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m7h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m7h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m7a}}</p>
+                <p class="center" :class="scope.row.m7ph ===0?'':scope.row.m7ph < 0?'green':'red'">(<i :class="scope.row.m7ph === 0?'':scope.row.m7ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m7ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="八月(万元)">
+            <el-table-column
+                prop="m8l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m8l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m8a}}</p>
+                <p class="center" :class="scope.row.m8pl ===0?'':scope.row.m8pl < 0?'green':'red'">(<i :class="scope.row.m8pl === 0?'':scope.row.m8pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m8pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m8h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m8h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m8a}}</p>
+                <p class="center" :class="scope.row.m8ph ===0?'':scope.row.m8ph < 0?'green':'red'">(<i :class="scope.row.m8ph === 0?'':scope.row.m8ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m8ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="九月(万元)">
+            <el-table-column
+                prop="m9l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m9l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m9a}}</p>
+                <p class="center" :class="scope.row.m9pl ===0?'':scope.row.m9pl < 0?'green':'red'">(<i :class="scope.row.m9pl === 0?'':scope.row.m9pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m9pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m9h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m9h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m9a}}</p>
+                <p class="center" :class="scope.row.m9ph ===0?'':scope.row.m9ph < 0?'green':'red'">(<i :class="scope.row.m9ph === 0?'':scope.row.m9ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m9ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="第四季度(万元)">
+            <el-table-column
+                prop="s4l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s4l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s4a}}</p>
+                <p class="center" :class="scope.row.s4pl ===0?'':scope.row.s4pl < 0?'green':'red'">(<i :class="scope.row.s4pl === 0?'':scope.row.s4pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s4pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="s4h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.s4h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.s4a}}</p>
+                <p class="center" :class="scope.row.s4ph ===0?'':scope.row.s4ph < 0?'green':'red'">(<i :class="scope.row.s4ph === 0?'':scope.row.s4ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.s4ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="十月(万元)">
+            <el-table-column
+                prop="m10l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m10l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m10a}}</p>
+                <p class="center" :class="scope.row.m10pl ===0?'':scope.row.m10pl < 0?'green':'red'">(<i :class="scope.row.m10pl === 0?'':scope.row.m10pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m10pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m10h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m10h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m10a}}</p>
+                <p class="center" :class="scope.row.m10ph ===0?'':scope.row.m10ph < 0?'green':'red'">(<i :class="scope.row.m10ph === 0?'':scope.row.m10ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m10ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="十一月(万元)">
+            <el-table-column
+                prop="m11l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m11l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m11a}}</p>
+                <p class="center" :class="scope.row.m11pl ===0?'':scope.row.m11pl < 0?'green':'red'">(<i :class="scope.row.m11pl === 0?'':scope.row.m11pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m11pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m11h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m11h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m11a}}</p>
+                <p class="center" :class="scope.row.m11ph ===0?'':scope.row.m11ph < 0?'green':'red'">(<i :class="scope.row.m11ph === 0?'':scope.row.m11ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m11ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="十二月(万元)">
+            <el-table-column
+                prop="m12l"
+                label="基本"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m12l}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m12a}}</p>
+                <p class="center" :class="scope.row.m12pl ===0?'':scope.row.m12pl < 0?'green':'red'">(<i :class="scope.row.m12pl === 0?'':scope.row.m12pl < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m12pl}}%)</p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="m12h"
+                label="挑战"
+                width="120">
+              <template slot-scope="scope">
+                <p class="center d-text">{{scope.row.m12h}}</p>
+                <p class="border"></p>
+                <p class="center">{{scope.row.m12a}}</p>
+                <p class="center" :class="scope.row.m12ph ===0?'':scope.row.m12ph < 0?'green':'red'">(<i :class="scope.row.m12ph === 0?'':scope.row.m12ph < 0?'el-icon-bottom':'el-icon-top'"></i>{{scope.row.m12ph}}%)</p>
+              </template>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </normalLayout>
+
 </div>
 </template>
 
@@ -537,7 +543,7 @@ export default {
 }
 .border{
   border:1px solid #c1bfbf;
-  transform: scale(1,.2);
+  transform: scale(2,.2);
 }
 .center{
   text-align: center;

+ 1 - 1
src/SManagement/personal_target/components/table.vue

@@ -513,7 +513,7 @@ export default {
 }
 .border{
   border:1px solid #c1bfbf;
-  transform: scale(1,.2);
+  transform: scale(2,.2);
 }
 .center{
   text-align: center;

+ 37 - 31
src/SManagement/personal_target/index.vue

@@ -1,37 +1,43 @@
 <template>
-  <div class="personal-target">
-    <Header>
+  <normalLayout @onRefresh="getSubmitEditAction">
+    <div slot="content">
+      <div class="personal-target">
+        <Header>
 
-      <el-button size="small" @click="export1" v-if="tool.checkAuth($route.name,'export')">导出</el-button>
-    </Header>
-    <div class="container normal-panel">
-      <select-panel
-        @yearChange="yearChange" 
-        @targetChange="targetChange" 
-        @clearTarget="targetClear" 
-        @searchActive="searchActive" 
-        @clearData="searchClear"
-      />
-      <Table ref="table">
-        <template v-slot:detail="scope">
-          <el-button v-if="tool.checkAuth($route.name,'read')" type="text" size="small" @click="$store.dispatch('DrawerShowChange',true),$router.push({path:'/PersonalDetail',query:{id:scope.data.data.hrid,year:scope.data.year}})">详情</el-button>
-        </template>
-      </Table>
-    </div>
-    <!--抽屉面板-->
-    <el-drawer
-      title="我是标题"
-      :visible.sync="drawer"
-      :with-header="false"
-      direction="rtl"
-      size="90%"
-      append-to-body
-      @close="closeDrawer">
-      <div class="detail__panel">
-        <router-view/>
+          <el-button size="small" @click="export1" v-if="tool.checkAuth($route.name,'export')">导出</el-button>
+        </Header>
+        <div class="container normal-panel">
+          <select-panel
+              @yearChange="yearChange"
+              @targetChange="targetChange"
+              @clearTarget="targetClear"
+              @searchActive="searchActive"
+              @clearData="searchClear"
+          />
+          <Table ref="table">
+            <template v-slot:detail="scope">
+              <el-button v-if="tool.checkAuth($route.name,'read')" type="text" size="small" @click="$store.dispatch('DrawerShowChange',true),$router.push({path:'/PersonalDetail',query:{id:scope.data.data.hrid,year:scope.data.year}})">详情</el-button>
+              <el-button v-if="tool.checkAuth($route.name,'update') " type="text" size="small" @click="$store.dispatch('DrawerShowChange',true),$router.push({path:'/editPersonalInfo',query:{id:scope.data.data.hrid,year:scope.data.year}})">编辑</el-button>
+            </template>
+          </Table>
+        </div>
+        <!--抽屉面板-->
+        <el-drawer
+            title="我是标题"
+            :visible.sync="drawer"
+            :with-header="false"
+            direction="rtl"
+            size="90%"
+            append-to-body
+            @close="closeDrawer">
+          <div class="detail__panel">
+            <router-view/>
+          </div>
+        </el-drawer>
       </div>
-    </el-drawer>
-  </div>
+    </div>
+  </normalLayout>
+
 </template>
 
 <script>

+ 3 - 2
src/SManagement/project_target/components/addProject.vue

@@ -55,13 +55,14 @@
           <tableLayout :layout="tablecols2" :custom="true" :data="selectProject">
             <template v-slot:customcol="scope">
                 <div v-if="scope.column.columnname == 'baseTarget'" class="base-target">
-                  <input type="text" @input="baseTargetChange($event,scope.column.data)">
+                  <input style="width: 100%" type="text" @input="baseTargetChange($event,scope.column.data)">
                 </div>
                 <div v-if="scope.column.columnname == 'doubleTarget'" class="base-target">
-                  <input type="text" @input="dealTargetChange($event,scope.column.data)">
+                  <input style="width: 100%" type="text" @input="dealTargetChange($event,scope.column.data)">
                 </div>
                 <div v-if="scope.column.columnname == 'dealTime'">
                   <el-date-picker
+                    style="width: 100%"
                     type="month"
                     placeholder="请选择月份"
                     size="small"

+ 2 - 2
src/SManagement/project_target/components/selectPanel.vue

@@ -10,7 +10,6 @@
         @change="yearChange">
       </el-date-picker>
     </div>
-    <Search @searchActive="searchActive" @clearData="clearData" />
     <div class="target">
       <span>考核指标:</span>
       <el-select placeholder="请选择" v-model="target" size="small" @change="change" clearable @clear="$emit('clearTarget')">
@@ -18,11 +17,12 @@
         </el-option>
       </el-select>
     </div>
+    <Search @searchActive="searchActive" @clearData="clearData" />
   </div>
 </template>
 
 <script>
-import Search from '@/components/search/index'
+import Search from '@/components/search/index1'
 export default {
   name: '',
   data () {

+ 4 - 2
src/SManagement/project_target/components/table.vue

@@ -474,7 +474,7 @@
         width="120"
         :fixed="Object.keys(tableData).length != 0 ? 'right' : ''">
         <template slot-scope="scope" v-if="scope.row.hrid">
-            <slot :data="{data:scope.row,year:year}" name="edit"/>
+            <slot :data="{data:scope.row,year:year}"  name="edit"/>
             <slot :data="{data:scope.row,year:year}" name="detail"/>
         </template>
       </el-table-column>
@@ -515,7 +515,9 @@ export default {
       this.params.content.year = this.year
       let res = await this.$api.requested(this.params)
       this.tableData = res.data
+      console.log("输出数据信息——————————————————————————————————————————")
       console.log(this.tableData);
+
       
     },
     /* 清空指标 */
@@ -555,7 +557,7 @@ export default {
 }
 .border{
   border:1px solid #c1bfbf;
-  transform: scale(1,.2);
+  transform: scale(2,.2);
 }
 .center{
   text-align: center;

+ 31 - 25
src/SManagement/project_target/index.vue

@@ -1,30 +1,36 @@
 <template>
-  <div class="personal-target">
-    <Header>
-      <el-button size="small" @click="export1" v-if="tool.checkAuth($route.name,'export')">导出</el-button>
-    </Header>
-    <div class="container normal-panel">
-      <table1 ref="table">
-        <template v-slot:detail="scope">
-          <el-button v-if="tool.checkAuth($route.name,'read')" type="text" size="small" @click="$store.dispatch('DrawerShowChange',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.hrid,year:scope.data.year}})">详情</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'update')" type="text" size="small" @click="$store.dispatch('DrawerShowChange',true),$router.push({path:'/editProjectInfo',query:{id:scope.data.data.hrid,year:scope.data.year}})">编辑</el-button>
-        </template>
-      </table1>
-    </div>
-    <!--抽屉面板-->
-    <el-drawer
-      title="我是标题"
-      :visible.sync="drawer"
-      :with-header="false"
-      direction="rtl"
-      size="90%"
-      append-to-body
-      @close="closeDrawer">
-      <div class="detail__panel">
-        <router-view/>
+  <normalLayout @onRefresh="closeDrawer">
+    <div slot="content">
+      <div class="personal-target">
+        <Header>
+          <el-button size="small" @click="export1" v-if="tool.checkAuth($route.name,'export')">导出</el-button>
+        </Header>
+        <div class="container normal-panel">
+          <table1 ref="table">
+            <template v-slot:detail="scope">
+<!--              <p >{{scope.data}}</p>-->
+              <el-button v-if="tool.checkAuth($route.name,'read') " type="text" size="small" @click="$store.dispatch('DrawerShowChange',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.hrid,year:scope.data.year}})">详情</el-button>
+              <el-button v-if="tool.checkAuth($route.name,'update') " type="text" size="small" @click="$store.dispatch('DrawerShowChange',true),$router.push({path:'/editProjectInfo',query:{id:scope.data.data.hrid,year:scope.data.year}})">编辑</el-button>
+            </template>
+          </table1>
+        </div>
+        <!--抽屉面板-->
+        <el-drawer
+            title="我是标题"
+            :visible.sync="drawer"
+            :with-header="false"
+            direction="rtl"
+            size="90%"
+            append-to-body
+            @close="closeDrawer">
+          <div class="detail__panel">
+            <router-view/>
+          </div>
+        </el-drawer>
       </div>
-    </el-drawer>
-  </div>
+    </div>
+  </normalLayout>
+
 </template>
 
 <script>

+ 2 - 0
src/SManagement/project_target/modules/detailInfo.vue

@@ -75,6 +75,8 @@ export default {
     this.getprojectTargetList()
     this.tablecols = this.tool.tabelCol(this.$route.name).projectTargetTable.tablecols
     this.tablecols.pop()
+    console.log(this.$route.query.year)
+    console.log(this.$route.query.status)
   },
   methods: {
     /* 获取项目信息 */

+ 64 - 0
src/components/search/index1.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="search">
+<!--    <span>搜索:</span>-->
+    <el-input
+      placeholder="请输入内容"
+      v-model="search"
+      clearable
+      @clear="clearData()"
+      @input="inputChange"
+      size="small"
+      @keyup.enter.native="queryClick()">
+      <i slot="prefix" class="el-icon-search" @click="queryClick()"></i>
+    </el-input>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {
+      search: '',
+    };
+  },
+  props: {
+  },
+  computed: {
+  },
+  watch: {
+  },
+  methods: {
+    queryClick() {
+      this.$emit('searchActive',this.search)
+    },
+    inputChange () {
+      this.search == '' && this.$emit('searchActive',this.search)
+    },
+    clearData() {
+      this.$emit('clearData')
+      this.search = ''
+    }
+  },
+  beforeDestroy() {
+    clearTimeout(this.timer)
+  }
+};
+</script>
+
+<style scoped>
+  .el-input {
+    width: 200px;
+    margin-right: 16px;
+  }
+  span {
+    font-size: 14px;
+    font-weight: normal;
+    color: #666666;
+    margin-right: 8px;
+  }
+  /deep/.el-input__prefix {
+    display: flex;
+    align-items: center;
+  }
+</style>