暂存

src/Form/cashcouponPay/add.vue

@@ -74,9 +74,9 @@
                 <el-select v-model="form.subclass" placeholder="请选择分类明细" style="width: 100%">
                   <el-option
                       v-for="item in subClassData"
-                      :key="item"
-                      :label="item"
-                      :value="item">
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -84,6 +84,7 @@
             <el-col :span="12">
               <el-form-item label="单据日期:" prop="billdate">
                 <el-date-picker
+                    style="width: 100%"
                     v-model="form.billdate"
                     format="yyyy-MM-dd"
                     value-format="yyyy-MM-dd"
@@ -132,6 +133,13 @@
                         <span style="margin-left: 10px">{{ scope.row.subclass?scope.row.subclass:'--' }}</span>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                        label="单据时间"
+                    >
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.billdate?scope.row.billdate:'--' }}</span>
+                      </template>
+                    </el-table-column>
                   </el-table>
                   <div class="container normal-panel" style="text-align:right">
                     <el-pagination
@@ -150,7 +158,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="金额:" prop="amount">
+              <el-form-item label="支出金额:" prop="amount">
                 <el-input v-model="form.amount" placeholder="请输入金额" type="number"></el-input>
               </el-form-item>
             </el-col>
@@ -275,6 +283,9 @@ export default {
             "sa_cashbillid_rebate": '', //所选的代金券id
             "sa_cashbillid_billno":""
           }
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/cashcouponPayDetail',query:{id:res.data.sa_cashbillid,rowindex:res.data.rowindex}})
+
         })
       })
     },
@@ -287,15 +298,15 @@ export default {
     },
     /*获取分类明细*/
     subClassList(){
-      this.$store.dispatch('optiontypeselect','rebatebillpaytype').then(res=>{
+      this.$store.dispatch('optiontypeselect','rebatepaytype').then(res=>{
         console.log(res,'分类明细')
-        let index = ''
+        /*let index = ''
         for (var i = 0 ;i<res.data.length; i++){
           if (res.data[i].value === '返利金'){
             index = i
           }
-        }
-        this.subClassData = res.data[index].subvalues
+        }*/
+        this.subClassData = res.data
       })
     },
     /*获取企业*/

src/Form/cashcouponPay/edit.vue

@@ -74,9 +74,9 @@
                 <el-select v-model="form.subclass" placeholder="请选择分类明细" style="width: 100%">
                   <el-option
                       v-for="item in subClassData"
-                      :key="item"
-                      :label="item"
-                      :value="item">
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -84,6 +84,7 @@
             <el-col :span="12">
               <el-form-item label="单据日期:" prop="billdate">
                 <el-date-picker
+                    style="width: 100%"
                     v-model="form.billdate"
                     format="yyyy-MM-dd"
                     value-format="yyyy-MM-dd"
@@ -132,6 +133,13 @@
                         <span style="margin-left: 10px">{{ scope.row.subclass?scope.row.subclass:'--' }}</span>
                       </template>
                     </el-table-column>
+                    <el-table-column
+                        label="单据时间"
+                    >
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.billdate?scope.row.billdate:'--' }}</span>
+                      </template>
+                    </el-table-column>
                   </el-table>
                   <div class="container normal-panel" style="text-align:right">
                     <el-pagination
@@ -150,7 +158,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="金额:" prop="amount">
+              <el-form-item label="支出金额:" prop="amount">
                 <el-input v-model="form.amount" placeholder="请输入金额" type="number"></el-input>
               </el-form-item>
             </el-col>
