Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/contractManage/components/reverseCheck.vue

@@ -0,0 +1,50 @@
+<template>
+  <div class="inline-16">
+    <el-popconfirm title="确定反审核当前合同吗？" @confirm="submit">
+      <el-button size="mini" slot="reference">反 审 核</el-button>
+    </el-popconfirm>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  name: '',
+  data() {
+    return {
+      checkVisible:false
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  created() {
+  },
+  methods: {
+    async submit () {
+        let res = await this.$api.requested({
+          "id": 20221212135402,
+          "content": {
+              "sa_contractid": this.data.sa_contractid
+          },
+        })
+        this.tool.showMessage(res,() => {
+          this.$emit('onSuccess')
+        })
+    },
+  },
+};
+</script>
+
+<style scoped>
+.box p {
+  line-height: 40px;
+  text-align: center;
+}
+.box p:hover {
+  background: #EBF1FE;
+  color: #6191F8;
+  cursor: pointer;
+}
+</style>

src/HDrpManagement/contractManage/components/submitCheck.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16" v-if="data.status">
-    <el-popconfirm title="确定提交当前合同吗？" @confirm="submit">
-      <el-button size="mini" slot="reference" :disabled="disabled" v-if="data.status=='新建'">提 交</el-button>
+    <el-popconfirm v-if="refresh" title="确定提交当前合同吗？" @confirm="submit">
+      <el-button size="mini" slot="reference" v-if="data.status=='新建'">提 交</el-button>
     </el-popconfirm>
 
     <el-dropdown :hide-on-click="false" @command="check">
@@ -22,12 +22,20 @@ export default {
   name: '',
   data() {
     return {
-      checkVisible:false
+      checkVisible:false,
+      refresh:true
     };
   },
   computed:{
   },
   watch:{
+    data (val) {
+      console.log(val);
+      this.refresh = false
+      setTimeout(() => {
+        this.refresh = !this.refresh
+      },50)
+    }
   },
   created() {
     console.log('eeee',this.disabled);

src/HDrpManagement/contractManage/components/taskTarget/editTarget.vue

@@ -34,7 +34,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="挑战目标">
-                  <el-input v-model="form[`s${index+1}l`]" disabled autocomplete="off"></el-input>
+                  <el-input v-model="form[`s${index+1}h`]" disabled autocomplete="off"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="24"></el-col>
@@ -123,8 +123,8 @@ export default {
     },
     async onSubmit () {
       for (var i = 0 ; i< 4 ; i++) {
-        this.form[`s${i + 1}l`] = this.form[`m${1 + i*3}l`] + this.form[`m${2 + i*3}l`] + this.form[`m${3 + i*3}l`]
-        this.form[`s${i + 1}h`] = this.form[`m${1 + i*3}h`] + this.form[`m${2 + i*3}h`] + this.form[`m${3 + i*3}h`]
+        this.form[`s${i + 1}l`] = parseInt(this.form[`m${1 + i*3}l`]) + parseInt(this.form[`m${2 + i*3}l`]) + parseInt(this.form[`m${3 + i*3}l`])
+        this.form[`s${i + 1}h`] = parseInt(this.form[`m${1 + i*3}h`]) + parseInt(this.form[`m${2 + i*3}h`]) + parseInt(this.form[`m${3 + i*3}h`])
       }
       this.form.y1l = this.form.s1l + this.form.s2l + this.form.s3l + this.form.s4l
       this.form.y1h = this.form.s1h + this.form.s2h + this.form.s3h + this.form.s4h

src/HDrpManagement/contractManage/modules/detail.vue

@@ -15,9 +15,10 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
-        <editBtn :modelList="modelList" v-if="tool.checkAuth($route.name,'update')" :disabled="mainData.status != '新建' || !isLeader" @onSuccess="queryMainData;$refs.billno.listData()" :data="mainData" class="inline-16"/>
+        <editBtn :modelList="modelList" v-if="tool.checkAuth($route.name,'update')" :disabled="mainData.status != '新建' || !isLeader" @onSuccess="queryMainData();$refs.billno.listData()" :data="mainData" class="inline-16"/>
         <submit-check :disabled="!isLeader" :data="mainData" @onSuccess="queryMainData" />
-        <contractOver v-if="tool.checkAuth($route.name,'contractOver') && mainData.status != '已终止'" :disabled="!isLeader" :id="mainData.sa_contractid" @onSuccess="queryMainData"/>
+        <reverseCheck @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status == '审核'" />
+        <contractOver v-if="tool.checkAuth($route.name,'contractOver') && mainData.status != '已终止' && mainData.status != '审核' && isLeader" :disabled="!isLeader" :id="mainData.sa_contractid" @onSuccess="queryMainData"/>
         <Del :idName="20221121202502" :id="mainData.sa_contractid" idKey="sa_contractids" class="inline-16" v-if="tool.checkAuth($route.name,'delete') && mainData.type == '新建' && isLeader"/>
       </div>
       <div slot="slot0" >
@@ -150,6 +151,7 @@ import contractClause from '../components/contractClause/contractClause'
 import editTarget from '../components/taskTarget/editTarget'
 import taskTarget from '../components/taskTarget//taskTarget'
 import contractOver from '../components/contractOver'
+import reverseCheck from '../components/reverseCheck'
 export default {
   name: "detail",
   data() {
@@ -175,12 +177,13 @@ export default {
     contractClause,
     editTarget,
     taskTarget,
-    contractOver
+    contractOver,
+    reverseCheck
   },
   watch: {
     mainData: {
       handler (val) {
-        this.isLeader = val.leader ? JSON.parse(window.sessionStorage.getItem('active_account')).userid == val.leader[0].userid : ''      
+        this.isLeader = val.leader ? JSON.parse(window.sessionStorage.getItem('active_account')).userid == val.leader[0].userid : false
       },
       deep:true,
       immediate:true

src/HDrpManagement/contractModel/modules/detail.vue

@@ -19,21 +19,19 @@
               <span v-else>{{scope.column.data[scope.column.columnname]}}</span>
             </div>
             <div v-else-if="scope.column.columnname == 'editable'">
-              <el-switch
+              <el-checkbox
                 v-if="currentEdit.sa_contract_template_clauseid!=scope.column.data.sa_contract_template_clauseid && scope.column.data.sa_contract_template_clauseid != 0"
                 :disabled="true"
                 :value="scope.column.data.editable"
-                :active-value="1"
-                :inactive-value="0"
-                size="mini">
-              </el-switch>
-              <el-switch
+                :true-label="1"
+                :false-label="0">
+              </el-checkbox>
+              <el-checkbox
                 v-else
                 v-model="currentEdit.editable"
-                :active-value="1"
-                :inactive-value="0"
-                size="mini">
-              </el-switch>
+                :true-label="1"
+                :false-label="0">
+              </el-checkbox>
             </div>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>

src/HManagement/clueManage/clue_rule/index.vue

@@ -23,9 +23,9 @@
       </div>
       <div v-show="activeName === 'second'">
         <setSaler ref="setSaler">
-          <el-button v-if="tool.checkAuth($route.name,'agent_insert')" slot="add" type="default" size="small" @click="onSalerShow">添 加</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'saler_insert')" slot="add" type="default" size="small" @click="onSalerShow">添 加</el-button>
           <template v-slot:del="scope">
-            <del-saler v-if="tool.checkAuth($route.name,'agent_delete')" :data="scope.data.data" @onSuccess="onSalerSuccess"></del-saler>
+            <del-saler v-if="tool.checkAuth($route.name,'saler_delete')" :data="scope.data.data" @onSuccess="onSalerSuccess"></del-saler>
           </template>
         </setSaler>
         <selectSaler ref="selectSaler" @onSuccess="onSalerSuccess"></selectSaler>

src/HManagement/roleManage/modules/role_details.vue

@@ -18,7 +18,7 @@
       </div>
       <div slot="customOperation" >
         <el-popconfirm title="确定删除当前角色吗？" @confirm="deleteRow()">
-          <el-button slot="reference" size="mini">删 除</el-button>
+          <el-button slot="reference" v-if="tool.checkAuth($route.name,'delete')" class="inline-16" size="mini">删 除</el-button>
         </el-popconfirm>
       </div>
       <div class="container normal-panel" slot="slot0" >

src/SManagement/orderclue/components/follow.vue

@@ -6,7 +6,7 @@
         <el-form :model="param" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm"
           label-position="right">
           <el-form-item label="跟进时间">
-            <el-date-picker v-model="timer" type="date" format="yyyy-MM-dd HH:mm:ss" disabled size="small">
+            <el-date-picker v-model="timer" type="date" format="yyyy-MM-dd" size="small">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="本次跟进方式" prop="followupmode">

src/SManagement/orderclue_detail/index.vue

@@ -25,8 +25,8 @@
           :teamList="teamList()"  
           v-if="userInfo.isAuth == 1 ? mainData.status == '待跟进' || mainData.status == '跟进中' : ''"></move> -->
         <changeData v-if="tool.checkAuth($route.name,'change')" :data="mainData" :disabled="!isHandle" class="inline-16"/>
-        <noNull v-if="tool.checkAuth($route.name,'change')" class="inline-16" :disabled="!isHandle" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid"/>
         <el-button v-if="tool.checkAuth($route.name,'goBack')" :disabled="!isHandle" class="inline-16" size="mini" @click="goBack">退 回</el-button>
+        <noNull v-if="tool.checkAuth($route.name,'change')" class="inline-16" :disabled="!isHandle" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid"/>
         <Del v-if="tool.checkAuth($route.name,'delete')" class="inline-16" :disabled="!isHandle" :idName="20221123193702" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid" idKey="sat_orderclueids"/>
       </div>
       <div slot="slot1" class="container normal-panel">
@@ -138,10 +138,6 @@ export default {
           label:'跟进次数',
           value:this.mainData.followcount
         },
-        {
-          label:'转化次数',
-          value:this.mainData.changecount
-        },
       ]
       this.detailInfo = {
         baseInfo: [
@@ -187,15 +183,14 @@ export default {
           {label:'创建人',value:this.mainData.createBy},
           {label:'分配人',value:this.mainData.assignedBy},
           {label:'最近跟进人',value:this.mainData.followBy},
-          {label:'转移人',value:this.mainData.changeBy},
           {label:'最近编辑人',value:this.mainData.editBy},
           {label:'创建时间',value:this.mainData.createDate},
           {label:'分配时间',value:this.mainData.assignedDate},
           {label:'最近跟进时间',value:this.mainData.followDate},
-          {label:'最近转移时间',value:this.mainData.changeDate},
           {label:'最近编辑时间',value:this.mainData.editDate},
           {label:'最近编辑时间',value:this.mainData.editDate},
           {label:'最近编辑时间',value:this.mainData.editDate},
+          {label:'转化次数',value:this.mainData.changecount},
         ]
       }
     },