Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

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

@@ -5,7 +5,7 @@
         <el-input size="small" style="width:200px;margin-right:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
         <slot name="addProduct"/>
       </div>
-      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :width="true" height="calc(100vh - 550px)" :custom="true" fixedName="operation qty marketprice discountrate price countPrice" >
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" height="calc(100vh - 550px)" :custom="true" fixedName="operation qty marketprice discountrate price countPrice" >
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'qty'">
             <el-input-number size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="scope.column.data.qty" @change="qtyChange" :min="1" label="描述文字"></el-input-number>

src/HManagement/clueManage/clue_import/detailPage/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="mini" type="primary" :disabled="disabled" @click="onShow" style="margin-bottom:16px">新 建</el-button>
     <el-drawer
-      title="创建用户"
+      title="新建线索"
       :visible.sync="drawer"
       size="800px"
       direction="rtl"

src/HManagement/clueManage/clue_import/detailPage/modules/edit.vue

@@ -2,7 +2,7 @@
   <div class="inline-16">
     <el-button size="mini" :disabled="disabled" type="text" @click="onShow">编 辑</el-button>
     <el-drawer
-      title="创建用户"
+      title="新建线索"
       :visible.sync="drawer"
       size="800px"
       direction="rtl"