Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into test

src/views/purchasingManage/inquiryManage/components/inventoryTable.vue

@@ -44,7 +44,7 @@
             filterable
             multiple
             collapse-tags
-            @change="handleSupplierSelect(scope.row)"
+        
           >
             <el-option
               v-for="i in scope.row.supplierList"
@@ -432,6 +432,8 @@
         });
       },
       setIsInquiry(list) {
+        return
+        
         this.form.datasource.forEach((productItem, index) => {
           //产品清单
           let isInquiry = 0,

src/views/purchasingManage/producerManage/components/contactDetailDialog.vue

@@ -313,7 +313,7 @@
       </el-tab-pane>
       <el-tab-pane label="证书资质" name="certificate">
         <headerTitle title="证书资质" style="margin-top: 30px"></headerTitle>
-        <ele-pro-table ref="certificateTable" :columns="certificateColumns" :datasource="tableCertificateData"
+        <ele-pro-table ref="certificateTable" :columns="certificateColumns"  :needPage="false"  :datasource="tableCertificateData"
                        :toolkit="[]" height="350px">
           <!-- 操作栏 -->
           <template v-slot:action="scope">

src/views/purchasingManage/supplierManage/components/contactDetailDialog.vue

@@ -313,7 +313,7 @@
       </el-tab-pane>
       <el-tab-pane label="证书资质" name="certificate">
         <headerTitle title="证书资质" style="margin-top: 30px"></headerTitle>
-        <ele-pro-table ref="certificateTable" :columns="certificateColumns" :datasource="tableCertificateData"
+        <ele-pro-table ref="certificateTable" :columns="certificateColumns"  :needPage="false" :datasource="tableCertificateData"
                        :toolkit="[]" height="350px">
           <!-- 操作栏 -->
           <template v-slot:action="scope">
@@ -322,6 +322,7 @@
               type="primary"
               :underline="false"
               icon="el-icon-edit"
+             
               @click="addCertificate('view',scope.row)">
               详情
             </el-link>

src/views/saleManage/businessOpportunity/components/darwerComponents/opportunityInfo.vue

@@ -66,8 +66,8 @@
         </el-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item label="创建人：" prop="createUsername">
-          <el-input v-model="form.createUsername" disabled></el-input>
+        <el-form-item label="创建人：" prop="createUserName">
+          <el-input v-model="form.createUserName" disabled></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="24">

src/views/saleManage/contact/components/contactDetailDialog.vue

@@ -333,7 +333,7 @@
 <!--      </el-tab-pane>-->
       <el-tab-pane label="证书资质" name="certificate">
         <headerTitle title="证书资质信息" style="margin-top: 30px"></headerTitle>
-        <ele-pro-table ref="certificateTable" :columns="certificateColumns" :datasource="tableCertificateData"
+        <ele-pro-table ref="certificateTable" :columns="certificateColumns"  :needPage="false"  :datasource="tableCertificateData"
                        :toolkit="[]" height="350px">
           <!-- 操作栏 -->
           <template v-slot:action="scope">