表格换行、大屏部门选择

src/views/APICONFIG/index.vue

@@ -136,12 +136,12 @@
           {{ scope.row.apiCode }}
         </template>
       </el-table-column>
-      <el-table-column label="接口名称" align="center" prop="apiName">
+      <el-table-column label="接口名称" width="180" show-overflow-tooltip  align="center" prop="apiName">
         <template slot-scope="scope">
           {{ scope.row.apiName }}
         </template>
       </el-table-column>
-      <el-table-column label="接口url" align="center" prop="apiUrl">
+      <el-table-column label="接口url" width="180" show-overflow-tooltip align="center" prop="apiUrl">
         <template slot-scope="scope">
           {{ scope.row.apiUrl }}
         </template>
@@ -152,12 +152,13 @@
           <span v-else-if="scope.row.status == 0">不启用</span>
         </template>
       </el-table-column>
-      <el-table-column label="配置协议" align="center" prop="accord">
+      <el-table-column label="配置协议"  width="140" show-overflow-tooltip  align="center" prop="accord">
         <template slot-scope="scope">
           {{ scope.row.accord }}
         </template>
       </el-table-column>
       <el-table-column
+      width="180" 
         label="是否启用分布式线程"
         align="center"
         prop="hadoopFlag"
@@ -179,7 +180,7 @@
           <span v-else-if="scope.row.linkStatus == 0">失败</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
+      <el-table-column label="备注" width="180" show-overflow-tooltip align="center" prop="remark">
         <template slot-scope="scope">
           {{ scope.row.remark }}
         </template>

src/views/AuxiliaryIndex/index.vue

@@ -103,7 +103,7 @@
           <!-- </el-link> -->
         </template>
       </el-table-column>
-      <el-table-column label="指标内容" align="center" prop="content"></el-table-column>
+      <el-table-column label="指标内容" width="350" show-overflow-tooltip align="center" prop="content"></el-table-column>
 
       <el-table-column label="角色名称" align="center" prop="senId_dictText">
       </el-table-column>
@@ -115,11 +115,13 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
+      <el-table-column label="备注"  width="200" show-overflow-tooltip align="center" prop="remark">
       </el-table-column>
       <el-table-column
+      fixed="right"
         label="操作"
         align="center"
+        width="120"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">

src/views/ENTERPRISESCREENDATA/index.vue

@@ -133,7 +133,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="企业名称" prop="enterpriseName">
-              <el-select
+              <!-- <el-select
                 @change="selectDept"
                 v-model="form.enterpriseName"
                 placeholder="请选择供应商类型(三种) "
@@ -145,7 +145,13 @@
                   :label="dict.deptName"
                   :value="index"
                 ></el-option>
-              </el-select>
+              </el-select> -->
+              <select-tree
+                    ref="selectTree"
+                    :placeholder="'请选择部门'"
+                    :modelValue="form.deptName"
+                    @setNodeValue="handleNodeClick"
+                  />
             </el-form-item>
           </el-col>
 
