bug修复

src/Form/contractManage/add.vue

@@ -44,8 +44,6 @@ import { log } from '@antv/g2plot/lib/utils'
 export default {
   components:{
   },
-  computed: {
-  },
   data () {
     return {
       drawer:false,

src/HDrpManagement/competitor/detail/modules/addressManage/list.vue

@@ -1,31 +1,32 @@
 <template>
   <div>
-    <div class="normal-margin">
-      <add v-if="tool.checkAuth($route.name,'addressManage')" :data="data" @insertSuccess="onSuccess" style="float: left;"></add>
-      <div style="width: 20%">
-        <el-input
-            placeholder="请输入内容"
-            v-model="search"
-            clearable
-            @clear="clearData()"
-            size="small"
-            @keyup.enter.native="queryClick()">
-          <i slot="prefix" class="el-icon-search" @click="queryClick()"></i>
-        </el-input>
-      </div>
+    <div >
+      <add v-if="tool.checkAuth($route.name,'addressManage')" class="inline-16" :data="data" @insertSuccess="onSuccess" ></add>
+      <el-input
+          placeholder="请输入内容"
+          v-model="search"
+          clearable
+          style="width:200px"
+          @clear="clearData()"
+          size="small"
+          @keyup.enter.native="queryClick()">
+        <i slot="prefix" class="el-icon-search" @click="queryClick()"></i>
+      </el-input>
+    </div>
+    <div style="margin-top: 15px">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" >
+        <template v-slot:customcol="scope">
+          <div v-if="scope.column.columnname === 'province'">
+            <p>{{ scope.column.data.province + scope.column.data.city + scope.column.data.county}}</p>
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+        </template>
+        <template v-slot:opreation="scope">
+          <edit v-if="tool.checkAuth($route.name,'addressManage')" :data="scope.data" @updateSuccess="onSuccess"></edit>
+          <toVoid v-if="tool.checkAuth($route.name,'addressManage')" :data="scope.data" @toVoidSuccess="onSuccess"></toVoid>
+        </template>
+      </tableLayout>
     </div>
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" >
-      <template v-slot:customcol="scope">
-        <div v-if="scope.column.columnname === 'province'">
-          <p>{{ scope.column.data.province + scope.column.data.city + scope.column.data.county}}</p>
-        </div>
-        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
-      </template>
-      <template v-slot:opreation="scope">
-        <edit v-if="tool.checkAuth($route.name,'addressManage')" :data="scope.data" @updateSuccess="onSuccess"></edit>
-        <toVoid v-if="tool.checkAuth($route.name,'addressManage')" :data="scope.data" @toVoidSuccess="onSuccess"></toVoid>
-      </template>
-    </tableLayout>
     <div style="margin-top:16px;text-align:right">
       <el-pagination
           background

src/HDrpManagement/competitor/detail/modules/contacts/list.vue

@@ -1,28 +1,29 @@
 <template>
   <div>
-    <div class="normal-margin">
-      <add v-if="tool.checkAuth($route.name,'contactsManage')" :data="data"  @insertSuccess="onSuccess" style="float: left;"></add>
-      <div style="width: 20%">
-        <el-input
-            placeholder="请输入内容"
-            v-model="search"
-            clearable
-            @clear="clearData()"
-            size="small"
-            @keyup.enter.native="queryClick()">
-          <i slot="prefix" class="el-icon-search" @click="queryClick()"></i>
-        </el-input>
-      </div>
+    <div>
+      <add v-if="tool.checkAuth($route.name,'contactsManage')" class="inline-16" :data="data"  @insertSuccess="onSuccess" ></add>
+      <el-input
+          placeholder="请输入内容"
+          v-model="search"
+          style="width:200px"
+          clearable
+          @clear="clearData()"
+          size="small"
+          @keyup.enter.native="queryClick()">
+        <i slot="prefix" class="el-icon-search" @click="queryClick()"></i>
+      </el-input>
+    </div>
+    <div style="margin-top: 15px">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" fixedName="operation">
+        <template v-slot:customcol="scope">
+          <p>{{scope.column.data[scope.column.columnname]}}</p>
+        </template>
+        <template v-slot:opreation="scope">
+          <edit v-if="tool.checkAuth($route.name,'contactsManage')" :data="scope.data" @updateSuccess="onSuccess"></edit>
+          <toVoid v-if="tool.checkAuth($route.name,'contactsManage')" :data="scope.data" @toVoidSuccess="onSuccess"></toVoid>
+        </template>
+      </tableLayout>
     </div>
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" >
-      <template v-slot:customcol="scope">
-        <p>{{scope.column.data[scope.column.columnname]}}</p>
-      </template>
-      <template v-slot:opreation="scope">
-        <edit v-if="tool.checkAuth($route.name,'contactsManage')" :data="scope.data" @updateSuccess="onSuccess"></edit>
-        <toVoid v-if="tool.checkAuth($route.name,'contactsManage')" :data="scope.data" @toVoidSuccess="onSuccess"></toVoid>
-      </template>
-    </tableLayout>
     <div style="margin-top:16px;text-align:right">
       <el-pagination
           background
@@ -124,5 +125,4 @@ export default {
   display: flex;
   align-items: center;
 }
-
 </style>

src/HDrpManagement/contractManage/components/addContract.vue

@@ -33,7 +33,7 @@
               <el-form-item label="折扣(%):" prop="discountrate">
                 <el-input type="text" size="small" v-model="form.discountrate"></el-input>
               </el-form-item>
-            </el-co暂存
+            </el-col>
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <el-input style="display:none" v-model="form.begdate"></el-input>
@@ -359,7 +359,6 @@
 
 <script>
 import {mapGetters} from 'vuex'
-
 import selectPople from './selectSaler'
 import selectAgent from './selectAgent'
 import seleteProject from './seleteProject'
@@ -519,6 +518,32 @@ export default {
     }
   },
   created () {
+    this.form = {
+      "sa_contractid": 0,
+      "sys_enterpriseid": "",
+      "projectname":'',
+      "begdate": "",
+      "enddate": "",
+      "sa_projectid": "", //可选
+      "type": "", //可选
+      "discountrate": '', //可选
+      "saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选
+      "signdate": "", //可选
+      "signby": "", //可选
+      "remarks": "", //可选
+      "title": "",
+      "signamount":'',
+      "salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,
+      "enterprisename":'',
+      "sys_printmodelid": '',//可选
+      "typemx":"",//可选
+      "modelname":"",
+      "calculatemodel":'1',
+      "productdiscount":'',
+      "orderratio":'',
+      "ascription_title":'',
+      'ascription_contractid':''
+    }
   },
   methods: {
     async onSubmit () {
@@ -599,6 +624,32 @@ export default {
     },
     onCancel () {
       this.$store.dispatch('DrawerShowChange',false)
+      this.form = {
+        "sa_contractid": 0,
+        "sys_enterpriseid": "",
+        "projectname":'',
+        "begdate": "",
+        "enddate": "",
+        "sa_projectid": "", //可选
+        "type": "", //可选
+        "discountrate": '', //可选
+        "saler_hrid": JSON.parse(window.sessionStorage.getItem('active_account')).hrid, //可选
+        "signdate": "", //可选
+        "signby": "", //可选
+        "remarks": "", //可选
+        "title": "",
+        "signamount":'',
+        "salername":JSON.parse(window.sessionStorage.getItem('active_account')).name,
+        "enterprisename":'',
+        "sys_printmodelid": '',//可选
+        "typemx":"",//可选
+        "modelname":"",
+        "calculatemodel":'1',
+        "productdiscount":'',
+        "orderratio":'',
+        "ascription_title":'',
+        'ascription_contractid':''
+      }
     },
     showChange (key) {
       this.agentVisible = false

src/HDrpManagement/contractManage/index.vue

@@ -10,31 +10,32 @@
       :options="options"
       :detailPath="{
         path:'/contractDetail',
+        param:{tabIndex:tabIndex}
       }"
       @listData="listdata"
       @listCreate="list">
-      <div slot="custom" style="display:flex">
-        <div class="label_center">
+      <template #custom>
+        <div class="mt-10">
           <p class="search__label">范围:</p>
           <el-select
-            class="inline-16"
+            class="inline-24"
             size="small"
             v-model="area"
             placeholder="请选择范围"
-            @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.type=area;$refs.list.listData()"
+            @change="areaChange"
           >
             <el-option
               v-for="item in areaList"
-              :key="item.remarks"
-              :label="item.value"
-              :value="item.remarks"
+              :key="item.index"
+              :label="item.title"
+              :value="item.name"
             ></el-option>
           </el-select>
         </div>
-        <div class="label_center">
+        <div class="mt-10">
           <p class="search__label">合同类型:</p>
           <el-select
-            class="inline-16"
+            class="inline-24"
             size="small"
             v-model="type"
             placeholder="请选择合同类型"
@@ -49,10 +50,10 @@
             ></el-option>
           </el-select>
         </div>
-        <div class="label_center">
+        <div class="mt-10">
           <p class="search__label">合同状态:</p>
           <el-select
-            class="inline-16"
+            class="inline-24"
             size="small"
             v-model="status"
             placeholder="请选择合同状态"
@@ -65,7 +66,7 @@
             <el-option label="已终止" value="已终止" ></el-option>
           </el-select>
         </div>
-      </div>
+      </template>
 
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
@@ -98,9 +99,31 @@ export default {
   data () {
     return {
       options:[],
-      areaList:[],
+      areaList:[
+        {
+          title: '我负责的',
+          name: "1",
+        },
+        {
+          title: '我参与的',
+          name: "2",
+        },
+        {
+          title: '我创建的',
+          name: "5",
+        },
+        {
+          title: '我下属负责的',
+          name: "3",
+        },
+        {
+          title: '我下属参与的',
+          name: "4",
+        }
+      ],
       typeList:[],
-      area:'0',
+      area:'1',
+      tabIndex:"1",
       type:'',
       condition:'',
       status:''
@@ -113,9 +136,9 @@ export default {
   },
   methods:{
     async getSystemList () {
-      const res = await this.$store.dispatch('optiontypeselect','dataarea')
+      /*const res = await this.$store.dispatch('optiontypeselect','dataarea')
       this.areaList = res.data
-      console.log(this.areaList);
+      console.log(this.areaList);*/
       
       const res2 = await this.$store.dispatch('optiontypeselect','contracttype')
       this.typeList = res2.data
@@ -156,6 +179,12 @@ export default {
     listdata(data) {
       console.log(data);
       
+    },
+    areaChange(){
+      this.tabIndex = this.area
+      this.$refs.list.param.content.pageNumber=1;
+      this.$refs.list.param.content.type=this.area;
+      this.$refs.list.listData()
     }
   }
 }

src/HDrpManagement/contractManage/modules/detail.vue

@@ -202,6 +202,7 @@ export default {
         }
       })
       this.mainData = res.data
+      this.$refs.details.param.content.type = this.$route.query.tabIndex
       console.log(this.mainData);
       
       this.mainData.type == '项目' 

src/HDrpManagement/projectChange/modules/modules/andEnterprise/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div>
-      <add class="inline-16" v-if="tool.checkAuth($route.name,'andEnterpriseManage')" :data="rowData" @addSuccess="onSuccess"></add>
+      <add class="inline-16" v-if="tool.checkAuth($route.name,'andEnterpriseManage')"  :data="rowData" @addSuccess="onSuccess"></add>
       <el-input
           placeholder="请输入搜索内容"
           suffix-icon="el-icon-search"

src/HManagement/clueManage/m_activity/index.vue

@@ -11,30 +11,30 @@
       idName="sat_campaignid" 
       :apiId="{query:20221101095102,del:''}" 
       :options="options"
-      :detailPath="{path:'/marketing_activityDetails'}"
+      :detailPath="{path:'/marketing_activityDetails',param:{tabIndex:tabIndex}}"
       @listCreate="list"
     >
-     <div slot="custom" style="display:flex">
-       <div class="label_center">
+     <template #custom >
+       <div class="mt-10">
         <p class="search__label">范围:</p>
         <el-select
-          class="inline-16"
+          class="inline-24"
           size="small"
           v-model="area"
           placeholder="请选择范围"
-          @change="$refs.basicLayout.param.content.pageNumber=1;$refs.basicLayout.param.content.type=area;$refs.basicLayout.listData()"
+          @change="areaChange"
         >
           <el-option
             v-for="item in areaList2"
-            :key="item.remarks"
-            :label="item.value"
-            :value="item.remarks"
+            :key="item.index"
+            :label="item.title"
+            :value="item.name"
           ></el-option>
         </el-select>
       </div>
-       <div class="label_center">
+       <div class="mt-10">
         <p class="search__label">活动类型:</p>
-        <el-select v-model="search.type" style="margin-right:10px" size="small" placeholder="请选择活动类型" @change="campaigntypeChange" clearable>
+        <el-select v-model="search.type" class="inline-24" size="small" placeholder="请选择活动类型" @change="campaigntypeChange" clearable>
           <el-option
             v-for="item in campaigntypeList"
             :key="item.index"
@@ -43,9 +43,9 @@
           </el-option>
         </el-select>
       </div>
-      <div class="label_center">
+      <div class="mt-10">
         <p class="search__label">活动状态:</p>
-        <el-select v-model="search.status" style="margin-right:10px" size="small" placeholder="请选择活动状态" @change="statusChange" clearable>
+        <el-select v-model="search.status" class="inline-24" size="small" placeholder="请选择活动状态" @change="statusChange" clearable>
           <el-option label="新建" value="新建">
           </el-option>
           <el-option label="发布" value="发布">
@@ -54,8 +54,7 @@
           </el-option>
         </el-select>
       </div>
-        
-     </div>
+     </template>
       <div slot="titleRight" style="display:flex;margin-left:10px">
       </div>
       <template v-slot:tbList="scope">
@@ -86,9 +85,30 @@ export default {
       options:[],
       search:{},
       campaigntypeList:'',
-      areaList2:[],
-      area:'全部'
-
+      areaList2:[
+        {
+          title: '我负责的',
+          name: "1",
+        },
+        {
+          title: '我参与的',
+          name: "2",
+        },
+        {
+          title: '我创建的',
+          name: "5",
+        },
+        {
+          title: '我下属负责的',
+          name: "3",
+        },
+        {
+          title: '我下属参与的',
+          name: "4",
+        }
+      ],
+      area:'1',
+      tabIndex:"1",
     }
   },
   provide () {
@@ -100,6 +120,7 @@ export default {
     list (param) {
       param.content.isAll = 0
       param.content.nocache = true
+      param.content.type = 1
     },
     async campaigntype () {
       const res = await this.$api.requested({
@@ -120,12 +141,19 @@ export default {
       this.$refs.basicLayout.param.content.where.status = this.search.status
       this.$refs.basicLayout.listData()
     },
+    areaChange(){
+      this.tabIndex = this.area
+      this.$refs.basicLayout.param.content.pageNumber=1;
+      this.$refs.basicLayout.param.content.type=this.area;
+      this.$refs.basicLayout.listData()
+    }
   },
-  async created () {
+  created () {
     this.campaigntype()
 
-    const res = await this.$store.dispatch('optiontypeselect','dataarea')
+   /* const res = await this.$store.dispatch('optiontypeselect','dataarea')
     this.areaList2 = res.data
+    console.log(this.areaList2)*/
   }
 }
 

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

@@ -76,6 +76,7 @@ export default {
         }
       })
       this.mainData = res.data
+      this.$refs.details.param.content.type = this.$route.query.tabIndex
       this.changeDataStructure()
       console.log(this.mainData);
       
@@ -182,9 +183,10 @@ export default {
       param.content.isAll = 0
     },
     // 监听切换数据,上一页,下一页
-    pageChange (id,rowindex) {
+    pageChange (id,rowindex,tabIndex) {
       this.flag = false
-      this.$router.replace({path:'/marketing_activityDetails',query:{id:id,rowindex:rowindex}})
+      tabIndex = this.$route.query.tabIndex
+      this.$router.replace({path:'/marketing_activityDetails',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
       this.queryMainData(id)
     }
   },

src/SDrpManagement/QuotedPrice/components/edit/productTable.vue

@@ -7,6 +7,7 @@
         append-to-body
         size="80%"
         direction="rtl"
+        :show-close="false"
         @close="onColes">
       <div class="drawer__panel">
         <div class="flex-align-center flex-between ">

src/SDrpManagement/QuotedPrice/components/edit/productTableProject.vue

@@ -7,6 +7,7 @@
         append-to-body
         size="80%"
         direction="rtl"
+        :show-close="false"
         @close="onColes">
       <div class="drawer__panel">
         <div class="flex-align-center flex-between ">

src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -7,6 +7,7 @@
         append-to-body
         size="80%"
         direction="rtl"
+        :show-close="false"
         @close="onColes">
       <div class="drawer__panel">
         <div class="flex-align-center flex-between ">

src/SDrpManagement/QuotedPrice/components/productTableProject.vue

@@ -6,6 +6,7 @@
         :visible.sync="dialogProductVisible"
         append-to-body
         size="80%"
+        :show-close="false"
         direction="rtl"
         @close="onColes">
       <div class="drawer__panel">

src/SDrpManagement/QuotedPrice/components/projectTable.vue

@@ -5,6 +5,7 @@
         :visible.sync="dialogProjectVisible"
         append-to-body
         width="900px"
+        :show-close="false"
         @close="onColes">
       <div class="panel_Target">
         <el-input style="width:200px;margin-top: 10px;margin-bottom: 15px" placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="selectChange" v-model="param.content.where.condition" @keyup.native.enter="projectList(param.content.pageNumber = 1)" @clear="projectList(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>

src/SManagement/orderclue/index.vue

@@ -11,36 +11,36 @@
       idName="sat_orderclueid" 
       :apiId="{query:20221101094502,del:''}" 
       :options="options"
-      :detailPath="{path:'/orderclue_detail'}"
+      :detailPath="{path:'/orderclue_detail',param:{tabIndex:tabIndex}}"
       @listCreate="list"
       @listData="list2"
     >
-    <div slot="custom" style="display:flex">
-      <div class="label_center">
+    <template #custom>
+      <div class="mt-10">
         <p class="search__label">范围:</p>
         <el-select
-          class="inline-16"
+          class="inline-24"
           size="small"
           v-model="area"
           placeholder="请选择范围"
-          @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.type=area;$refs.list.listData()"
+          @change="areaChange"
         >
           <el-option
             v-for="item in areaList2"
-            :key="item.remarks"
-            :label="item.value"
-            :value="item.remarks"
+            :key="item.index"
+            :label="item.title"
+            :value="item.name"
           ></el-option>
         </el-select>
       </div>
-      <div class="label_center">
+      <div class="mt-10">
         <p class="search__label">跟进状态:</p>
-        <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.where.status = status;$refs.list.listData()">
+        <el-select v-model="status" clearable class="inline-24" size="small" placeholder="请选择线索状态" @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.where.status = status;$refs.list.listData()">
           <el-option v-for="item in statusList" :label="item.value" :key="item.rowindex" :value="item.remarks">
           </el-option>
         </el-select>
       </div>
-    </div>
+    </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span style="color:#999999" v-if="scope.data.column.data[[scope.data.column.columnname]] == '已过期'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -74,8 +74,30 @@ export default {
       options:[],
       arealist:[],
       teamList:[],
-      areaList2:[],
-      area:'0',
+      areaList2:[
+        {
+          title: '我负责的',
+          name: "1",
+        },
+        {
+          title: '我参与的',
+          name: "2",
+        },
+        {
+          title: '我创建的',
+          name: "5",
+        },
+        {
+          title: '我下属负责的',
+          name: "3",
+        },
+        {
+          title: '我下属参与的',
+          name: "4",
+        }
+      ],
+      area:'1',
+      tabIndex:"1",
       status:'',
       statusList:[]
     }
@@ -91,8 +113,8 @@ export default {
     this.query_arealist()
     this.queryUserInfo()
 
-    const res = await this.$store.dispatch('optiontypeselect','dataarea')
-    this.areaList2 = res.data
+   /* const res = await this.$store.dispatch('optiontypeselect','dataarea')
+    this.areaList2 = res.data*/
 
     const res2 = await this.$store.dispatch('optiontypeselect','datafollowuptype')
     this.statusList = res2.data
@@ -124,6 +146,12 @@ export default {
       
       this.arealist = this.tool.createMenu(res.data)
     },
+    areaChange(){
+      this.tabIndex = this.area
+      this.$refs.list.param.content.pageNumber=1;
+      this.$refs.list.param.content.type=this.area;
+      this.$refs.list.listData()
+    },
     async queryUserInfo() {
       let res = await this.$api.requested({
         "classname": "common.usercenter.usercenter",
@@ -144,6 +172,7 @@ export default {
     },
     list (param) {
       param.content.isAll = 0
+      param.content.type = 1
     },
     list2 (data) {
       console.log(data);

src/SManagement/orderclue_detail/index.vue

@@ -107,6 +107,7 @@ export default {
         }
       })
       this.mainData = res.data
+      this.$refs.details.param.content.type = this.$route.query.tabIndex
       console.log(this.mainData,"销售线索手机号数据");
       
       this.changeDataStructure()
@@ -301,9 +302,10 @@ export default {
       })
     },
     // 监听切换数据,上一页,下一页
-    pageChange (id,rowindex) {
+    pageChange (id,rowindex,tabIndex) {
       this.flag = false
-      this.$router.replace({path:'/orderclue_detail',query:{id:id,rowindex:rowindex}})
+      tabIndex = this.$route.query.tabIndex
+      this.$router.replace({path:'/orderclue_detail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
       this.queryMainData(id)
     },
     onChangeCustomer(){