qymljy преди 3 години
родител
ревизия
6541d9d087

+ 61 - 0
src/HDrpManagement/ProductMag/detail/index.vue

@@ -0,0 +1,61 @@
+<template>
+  <div>
+    <basicDetails
+        ref="details"
+        :titleText="`${mainData.accountno}-${mainData.name}`"
+        :oldFormPath="{edit:'HDrpManagement/ProductMag/modules'}"
+        :editData="mainData"
+        :mainAreaData="mainAreaData"
+        turnPageId="20221031141102"
+        idname="userid"
+        ownertable="sys_users"
+        tags=""
+        :tabs="['员工信息','角色信息']"
+        @pageChange="pageChange"
+        @onEditSuccess="queryMainData($route.query.id)">
+      <div slot="tags">
+      </div>
+      <div slot="customOperation" >
+      </div>
+      <div slot="slot0" >
+      </div>
+      <div slot="slot1" >
+      </div>
+    </basicDetails>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "index",
+  data() {
+    return {
+      mainData:{},
+      mainAreaData:{}
+    }
+  },
+  components:{
+  },
+  methods: {
+    async queryMainData(id) {
+      const res = await this.$api.requested({
+        "classname": "webmanage.users.users",
+        "method": "query_userMain",
+        "content": {
+          "userid": this.$route.query.id
+        }
+      })
+      this.mainData = res.data
+    },
+    // 监听切换数据,上一页,下一页
+    pageChange (id,rowindex) {
+      this.$router.replace({path:'/productmagDetail',query:{id:id,rowindex:rowindex}})
+      this.queryMainData(id)
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

+ 4 - 1
src/HDrpManagement/ProductMag/index.vue

@@ -13,6 +13,9 @@
       :options="options"
       @onFixedClick="rows"
       @checkboxCallBack="rows"
+      :detailPath="{
+        path:'/productmagDetail'
+      }"
       >
       <div slot="titleRight">
         <to_examine class="inline-16" style="margin-left: 10px" :rowData="rowData" @examineSuccess="onSuccess"></to_examine>
@@ -55,7 +58,7 @@
         </div>
       </template>
       <template v-slot:tbOpreation="scope">
-        <editTemp :data="scope.data.data"></editTemp>
+<!--        <editTemp :data="scope.data.data"></editTemp>-->
       </template>
     </basicLayout>
   </div>

+ 1 - 1
src/HDrpManagement/ProductMag/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="inline-16">
-    <el-button type="text" :disabled="form.status==='审核'" size="small" @click="onShow">编 辑</el-button>
+    <el-button  :disabled="form.status==='审核'" size="mini" @click="onShow">编 辑</el-button>
     <el-drawer append-to-body title="编辑产品" :visible.sync="dialogFormVisible" size="50%">
       <div class="drawer__panel" >
         <el-row :gutter="10">

+ 31 - 5
src/SManagement/project_target/components/table.vue

@@ -5,7 +5,8 @@
       :data="tableData"
       style="width: 100%"
       height="calc(100vh - 182px)"
-      size="small">
+      size="small"
+      :row-class-name="tableRowClassName">
       <el-table-column
         prop="depfullname"
         label="部门"
@@ -497,11 +498,13 @@
 <script>
 import selectPanel from '../components/selectPanel'
 export default {
+  props:["data"],
   data () {
     return {
       tableData:[],
       currentPage:0,
       total:0,
+      rowIndex:'',
       year:String((new Date()).getFullYear()),
       placeholder:'请输入部门/姓名/项目名称',
       params: {
@@ -531,11 +534,13 @@ 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);
+    /*  console.log("输出数据信息——————————————————————————————————————————")
+      console.log(this.tableData);*/
       this.total = res.total
+      /*console.log(this.data,"hrid的数据输出")*/
+
       this.currentPage = res.pageNumber
-      
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -567,21 +572,42 @@ export default {
     clearData() {
       this.params.content.where.condition = ''
       this.queryData()
+    },
+
+    tableRowClassName({row, rowIndex}) {
+      console.log(this.data,"行号")
+      if (row.hrid == this.data) {
+        return 'warning-row';
+      }
+      return '';
     }
   },
   mounted () {
+    /*this.queryData()*/
+  },
+  created() {
     this.queryData()
-  }
+  },
 }
 
 </script>
 <style>
+.el-table .warning-row {
+  background: oldlace;
+}
+
+.el-table .success-row {
+  background: #f0f9eb;
+}
 </style>
 <style scoped>
 .d-text{
   height: 46px;
   line-height: 46px;
 }
+.warning-row{
+  background:orange
+}
 .border{
   border:1px solid #c1bfbf;
   transform: scale(2,.2);

+ 12 - 4
src/SManagement/project_target/index.vue

@@ -6,9 +6,9 @@
     <div slot="content">
       <div class="personal-target">
         <div class="container normal-panel">
-          <table1 ref="table">
+          <table1 ref="table" :data="hrid">
             <template v-slot:detail="scope">
-              <el-button v-if="tool.checkAuth($route.name,'read') " type="text" size="small" @click="$store.dispatch('changeDetailDrawer',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,'read') " type="text" size="small" @click="$store.dispatch('changeDetailDrawer',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.hrid,year:scope.data.year,ownerHrid:hrid}})">详情</el-button>
 <!--              <el-button v-if="tool.checkAuth($route.name,'update') && scope.data.data.status === '新建' " 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>
@@ -41,7 +41,9 @@ export default {
   name: '',
   data() {
     return {
-      drawer:false
+      drawer:false,
+      session:[],
+      hrid:''
     };
   },
   components: { Header , table1},
@@ -61,7 +63,13 @@ export default {
     })
   },
   created() {
-    
+    console.log('执行')
+    this.session = sessionStorage.getItem('active_account')
+    /*var  r = "{'msg':'你好'}" ;*/
+    const map = eval("("+this.session+")"); //r为String类型的数据
+   /* const xx = map.msg;  //此时 xx 的值为 你好*/
+    console.log(map.hrid)
+    this.hrid = map.hrid
   },
   methods: {
     closeDrawer () {

+ 2 - 2
src/SManagement/project_target/modules/components/delProject.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" size="mini" @click="onShow">删除</el-button>
+    <el-button type="text" size="mini" @click="onShow" :disabled="disabled">删除</el-button>
 <!--    <el-popconfirm
         title="确定删除该项目嘛?"
     >
@@ -12,7 +12,7 @@
 <script>
 export default {
   name: "delProject",
-  props:["data"],
+  props:["data","disabled"],
   methods:{
     onShow(){
       console.log(this.data)

+ 2 - 2
src/SManagement/project_target/modules/components/projectAdd/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini"  type="primary" style="margin-bottom: 15px" @click="dialogTableVisible = true">添加项目</el-button>
+    <el-button size="mini"  type="primary" style="margin-bottom: 15px" @click="dialogTableVisible = true" :disabled="disabled">添加项目</el-button>
     <el-dialog
         title="添加项目"
         :visible.sync="dialogTableVisible"
@@ -34,7 +34,7 @@ import project from '../../components/projectAdd/project'
 export default {
   name: "index",
   components:{project},
-  props:["id","year"],
+  props:["id","year","disabled"],
   data(){
     return {
       dialogTableVisible:false,

+ 26 - 6
src/SManagement/project_target/modules/detailInfo.vue

@@ -13,7 +13,8 @@
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)"
       @onTabClick="onTabClick"
-      :noPageChange="true"
+      :noPageChange="false"
+      :hideTags="false"
       >
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
@@ -28,7 +29,7 @@
 
     <div slot="slot0">
       <div>
-        <project_add :id="this.$route.query.id" :year="this.$route.query.year" @onSuccess="onSuccess"></project_add>
+        <project_add :id="this.$route.query.id" :year="this.$route.query.year" @onSuccess="onSuccess" :disabled="disable"></project_add>
       </div>
       <tableLayout ref="list" :layout="tablecols" :data="list" :custom="true" height="300">
 <!--        <template v-slot:customcol="scope">
@@ -51,9 +52,9 @@
         </template>
 
         <template v-slot:opreation="scope">
-          <el-button type="text" size="mini" class="inline-16" @click="edit(scope.data)" v-if="editShow ">编辑</el-button>
+          <el-button type="text" size="mini" class="inline-16" @click="edit(scope.data)" v-if="editShow " :disabled="disable">编辑</el-button>
           <el-button type="text" style="color: #e09a1a" size="mini" class="inline-16" v-if="saveShow && actindex === (scope.data.index + 1)" @click="save(scope.data)">保存</el-button>
-          <project_del class="inline-16" v-if="editShow " :data="scope.data" @onDel="onProjectSuccess"></project_del>
+          <project_del class="inline-16" v-if="editShow " :data="scope.data" @onDel="onProjectSuccess" :disabled="disable"></project_del>
         </template>
       </tableLayout>
       <div>
@@ -102,9 +103,10 @@ export default {
     return {
       pickerOptions:{
         disabledDate(time){
-          return (time.getMonth() +1) < (new Date().getMonth() +1)
+          return ((time.getMonth() +1) < (new Date().getMonth() +1) && (time.getFullYear() > (new Date().getFullYear())))
         }
       },
+      disable:false,
       actindex:0,
       mainData:{},
       mainAreaData:[],
@@ -150,6 +152,11 @@ export default {
       })
       this.mainData = res.data
       console.log(this.mainData)
+      if (this.$route.query.id === this.$route.query.ownerHrid){
+        this.disable = false
+      }else{
+        this.disable = true
+      }
       this.changeDataStructure()
       this.getprojectTargetList()
     },
@@ -226,6 +233,10 @@ export default {
     async save(row){
       console.log("保存数据")
       console.log(row)
+      console.log(this.date)
+      const dateNow = new Date(this.date)
+      const month = dateNow.getMonth() +1
+      console.log(month)
       this.saveShow = false
       this.editShow = true
       this.actindex = 0
@@ -234,7 +245,8 @@ export default {
         "content": {
           "sa_salestargetid": row.sa_salestargetid,
           "target_l": row.target_l,
-          "target_h": row.target_h
+          "target_h": row.target_h,
+          "month":month
         },
       })
       this.tool.showMessage(res,()=>{
@@ -245,6 +257,14 @@ export default {
   created() {
     this.queryMainData(this.$route.query.id)
     this.tablecols = this.tool.tabelCol(this.$route.name).projectTargetTable.tablecols
+    console.log(this.$route.query.id)
+    console.log(this.$route.query.ownerHrid)
+    if (this.$route.query.id === this.$route.query.ownerHrid){
+      this.disable = false
+    }else {
+      this.disable = true
+    }
+    console.log(this.disable)
   }
 }
 </script>

+ 12 - 0
src/router/HDrpManagement.js

@@ -49,6 +49,18 @@ const HDrpManagement = [
       keeproute: true,
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/ProductMag/index'),
+    children: [
+      {
+        path: '/productmagDetail',
+        name: 'productmag',
+        meta: {
+          title: '商品管理详情',
+          ast_nav: true,
+          keeproute: true,
+        },
+        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/ProductMag/detail/index')
+      }
+    ]
   }, {
     path: '/sm_saleclass',
     name: 'saleclass',