Browse Source

官网bug修复

qymljy 10 months ago
parent
commit
d3eb5ff0f9

+ 2 - 2
src/HManagement/clueManage/m_activity/modules/addClue.vue

@@ -127,7 +127,7 @@
 
             <el-col :span="24">
               <el-form-item label="市场活动:" prop="activityName">
-                <el-input disabled type="text" size="small" v-model="activityName"></el-input>
+                <el-input disabled type="text" size="small" v-model="form.activityName"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -296,7 +296,7 @@ export default {
   methods:{
     onShow () {
       this.drawer = true
-      this.activityName = this.data.name
+      this.form.activityName = this.data.name
       this.siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       this.queryTradefield()
       this.queryUnitname()

+ 12 - 2
src/SManagement/orderclue_detail/components/changeProject.vue

@@ -504,9 +504,19 @@ export default {
       //   }
       // }
       this.$refs.form.validate((valid) => {
-        if (!valid) return false
+        if (!valid) {
+          this.$notify({
+            title: '警告',
+            message: '请按照要求输入信息',
+            type: 'warning'
+          });
+          return false
+        }
+        this.$store.commit('setLoading',true)
         this.$refs.check.creatShow = true
-        this.$refs.check.queryRule()
+        this.$refs.check.queryRule(()=>{
+          this.$store.commit('setLoading',false)
+        })
       })
     },
     onSubmit(){

+ 6 - 5
src/SManagement/orderclue_detail/index.vue

@@ -26,8 +26,8 @@
           :teamList="teamList()"
           v-if="userInfo.isAuth == 1 ? mainData.status == '待跟进' || mainData.status == '跟进中' : ''"></move> -->
 
-        <changeCustomer v-if="mainData.iscustomer == 0 && tool.checkAuth($route.name,'changeCutomer')" :data="mainData" :disabled="!isHandle" class="inline-16" @onChangeCustomer="onChangeCustomer"></changeCustomer>
-        <changeProject v-if="mainData.isproject == 0 && tool.checkAuth($route.name,'changeProject')" :data="mainData" :disabled="!isHandle" class="inline-16" @onChangeProject="queryMainData($route.query.id)"></changeProject>
+        <changeCustomer v-if="mainData.iscustomer == 0 && tool.checkAuth($route.name,'changeCutomer') && mainData.istransformingtocustomer == 0" :data="mainData" :disabled="!isHandle" class="inline-16" @onChangeCustomer="onChangeCustomer"></changeCustomer>
+        <changeProject v-if="mainData.isproject == 0 && tool.checkAuth($route.name,'changeProject') && mainData.istransformingtoproject == 0" :data="mainData" :disabled="!isHandle" class="inline-16" @onChangeProject="queryMainData($route.query.id)"/>
         <el-button :type="!isHandle || mainData.status === '已无效'?'':'primary'" v-if="tool.checkAuth($route.name,'goBack') && mainData.status != '已转化' && mainData.isprivate !== 1" :disabled="!isHandle || mainData.status === '已无效'" class="inline-16" size="mini" @click="goBack">退 回</el-button>
         <noNull v-if="tool.checkAuth($route.name,'noNull') && mainData.status != '已转化' " class="inline-16" :data="mainData" :disabled="!isHandle" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid"/>
         <Del v-if="tool.checkAuth($route.name,'toVoid') " class="inline-16" :data="mainData" :disabled="!isHandle" :idName="20221123193702" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid" idKey="sat_orderclueids"/>
@@ -68,6 +68,7 @@ export default {
       mainAreaData:{},
       detailInfo:{},
       userInfo:JSON.parse(window.sessionStorage.getItem('userInfo')),
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       isHandle:''
     }
   },
@@ -83,7 +84,7 @@ export default {
     edit,
     sourceClues,
     changeSite,
-    saveContact
+    saveContact,
   },
   watch: {
    async mainData(val) {
@@ -147,7 +148,7 @@ export default {
     detailCreate (param) {
       param.content.isAll = 0
     },
-    async queryMainData(id) {
+    async queryMainData(val) {
       const res = await this.$api.requested({
         "classname": "saletool.orderclue.web.orderclue",
         "method": "selectDetail",
@@ -157,7 +158,7 @@ export default {
       })
       this.mainData = res.data
       this.$refs.details.param.content.type = this.$route.query.tabIndex
-
+      if (val == '审核') return this.$refs.details.$refs.tag.queryTag()
       this.changeDataStructure()
     },
     changeDataStructure() {

+ 7 - 2
src/components/duplicatesCheck/projectChangeCheck.vue

@@ -72,11 +72,12 @@ export default {
       fields1:[],
       fields2:[],
       fields3:[],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{
     async listData(){
-      this.param.content.sa_projectid = this.data.sa_projectid || 0
+      this.param.content.sa_projectid = 0
       this.fields1.forEach(item=>{
         this.param.content[item] = this.data[item] || ""
       })
@@ -94,7 +95,11 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
-          this.dialogTableVisible = true
+          if (this.siteid == 'HY'){
+            this.onCheck()
+          }else {
+            this.dialogTableVisible = true
+          }
         }else {
           if (this.creatShow){
             this.onSubmit()