@@ -286,15 +294,8 @@ export default {
     },
     /*获取分类明细*/
     subClassList(){
-      this.$store.dispatch('optiontypeselect','rebatebillpaytype').then(res=>{
-        console.log(res,'分类明细')
-        let index = ''
-        for (var i = 0 ;i<res.data.length; i++){
-          if (res.data[i].value === '返利金'){
-            index = i
-          }
-        }
-        this.subClassData = res.data[index].subvalues
+      this.$store.dispatch('optiontypeselect','rebatepaytype').then(res=>{
+        this.subClassData = res.data
       })
     },
     /*获取企业*/

src/HDrpManagement/contractManage/modules/detail.vue

@@ -188,11 +188,21 @@ export default {
   watch: {
     mainData: {
       handler (val) {
-        if (Object.keys(JSON.parse(window.sessionStorage.getItem('userInfo'))).length > 0) {
+        if (this.mainData.leader.length !== 0){
+          if (JSON.parse(window.sessionStorage.getItem('active_account')).userid === this.mainData.leader[0].userid){
+            /*是负责人*/
+            this.isLeader = true
+          }else {
+            /*不是负责人*/
+            this.isLeader = false
+          }
+        }
+               /*if (Object.keys(JSON.parse(window.sessionStorage.getItem('userInfo'))).length > 0) {
         this.isLeader = val.leader ? JSON.parse(window.sessionStorage.getItem('active_account')).userid == val.leader[0].userid : false
         } else {
           this.isLeader = true
-        }
+        }*/
+
       },
       deep:true,
       immediate:true

src/HDrpManagement/orderManage/modules/edit.vue

@@ -338,6 +338,7 @@ export default {
         }
       })
       console.log(res)
+      this.$emit('onSuccess')
       this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
       res.msg === '成功' ?this.data.rebateamount = res.data:''
     },

src/HManagement/accountManage/modules/account_detail.vue

@@ -11,26 +11,15 @@
       idname="userid"
       ownertable="sys_users"
       tags=""
-      :tabs="['员工信息','角色信息']"
+      :tabs="[this.mainData.usertype === 1 || this.mainData.usertype === 0 ? '人员信息' : '基本信息','角色信息']"
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" >
         <useTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></useTemp>
         <unuseTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></unuseTemp>
       </div>
-      <div class="container normal-panel" slot="slot0" >
-        <el-descriptions :column="4">
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="编号">{{mainData.hrmsg.hrcode?mainData.hrmsg.hrcode:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="身份证号">{{mainData.hrmsg.idcard?mainData.hrmsg.idcard:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="部门">{{mainData.hrmsg.depname?mainData.hrmsg.depname:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="部门负责人">{{mainData.hrmsg.isleader === 1?'是':'否'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="职位">{{mainData.hrmsg.position?mainData.hrmsg.position:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="办公电话">{{mainData.hrmsg.officetelephone?mainData.hrmsg.officetelephone:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="姓名">{{mainData.hrmsg.name?mainData.hrmsg.name:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="电话">{{mainData.hrmsg.phonenumber?mainData.hrmsg.phonenumber:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="性别">{{mainData.hrmsg.sex?mainData.hrmsg.sex:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="电子邮箱">{{mainData.hrmsg.email?mainData.hrmsg.email:'--'}}</el-descriptions-item>
-        </el-descriptions>
+      <div slot="slot0" >
+        <detailInfo :more="true" :data="detailInfo"></detailInfo>
       </div>
       <div class="container normal-panel" slot="slot1" >
         <tableLayout :layout="table_roleinfo" :data="roleData" :opwidth="200" :custom="false">
@@ -46,6 +35,8 @@
 <script>
 import unuseTemp from './unuseAccount.vue'
 import useTemp from './useAccdount.vue'
+
+import detailInfo from '@/components/detailInfo/index'
 export default {
   name: "detail",
   data() {
@@ -57,12 +48,15 @@ export default {
       table_roleinfo:[],
       list:[],
       hrmsg:[],
-      roleData:[]
+      roleData:[],
+      accountInfo:{},
+      detailInfo:[]
     }
   },
   components:{
     unuseTemp,
-    useTemp
+    useTemp,
+    detailInfo
   },
   methods:{
     async queryMainData(id) {
@@ -90,6 +84,89 @@ export default {
       // 插入角色数据
       this.roleData = res.data.userrole
       this.changeDataStructure()
+
+      this.getAccountInfo()
+    },
+    /* 获取企业员工信息 || 合作商/合作商员工信息 */
+    async getAccountInfo () {
+      let res
+      if (this.mainData.usertype === 1 || this.mainData.usertype === 0) {
+        res = await this.$api.requested({
+          "classname":"webmanage.hr.hr",
+          "method": "query_hrMain",
+          "content": {
+            hrid:this.mainData.hrmsg.hrid
+          }
+        })
+        this.accountInfo = res.data
+        console.log('企业员工',this.accountInfo);
+        
+      } else {
+        res = await this.$api.requested({
+          "classname":"webmanage.sale.agents.agents",
+          "method": "query_agentMain",
+          "content": {
+            sa_agentsid:this.mainData.agentmsg.sa_agentsid
+          }
+        })
+        this.accountInfo = res.data
+        console.log('合作商',this.accountInfo);
+      }
+
+      this.detailInfo = this.mainData.usertype === 1 || this.mainData.usertype === 0 
+      ? 
+        [{
+          title:'基本信息',
+          info: [
+            {label:'登录账号',value:this.accountInfo.accountno},
+            {label:'账号名称',value:this.accountInfo.username},
+            {label:'账号类型',value:this.accountInfo.usertypename},
+            {label:'授权角色',value:this.accountInfo.userrole},
+            {label:'电话',value:this.accountInfo.accountno !== ''?this.accountInfo.userphonenumber:this.accountInfo.phonenumber},
+            {label:'办公电话',value:this.accountInfo.officetelephone},
+            {label:'部门',value:this.accountInfo.depname},
+            {label:'职位',value:this.accountInfo.position},
+            {label:'是否部门负责人',value:this.accountInfo.isleader === 1?'是':'否'},
+            {label:'电子邮箱',value:this.accountInfo.email},
+            {label:'汇报对象',value:this.accountInfo.reporthrname},
+            {label:'身份证号',value:this.accountInfo.idcard},
+            {label:'性别',value:this.accountInfo.sex},
+            {label:'是否服务人员',value:this.accountInfo.isworker === 1?'是':'否'},
+          ]
+        },{
+          title:'系统信息',
+          info: [
+            {label:'创建人',value:this.accountInfo.createby},
+            {label:'创建时间',value:this.accountInfo.createdate},
+            {label:'提交人',value:this.accountInfo.submitby},
+            {label:'提交时间',value:this.accountInfo.submitdate},
+          ]
+        }]
+      :
+        [{
+          title:'基本信息',
+          info: [
+            {label:'经销商编号',value:this.accountInfo.agentnum},
+            {label:'erp编号',value:this.accountInfo.erpagentnum},
+            {label:'是否服务经销商',value:this.accountInfo.isservice?'是':'否'},
+            {label:'状态',value:this.accountInfo.status},
+            {label:'签约日期',value:this.accountInfo.signdate},
+            {label:'经销商类型',value:this.accountInfo.type},
+            {label:'上级经销商',value:this.accountInfo.parent_enterprisename},
+            {label:'经销商等级',value:this.accountInfo.grade},
+            {label:'省市县',value:`${this.accountInfo.province}-${this.accountInfo.city}-${this.accountInfo.county}`},
+            {label:'详细地址',value:this.accountInfo.address},
+            {label:'企业联系人',value:this.accountInfo.contact},
+            {label:'联系电话',value:this.accountInfo.phonenumber},
+            {label:'税号',value:this.accountInfo.taxno},
+            {label:'免运费金额',value:this.accountInfo.freefreightamount},
+            {label:'订单可退货天数',value:this.accountInfo.limitreturnday},
+            {label:'是否订单审核可开票',value:this.accountInfo.invoicingpoint == '1' ? '订单审核' : '发货'},
+            {label:'是否授权所有营销类别',value:this.accountInfo.saleclassauth ? '否' : '是'},
+            {label:'创建人',value:this.accountInfo.createby},
+            {label:'创建时间',value:this.accountInfo.createdate},
+          ]
+        }]
     },
     changeDataStructure() {
       this.mainAreaData = [

src/HManagement/clueManage/m_activity/modules/details.vue

@@ -47,7 +47,9 @@ export default {
   name: "detail",
   data() {
     return {
-      mainData:{},
+      mainData:{
+        disabled:false
+      },
       mainAreaData:{},
       detailInfo:{},
     }
@@ -57,6 +59,20 @@ export default {
       status: () => this.mainData.status
     }
   },
+  watch:{
+    mainData(val) {
+      if (this.mainData.leader.length !== 0){
+        if (JSON.parse(window.sessionStorage.getItem('active_account')).userid === this.mainData.leader[0].userid){
+          /*是负责人*/
+          this.mainData.disabled = true
+        }else {
+          /*不是负责人*/
+          this.mainData.disabled = false
+        }
+      }
+      console.log("权限结果", this.mainData.disabled)
+    }
+  },
   components:{
     BaseInfo,
     DetailTable,
@@ -75,7 +91,7 @@ export default {
 
         }
       })
-      this.mainData = res.data
+      this.mainData = Object.assign({},this.mainData,res.data)
       this.$refs.details.param.content.type = this.$route.query.tabIndex
       this.changeDataStructure()
       console.log(this.mainData);

src/HManagement/clueManage/m_activity/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" @click="onShow()" v-if="status() == '新建'" type="primary">编 辑</el-button>
+    <el-button size="mini" @click="onShow()" v-if="status() == '新建'" :type="!data.disabled?'':'primary'" :disabled="!data.disabled">编 辑</el-button>
     <el-drawer
       title="编辑活动"
       :visible.sync="drawer"

src/HManagement/clueManage/m_activity/modules/finish.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="data.status !== '结束'" class="inline-16">
-      <el-button type="primary" slot="reference" size="mini" @click="onShow">结 束</el-button>
+      <el-button :type="!data.disabled?'':'primary'" :disabled="!data.disabled" slot="reference" size="mini" @click="onShow">结 束</el-button>
   </div>
 </template>
 

src/HManagement/clueManage/m_activity/modules/relase.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="inline-16">
-    <el-button :type="data.status === '结束'?'':'primary'" :disabled="data.status === '结束'" size="mini" @click="onShow">{{data.status === '新建'?'发 布':data.status === '结束'?'发 布':'取消发布'}}</el-button>
+    <el-button :type="data.status === '结束' || !data.disabled?'':'primary'" :disabled="data.status === '结束' || !data.disabled" size="mini" @click="onShow">{{data.status === '新建'?'发 布':data.status === '结束'?'发 布':'取消发布'}}</el-button>
   </div>
 </template>
 

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -482,6 +482,7 @@ export default {
           "rebateamount":rebatebalance > amount ? amount : rebatebalance//返利金使用金额
         }
       })
+      this.$emit('onSuccess')
       // this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
 
     }

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -298,7 +298,7 @@ export default {
     },
     async rebateUsedChange(){
       console.log(this.data)
-      if(this.data.status != '新建') return 1
+      if(this.data.status != '新建') return false
       let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
       let rebatebalance = this.data.rebatebalance; //返利金账户余额
       const res = await this.$api.requested({
@@ -309,7 +309,7 @@ export default {
           "rebateamount": rebatebalance > amount ? amount : rebatebalance //返利金使用金额
         }
       })
-      console.log(res)
+      this.$emit('onSuccess')
       // this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
     },
     onShow () {

src/SManagement/orderclue_detail/index.vue

@@ -74,7 +74,16 @@ export default {
   },
   watch: {
    mainData(val) {
-      let is 
+     if (this.mainData.leader.length !== 0){
+       if (JSON.parse(window.sessionStorage.getItem('active_account')).userid === this.mainData.leader[0].userid){
+         /*是负责人*/
+         this.isHandle = true
+       }else {
+         /*不是负责人*/
+         this.isHandle = false
+       }
+     }
+     /* let is
       if (Object.keys(JSON.parse(window.sessionStorage.getItem('userInfo'))).length > 0) {
         console.log('负责人逻辑');
         
@@ -88,7 +97,7 @@ export default {
         console.log('不是负责人逻辑');
         is = true
       }
-      this.isHandle = is
+      this.isHandle = is*/
       console.log(this.isHandle,'权限');
       
    }