代码上传

src/Form/Creditbilladj/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="新 建" :visible.sync="dialogFormVisible">
+    <el-dialog title="新 建" append-to-body :visible.sync="dialogFormVisible">
       <el-row :gutter="20">
         <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
           <el-col :span="24">

src/Form/Creditbilladj/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" :type="btnType?btnType:'text'" @click="onShow">编 辑</el-button>
-    <el-dialog title="编 辑" :visible.sync="dialogFormVisible">
+    <el-dialog title="编 辑" append-to-body :visible.sync="dialogFormVisible">
       <el-row :gutter="20">
         <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
           <el-col :span="24">

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}})
         })
       })
     },

src/HDrpManagement/AccountMoney/index.vue

@@ -7,37 +7,44 @@
       tableName="accountMoneyTable" 
       :apiId="{query:20221008145903}"
       :options="options">
-      <div slot="custom">
-        <el-select 
-          v-model="sys_enterpriseid" 
-          placeholder="企业筛选" 
-          size="mini" 
-          @change="enterpriseChange" 
-          clearable 
-          @clear="enterpriseChange($refs.list.param.content.where.sys_enterpriseid='')"
-        >
-          <el-option
-            v-for="item in enterpriseList"
-            :key="item.sys_enterpriseid"
-            :label="item.enterprisename"
-            :value="item.sys_enterpriseid">
-          </el-option>
-        </el-select>
-        <el-select 
-          v-model="accountType" 
-          placeholder="账户名称筛选" 
-          size="mini" 
-          @change="accountChange" 
-          clearable 
-          @clear="accountChange($refs.list.param.content.where.accountname='')"
-        >
-          <el-option
-            v-for="(item,index) in accountTypeList"
-            :key="index"
-            :label="item.value"
-            :value="item.value">
-          </el-option>
-        </el-select>
+      <div slot="custom" style="display:flex">
+        <div class="label_center">
+          <span class="search__label">企业: </span>
+            <el-select 
+              v-model="sys_enterpriseid" 
+              placeholder="企业筛选" 
+              size="small" 
+              @change="enterpriseChange" 
+              clearable 
+              @clear="enterpriseChange($refs.list.param.content.where.sys_enterpriseid='')"
+            >
+              <el-option
+                v-for="item in enterpriseList"
+                :key="item.sys_enterpriseid"
+                :label="item.enterprisename"
+                :value="item.sys_enterpriseid">
+              </el-option>
+            </el-select>
+        </div>
+        <div class="label_enter" style="margin-right:10px">
+          <span class="search__label">账户类型: </span>
+            <el-select 
+              v-model="accountType" 
+              placeholder="账户类型筛选" 
+              size="small" 
+              @change="accountChange" 
+              clearable 
+              @clear="accountChange($refs.list.param.content.where.accountname='')"
+            >
+              <el-option
+                v-for="item in accountTypeList"
+                :key="item.accountno"
+                :label="item.accountname"
+                :value="item.accountname">
+              </el-option>
+            </el-select>
+        </div>
+        
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'province'">
@@ -63,14 +70,13 @@ export default {
       options:[],
       enterpriseList:'',
       accountType:'',
-      accountTypeList:'',
-      sys_enterpriseid:''
+      sys_enterpriseid:'',
+      accountTypeList:[]
     }
   },
   async created () {
     this.getEnterprise()
-    let res = await this.$store.dispatch('optiontypeselect','accountname')
-    this.accountTypeList = res.data
+    this.getAccountType()
   },
   methods:{
     /** 获取公司数据 */
@@ -87,6 +93,17 @@ export default {
       })
       this.enterpriseList = res.data
     },
