修复bug及优化

src/Form/accountclass/add.vue

@@ -24,12 +24,12 @@
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-checkbox v-model="form.isorder" :false-label="0" :true-label="1" checked="checked">允许订货</el-checkbox>
+              <el-checkbox v-model="form.isorder" :false-label="0" :true-label="1" >允许订货</el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-checkbox v-model="form.isused" :false-label="0" :true-label="1" checked="checked">是否启用</el-checkbox>
+              <el-checkbox v-model="form.isused" :false-label="0" :true-label="1" >是否启用</el-checkbox>
             </el-form-item>
           </el-col>
         </el-form>
@@ -54,7 +54,7 @@ export default {
         sa_accountclassid: 0,
         accountno: '',
         accountname: '',
-        isorder: '',
+        isorder: 1,
         isused: 0,
         isrebate: 0
       },
@@ -82,6 +82,14 @@ export default {
           this.$emit('onSuccess')
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
+          this.form = {
+            sa_accountclassid: 0,
+                accountno: '',
+                accountname: '',
+                isorder: 1,
+                isused: 0,
+                isrebate: 0
+          }
         })
       })
     }

src/HDrpManagement/projectChange/modules/detail.vue

@@ -527,6 +527,8 @@ export default {
 
 
           {label:'负责人',value:this.mainData.name ? this.mainData.name : '--'},
+          {label:'结案/失败原因',value:this.mainData.status == '已结案'?this.mainData.endreason:this.mainData.status == '已失败'?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},
+        /*  {label:'失败原因',value:this.mainData.defeatreason?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},*/
        /*   {label:'修正比例',value:this.mainData.reward_rate ? Math.round((this.mainData.reward_rate * 100)*100)/100 + '%': '0%'},
           {label:'提成计算节点',value:this.mainData.reward_point ? this.mainData.reward_point : '--'},*/
         ],
@@ -541,8 +543,7 @@ export default {
           {label:'报备审核人',value:this.mainData.reportcheckby?this.mainData.reportcheckby:'--'},
           {label:'报备审核时间',value:this.mainData.reportcheckdate?this.mainData.reportcheckdate:'--'},
           /*{label:'锁定状态',value:this.mainData.locked == '0' ? '锁定' : '解锁'},*/
-          {label:'结案原因',value:this.mainData.endreason?this.mainData.endreason:'--'},
-          {label:'失败原因',value:this.mainData.defeatreason?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},
+
           {label:'转手次数',value:this.mainData.leader.length !== 0?this.mainData.leader[0].leadernum === 0?'0':this.mainData.leader[0].leadernum:'--'},
         ]
       }
@@ -622,6 +623,9 @@ export default {
 
 
           {label:'负责人',value:this.mainData.name ? this.mainData.name : '--'},
+         /* {label:'结案原因',value:this.mainData.endreason?this.mainData.endreason:'--'},
+          {label:'失败原因',value:this.mainData.defeatreason?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},*/
+          {label:'结案/失败原因',value:this.mainData.status == '已结案'?this.mainData.endreason:this.mainData.status == '已失败'?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},
         ],
 
         systemInfo: [
@@ -634,8 +638,6 @@ export default {
           {label:'报备审核人',value:this.mainData.reportcheckby?this.mainData.reportcheckby:'--'},
           {label:'报备审核时间',value:this.mainData.reportcheckdate?this.mainData.reportcheckdate:'--'},
           /*{label:'锁定状态',value:this.mainData.locked == '0' ? '锁定' : '解锁'},*/
-          {label:'结案原因',value:this.mainData.endreason?this.mainData.endreason:'--'},
-          {label:'失败原因',value:this.mainData.defeatreason?this.mainData.defeattype + ','+ this.mainData.defeatreason:'--'},
           {label:'转手次数',value:this.mainData.leader.length !== 0?this.mainData.leader[0].leadernum === 0?'0':this.mainData.leader[0].leadernum:'--'},
         ]
       }

src/HManagement/department/staff/detail/modules/main.vue

@@ -2,13 +2,6 @@
   <div>
     <div class="user-panel normal-margin">
       <el-descriptions title="基本信息" border :column="2" labelClassName="my-label" contentClassName="my-content">
