2022-12-19 9:00

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

@@ -27,16 +27,9 @@
             @change="cascaderChange">
           </el-cascader>
           </el-form-item>
-          <!-- <el-form-item label="市场活动" prop="sat_campaignid">
-            <el-popover
-              placement="bottom"
-              trigger="manual"
-              v-model="activityVisible"
-              width="400">
-              <selectActivity ref="member" :radio="true" @onSelect="centerChange" @onCancel="activityVisible = false"></selectActivity>
-              <el-input readonly type="text" slot="reference" size="small" @focus="activityVisible=true" v-model="form.campaign_name"></el-input>
-            </el-popover>
-          </el-form-item> -->
+          <el-form-item label="市场活动">
+            <el-input disabled type="text" size="small" v-model="activityName"></el-input>
+          </el-form-item>
           <el-form-item label="地址" prop="address">
             <el-input v-model="form.address" placeholder="请输入地址"></el-input>
           </el-form-item>
@@ -58,13 +51,15 @@
 
 <script>
 import selectActivity from '@/SManagement/orderclue/components/selectActivity/selectActivity'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
-  props:['disabled'],
+  props:['disabled','data'],
   components: {selectActivity},
   data () {
     return {
       drawer:false,
       activityVisible:false,
+      activityName:'',
       form:{
         "sat_orderclueid": 0,
         "enterprisename":"",
@@ -92,6 +87,7 @@ export default {
   methods:{
     onShow () {
       this.drawer = true
+      this.activityName = this.data.name
     },
     add () {
       this.$refs['form'].validate(async (valid) => {

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

@@ -10,7 +10,7 @@
         :mainAreaData="mainAreaData"
         turnPageId="20221101095102"
         idname="sat_campaignid"
-        :tabs="['详细信息','活动线索']"
+        :tabs="['活动线索','详细信息']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)"
         @detailCreate="detailCreate">
@@ -21,16 +21,16 @@
         <finish class="inline-16" v-if="tool.checkAuth($route.name,'finish')  && mainData.status != '结束'" :data="mainData" @onSuccess="queryMainData"></finish>
       </div>
       <div slot="slot0" class="container normal-panel">
-        <BaseInfo :detailInfo="detailInfo"/>
-      </div>
-      <div slot="slot1" class="container normal-panel">
         <DetailTable ref="DetailTable">
-          <addClue slot="addClue" class="inline-16" v-if="tool.checkAuth($route.name,'insert')" @onSuccess="$refs.DetailTable.getList()"/>
+          <addClue slot="addClue" :data="mainData" class="inline-16" v-if="tool.checkAuth($route.name,'insert')" @onSuccess="$refs.DetailTable.getList()"/>
           <template v-slot:editClue="scope">
             <editClue  v-if="tool.checkAuth($route.name,'update')" :data="scope.data" @onSuccess="$refs.DetailTable.getList()"/>
           </template>
         </DetailTable>
       </div>
+      <div slot="slot1" class="container normal-panel">
+        <BaseInfo :detailInfo="detailInfo"/>
+      </div>
     </basicDetails>
   </div>
 </template>

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

@@ -27,16 +27,9 @@
             @change="cascaderChange">
           </el-cascader>
           </el-form-item>
-          <!-- <el-form-item label="市场活动" prop="sat_campaignid">
-            <el-popover
-              placement="bottom"
-              trigger="manual"
-              v-model="activityVisible"
-              width="400">
-              <selectActivity ref="member" :radio="true" @onSelect="centerChange" @onCancel="activityVisible = false"></selectActivity>
-              <el-input readonly type="text" slot="reference" size="small" @focus="activityVisible=true" v-model="form.campaign_name"></el-input>
-            </el-popover>
-          </el-form-item> -->
+          <el-form-item label="市场活动" prop="sat_campaignid">
+            <el-input disabled type="text" size="small" v-model="form.campaign_name"></el-input>
+          </el-form-item>
           <el-form-item label="地址" prop="address">
             <el-input v-model="form.address" placeholder="请输入地址"></el-input>
           </el-form-item>