+    async getAccountType () {
+      let res = await this.$api.requested({
+        "id":20221008134803,
+        "content": {
+
+        }
+      })
+      this.accountTypeList = res.data
+      console.log(this.accountTypeList);
+      
+    },
     /* 企业筛选 */
     enterpriseChange () {
       this.$refs.list.param.content.where.sys_enterpriseid = this.sys_enterpriseid

src/HDrpManagement/AccountMoney/modules/detail.vue

@@ -1,32 +1,40 @@
 <template>
   <div>
-    <el-button size="mini" type="text" @click="editBtn">详 情</el-button>
-    <el-dialog title="新 建" :visible.sync="dialogFormVisible" width="80%">
-      <div slot="title" style="font-size: 15px">
-        资金流水账
+    <el-button size="mini" type="text" @click="editBtn">明 细</el-button>
+    <el-drawer title="账户流水明细" append-to-body :visible.sync="dialogFormVisible" size="50%">
+      <div class="container">
+        <el-input type="text" size="small" class="inline-16" style="width:200px;margin-bottom:10px" clearable @clear="getList" v-model="params.content.where.condition" placeholder="请输入搜索内容" @keyup.native.enter="getList(params.content.pageNumber=1)"></el-input>
+        <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="600px">
+          <template v-slot:customcol="scope">
+            <p>{{scope.column.data[scope.column.columnname]}}</p>
+          </template>
+          <template v-slot:opreation="scope">
+            <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>
+            <delete-btn 
+              @deleteCreate="deleteCreate" 
+              v-if="tool.checkAuth($route.name,'delete')" 
+              :id="scope.data.sa_itempriceadjust_itemsid" 
+              @deleteSuccess="$refs.basicLayout.listData()" 
+              nameId="20221025095404" 
+              nameKey="sa_itempriceadjust_itemsids"
+            />
+          </template>
+        </tableLayout>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="params.content.pageNumber"
+            :page-size="params.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
       </div>
-      <basicLayout 
-        ref="basicLayout" 
-        formPath="" 
-        tableName="accountMoneyDetailTable" 
-        idName="sa_accountclassid" 
-        :apiId="{query:20221022161304,del:''}" 
-        :options="options"
-        @listCreate="list">
-        <div slot="custom"></div>
-        <template v-slot:tbList="scope">
-          <div v-if="scope.data.column.columnname === 'isorder'">
-            <span v-if="scope.data.column.data[scope.data.column.columnname] === 1">是</span>
-            <span v-else>否</span>
-          </div>
-          <div v-else>
-            {{scope.data.column.data[[scope.data.column.columnname]]}}
-          </div>
-        </template>
-        <template v-slot:tbOpreation="scope">
-        </template>
-      </basicLayout>
-    </el-dialog>
+
+    </el-drawer>
     
   </div>
 </template>
@@ -40,21 +48,48 @@ export default {
   data() {
     return {
       options:[],
-      dialogFormVisible:false
+      dialogFormVisible:false,
+      total:0,
+      list:[],
+      tablecols:[],
+      params: {
+        "id":20221022161304,
+        "content": {
+          "pageNumber":1,
+          "pageSize":20,
+          "sa_accountclassid":"",
+          "sys_enterpriseid":"",
+          "minAmount":20,
+          "maxAmount":0,
+          "where": {
+            "condition":""
+          }
+        }
+      }
     }
   },
+  created () {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['accountMoneyDetailTable'].tablecols
+    this.getList()
+  },
   methods: {
     editBtn () {
+      this.getList()
       this.dialogFormVisible = true
     },
-    list (param) {
-      console.log(this.rowData);
-      
-      param.content.sa_accountclassid = this.rowData.sa_accountclassid
-      param.content.sys_enterpriseid = this.rowData.sys_enterpriseid
-      param.content.minAmount = 20
-      param.content.maxAmount = 0
-    }
+    async getList () {
+      this.params.content.sa_accountclassid = this.rowData.sa_accountclassid
+      this.params.content.sys_enterpriseid = this.rowData.sys_enterpriseid
+      let res = await this.$api.requested(this.params)
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+    },
   }
 }
 </script>

src/HDrpManagement/Creditbilladj/index.vue

@@ -7,7 +7,8 @@
       tableName="creditbilladjTable" 
       idName="sa_creditbillid" 
       :apiId="{query:20221008155103,del:20221008155403}"
-      :options="options">
+      :options="options"
+      :detailPath="{path:'/creditbilladjDetail'}">
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'" :style="scope.data.column.data[[scope.data.column.columnname]] == '审核' ? 'color: rgb(82, 196, 25);' : ''">{{scope.data.column.data[[scope.data.column.columnname]]}}</div>
         <div v-else>
@@ -16,7 +17,6 @@
       </template>
       <template v-slot:tbOpreation="scope">
         <el-button size="mini" type="text" @click="checkBuill(scope.data.data)" v-if="scope.data.data.status == '新建'">审 核</el-button>
-        <el-button size="mini" type="text" @click="$router.push({path:'/creditbilladjDetail',query:{id:scope.data.data.sa_creditbillid,rowindex:scope.data.data.rowindex}})">详 情</el-button>
       </template>
     </basicLayout>
   </div>

src/HDrpManagement/productMoneyOdd/components/add.vue

@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="dialogFormVisible=true">新 增</el-button>
+    <el-drawer title="新 增 商 品" append-to-body :visible.sync="dialogFormVisible" size="50%">
+      <div class="container">
+        <el-input style="width:200px;margin-bottom:10px" size="small" placeholder="请输入商品" @clear="getProductList(params.content.pageNumber=1)"
+          @keyup.native.enter="getProductList(params.content.pageNumber=1)" v-model="params.content.where.condition" clearable />
+        <Table ref="table" :layout="tablecols" :data="productList" :custom="false" height="500px">
+        </Table>
+        <el-pagination
+          style="text-align:right;margin-top:10px"
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="params.content.pageNumber"
+          :page-size="params.content.pageSize"
+          layout="total, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import Table from './table'
+export default {
+  components:{Table},
+  name: "index",
+  data() {
+    return {
+      options:[],
+      dialogFormVisible: false,
+      productList:'',
+      selectProduct:[],
+      params: {
+        "id": 20221028154004,
+        "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+                "condition": ""
+            }
+        }
+      },
+      total:0,
+      tablecols:[]
+    }
+  },
+  provide () {
+    return {
+    }
+  },
+  watch: {
+    dialogFormVisible (val) {
+      !val ? this.$refs.table.$refs.tables.clearSelection() : ''
+    }
+  },
+  mounted () {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['productList'].tablecols
+    this.getProductList()
+  },
+  methods: {
+    /* 提交 */
+    async onSubmit () {
+      let content = this.$refs.table.allArr.map(item => {
+        return {
+          "sa_itempriceadjust_itemsid":0,
+          "itemid":item.itemid,
+          "remarks":""
+        }
+      })
+      let res = await this.$api.requested({
+        "id": "20221025095104",
+        "content": {
+            "sa_itempriceadjustid": this.$route.query.id,
+            "sa_itempriceadjust_items": content
+        }
+      })
+      this.tool.showMessage(res,() => {
+        this.$emit('onSuccess')
+        this.dialogFormVisible = false
+      })
+    },
+    checkboxCallBack (data) {
+      this.selectProduct = data
+    },
+    /* 获取可添加的商品 */
+    async getProductList () {
+      let res = await this.$api.requested(this.params)
+      this.productList = res.data
+      this.total = res.total
+      console.log(this.productList);
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.getProductList()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.getProductList()
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/productMoneyOdd/components/check.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="inline-16" style="width:100%">
+  <div class="inline-16">
     <el-popconfirm title="确定通过审核吗？" @confirm="CheckRow()">
-      <el-button slot="reference" size="mini" style="width:100%">审 核</el-button>
+      <el-button slot="reference" size="mini">审 核</el-button>
     </el-popconfirm>
   </div>
 </template>

src/HDrpManagement/productMoneyOdd/components/editPrice.vue

@@ -1,81 +1,81 @@
 <template>
   <div>
     <el-button size="mini" type="text" @click="editBtn">编 辑 价 格</el-button>
-    <el-dialog title="编 辑" append-to-body :visible.sync="dialogFormVisible" width="50%">
-      <div slot="title" style="font-size: 15px">
-        编辑价格调整单商品价格
+    <el-drawer title="编辑价格调整单商品价格" append-to-body :visible.sync="dialogFormVisible" width="50%">
+      <div class="container">
+        <el-row>
+          <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
+            <!-- <el-col :span="24">
+              <el-form-item label="价格等级" prop="pricegrade">
+                <el-select v-model="form.pricegrade" placeholder="请选择价格等级">
+                  <el-option
+                      v-for="item in priceGrade()"
+                      :key="item.rowindex"
+                      :label="item.value"
+                      :value="item.rowindex">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="12">
+              <el-form-item label="一级原价" prop="price">
+                <el-input size="mini" :disabled="form.oldprice1==0" placeholder="请输入调整价" v-model="form.oldprice1"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="一级调整价" prop="price1">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice1==0" v-model="form.price1"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="二级原价" prop="price">
+                <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice2==0" v-model="form.oldprice2"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="二级调整价" prop="price2">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice2==0" v-model="form.price2"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="三级原价" disabled prop="price">
+                <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice3==0" v-model="form.oldprice3"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="三级调整价" prop="price3">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice3==0" v-model="form.price3"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="四级原价" disabled prop="price">
+                <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice4==0"  v-model="form.oldprice4"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="四级调整价" prop="price4">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice4==0" v-model="form.price4"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="五级原价" disabled prop="oldprice5">
+                <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice5==0"  v-model="form.oldprice5"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="五级调整价" prop="price5">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice5==0" v-model="form.price5"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
       </div>
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
-          <!-- <el-col :span="24">
-            <el-form-item label="价格等级" prop="pricegrade">
-              <el-select v-model="form.pricegrade" placeholder="请选择价格等级">
-                <el-option
-                    v-for="item in priceGrade()"
-                    :key="item.rowindex"
-                    :label="item.value"
-                    :value="item.rowindex">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-          <el-col :span="12">
-            <el-form-item label="一级原价" prop="price">
-              <el-input size="mini" :disabled="form.oldprice1==0" placeholder="请输入调整价" v-model="form.oldprice1"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="一级调整价" prop="price1">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice1==0" v-model="form.price1"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="二级原价" prop="price">
-              <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice2==0" v-model="form.oldprice2"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="二级调整价" prop="price2">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice2==0" v-model="form.price2"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="三级原价" disabled prop="price">
-              <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice3==0" v-model="form.oldprice3"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="三级调整价" prop="price3">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice3==0" v-model="form.price3"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="四级原价" disabled prop="price">
-              <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice4==0"  v-model="form.oldprice4"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="四级调整价" prop="price4">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice4==0" v-model="form.price4"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="五级原价" disabled prop="oldprice5">
-              <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice5==0"  v-model="form.oldprice5"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="五级调整价" prop="price5">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice5==0" v-model="form.price5"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
+      
+      <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 
@@ -115,6 +115,9 @@ export default {
         ],
         price4:[
           { required: true, message: '请输入4级调整价', trigger: 'blur'},
+        ],
+        price5:[
+          { required: true, message: '请输入5级调整价', trigger: 'blur'},
         ]
       }
     }