-<!--          <div slot="title" class="flex-align-center flex-between">
-            <span>账号信息</span>
-            <div class="flex-align-center flex-between">
-              <slot name="createuser" :data="mainInfo"></slot>
-              <slot name="linkact" :data="mainInfo"></slot>
-            </div>
-          </div>-->
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="登录账号">{{mainInfo.accountno?mainInfo.accountno:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="账号名称">{{mainInfo.username?mainInfo.username:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="账号类型">{{mainInfo.usertypename?mainInfo.usertypename:'--'}}</el-descriptions-item>
@@ -16,13 +9,39 @@
         <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="状态">
           <span :style="{color:mainInfo.status == '0'?'#52c41a':''}">{{mainInfo.status == '0'?'在职':'离职'}}</span>
         </el-descriptions-item>
-<!--        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="报备领域">{{mainInfo.tradefield?mainInfo.tradefield:'&#45;&#45;'}}</el-descriptions-item>-->
-<!--          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="账号密码">
-            <div class="flex-align-center flex-between">
-              *******
-             <slot name="restpas"></slot>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="编号">{{mainInfo.hrcode?mainInfo.hrcode:'--'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="性别">{{mainInfo.sex?mainInfo.sex:'--'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="姓名">{{mainInfo.name?mainInfo.name:'--'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="电子邮箱">{{mainInfo.email?mainInfo.email:'--'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="身份证号">{{mainInfo.idcard?mainInfo.idcard:'--'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="部门">{{mainInfo.depname?mainInfo.depname:'--'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="职位">{{mainInfo.position?mainInfo.position:'--'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="办公电话">{{mainInfo.officetelephone?mainInfo.officetelephone:'--'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="汇报对象">{{mainInfo.reporthrname?mainInfo.reporthrname:'--'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="是否部门负责人">{{mainInfo.isleader == 1?'是':'否'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="是否服务人员">{{mainInfo.isworker == 1?'是':'否'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="是否上图员">{{mainInfo.isuppictured == 1?'是':'否'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="是否业务员">{{mainInfo.issalehr == 1?'是':'否'}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="营销区域">
+          <div v-if="mainInfo.salearea">
+            <div v-if="mainInfo.salearea.length > 0">
+              <div v-for="(item,index) in mainInfo.salearea">
+                <span v-if="mainInfo.salearea.length == 1 || index == mainInfo.salearea.length -1">
+                  {{item.areaname}}
+                </span>
+                <span v-else >
+                  {{item.areaname}} + ','
+                </span>
+              </div>
+            </div>
+            <div v-else>
+              --
             </div>
-          </el-descriptions-item>-->
+          </div>
+          <div v-else>
+            --
+          </div>
+        </el-descriptions-item>
       </el-descriptions>
     </div>
     <div class="">
@@ -30,8 +49,6 @@
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="创建人">{{mainInfo.createby?mainInfo.createby:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="创建时间">{{mainInfo.createdate?mainInfo.createdate:'--'}}</el-descriptions-item>
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="最近编辑人">{{mainInfo.changeby?mainInfo.changeby:'--'}}</el-descriptions-item>
-<!--          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" label="手机号">{{mainInfo.userphonenumber?mainInfo.userphonenumber:'&#45;&#45;'}}</el-descriptions-item>-->
-
           <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="最近编辑时间">{{mainInfo.changedate?mainInfo.changedate:'--'}}</el-descriptions-item>
       </el-descriptions>
     </div>

src/HManagement/department/staff/list/modules/add.vue

@@ -83,7 +83,7 @@
             </el-col>
             <el-col  :span="24">
               <el-form-item label="汇报对象:">
-                <selectMenber @selectMenber="selectMenber"></selectMenber>
+                <selectMenber @selectMenber="selectMenber" @clearMenber="form.hrid = ''"></selectMenber>
               </el-form-item>
             </el-col>
             <el-col :span="24" >

src/HManagement/department/staff/list/modules/edit.vue

@@ -83,7 +83,7 @@
             </el-col>
             <el-col  :span="24">
               <el-form-item label="汇报对象:">
-                <selectMenber :reporthrname="form.reporthrname" @selectMenber="selectMenber"></selectMenber>
+                <selectMenber :reporthrname="form.reporthrname" @selectMenber="selectMenber"  @clearMenber="form.hrid = ''"></selectMenber>
               </el-form-item>
             </el-col>
             <el-col  :span="24">

src/components/selectMenber/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div>
-    <el-input v-model="value.name" readonly placeholder="选择对象人员" suffix-icon="el-icon-arrow-down" autocomplete="off" @focus="dialogTableVisible = true" :disabled="disabled"></el-input>
+    <el-input v-model="value.name" readonly placeholder="选择对象人员" suffix-icon="el-icon-arrow-down" autocomplete="off" @focus="dialogTableVisible = true" :disabled="disabled">
+      <template slot="append">
+        <el-button size="small" @click="onClear" style="width:100%" type="primary">清空</el-button>
+      </template>
+    </el-input>
     <el-dialog title="选择人员" append-to-body :visible.sync="dialogTableVisible" width="80%">
       <div class="flex">
         <dep-list ref="list" style="width:200px" @onClick="onClick">
@@ -57,6 +61,11 @@ export default {
     onStaffSuccess () {
       this.$refs.staff.listData(this.depInfo.data.departmentid)
     },
+    onClear(){
+      this.value = ''
+      this.$emit('clearMenber')
+      this.dialogTableVisible = false
+    }
   },
   watch:{
     reporthrname (val) {