@@ -195,8 +201,11 @@ import {
 import { checkPermi } from "@/utils/permission.js";
 import { getUserProfile } from "@/api/system/user.js";
 import { listDept } from "@/api/system/dept.js";
+import selectTree from "@/components/selectTree";
+
 export default {
   name: "ENTERPRISESCREENDATA",
+  components: { selectTree },
   data() {
     return {
       // 供应商类型
@@ -287,7 +296,7 @@ export default {
     this.getList();
     getUserProfile().then((res) => {
       this.userData = res.data;
-      listDept({ parentId: this.userData.deptId }).then((data) => {
+      listDept().then((data) => {
         this.deptList = data.data;
         console.log(this.deptList);
       });
@@ -295,6 +304,13 @@ export default {
   },
   methods: {
     checkPermi,
+
+    // 企业选择
+    handleNodeClick(data) {
+      this.$set(this.form, "deeptId", data.deptId);
+      this.$set(this.form, "enterpriseName", data.deptName);
+    },
+
     /** 查询企业大屏所需供应商数据列表 */
     getList() {
       // this.loading = true;
@@ -345,6 +361,9 @@ export default {
       this.reset();
       this.open = true;
       this.title = "添加企业大屏所需供应商数据";
+      this.$nextTick(() => {
+        this.$refs.selectTree.init(this.deptList);
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/ENTERPRISETRADEPERFORMANCE/index.vue

@@ -44,9 +44,9 @@
 
       <el-table-column label="企业名称" width="220" show-overflow-tooltip align="center" prop="deptName">
       </el-table-column>
-      <el-table-column label="规模以上工业产值(万元)" width="180" show-overflow-tooltip  align="center" prop="gmysgycz">
+      <el-table-column label="规模以上工业产值(万元)" width="200" show-overflow-tooltip  align="center" prop="gmysgycz">
       </el-table-column>
-      <el-table-column label="固定资产投资(万元)" width="140" show-overflow-tooltip  align="center" prop="gdzctz">
+      <el-table-column label="固定资产投资(万元)" width="160" show-overflow-tooltip  align="center" prop="gdzctz">
       </el-table-column>
       <el-table-column label="资产分类 " width="220" show-overflow-tooltip  align="center" prop="zcfl">
       </el-table-column>
@@ -54,8 +54,8 @@
       </el-table-column>
       <el-table-column label="电子账册分类 "  width="220" show-overflow-tooltip   align="center" prop="dzzcfl">
       </el-table-column>
-<<<<<<< HEAD
-      <el-table-column label="进、出口总值(万元)"  width="140" show-overflow-tooltip   align="center" prop="jckzz">
+
+      <el-table-column label="进、出口总值(万元)"  width="160" show-overflow-tooltip   align="center" prop="jckzz">
       </el-table-column>
       <el-table-column label="进口总值(万元)"  width="140" show-overflow-tooltip   align="center" prop="jkzz">
       </el-table-column>
@@ -100,7 +100,7 @@
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="60%" append-to-body>
       <el-tabs v-model="activeName">
         <el-tab-pane label="基本信息" name="first">
-          <el-form ref="forms" :model="form" :rules="rules" label-width="180px">
+          <el-form ref="forms" :model="form" :rules="rules" label-width="190px">
             <el-row>
               <el-col :span="12">
                 <el-form-item label="部门" prop="deptName">
@@ -149,9 +149,10 @@
                   <el-input v-model="form.qmqycyry" placeholder="请输入期末企业从业人员"></el-input>
                 </el-form-item>
               </el-col>
+             
               <el-col :span="12">
-                <el-form-item label="实际使用外资金额(万美元)" prop="sjsywzje">
-                  <el-input v-model="form.sjsywzje" placeholder="请输入实际使用外资金额"></el-input>
+                <el-form-item label="经营总收入(万元)" prop="jysr">
+                  <el-input v-model="form.jysr" placeholder="请输入经营总收入"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -160,8 +161,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="经营总收入(万元)" prop="jysr">
-                  <el-input v-model="form.jysr" placeholder="请输入经营总收入"></el-input>
+                <el-form-item  label="实际使用外资金额(万美元)" prop="sjsywzje">
+                  <el-input v-model="form.sjsywzje" placeholder="请输入实际使用外资金额"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>

src/views/GATHER/index.vue

@@ -164,12 +164,12 @@
         </template>
       </el-table-column>
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="单位名称" align="center" prop="deptId_dictText">
+      <el-table-column label="单位名称" fixed width="150"  align="center" prop="deptId_dictText">
         <template slot-scope="scope">
           {{ scope.row.deptId_dictText }}
         </template>
       </el-table-column>
-      <el-table-column label="数据类型" align="center" prop="type">
+      <el-table-column label="数据类型" width="140" align="center" prop="type">
         <template slot-scope="scope">
           <span v-if="scope.row.type == 0">量化指标数据</span>
           <span v-if="scope.row.type == 1">月报表数据</span>
@@ -207,7 +207,7 @@
         label="采集时间"
         align="center"
         prop="collTime"
-        width="100"
+        width="160"
       >
       </el-table-column>
 
@@ -221,25 +221,25 @@
         label="上报人"
         align="center"
         prop="reportName"
-        width="110"
+        width="160"
       />
       <el-table-column
+        width="160"
         label="上报时间"
         align="center"
         prop="reportTime"
-        width="100"
       />
       <el-table-column
         label="审核人"
         align="center"
         prop="approveName"
-        width="110"
+        width="160"
       />
       <el-table-column
         label="审核时间"
         align="center"
         prop="approveTime"
-        width="100"
+        width="160"
       />
       <el-table-column label="审核状态" align="center" prop="approveStatus">
         <template slot-scope="scope">
@@ -259,7 +259,7 @@
         label="驳回时间"
         align="center"
         prop="collTime"
-        width="100"
+        width="160"
       >
       </el-table-column>
 
@@ -267,7 +267,7 @@
         label="驳回姓名"
         align="center"
         prop="approveName"
-        width="100"
+        width="160"
       >
       </el-table-column>
 
@@ -275,6 +275,7 @@
         label="操作"
         align="center"
         fixed="right"
+        width="170"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">

src/views/GATHERWARNING/index.vue

@@ -85,13 +85,13 @@
     >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
 
-      <el-table-column label="数据类型" align="center" prop="type">
+      <el-table-column label="数据类型"  width="120" align="center" prop="type">
         <template slot-scope="scope">
           <span v-if="scope.row.type == 0">量化指标数据</span>
           <span v-else-if="scope.row.type == 1">月报表数据</span>
         </template>
       </el-table-column>
-      <el-table-column label="综保区" align="center" prop="deptId_dictText">
+      <el-table-column label="综保区" width="140"  align="center" prop="deptId_dictText">
         <template slot-scope="scope">
           {{ scope.row.deptId_dictText }}
         </template>
@@ -106,12 +106,12 @@
           {{ scope.row.month }}
         </template>
       </el-table-column>
-      <el-table-column label="指标名称" align="center" prop="gatherFeeName">
+      <el-table-column label="指标名称" width="200" show-overflow-tooltip align="center" prop="gatherFeeName">
         <template slot-scope="scope">
           {{ scope.row.gatherFeeName }}
         </template>
       </el-table-column>
-      <el-table-column label="采集参考值" align="center" prop="collValue">
+      <el-table-column label="采集参考值" width="130" align="center" prop="collValue">
         <template slot-scope="scope">
           <span v-if="scope.row.collValue">{{ scope.row.collValue }}</span>
           <span v-else>无</span>
@@ -122,12 +122,12 @@
           {{ scope.row.errValue }}
         </template>
       </el-table-column>
-      <el-table-column label="处置人" align="center" prop="dealBy">
+      <el-table-column label="处置人" width="200" align="center" prop="dealBy">
         <template slot-scope="scope">
           {{ scope.row.dealBy }}
         </template>
       </el-table-column>
-      <el-table-column label="处置时间" align="center" prop="dealTime">
+      <el-table-column label="处置时间" width="160" align="center" prop="dealTime">
         <template slot-scope="scope">
           {{ scope.row.dealTime }}
         </template>
@@ -141,22 +141,23 @@
           <el-tag v-else-if="scope.row.status == 2" type="info">已取消</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="取消人" align="center" prop="cancelBy">
+      <el-table-column label="取消人" width="160"  align="center" prop="cancelBy">
         <template slot-scope="scope">
           {{ scope.row.cancelBy }}
         </template>
       </el-table-column>
-      <el-table-column label="取消时间" align="center" prop="cancelTime">
+      <el-table-column label="取消时间"  width="160" align="center" prop="cancelTime">
         <template slot-scope="scope">
           {{ scope.row.cancelTime }}
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark">
+      <!-- <el-table-column label="备注"  width="160" show-overflow-tooltip align="center" prop="remark">
         <template slot-scope="scope">
           {{ scope.row.remark }}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
+        fixed="right"
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -249,7 +250,7 @@
         <el-form-item label="异常数据名称">
           {{ form.gatherFeeName }}
         </el-form-item>
-        <el-form-item label="采集参考值">
+        <el-form-item label="采集参考值" >
           <template slot-scope="scope">
             <span v-if="form.collValue">{{ form.collValue }}</span>
             <span v-else>无</span>

src/views/news/index.vue

@@ -27,7 +27,7 @@
     </el-row>
     <el-table :data="NEWSList" @selection-change="handleSelectionChange">
       <el-table-column type="selection"></el-table-column>
-      <el-table-column label="标题" align="left" prop="title" width="220">
+      <el-table-column label="标题" align="left" prop="title" width="220" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="omit">{{ scope.row.title }}</div>
         </template>
@@ -58,7 +58,7 @@
           <span v-if="scope.row.status == 6"><el-tag>已置顶</el-tag></span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" width="170">
+      <el-table-column label="操作" align="center" fixed="right" width="190">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status == 4 && checkPermi(['business:NEWS:edit'])" size="mini" type="text" @click="handleDownOrUp(scope.row)" >下架</el-button>
           <el-button v-if="(scope.row.status == 0 || scope.row.status == 2) && checkPermi(['business:NEWS:audit'])" size="mini" type="text"  @click="handleCommit(scope.row)">提交审核</el-button>

src/views/norm/quotaBonded.vue

@@ -55,7 +55,7 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核时间" align="center" prop="approvalTime"></el-table-column>
+      <el-table-column label="审核时间" width="160" align="center" prop="approvalTime"></el-table-column>
       <el-table-column label="审核人" align="center" prop="approvalName"></el-table-column>
       <el-table-column label="上报状态" align="center" prop="reportStatus">
         <template slot-scope="scope">
@@ -63,9 +63,9 @@
           <span v-if="scope.row.reportStatus == 1">已上报</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报人" align="center" prop="reportName"></el-table-column>
-      <el-table-column label="上报时间" align="center" prop="reportTime"></el-table-column>
-      <el-table-column label="操作" align="center" fixed="right" width="200">
+      <el-table-column label="上报人" align="center" width="160" prop="reportName"></el-table-column>
+      <el-table-column label="上报时间" align="center" width="160" prop="reportTime"></el-table-column>
+      <el-table-column label="操作" width="260" align="center" fixed="right" >
         <template slot-scope="scope">
           <el-button v-if="(scope.row.auditStatus == 0 || scope.row.auditStatus == null) &&
             (scope.row.approvalStatus == 0 ||

src/views/norm/quotafee.vue

@@ -53,9 +53,9 @@
         </el-table-column>
         <!--<el-table-column label="保税区id" align="center" prop="bondedId">
         </el-table-column>-->
-        <el-table-column label="指标名称"  align="center" prop="quotaName">
+        <el-table-column label="指标名称"  align="center" width="240" show-overflow-tooltip prop="quotaName">
         </el-table-column>
-        <el-table-column label="指标内容" align="center" prop="content">
+        <el-table-column label="指标内容" width="300" show-overflow-tooltip align="center" prop="content">
         </el-table-column>
         <el-table-column label="得分"  align="center" prop="score">
         </el-table-column>

src/views/wf/index.vue

@@ -72,9 +72,9 @@
 
     <el-table :data="PROTEMPLATEList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="保税区" align="center" prop="cbId_dictText" />
+      <el-table-column label="保税区"  width="200" align="center" prop="cbId_dictText" />
       <el-table-column label="流程编码" align="center" prop="procode" />
-      <el-table-column label="流程名称" align="center" prop="proname">
+      <el-table-column label="流程名称"  width="160" align="center" prop="proname">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -86,11 +86,11 @@
         </template>
       </el-table-column>
       <el-table-column label="版本" align="center" prop="version" />
-      <el-table-column label="关键字" align="center" prop="keyword" />
+      <el-table-column label="关键字" width="220" align="center" prop="keyword" />
       <el-table-column label="排序" align="center" prop="seqno" />
-      <el-table-column label="流程说明" align="center" prop="pronotes" />
-      <el-table-column label="服务层地址" align="center" prop="serviceUrl" />
-      <el-table-column label="前端查看页面地址" align="center" prop="infoUrl" />
+      <el-table-column label="流程说明" show-overflow-tooltip  width="200"  align="center" prop="pronotes" />
+      <el-table-column label="服务层地址" show-overflow-tooltip  width="200"  align="center" prop="serviceUrl" />
+      <el-table-column label="前端查看页面地址" show-overflow-tooltip  width="200"  align="center" prop="infoUrl" />
       <el-table-column label="是否启用" align="center" prop="status">
         <template slot-scope="scope">
           <el-switch
@@ -103,7 +103,9 @@
         </template>
       </el-table-column>
       <el-table-column
+        fixed="right"
         label="操作"
+        width="220" 
         align="center"
         class-name="small-padding fixed-width"
       >