暂存

src/HDrpManagement/contractManage/modules/detail.vue

@@ -50,7 +50,7 @@
         <!--产品明细折扣表-->
         <productDetailList :data="mainData" :isLeader="isLeader" ref="productDetailList" v-if="mainData.type == '框架'" @priceChange="queryMainData">
           <importFile
-            v-if="tool.checkAuth($route.name,'exportProduct') && isLeader"
+            v-if="tool.checkAuth($route.name,'exportProduct') && isLeader && mainData.status === '新建'"
             slot="export"
             ref="importFile"
             class="inline-16"

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/add.vue

@@ -10,8 +10,8 @@
         :show-close="false"
         @close="onClose">
       <div class="drawer__panel">
-        <el-tabs type="border-card">
-          <el-tab-pane label="客户" >
+        <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="客户" name="客户">
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-input
@@ -70,7 +70,7 @@
               </el-col>
             </el-row>
           </el-tab-pane>
-          <el-tab-pane label="合作伙伴">
+          <el-tab-pane label="合作伙伴" name="合作伙伴">
             <el-row :gutter="20">
               <el-col :span="24">
                 <el-input
@@ -98,6 +98,20 @@
                       <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
                     </template>
                   </el-table-column>
+                  <el-table-column
+                      label="合作伙伴类型"
+                  >
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px" v-for="(item,index) in scope.row.agenttype">
+                        <span v-if="index === scope.row.agenttype.length -1">
+                          {{item}}
+                        </span>
+                        <span v-else>
+                          {{item + ','}}
+                        </span>
+                      </span>
+                    </template>
+                  </el-table-column>
                   <el-table-column
                       label="地址"
                   >
@@ -153,6 +167,7 @@ export default {
       visibleEnterprise:false,
       customerShow:false,
       customertype:'',
+      activeName: '客户',
       index:'',
       form:{
         sa_project_partiesid: 0,
@@ -318,6 +333,13 @@ export default {
       this.customerParam.content.pageNumber = val
       this.distributorList()
     },
+    handleClick(){
+      if (this.activeName === '客户'){
+        this.customerList()
+      }else {
+        this.distributorList()
+      }
+    }
 
   },
   mounted() {

src/HDrpManagement/projectChange/modules/modules/contacts/components/add.vue

@@ -177,9 +177,12 @@
                     width="900"
                     v-model="associatedCustomers.show"
                     trigger="click">
+                  <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="associatedCustomers.param.content.where.condition?associatedCustomers.param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="associatedCustomers.param.content.where.condition" @keyup.native.enter="associatedCustomersList(associatedCustomers.param.content.pageNumber = 1)" @clear="associatedCustomersList(associatedCustomers.param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+                  </el-input>
                       <el-table
                           border
                           :data="associatedCustomers.listData"
+                          style="margin-top: 10px"
                           @row-click="associatedCustomersSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                           size="mini">
@@ -213,7 +216,7 @@
                         </div>
                         <slot name="footerLeft"></slot>
                       </div>
-                  <el-input  slot="reference" :disabled="form.contactsid !== 0"  autosize v-model="form.enterprisename" placeholder="请输入单位" @input="changeTabCustomers"></el-input>
+                  <el-input readonly  slot="reference" :disabled="form.contactsid !== 0"  autosize v-model="form.enterprisename" placeholder="请输入单位" @input="associatedCustomersList"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -504,7 +507,7 @@ export default {
     },
     /*关联客户*/
     async associatedCustomersList(){
-      this.associatedCustomers.param.content.where.condition = this.form.enterprisename
+      // this.associatedCustomers.param.content.where.condition = this.form.enterprisename
       this.associatedCustomers.param.content.where.sa_projectid = this.data.sa_projectid
       const res = await this.$api.requested(this.associatedCustomers.param)
       console.log(res,"关联客户")

src/HDrpManagement/projectChange/modules/modules/contacts/components/edit.vue

@@ -179,9 +179,12 @@
                     trigger="click">
                   <el-tabs type="border-card" @tab-click="changeTabCustomers">
                     <el-tab-pane label="关联客户">
+                      <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="associatedCustomers.param.content.where.condition?associatedCustomers.param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="associatedCustomers.param.content.where.condition" @keyup.native.enter="associatedCustomersList(associatedCustomers.param.content.pageNumber = 1)" @clear="associatedCustomersList(associatedCustomers.param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+                      </el-input>
                       <el-table
                           border
                           :data="associatedCustomers.listData"
+                          style="margin-top: 10px"
                           @row-click="associatedCustomersSelect"
                           :header-cell-style="{background:'#EEEEEE',color:'#333'}"
                           size="mini">

src/HManagement/department/index.vue

@@ -48,6 +48,9 @@
             <p v-else-if="scope.data.column.columnname === 'province'">
               {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
             </p>
+            <p v-else-if="scope.data.column.columnname === 'isleader'">
+              {{scope.data.column.data.isleader == '0'?'否':'是'}}
+            </p>
             <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}</p>
           </div>
         </template>

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

@@ -219,6 +219,10 @@ export default {
           label:'签约日期',
           value: this.mainData.signdate
         },
+        {
+          label:'合作伙伴状态',
+          value: this.mainData.cooperationstatus
+        },
         {
           label:'合作伙伴类型',
           value: this.mainData.type

src/HManagement/marketing2/agent/index.vue

@@ -34,6 +34,7 @@
               v-model="status"
               placeholder="请选择经销商状态"
               @change="handleSelectChange"
+              clearable
             >
               <el-option
                 v-for="item in statusList"
@@ -52,6 +53,7 @@
                 placeholder="请选择合作伙伴类别"
                 size="small"
                 @change="handleSelectChange"
+                clearable
             >
               <el-option
                   v-for="item in agent_type"
@@ -73,6 +75,7 @@
                 placeholder="请选择合作状态"
                 size="small"
                 @change="handleSelectChange"
+                clearable
             >
               <el-option
                   v-for="item in cooperationstatus"