Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -4,7 +4,10 @@
     <el-drawer append-to-body size="80%" :with-header="false" :visible.sync="drawer">
       <div class="container">
         <p class="normal-title normal-margin">产品类别</p>
-        <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
+        <div style="display:flex;justify-content:space-between;align-items:center">
+          <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
+          <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
+        </div>
           <Table @selectArr="selectArr" ref="table" id="itemclassid" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="500px"  @upDateData="upDateData">
             <template v-slot:customcol="scope">
               <div v-if="scope.column.columnname == 'attinfos'">

src/HDrpManagement/contractManage/components/productDetailList/addProduct.vue

@@ -4,7 +4,10 @@
     <el-drawer append-to-body size="80%" :with-header="false" :visible.sync="drawer">
       <div class="container">
         <p class="normal-title normal-margin">产品清单</p>
-        <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
+        <div style="display:flex;justify-content:space-between;align-items:center">
+          <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
+          <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
+        </div>
         <Table @selectArr="selectArr" ref="table" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="500px"  @upDateData="upDateData">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname == 'attinfos'">
@@ -42,10 +45,6 @@
           </el-pagination>
         </div>
       </div>
-      <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false">取 消</el-button>
-        <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
-      </div>
     </el-drawer>
   </div>
 </template>

src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -54,7 +54,10 @@
     <el-drawer append-to-body size="80%" :with-header="false" :visible.sync="drawer">
       <div class="container">
         <p class="normal-title normal-margin">产品清单</p>
-        <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
+        <div style="display:flex;justify-content:space-between;align-items:center">
+          <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
+          <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
+        </div>
         <Table @selectArr="selectArr" ref="table" fixedName="operation" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="500px"  @upDateData="upDateData">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname == 'attinfos'">
@@ -92,10 +95,6 @@
           </el-pagination>
         </div>
       </div>
-      <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false">取 消</el-button>
-        <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
-      </div>
     </el-drawer>
   </div>
 </template>

src/HDrpManagement/contractManage/components/toolList/addTool.vue

@@ -4,7 +4,10 @@
     <el-drawer append-to-body size="80%" :with-header="false" :visible.sync="drawer">
       <div class="container">
         <p class="normal-title normal-margin">工具清单</p>
-        <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
+        <div style="display:flex;justify-content:space-between;align-items:center">
+          <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
+          <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
+        </div>
         <Table @selectArr="selectArr" ref="table" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="500px"  @upDateData="upDateData">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname == 'attinfos'">
@@ -42,10 +45,6 @@
           </el-pagination>
         </div>
       </div>
-      <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false">取 消</el-button>
-        <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
-      </div>
     </el-drawer>
   </div>
 </template>

src/HManagement/personalTarget/target/modules/adjustment.vue

@@ -29,7 +29,7 @@ export default {
       let date = new Date()
       let year = date.getFullYear()
       let month = date.getMonth() + 1
-      if (year <= this.data.year && month < 12) 
+      if (year <= this.data.year) 
         return true
     }
   },

src/HManagement/projectTarget/target/modules/adjustment.vue

@@ -29,7 +29,7 @@ export default {
       let date = new Date()
       let year = date.getFullYear()
       let month = date.getMonth() + 1
-      if (year <= this.data.year && month < 12) 
+      if (year <= this.data.year) 
         return true
     }
   },

src/SManagement/orderclue_detail/index.vue

@@ -24,8 +24,8 @@
           @updataList="queryMainData" 
           :teamList="teamList()"  
           v-if="userInfo.isAuth == 1 ? mainData.status == '待跟进' || mainData.status == '跟进中' : ''"></move> -->
-        <changeProject v-if="tool.checkAuth($route.name,'change') && mainData.isproject == 0" :data="mainData" :disabled="!isHandle" class="inline-16"/>
-        <changeCustomer v-if="tool.checkAuth($route.name,'change') && mainData.iscustomer == 0" :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"/>
+        <changeCustomer v-if=" mainData.iscustomer == 0 && tool.checkAuth($route.name,'changeCutomer')" :data="mainData" :disabled="!isHandle" class="inline-16" @onChangeCustomer="onChangeCustomer"></changeCustomer>
         <el-button :type="!isHandle?'':'primary'" v-if="tool.checkAuth($route.name,'goBack') && mainData.status != '已转化'" :disabled="!isHandle" class="inline-16" size="mini" @click="goBack">退 回</el-button>
         <noNull v-if="tool.checkAuth($route.name,'change') && mainData.status != '已转化'" class="inline-16" :disabled="!isHandle" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid"/>
         <Del v-if="tool.checkAuth($route.name,'delete') && mainData.status != '已转化'" class="inline-16" :disabled="!isHandle" :idName="20221123193702" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid" idKey="sat_orderclueids"/>