src/HDrpManagement/productMoneyOdd/components/table.vue

@@ -0,0 +1,91 @@
+<template>
+  <div>
+    <el-table ref="tables"  @select="aaaa" @select-all="selectAll" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" style="width:100%"  border>
+        <el-table-column
+        type="selection"
+        width="45"
+        align="center"
+        fixed>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width" :fixed="col.columnname === fixedName?'right':false">
+        <template slot-scope="scope">
+          <!-- 自定义表格显示内容 -->
+          <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+          <!-- 否则就是默认 -->
+          <span v-else>{{scope.row[col.columnname]}}</span>
+          <!-- 操作结构内容 -->
+          <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {mapGetters} from "vuex"
+export default {
+  /*
+    layout:表结构数据;
+    data:表渲染数据;
+    custom:是否启用自定义结构;
+    opwidth:操作列宽度
+  */
+  props:['layout','data','custom','height','fixedName'],
+  data () {
+    return {
+      list:[],
+      allArr:[]
+    }
+  },
+  computed:{
+    ...mapGetters({
+      loading:'loading'
+    })
+  },
+  watch: {
+    data (val) {
+      this.data.forEach((row) => {
+        this.allArr.forEach(item => {
+          if (row.itemid == item.itemid) {
+            this.$nextTick(() => {
+              this.$refs["tables"].toggleRowSelection(row, true);
+            })
+          }
+        })
+      });    
+    },
+    allArr (val) {
+      this.$emit('upDateData',val)
+    }
+  },
+  methods:{
+    aaaa(e,a) {
+      let index = this.allArr.findIndex(v=>v.itemid == a.itemid)
+      if(index == -1) {
+        this.allArr.push(a)
+      } else {
+        this.allArr.splice(index,1)
+      }
+    },
+    selectAll (val) {
+      if (val.length == 0) {
+        this.data.forEach(item => {
+          this.allArr.splice(item,1)
+        })
+      } else {
+        val.forEach(item => {
+          let res = this.allArr.every(item2 => item.itemid != item2.itemid)
+          res ? this.allArr.push(item) : ''
+        })
+      }
+    },
+  },
+}
+
+</script>
+<style scoped>
+
+/deep/.el-table__header .DisableSelection > .cell {
+  display: none !important;
+}
+</style>

