换行和筛选条件

src/views/ARTICLE/edit.vue

@@ -53,9 +53,11 @@
       </el-form-item>
       <el-form-item label="形象进度" prop="schedule">
         <el-input
+          type="textarea"
+          :rows="5"
           v-model="form.schedule"
           placeholder="请输入形象进度"
-          style="width: 50%"
+          style="width: 100%"
         ></el-input>
       </el-form-item>
     </el-form>

src/views/ARTICLE/index.vue

@@ -14,6 +14,16 @@
           placeholder="请输入项目名称"
         ></el-input>
       </el-form-item>
+      <el-form-item label="保税区">
+        <el-select v-model="queryParams.deptId" placeholder="请选择保税区">
+          <el-option
+            v-for="item in bsqList"
+            :key="item.value"
+            :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+      </el-select>
+      </el-form-item>
 
       <el-form-item label="建设规模">
         <el-input
@@ -277,6 +287,8 @@ import {
 import edit from "./edit.vue";
 import enterData from "./enterData.vue";
 import detail from "./detail.vue";
+import {listDept} from "@/api/system/dept";
+
 export default {
   name: "ARTICLE",
   data() {
@@ -363,6 +375,10 @@ export default {
     };
   },
   created() {
+    listDept({type:2}).then(res=>{
+      this.bsqList = res.data;
+      console.log(res);
+    })
     this.getList();
     this.getDeptId();
     this.getqueryArticleDate();

src/views/COUNSELINGMESSAGE/index.vue

@@ -28,7 +28,7 @@
     <!--列表-->
     <el-table  :data="COUNSELINGMESSAGEList" @selection-change="handleSelectionChange" height="calc(100vh - 300px)">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="标题信息" align="center" prop="title" width="220px"/>
+      <el-table-column label="标题信息" width="260" show-overflow-tooltip align="center" prop="title"/>
       <el-table-column label="创建时间" align="center" prop="createTime" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>

src/views/ENTERPRISESCREENDATA/index.vue

@@ -257,7 +257,7 @@ export default {
         createBy: null,
         updateTime: null,
         updateBy: null,
-        deeptId: null,
+        deptId: null,
       },
       // 表单参数
       form: {},
@@ -283,7 +283,7 @@ export default {
             trigger: "change",
           },
         ],
-        deeptId: [
+        deptId: [
           { required: true, message: "部门主键不能为空", trigger: "blur" },
         ],
       },
@@ -307,7 +307,7 @@ export default {
 
     // 企业选择
     handleNodeClick(data) {
-      this.$set(this.form, "deeptId", data.deptId);
+      this.$set(this.form, "deptId", data.deptId);
       this.$set(this.form, "enterpriseName", data.deptName);
     },
 
@@ -328,7 +328,7 @@ export default {
 
     selectDept(i) {
       this.form.enterpriseName = this.deptList[i].deptName;
-      this.form.deeptId = this.deptList[i].deptId;
+      this.form.deptId = this.deptList[i].deptId;
     },
     // 表单重置
     reset() {
@@ -336,7 +336,7 @@ export default {
         enterpriseName: null,
         providerName: null,
         providerType: null,
-        deeptId: null,
+        deptId: null,
       };
       this.resetForm("form");
     },
@@ -379,7 +379,7 @@ export default {
     submitForm() {
       console.log(this.form, "---");
       this.$refs["form"].validate((valid) => {
-        // this.form.deeptId = this.userData.deptId;
+        // this.form.deptId = this.userData.deptId;
         if (valid) {
           if (this.form.id != null) {
             updateENTERPRISESCREENDATA(this.form).then((response) => {

src/views/GARDENTRADEDATA/index.vue

@@ -107,16 +107,28 @@
           {{scope.row.gardenInnovative}}
         </template>
       </el-table-column>
-      <el-table-column label="企业工业用水、用电量" align="center" prop="companyWaterElectric" width="170">
+      <el-table-column label="企业工业用水(吨)" align="center" prop="companyWaterElectric" width="170">
         <template slot-scope="scope">
           {{scope.row.companyWaterElectric}}
         </template>
       </el-table-column>
-      <el-table-column label="园区工业用水、用电总量" align="center" prop="gardenWaterElectric" width="190">
+      <el-table-column label="企业工业用电(度)" align="center" prop="companyElectric" width="170">
+        <template slot-scope="scope">
+          {{scope.row.companyElectric}}
+        </template>
+      </el-table-column>
+      <el-table-column label="园区工业用水(吨)" align="center" prop="gardenWaterElectric" width="170">
         <template slot-scope="scope">
           {{scope.row.gardenWaterElectric}}
         </template>
       </el-table-column>
+      <el-table-column label="园区工业用电(度)" align="center" prop="gardenElectric" width="190">
+        <template slot-scope="scope">
+          {{scope.row.gardenElectric}}
+        </template>
+      </el-table-column>
+
+     
       <el-table-column fixed="right" label="操作" width="140" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

src/views/GATHER/index.vue

@@ -1180,26 +1180,6 @@ export default {
             }
           }
         }
-
-        // 这里科研失败！想动态绑定校验规则的
-        //遍历设置表单校验  我好困
-        // for (const i in this.form.feeLists) {
-        //   this.$set(this.rules,this.form.feeLists[i].normfeeId,[
-        //     {  required: true, message: this.form.feeLists[i].normfeeName+"不能为空", trigger: "blur"  }
-        //   ])
-        // }
-
-
-        //这里是第二种写法
-        //获取分类ID相同的子集
-        // for (let index = 0; index < this.tabList.length; index++) {
-        //   this.$set(this.tabList[index],'list',[])
-        //   for (let i = 0; i < dataList.length; i++) {
-        //     if (dataList[i].normId == this.tabList[index].normId) {
-        //       this.tabList[index].list.push(dataList[i]);
-        //     }
-        //   }
-        // }
       });
     },
 
@@ -1274,21 +1254,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm(type) {
-      // for (const i in this.form.feeLists) {
-      //   if (
-      //     this.form.feeLists[i].collCalue == "" ||
-      //     this.form.feeLists[i].collCalue == null
-      //   ) {
-      //     return this.$message({
-      //       message:
-      //         this.form.feeLists[i].normName +
-      //         " - " +
-      //         this.form.feeLists[i].normfeeName +
-      //         " 未填写！",
-      //       type: "warning",
-      //     });
-      //   }
-      // }
       // 验证表单
       let p = [];
       p = this.form.feeLists.map((item, index) => {

src/views/ONLINE/index.vue

@@ -27,7 +27,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="单位名称" align="left" prop="depName" />
       <el-table-column label="单位编码" align="center" prop="deptId" width="90" />
-      <el-table-column label="位置" align="center" prop="location" />
+      <el-table-column label="位置" width="260" show-overflow-tooltip  align="center" prop="location" />
       <el-table-column label="电话" align="center" prop="telphone" />
       <el-table-column label="邮箱" align="center" prop="email" />
     </el-table>

src/views/QUESTION/index.vue

@@ -98,7 +98,7 @@
               <div class="clear_p" v-html="props.row.expertAnswer"></div>
             </el-form-item>
             <el-form-item label="提问详情">
-              {{ props.row.detail }}
+              <span v-html="props.row.detail"></span>
             </el-form-item>
           </el-form>
         </template>

src/views/norm/feeindex.vue

@@ -73,24 +73,27 @@
 
       <el-table :data="normData" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="分类占比" align="center" prop="normRatio" />
         <el-table-column
+        fixed
           label="指标参数名称"
           align="center"
           prop="fname"
           width="150"
+          show-overflow-tooltip
         />
+        <el-table-column label="分类占比" width="80" show-overflow-tooltip align="center" prop="normRatio" />
         <el-table-column
           label="指标编码"
           align="center"
           prop="fcode"
-          width="150"
+          width="120"
         />
         <el-table-column
           label="计算公式"
           align="center"
           prop="formula"
-          width="150"
+          width="120"
+          show-overflow-tooltip
         >
           <template slot-scope="scope">
             <el-link style="text-decoration: underline;color: #36aafd" @click="formulaDialog(scope.row.id,scope.row.formula)">{{scope.row.formula}}</el-link>
@@ -106,25 +109,26 @@
           label="权数"
           align="center"
           prop="fnumber"
-          width="90"
+          width="80"
         />
         <el-table-column
           label="排序"
           align="center"
           prop="sort"
-          width="90"
+          width="80"
         />
         <el-table-column
           label="绩效公差上下公差占比"
           align="center"
           prop="msRetio"
-          width="130"
+          width="180"
+          show-overflow-tooltip
         />
         <el-table-column
           label="采集公差上下公差占比"
           align="center"
           prop="dfRetio"
-          width="130"
+          width="180"
         />
         <el-table-column
           label="采集参考值"
@@ -160,9 +164,10 @@
           label="备注"
           align="center"
           prop="remark"
-          width="150"
+          width="220"
+          show-overflow-tooltip
         />
-        <el-table-column label="操作" align="center" fixed="right" width="150">
+        <el-table-column label="操作" align="center" fixed="right" width="220">
           <template slot-scope="scope">
             <el-button
               size="mini"

src/views/norm/index.vue

@@ -44,6 +44,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:NORM:edit']">修改</el-button>
           <el-button v-if="scope.row.status != 1" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:NORM:remove']">删除</el-button>
+          <el-button size="mini" type="text"  @click="tableBdClick(scope.row)" v-hasPermi="['business:NORM:query']">指标</el-button>
+        
         </template>
       </el-table-column>
     </el-table>
@@ -299,14 +301,15 @@ export default {
     // 表格行点击事件处理
     tableBdClick(row) {
       this.normId = row.id;
-      listNORMFEE({ normId: this.normId, ...this.pageParams }).then(res => {
+      // console.log(this.normId);
+      listNORMFEE({ normId: row.id, ...this.pageParams }).then(res => {
         res.rows.forEach((item, index) => {
           res.rows[index].status = item.status == 0 ? false : true;
         });
         this.totalNum = res.total
         this.normData = res.rows;
+        this.isShowNormDialog = !this.isShowNormDialog;
       });
-      this.isShowNormDialog = !this.isShowNormDialog;
     },
 
     // 启动开关事件处理

src/views/task/index.vue

@@ -18,22 +18,22 @@
 
     <el-table v-hasPermi="['business:INSTACTIONTASK:byUser']" :data="INSTACTIONTASKList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="活动名称" align="center" prop="acname">
+      <el-table-column label="活动名称" width="180" show-overflow-tooltip align="center" prop="acname">
         <template slot-scope="scope">
           {{ scope.row.acname }}
         </template>
       </el-table-column>
-      <el-table-column label="标题" align="center" prop="fromKeyword ">
+      <el-table-column label="标题" width="220" show-overflow-tooltip align="center" prop="fromKeyword ">
         <template slot-scope="scope">
           {{ scope.row.fromKeyword }}
         </template>
       </el-table-column>
-      <el-table-column label="流程名称" align="center" prop="proname">
+      <el-table-column label="流程名称" width="180" show-overflow-tooltip align="center" prop="proname">
         <template slot-scope="scope">
           {{ scope.row.proname }}
         </template>
       </el-table-column>
-      <el-table-column label="递交时间" align="center" prop="beginTime">
+      <el-table-column label="递交时间" width="160" show-overflow-tooltip align="center" prop="beginTime">
         <template slot-scope="scope">
           {{ scope.row.beginTime }}
         </template>
@@ -46,12 +46,12 @@
           <el-tag v-else-if="scope.row.status == '0'">待审核</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="审核意见" align="center" prop="comments">
+      <el-table-column label="审核意见" width="260" show-overflow-tooltip align="center" prop="comments">
         <template slot-scope="scope">
           {{ scope.row.comments }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" width="80" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status == '0' && checkPermi(['business:INSTACTIONTASK:query'])" size="mini" type="text" @click="handleExamine(scope.row)"
             >详情</el-button>