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

dsk-operate-ui/src/assets/styles/index.scss

@@ -803,3 +803,7 @@ ul, li {
   }
 
 }
+
+.min1370{
+  min-width: 1370px;
+}

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -5,7 +5,7 @@
       <span> / 客户列表</span>
     </div>
     <div class="app-container">
-      <el-card class="box-card noborder">
+      <el-card class="box-card noborder min1370">
         <div class="tables ">
           <div class="empty" v-if="tableData.total==0 && !isSkeleton">
             <img src="@/assets/images/project/empty.png">

dsk-operate-ui/src/views/detail/party-a/opport/announcement.vue

@@ -60,7 +60,7 @@ export default {
         {label: '发布日期', prop: 'issueTime', sortable: 'custom', descending: '3', ascending: '4', width: '120'},
         {label: '预算金额（万元）', prop: 'projectAmount', sortable: 'custom', descending: '1', ascending: '2', width: '140'},
         {label: '项目地区', prop: 'province', width: '120', slot: true},
-        {label: '项目类别', prop: 'tenderStage', width: '90'},
+        {label: '招标阶段', prop: 'tenderStage', width: '90'},
         {label: '招采单位联系人', prop: 'contact', width: '120'},
         {label: '招采单位联系方式', prop: 'contactTel', width: '130'},
         {label: '代理单位', prop: 'agency', minWidth: '170'},

dsk-operate-ui/src/views/project/projectList/component/lxr.vue

@@ -143,21 +143,22 @@
               <el-radio label=0>女</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="联系人角色：" class="row">
-            <el-input type="text" v-model="queryParam.role" placeholder="请输入"></el-input>
+          <el-form-item label="联系方式：" class="row">
+            <el-input type="text" maxlength="11" @input="inputphone"  v-model="queryParam.contactInformation" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item label="关联企业：" class="row" v-if="thistype == 'project'">
+          <!--<el-form-item label="关联企业：" class="row" v-if="thistype == 'project'">-->
+          <el-form-item label="关联企业：" class="row">
             <el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input>
           </el-form-item>
+          <el-form-item label="联系人角色：" class="row">
+            <el-input type="text" v-model="queryParam.role" placeholder="请输入"></el-input>
+          </el-form-item>
           <el-form-item label="联系人职位：" class="row">
             <el-input type="text" v-model="queryParam.position" placeholder="请输入"></el-input>
           </el-form-item>
           <!--<el-form-item label="内部维护人：" class="row">-->
             <!--<el-input type="text" v-model="queryParam.accendant" placeholder="请输入"></el-input>-->
           <!--</el-form-item>-->
-          <el-form-item label="联系方式：" class="row">
-            <el-input type="text" maxlength="11" @input="inputphone"  v-model="queryParam.contactInformation" placeholder="请输入"></el-input>
-          </el-form-item>
           <el-form-item label="备注：" class="row">
             <el-input
               type="textarea"
@@ -339,14 +340,17 @@
           position:"",
           contactInformation:"",
           remark:"",
+          companyName:"",
           // accendant:"",
         }
         if(this.thistype == 'project'){
           this.queryParam.businessId = this.searchParam.businessId
           this.companyName = ""
+          this.queryParam.companyName=this.$route.query.projectname
         }
         if(this.thistype == 'custom'){
           this.queryParam.customerId = this.searchParam.customerId
+          this.queryParam.companyName=this.customname
         }
       },
     }

dsk-operate-ui/src/views/system/user/index.vue

@@ -767,3 +767,16 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.head-container{
+  ::v-deep .el-tree-node__content{
+    white-space: normal !important;
+    height: auto;
+    padding: 2px 0;
+    .el-tree-node__expand-icon{
+      padding: 2px 6px;
+      align-self: flex-start;
+    }
+  }
+}
+</style>