src/HDrpManagement/productMoneyOdd/index.vue

@@ -15,7 +15,11 @@
         </importFile>
       </div>
       <template v-slot:tbList="scope">
-        <div>
+        <div v-if="scope.data.column.columnname == 'status'">
+          <span v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'" style="color:rgb(82, 196, 26)">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
+        <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>
       </template>

src/HDrpManagement/productMoneyOdd/modules/detail.vue

@@ -14,20 +14,8 @@
     <!-- 使用此插槽可不传[tags] -->
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
-      <el-popover
-            placement="bottom"
-            width="50"
-            trigger="focus"
-            v-model="visible"
-        >
-        <div class="normal-margin">
-          <Check v-if="mainData.status == '新建' && tool.checkAuth($route.name,'check')" :rowData="mainData" @checkSuccess="queryMainData"/>
-        </div>
-        <div class="normal-margin">
-          <delete-btn type="detail" style="width:100%" v-if="tool.checkAuth($route.name,'delete')" :id="$route.query.id" @deleteSuccess="onSuccess" nameId="20221025092904" nameKey="sa_itempriceadjustids"/>
-        </div>
-        <el-button size="mini" slot="reference" icon="el-icon-more" @click="visible = !visible"></el-button>
-      </el-popover>
+      <Check v-if="mainData.status == '新建' && tool.checkAuth($route.name,'check')" :rowData="mainData" @checkSuccess="queryMainData"/>
+      <!-- <delete-btn type="detail" style="width:100%" v-if="tool.checkAuth($route.name,'delete')" :id="$route.query.id" @deleteSuccess="onSuccess" nameId="20221025092904" nameKey="sa_itempriceadjustids"/> -->
     </div>
     <div slot="slot0" class="container normal-panel">
       <productOddDetail :rowData="mainData"/>

