跳转，调整销售线索转为项目

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -120,18 +120,18 @@
                 </el-option>
               </el-select>
             </el-col>
-            <el-col :span="24" v-if="siteid === 'HY'">
+            <el-col :span="24" v-if="siteid !== 'HY'">
               <el-form-item label="项目预算(万元):" prop="budgetary" :rules="{required: false,pattern:/^\d+(.\d{1,2})?$/, message: '请输入数字值', trigger: 'blur,change'}">
                 <el-input  v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col :span="24" v-if="siteid === 'HY'">
+            <el-col :span="24" v-if="siteid !== 'HY'">
               <el-form-item label="总投资额(万元):" prop="budgetary" :rules="{required: false,pattern:/^\d+(.\d{1,2})?$/, message: '请输入数字值', trigger: 'blur,change'}">
                 <el-input  v-model="form.totalinvestment" placeholder="总投资额"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" v-if="siteid === 'HY'">
+            <el-col :span="24" v-if="siteid !== 'HY'">
               <el-form-item label="造价(万元):" prop="budgetary" :rules="{required: false,pattern:/^\d+(.\d{1,2})?$/, message: '请输入数字值', trigger: 'blur,change'}">
                 <el-input  v-model="form.costofconstruction" placeholder="造价"></el-input>
               </el-form-item>

src/components/normal-basic-layout/drawerDetail/drawer.vue

@@ -36,7 +36,6 @@ export default {
   },
   methods:{
     closeDrawer (done) {
-      console.log(this.historyRouter)
       if (this.historyRouter) {
 
         if (this.$route.query.isPredicion){
@@ -54,8 +53,15 @@ export default {
           }
 
         }else {
-          this.$router.replace(this.historyRouter)
-          this.$store.dispatch('setHistoryRouter',null)
+          if (this.historyRouter.path === '/message'){
+            this.$store.dispatch('changeDetailDrawer',false)
+            this.$router.replace(this.historyRouter)
+            this.$store.dispatch('setHistoryRouter',null)
+          }else {
+            this.$router.replace(this.historyRouter)
+            this.$store.dispatch('setHistoryRouter',null)
+          }
+
         }
 
       } else {

src/store/index.js

@@ -111,6 +111,7 @@ export default new Vuex.Store({
       state.historyRouter = route
     },
     detailDeleteRouterBack (state) {
+      console.log(state,'state')
       if (state.historyRouter) {
         router.replace(state.historyRouter)
         state.historyRouter = null

src/utils/tool.js

@@ -196,4 +196,4 @@ export default {
     
     return result
   }
-}
+}

src/views/message/index.vue

@@ -142,8 +142,8 @@ export default {
     //跳转到消息具体页面
     goDetail() {
       sessionStorage.setItem('active_modules',JSON.stringify(this.message.modules))
-      console.log(this.message.link)
-      console.log(this.message)
+      console.log(this.message.link,'link')
+      console.log(this.message,'message')
      /* this.$router.push(this.message.link.listPath)*/
       if (this.message.objectname === 'sat_orderclueuploadbill'){
         setTimeout(() => {