2023-7-26

src/Form/marketing2/agent/add.vue

@@ -140,7 +140,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="是否授权所有标准:" style="height:51px" prop="standardsauth" label-width="160px">
-              <el-checkbox v-model="form.standardsauth" :true-label="1" :false-label="0"></el-checkbox>
+              <el-checkbox v-model="form.standardsauth" :true-label="0" :false-label="1"></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -228,7 +228,7 @@ export default {
         "invoicingpoint": 1, //开票节点（1:订单审核：2:发货）
         "saleclassauth": 1, //是否需要经营授权,默认1
         "grade":'',
-        "standardsauth":1,
+        "standardsauth":0,
       },
       ENlist:[],
       agent_level:[],

src/Form/marketing2/agent/edit.vue

@@ -153,7 +153,7 @@
             </el-col>
             <el-col :span="12">
             <el-form-item label="是否授权所有标准:" style="height:51px" prop="standardsauth" label-width="160px">
-              <el-checkbox v-model="form.standardsauth" :true-label="1" :false-label="0"></el-checkbox>
+              <el-checkbox v-model="form.standardsauth" :true-label="0" :false-label="1"></el-checkbox>
             </el-form-item>
           </el-col>
             <el-col :span="12">

src/HDrpManagement/customerPortrait/index.vue

@@ -50,13 +50,13 @@
         </div>
 
         <div class="mt-10">
-          <label  class="search__label" >标签类型:</label>
-          <el-select v-model="form.tag" class="inline-24" placeholder="请选择标签" @change="selectChange" size="small" >
+          <label  class="search__label" >标签:</label>
+          <el-select v-model="form.tag" class="inline-24" placeholder="请选择标签" @change="selectChange" size="small" clearable filterable>
             <el-option
               v-for="item in tagType"
-              :key="item.value"
-              :label="item.value"
-              :value="item.value">
+              :key="item.sys_systemtagdetailid"
+              :label="item.tag"
+              :value="item.tag">
             </el-option>
           </el-select>
         </div>
@@ -343,9 +343,15 @@ export default {
       this.$refs.list.param.content.where = this.form
       this.$refs.list.listData()
     },
-    timeChange () {
-      this.$refs.list.param.content.where.begindate = this.dateSelect[0]
-      this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+    timeChange (data) {
+      if (data) {
+        this.$refs.list.param.content.where.begindate = this.dateSelect[0]
+        this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+      } else {
+        this.$refs.list.param.content.where.begindate = ''
+        this.$refs.list.param.content.where.enddate = ''
+      }
+      
       this.$refs.list.listData()
     },
     depChange(val){

src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -72,7 +72,7 @@
                 {title:'跟进次数',value:$refs.fllow && $refs.fllow.total,bg:'#F3F9FC',color:'#3874F6'},
                 {title:'最近跟进人',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].name,bg:'#E8F7EC',color:'#78B32B'},
                 {title:'最近跟进时间',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].createdate || '--',bg:'#F9F2E5',color:'#FF7603'},
-                {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'平均跟进天数，跟进频率=（总跟进天数-节假日）÷总跟进次数',bg:'#FDF3F3',color:'#E85B5B'},
+                {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'定义：平均跟进天数；若没有跟进次数，则按照：跟进频率=创建时间到当前时间的天数-节假日；若有跟进次数，则按照：跟进频率=（首次跟进时间到当前时间的天数-节假日）÷跟进次数；',bg:'#FDF3F3',color:'#E85B5B'},
               ]"
             >
             </myCard>

src/HDrpManagement/projectPortrait/index.vue

@@ -39,7 +39,7 @@
 
         <div class="mt-10">
           <label  class="search__label" >项目类型:</label>
-          <el-select class="inline-24" v-model="form.projecttype" placeholder="请选择项目类型" size="mini">
+          <el-select class="inline-24" v-model="form.projecttype" @change="selectChange" placeholder="请选择项目类型" size="mini" clearable filterable>
             <el-option
                 v-for="(item,index) in projectType"
                 :key="index"
@@ -78,8 +78,8 @@
         </div>
 
         <div class="mt-10">
-          <label class="search__label" >标签类型:</label>
-          <el-select v-model="form.tag" class="inline-24" placeholder="请选择标签" @change="selectChange" size="small" clearable>
+          <label  class="search__label" >标签:</label>
+          <el-select v-model="form.tag" class="inline-24" placeholder="请选择标签" @change="selectChange" size="small" clearable filterable>
             <el-option
               v-for="item in tagType"
               :key="item.sys_systemtagdetailid"
@@ -355,9 +355,15 @@ export default {
       this.selectList.dep = this.createMenu(res.data.dep)
       console.log(this.selectList,'范围选择数据');
     },
-    timeChange () {
-      this.$refs.list.param.content.where.begindate = this.dateSelect[0]
-      this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+    timeChange (data) {
+      if (data) {
+        this.$refs.list.param.content.where.begindate = this.dateSelect[0]
+        this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+      } else {
+        this.$refs.list.param.content.where.begindate = ''
+        this.$refs.list.param.content.where.enddate = ''
+      }
+      
       this.$refs.list.listData()
     },
     selectChange () {

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -100,7 +100,7 @@
                 {title:'跟进次数',value:$refs.fllow && $refs.fllow.total,bg:'#F3F9FC',color:'#3874F6'},
                 {title:'最近跟进人',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].name,bg:'#E8F7EC',color:'#78B32B'},
                 {title:'最近跟进时间',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].createdate || '--',bg:'#F9F2E5',color:'#FF7603'},
