Merge remote-tracking branch 'origin/mergeBranch' 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,18 +1,9 @@
 <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-button size="mini" slot="reference" v-if="data.status=='已提交'">审 核</el-button>
     </el-popconfirm>
-
-    <el-dropdown :hide-on-click="false" @command="check">
-      <span class="el-dropdown-link">
-        <el-button size="mini" :disabled="disabled" v-if="data.status == '已提交'">审 核</el-button>
-      </span>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item command="1">通过</el-dropdown-item>
-        <el-dropdown-item command="0">退回</el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
   </div>
 </template>
 
@@ -22,18 +13,27 @@ 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);
   },
   methods: {
     async submit () {
+      if (this.data.status == '新建') {
         let res = await this.$api.requested({
           "id": 20221121202802,
           "content": {
@@ -43,18 +43,18 @@ export default {
         this.tool.showMessage(res,() => {
           this.$emit('onSuccess')
         })
-    },
-    async check (num) {
-      let res = await this.$api.requested({
-        "id": 20221121203102,
-        "content": {
-            "type":num,//0：不通过，1：通过
-            "sa_contractids": [this.data.sa_contractid]
-        },
-      })
-      this.tool.showMessage(res,() => {
-        this.$emit('onSuccess')
-      })
+      } else {
+        let res = await this.$api.requested({
+          "id": 20221121203102,
+          "content": {
+              "type":1,//0：不通过，1：通过
+              "sa_contractids": [this.data.sa_contractid]
+          },
+        })
+        this.tool.showMessage(res,() => {
+          this.$emit('onSuccess')
+        })
+      }
     },
   },
 };

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_import/detailPage/index.vue

@@ -3,9 +3,6 @@
     <basicDetails
         ref="details"
         :titleText="mainData.uploadbillnum"
-        :oldFormPath="{
-          edit:'HManagement/clueManage/clue_public/modules',
-        }"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20221101094702"
@@ -19,6 +16,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation">
+        <!-- <edit :data="mainData" @onSuccess="queryMainData"></edit> -->
         <!-- <div v-if="tool.checkAuth($route.name,'update') && mainData.status === '待审核'" class="container normal-panel sticky inline-16">
           <save  @onSave="updateOrderclueuploadbill"></save>
         </div> -->
@@ -41,7 +39,8 @@ import save from './modules/op_save.vue'
 import onDel from './modules/op_del.vue'
 import onCheck from './modules/op_check.vue'
 import switchData from './modules/switchData.vue'
-import billBody from './modules/billBody.vue'
+import billBody from './modules/billBody'
+import edit from './modules/edit'
 
 import BaseInfo from '@/HDrpManagement/projectChange/modules/modules/baseInfo/baseInfo'
 
@@ -62,7 +61,7 @@ export default {
     }
   },
   components:{
-    BaseInfo,save,onDel,onCheck,switchData,billBody
+    BaseInfo,save,onDel,onCheck,switchData,billBody,edit
   },
   methods:{
     detailCreate (param) {
@@ -92,6 +91,7 @@ export default {
       this.tool.showMessage(res)
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
           {
           label:'单号',
@@ -99,7 +99,18 @@ export default {
         },
         {
           label:'状态',
-          value:this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '待审核':
+                style = {color: 'rgb(82, 196, 26)'}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         },
         {
           label:'线索类型',
@@ -118,7 +129,7 @@ export default {
           },
           {
             label:'状态',
-            value:this.mainData.status
+            value:this.mainData.status,
           },
           {
             label:'导入人',

src/HManagement/clueManage/clue_import/detailPage/modules/edit.vue

@@ -81,12 +81,15 @@ export default {
       this.form = Object.assign({},this.form,this.data)
       this.form.enterprisename = this.data.enterprisename_customer
       this.form.province = [this.data.province,this.data.city,this.data.county]
-      console.log(this.form.province);
+      console.log(this.form);
       
     },
     async onSubmit () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false;
+        this.form.city = this.form.province[1]
+        this.form.county = this.form.province[2]
+        this.form.province = this.form.province[0]
         const res = await this.$api.requested({
           "classname":"webmanage.saletool.orderclue.orderclue",
           "method": "insertormodify_Orderclueuploadbillmx",
@@ -101,6 +104,8 @@ export default {
     },
     cascaderChange (val) {
       this.form.province = val
+      console.log(this.form.province);
+      
     }
   }
 }

src/HManagement/clueManage/clue_private/index.vue

@@ -13,6 +13,7 @@
       :options="options"
       :detailPath="{path:'/clueDetail_private'}"
       @listCreate="list"
+      @listData="listdata"
     >
       <div slot="titleRight" style="display:flex;margin-left:10px">
         <distribution class="inline-16" v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$refs.basicLayout.listData()"></distribution>
@@ -120,6 +121,10 @@ export default {
       
       this.arealist = this.tool.createMenu(res.data)
     },
+        listdata(data) {
+      console.log(data);
+      
+    }
   }
 }
 

src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -111,6 +111,7 @@ export default {
       this.changeDataStructure()
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
           {
           label:'客户名称',
@@ -138,11 +139,36 @@ export default {
         },
         {
           label:'跟进状态',
-          value:this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '已过期':
+                style = {color:'#333'}
+                break;
+              case '跟进中':
+                style = {color:'#52C41A'}
+                break;
+              case '待跟进':
+                style = {color:'#FA8C16'}
+                break;
+              case '已成交':
+                style = {color:'#F60909'}
+                break; 
+              case '无效':
+                style = {color:'#BBBBBB'}
+                break; 
+              default:
+                break;
+            }
+            return style
+            
+          }
         },
         {
           label:'分配状态',
-          value:this.mainData.allocationstatus
+          value:this.mainData.allocationstatus,
+
         },
       ]
       this.detailInfo = {

src/HManagement/clueManage/clue_public/index.vue

@@ -15,13 +15,7 @@
       @listCreate="list"
     >
     <div slot="custom" style="display:flex">
-      <div class="label_center">
-        <p class="search__label">跟进状态:</p>
-        <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.pageNumber=1;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
-          <el-option v-for="item in statusList" :label="item.value" :key="item.rowindex" :value="item.remarks">
-          </el-option>
-        </el-select>
-      </div>
+
     </div>
       <div slot="titleRight" style="display:flex;margin-left:10px">
         <distribution class="inline-16" v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$refs.basicLayout.listData()"></distribution>
@@ -106,6 +100,7 @@ export default {
       
       this.arealist = this.tool.createMenu(res.data)
     },
+
   }
 }
 

src/HManagement/clueManage/clue_public/modules/detail.vue

@@ -169,6 +169,7 @@ export default {
       this.changeDataStructure()
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
           {
           label:'客户名称',
@@ -200,7 +201,31 @@ export default {
         },
         {
           label:'跟进状态',
-          value:this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '已过期':
+                style = {color:'#333'}
+                break;
+              case '跟进中':
+                style = {color:'#52C41A'}
+                break;
+              case '待跟进':
+                style = {color:'#FA8C16'}
+                break;
+              case '已成交':
+                style = {color:'#F60909'}
+                break; 
+              case '无效':
+                style = {color:'#BBBBBB'}
+                break; 
+              default:
+                break;
+            }
+            return style
+            
+          }
         },
       ]
       this.detailInfo = {

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/clueManage/m_activity/index.vue

@@ -15,6 +15,23 @@
       @listCreate="list"
     >
      <div slot="custom" style="display:flex">
+       <div class="label_center">
+        <p class="search__label">范围:</p>
+        <el-select
+          class="inline-16"
+          size="small"
+          v-model="area"
+          placeholder="请选择范围"
+          @change="$refs.basicLayout.param.content.pageNumber=1;$refs.basicLayout.param.content.type=area;$refs.basicLayout.listData()"
+        >
+          <el-option
+            v-for="item in areaList2"
+            :key="item.remarks"
+            :label="item.value"
+            :value="item.remarks"
+          ></el-option>
+        </el-select>
+      </div>
        <div class="label_center">
         <p class="search__label">活动类型:</p>
         <el-select v-model="search.type" style="margin-right:10px" size="small" placeholder="请选择活动类型" @change="campaigntypeChange" clearable>
@@ -64,7 +81,10 @@ export default {
     return {
       options:[],
       search:{},
-      campaigntypeList:''
+      campaigntypeList:'',
+      areaList2:[],
+      area:''
+
     }
   },
   provide () {
@@ -96,8 +116,11 @@ export default {
       this.$refs.basicLayout.listData()
     },
   },
-  created () {
+  async created () {
     this.campaigntype()
+
+    const res = await this.$store.dispatch('optiontypeselect','dataarea')
+    this.areaList2 = res.data
   }
 }
 

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

@@ -80,8 +80,11 @@ export default {
       })
       this.mainData = res.data
       this.changeDataStructure()
+      console.log(this.mainData);
+      
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
           {
           label:'活动名称',
@@ -101,7 +104,18 @@ export default {
         },
         {
           label:'状态',
-          value:this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '发布':
+                style = {color:"rgb(82, 196, 26)"}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         },
       ]
       this.detailInfo = {

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/HManagement/salesForecastTemplate/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="queryRoles(dialogFormVisible = true)">新 建</el-button>
-    <el-drawer append-to-body title="新建模板" :visible.sync="dialogFormVisible" size="800px">
+    <el-drawer append-to-body title="新建模板" :visible.sync="dialogFormVisible" size="800px" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" ref="form" :rules="rules" label-position="right" label-width="80px" size="small">
@@ -222,6 +222,27 @@ export default {
         this.form.taskdays = this.addDate.taskday === ''?[]:[this.addDate.taskday]
       }
       this.$refs['form'].validate(async (valid) => {})
+    },
+    onClose () {
+      this.form = {
+        sa_salesforecastmodelid:0,
+        title:'',
+        remarks:'',
+        begdate:null,
+        enddate:null,
+        periodtype:'周',
+        periodpoint:[],
+        baseonproject:false,
+        isrepeat:1,
+        taskdays:[],
+        sales:[],
+        roles:[],
+      },
+      this.sdList = []
+      this.addDate = {
+        periodpoint:'',
+        taskday:'',
+      }
     }
   },
   mounted () {

src/HManagement/salesForecastTemplate/modules/modelDetail.vue

@@ -16,8 +16,8 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
-        <release v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="onSuccess"></release>
-        <finish v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="onSuccess"></finish>
+        <release v-if="tool.checkAuth($route.name,'release')" :data="mainData" @onSuccess="onSuccess"></release>
+        <finish v-if="tool.checkAuth($route.name,'cancel')" :data="mainData" @onSuccess="onSuccess"></finish>
       </div>
       <div slot="slot0" >
         <el-row :gutter="10"> 

src/HManagement/siteManage/custom_option/modules/detailsList.vue

@@ -9,7 +9,7 @@
         <slot name="del" :data="scope.data"></slot>
       </template>
     </tableLayout>
-    <div  style="margin-top:16px;text-align:right">
+    <!-- <div  style="margin-top:16px;text-align:right">
       <el-pagination
           background
           small
@@ -20,7 +20,7 @@
           layout="total, prev, pager, next, jumper"
           :total="total">
       </el-pagination>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -48,10 +48,10 @@ export default {
       //   }
       // }
       param:{
-        "pageNumber": 1,
-        "pageSize": 20,
         "id": 20220901092501,
         "content": {
+          "pageNumber": 1,
+          "pageSize": 9999999,
           "optiontypeid":''
         }
       }
@@ -70,12 +70,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.queryOptions()
+      this.detailsList()
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.queryOptions()
+      this.detailsList()
     },
   },
   mounted() {

src/HManagement/siteManage/custom_option/modules/list.vue

@@ -5,7 +5,7 @@
         <p>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
     </tableLayout>
-    <div style="margin-top:16px;text-align:right">
+    <!-- <div style="margin-top:16px;text-align:right">
       <el-pagination
         background
         small
@@ -16,7 +16,7 @@
         layout="total, prev, pager, next, jumper"
         :total="total">
       </el-pagination>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -30,7 +30,7 @@ export default {
         "id": 20220901092401,
         "content": {
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 99999999,
           "where":{
             "condition":""
           }

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">
@@ -54,6 +54,7 @@ export default {
       param: {
         "sat_orderclueid": 4,
         "content": "",
+        "createdate":'',
         "followupmode": "", //当面拜访、电话沟通
         "logtype": "跟进", //跟进、成交、丢单、无效
         "competitor": "",
@@ -129,6 +130,7 @@ export default {
       this.$refs.ruleForm.validate(async val => {
         if (!val) return
         this.param.sat_orderclueid = this.detailInfo.sat_orderclueid
+        this.param.createdate = `${this.timer.getFullYear()}-${this.timer.getMonth() + 1}-${this.timer.getDate()}`
         let res = await this.$api.requested({
           "id":20221208100602,
           "content": this.param

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">
@@ -105,6 +105,7 @@ export default {
       this.changeDataStructure()
     },
     changeDataStructure() {
+      var that = this
       this.mainAreaData = [
         {
           label:'客户名称',
@@ -132,16 +133,36 @@ export default {
         },
         {
           label:'跟进状态',
-          value:this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '已过期':
+                style = {color:'#333'}
+                break;
+              case '跟进中':
+                style = {color:'#52C41A'}
+                break;
+              case '待跟进':
+                style = {color:'#FA8C16'}
+                break;
+              case '已成交':
+                style = {color:'#F60909'}
+                break; 
+              case '无效':
+                style = {color:'#BBBBBB'}
+                break; 
+              default:
+                break;
+            }
+            return style
+            
+          }
         },
         {
           label:'跟进次数',
           value:this.mainData.followcount
         },
-        {
-          label:'转化次数',
-          value:this.mainData.changecount
-        },
       ]
       this.detailInfo = {
         baseInfo: [
@@ -187,15 +208,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},
         ]
       }
     },

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

@@ -20,7 +20,7 @@
       </div>
       <div>
         <el-descriptions :column="5" size="mini">
-          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAreaData" :key="item.index" :label="item.label">{{item.value?item.value:'--'}}</el-descriptions-item>
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAreaData" :key="item.index" :label="item.label"><span :style="item.style?item.style():''">{{item.value?item.value:'--'}}</span></el-descriptions-item>
         </el-descriptions>
       </div>
     </div>

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

@@ -32,7 +32,7 @@
         </div>
         <div class="flex-align-stretch" style="min-width:800px">
           <slot name="custom"></slot>
-          <el-input style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition.length >0?'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          <el-input style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
       </div>