src/HDrpManagement/productMoneyOdd/modules/productOddDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basicLayout 
+    <!-- <basicLayout 
       ref="basicLayout" 
       formPath="productMoneyOdd/productOddDetail" 
       tableName="productDetailTable" 
@@ -29,21 +29,66 @@
         <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data.data"/>
         <delete-btn @deleteCreate="deleteCreate" v-if="tool.checkAuth($route.name,'delete')" :id="scope.data.data.sa_itempriceadjust_itemsid" @deleteSuccess="$refs.basicLayout.listData()" nameId="20221025095404" nameKey="sa_itempriceadjust_itemsids"/>
       </template>
-    </basicLayout>
+    </basicLayout> -->
+    <el-input type="text" size="small" class="inline-16" style="width:200px;margin-bottom:10px" clearable @clear="getDetailList" v-model="params.content.where.condition" placeholder="请输入搜索内容" @keyup.native.enter="getDetailList(params.content.pageNumber=1)"></el-input>
+    <addPrice class="inline-16" v-if="tool.checkAuth($route.name,'update')" @onSuccess="getDetailList(params.content.pageNumber=1)"/>
+    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="400px">
+      <template v-slot:customcol="scope">
+        <p>{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+      <template v-slot:opreation="scope">
+        <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>
+        <delete-btn 
+          @deleteCreate="deleteCreate" 
+          v-if="tool.checkAuth($route.name,'delete')" 
+          :id="scope.data.sa_itempriceadjust_itemsid" 
+          @deleteSuccess="$refs.basicLayout.listData()" 
+          nameId="20221025095404" 
+          nameKey="sa_itempriceadjust_itemsids"
+        />
+      </template>
+    </tableLayout>
+    <div style="margin-top:16px;text-align:right">
+      <el-pagination
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="params.content.pageNumber"
+        :page-size="params.content.pageSize"
+        layout="total, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
   </div>
 </template>
 
 <script>
 import priceHelper from '../components/priceHelper'
 import editPrice from '../components/editPrice'
+import addPrice from '../components/add'
+import { log } from '@antv/g2plot/lib/utils'
 
 export default {
-  components:{priceHelper,editPrice},
+  components:{priceHelper,editPrice,addPrice},
   name: "index",
   data() {
     return {
       options:[],
-      productList:''
+      productList:'',
+      tablecols:[],
+      total:0,
+      list:[],
+      params: {
+        "id":20221025160904,
+        "content":{
+          "pageNumber":1,
+          "pageSize":20,
+          "where": {
+            "condition":""
+          }
+        }
+      }
     }
   },
   provide () {
@@ -52,14 +97,28 @@ export default {
     }
   },
   mounted () {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['productDetailTable'].tablecols
     this.getProductList()
+    this.getDetailList()
   },
   methods: {
+    async getDetailList () {
+      this.params.content.sa_itempriceadjustid = this.$route.query.id
+      let res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+      console.log(res);
+    },
     deleteCreate (param) {
       param.content.sa_itempriceadjustid = this.$route.query.id
     },
-    list (param) {
-      param.content.sa_itempriceadjustid = this.$route.query.id
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
     },
     /* 获取可添加的商品 */
     async getProductList () {

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;

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;

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;

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>

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"

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 () {

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;

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>

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: {
     /* 获取项目信息 */

src/SManagement/sales_forecast/modules/projectDetail.vue

@@ -86,7 +86,7 @@ export default {
   created() {
     this.getDetail()
     this.getSubmitList()
-    this.tablecols = this.tool.tabelCol(this.$route.name).salesEditTable.tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name).salesEditTable.tablecols.splice(0,8)
   },
   methods: {
     /* 获取头部详情 */

src/components/normal-basic-layout/details/index.vue

@@ -130,7 +130,7 @@ export default {
         }
         const res = await this.$api.requested(param)
         this.tool.showMessage(res,()=>{
-          this.$store.dispatch('detailDeleleSuccess',true)
+          this.$store.dispatch('changeDetailDrawer',true)
         })
       }).catch((err) => {
         

src/components/normal-basic-layout/drawerDetail/index.vue

@@ -45,13 +45,13 @@ export default {
     },
     closeDrawer () {
       this.$router.go(-1)
-      this.$store.dispatch('detailDeleleSuccess',false)
+      this.$store.dispatch('changeDetailDrawer',false)
       this.$emit('onSuccess')
     }
   },
   watch:{
     closeDrawerTemp (val) {
-      val?this.drawer = false:''
+      val?this.drawer = false:true
     }
   }
 }

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>

src/router/HDrpManagement.js

@@ -138,16 +138,19 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/Creditbilladj/index')
-  },{
-    path: '/creditbilladjDetail',
-    name:'creditbilladj',
-    meta: {
-      title: '信用额度调整单详情',
-      ast_nav: true,
-      keeproute: true,
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/Creditbilladj/modules/details')
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/Creditbilladj/index'),
+    children: [
+      {
+        path: '/creditbilladjDetail',
+        name:'creditbilladj',
+        meta: {
+          title: '信用额度调整单详情',
+          ast_nav: true,
+          keeproute: true,
+        },
+        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/Creditbilladj/modules/details')
+      },
+    ]
   },{
     path: '/accountmoney',
     name:'accountmoney',

src/store/index.js

@@ -88,7 +88,7 @@ export default new Vuex.Store({
     setAppMenu (state,data) {
       state.menuApp = data
     },
-    detailDeleleSuccess (state,bool) {
+    changeDetailDrawer (state,bool) {
       state.closeDrawerTemp = bool
     },
     DrawerShowChange (state,bool) {
@@ -225,8 +225,8 @@ export default new Vuex.Store({
     setActiveApp ({commit}, data) {
       commit('setActiveApp',data)
     },
-    detailDeleleSuccess ({commit}, bool) {
-      commit('detailDeleleSuccess',bool)
+    changeDetailDrawer ({commit}, bool) {
+      commit('changeDetailDrawer',bool)
     },
     DrawerShowChange ({commit},bool) {
       commit('DrawerShowChange',bool)