-                {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'平均跟进天数，跟进频率=（总跟进天数-节假日）÷总跟进次数',bg:'#FDF3F3',color:'#E85B5B'},
+                {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'定义：平均跟进天数；若没有跟进次数，则按照：跟进频率=创建时间到当前时间的天数-节假日；若有跟进次数，则按照：跟进频率=（首次跟进时间到当前时间的天数-节假日）÷跟进次数；',bg:'#FDF3F3',color:'#E85B5B'},
               ]"
             >
             </myCard>

src/HDrpManagement/salerPortrait/index.vue

@@ -249,9 +249,15 @@ export default {
       this.selectList.dep = this.createMenu(res.data.dep)
       console.log(this.selectList,'范围选择数据');
     },
-    timeChange () {
-      this.$refs.list.param.content.where.begindate = this.dateSelect[0]
-      this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+    timeChange (data) {
+      if (data) {
+        this.$refs.list.param.content.where.begindate = this.dateSelect[0]
+        this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+      } else {
+        this.$refs.list.param.content.where.begindate = ''
+        this.$refs.list.param.content.where.enddate = ''
+      }
+      
       this.$refs.list.listData()
     },
     depChange(val){

src/HDrpManagement/writeoffbill/components/add.vue

@@ -29,7 +29,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="核销金额" prop="writeoffamount">
-                <el-input size="small" placeholder="请输入核销金额" v-model.number="form.writeoffamount"></el-input>
+                <el-input size="small" placeholder="请输入核销金额" v-model="form.writeoffamount"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -44,7 +44,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="备注" prop="remarks">
-                <el-input size="small" type="textarea" placeholder="请输入备注" v-model.number="form.remarks"></el-input>
+                <el-input size="small" type="textarea" placeholder="请输入备注" v-model="form.remarks"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -96,6 +96,13 @@ export default {
   name: "add",
   components:{selectEnterprise,selectVoucher,selectOrder},
   data(){
+    var checkNumber = (rule, value, callback) => {
+      console.log(+value)
+      if (isNaN(+value) && value != '') {
+        return callback(new Error('请填写数字'));
+      }
+      callback()
+    }
     return {
       dialogFormVisible:false,
       accountType:[],
@@ -107,7 +114,7 @@ export default {
         "sys_enterpriseid": "",
         "sa_accountclassid": "",
         "sa_cashbillid":"",
-        "writeoffamount":0,  //新增时可不传
+        "writeoffamount":'',  //新增时可不传
         "billnodate": '',
         "remarks":''
       },
@@ -122,7 +129,7 @@ export default {
           { required: true, message: '请选择支出或收入凭证', trigger: 'change'}
         ],
         writeoffamount:[
-          { message: '请填写正确金额', trigger: 'blur',type:'number'}
+          { validator: checkNumber, trigger: 'blur'}
         ],
       },
       params: {

src/HDrpManagement/writeoffbill/components/edit.vue

@@ -32,7 +32,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="核销金额" prop="writeoffamount">
-                <el-input size="small" placeholder="请输入核销金额" v-model.number="form.writeoffamount"></el-input>
+                <el-input size="small" placeholder="请输入核销金额" v-model="form.writeoffamount"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -47,7 +47,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="备注" prop="remarks">
-                <el-input size="small" type="textarea" placeholder="请输入备注" v-model.number="form.remarks"></el-input>
+                <el-input size="small" type="textarea" placeholder="请输入备注" v-model="form.remarks"></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -69,6 +69,13 @@ export default {
   props:['data','disabled'],
   components:{selectEnterprise,selectVoucher},
   data(){
+    var checkNumber = (rule, value, callback) => {
+      console.log(+value)
+      if (isNaN(+value) && value != '') {
+        return callback(new Error('请填写数字'));
+      }
+      callback()
+    }
     return {
       dialogFormVisible:false,
       accountType:[],
@@ -92,7 +99,7 @@ export default {
           { required: true, message: '请选择支出或收入凭证', trigger: 'blur'}
         ],
         writeoffamount:[
-          { message: '请填写正确金额', trigger: 'change',type:'number'}
+          { validator: checkNumber, trigger: 'blur'}
         ],
       }
     }

src/HManagement/marketing2/agent/details/index.vue

@@ -275,7 +275,7 @@ export default {
         },
         {
           label:'是否授权所有标准',
-          value: this.mainData.standardsauth ? '开启' : '关闭'
+          value: this.mainData.standardsauth ? '否' : '是'
         },
         {
           label:'是否订单审核可开票',

src/HManagement/marketing2/agent/details/modules/areaBase/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Add class="inline-16 mt-10" @onSuccess="listData" v-if="tool.checkAuth($route.name,'areaBase')"/>
+    <Add class="inline-16 mt-10" @onSuccess="listData" v-if="tool.checkAuth($route.name,'areaBase') && data.standardsauth"/>
     <el-table
       :data="list"
       style="width: 100%"