Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

dsk-operate-ui/src/views/detail/party-a/dealings/component/customDetail.vue

@@ -26,6 +26,9 @@
         :queryParams="queryParams"
         @handle-current-change="handleCurrentChange"
       >
+        <template slot="projectName" slot-scope="scope">
+          <span v-html="scope.row.projectName"></span>
+        </template>
         <template slot="sourceType" slot-scope="scope">
           <div class="flex-box">
             <div class="a-link" @click="linkTo(scope)" v-if="scope.row.sourceId&&scope.row.sourceType=='中标业绩'" v-html="scope.row.sourceType" style="cursor: pointer"></div>
@@ -72,7 +75,7 @@ export default {
         { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目/工程名称查询', options: []},
       ],
       forData: [
-        {label: '项目名称', prop: 'projectName', fixed: true},
+        {label: '项目名称', prop: 'projectName', fixed: true,slot: true},
         {label: '公布时间', prop: 'time', width: '120',sortable:'custom',descending: '3', ascending: '4'},
         {label: '本次合同金额（万元）', prop: 'amount', width: '180',sortable:'custom',descending: '1', ascending: '2'},
         {label: '项目类型', prop: 'projectTtype', width: '130'},

dsk-operate-ui/src/views/detail/party-a/dealings/component/supplierDetail.vue

@@ -26,6 +26,9 @@
         @sort-change="sortChange"
         @handle-current-change="handleCurrentChange"
       >
+      <template slot="projectName" slot-scope="scope">
+        <span v-html="scope.row.projectName"></span>
+      </template>
         <template slot="sourceType" slot-scope="scope">
           <div class="flex-box">
             <div class="a-link" @click="linkTo(scope)" v-if="scope.row.sourceId&&scope.row.sourceType=='中标业绩'" v-html="scope.row.sourceType" style="cursor: pointer"></div>
@@ -72,7 +75,7 @@ export default {
         { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
       ],
       forData: [
-        {label: '项目名称', prop: 'projectName', fixed: true},
+        {label: '项目名称', prop: 'projectName', fixed: true,slot: true},
         {label: '公布时间', prop: 'time', width: '120',sortable:'custom',descending: '3', ascending: '4'},
         {label: '本次合同金额（万元）', prop: 'amount', width: '180',sortable:'custom',descending: '1', ascending: '2'},
         {label: '项目类型', prop: 'projectType', width: '130'},

dsk-operate-ui/src/views/project/overview/index.vue

@@ -345,7 +345,7 @@
               </div>
             </div>
           </template>
-          <no-data style="margin:20px 0" v-if="viewData6.length==0"/>
+          <no-data :condition="true" style="padding:40px" v-if="viewData6.length==0"/>
         </div>
       </el-card>
     </div>