Explorar el Código

履职内容输入时可换行;显示时也换行

jiawuxian hace 2 años
padre
commit
393bf09afd

+ 8 - 0
src/assets/styles/index.scss

@@ -24,6 +24,14 @@ html {
   box-sizing: border-box;
 }
 
+pre{
+  margin:0px;
+  word-wrap: break-word;
+  white-space: break-spaces;
+  font-size: inherit;
+  font-family: inherit;
+}
+
 #app {
   height: 100%;
 }

+ 5 - 1
src/views/resumption/plan/dialog.edit.vue

@@ -227,7 +227,11 @@
           <el-table-column prop="ruleName" label="履职内容库">
           </el-table-column>
           <el-table-column prop="itemName" label="履职项"> </el-table-column>
-          <el-table-column prop="pointName" label="履职内容"> </el-table-column>
+          <el-table-column prop="pointName" label="履职内容" width="300px">
+            <template slot-scope="scope">
+              <pre>{{ scope.row.pointName }}</pre>
+            </template>
+          </el-table-column>
           <el-table-column v-if="false" prop="ofOrgId" label="所属机构id"> </el-table-column>
           <el-table-column prop="areaName" label="履职区域"> </el-table-column>
           <el-table-column prop="checkName" label="履职点位"> </el-table-column>

+ 53 - 13
src/views/resumption/ruleManager/dialog.editItem.vue

@@ -1,35 +1,67 @@
 <template>
   <div class="rule-type">
-    <DialogCom :title="!formData.id ? '新增履职项' : '编辑履职项'" :visible.sync="dialogVisible" width="50%" :show-close="true"
-      @close="onHide">
+    <DialogCom
+      :title="!formData.id ? '新增履职项' : '编辑履职项'"
+      :visible.sync="dialogVisible"
+      width="50%"
+      :show-close="true"
+      @close="onHide"
+    >
       <div class="page-body">
         <div class="box">
-          <el-form ref="form" :model="formData" :rules="formDataRules" label-width="100px">
+          <el-form
+            ref="form"
+            :model="formData"
+            :rules="formDataRules"
+            label-width="100px"
+          >
             <el-row>
               <el-col :span="20">
                 <el-form-item prop="name" label="履职项">
-                  <el-input v-model.trim="formData.name" :maxlength="255" name="name" placeholder="请输入履职项" clearable />
+                  <el-input
+                    v-model.trim="formData.name"
+                    :maxlength="255"
+                    name="name"
+                    placeholder="请输入履职项"
+                    clearable
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
-
           </el-form>
         </div>
         <div class="box">
           <div style="margin-bottom: 10px">
-            <el-button type="primary" @click="onEdit(-1)">新增履职内容</el-button>
+            <el-button type="primary" @click="onEdit(-1)"
+              >新增履职内容</el-button
+            >
           </div>
           <el-table :data="formData.pointDtoList" border style="width: 100%">
-            <el-table-column prop="name" label="履职内容"> </el-table-column>
+            <el-table-column prop="name" label="履职内容">
+              <template slot-scope="scope">
+                <pre>{{ scope.row.name }}</pre>
+              </template>
+            </el-table-column>
             <el-table-column prop="areaName" label="履职区域">
             </el-table-column>
             <el-table-column prop="checkName" label="履职点位">
             </el-table-column>
             <el-table-column label="操作" width="140">
               <template slot-scope="scope">
-                <el-button type="text" size="small" @click="onEdit(scope.$index, scope.row)">编辑</el-button>
-                <el-popconfirm title="是否删除履职内容" @confirm="delitem(scope.$index)" style="margin-left: 20px;">
-                  <el-button slot="reference" type="text" size="small">删除</el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  @click="onEdit(scope.$index, scope.row)"
+                  >编辑</el-button
+                >
+                <el-popconfirm
+                  title="是否删除履职内容"
+                  @confirm="delitem(scope.$index)"
+                  style="margin-left: 20px"
+                >
+                  <el-button slot="reference" type="text" size="small"
+                    >删除</el-button
+                  >
                 </el-popconfirm>
               </template>
             </el-table-column>
@@ -42,7 +74,12 @@
         <el-button type="primary" @click="onSubmit()">保 存</el-button>
       </div>
     </DialogCom>
-    <EditPoint ref="editDialog" @submit="onPointSubmit" :rule="rule" v-bind="$attrs"></EditPoint>
+    <EditPoint
+      ref="editDialog"
+      @submit="onPointSubmit"
+      :rule="rule"
+      v-bind="$attrs"
+    ></EditPoint>
   </div>
 </template>
 
@@ -97,7 +134,10 @@ export default {
         if (!isValidate) {
           return;
         }
-        if (!this.formData.pointDtoList || this.formData.pointDtoList.length == 0) {
+        if (
+          !this.formData.pointDtoList ||
+          this.formData.pointDtoList.length == 0
+        ) {
           this.$message.warning("履职内容不能为空!");
           return;
         }
@@ -125,7 +165,7 @@ export default {
       this.formData.pointDtoList.splice(val, 1);
     },
   },
-  mounted() { },
+  mounted() {},
   components: { EditPoint },
 };
 </script>

+ 5 - 1
src/views/resumption/ruleManager/dialog.editPoint.vue

@@ -17,7 +17,7 @@
             ></el-input>
           </el-form-item> -->
           <el-form-item label="履职内容" prop="name">
-            <el-input v-model.trim="formData.name" placeholder="请输入履职内容" maxlength="255"></el-input>
+            <el-input  type="textarea" :rows="3" v-model="formData.name" placeholder="请输入履职内容" maxlength="255"></el-input>
           </el-form-item>
           <el-form-item label="履职区域" prop="areaId">
             <el-select style="width: 100%;" v-model="formData.areaId" placeholder="请选择履职区域" @change="onAreaChanged"
@@ -123,6 +123,10 @@ export default {
       this.dataVisible = true;
     },
     onSubmit() {
+      if(this.formData.name){
+        this.formData.name=this.formData.name.trim();
+      }
+      
       this.$refs.form.validate((isValidate) => {
         if (!isValidate) return;
         if(!this.formData.checkId && !this.formData.areaId){

+ 21 - 15
src/views/resumption/ruleManager/dialog.select.point.vue

@@ -35,7 +35,11 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="key" label="关键字">
-            <el-input v-model="search.key" maxlength="50"  placeholder="请输入履职项或履职内容"></el-input>
+            <el-input
+              v-model="search.key"
+              maxlength="50"
+              placeholder="请输入履职项或履职内容"
+            ></el-input>
           </el-form-item>
         </template>
 
@@ -47,6 +51,9 @@
             min-width="40%"
           ></el-table-column>
           <el-table-column label="履职内容" prop="pointName" min-width="40%">
+            <template slot-scope="scope">
+              <pre>{{ scope.row.pointName }}</pre>
+            </template>
           </el-table-column>
           <el-table-column
             prop="areaName"
@@ -86,20 +93,20 @@ export default {
   },
   computed: {},
   watch: {
-    search:{
-      deep:true,
-      handler(v){
-        if(v.ruleId){
-          this.$refs.st.search();    
-        }       
-      }
-    }
+    search: {
+      deep: true,
+      handler(v) {
+        if (v.ruleId) {
+          this.$refs.st.search();
+        }
+      },
+    },
   },
   props: {
     // defaultSelect:{
     //   type:Array
     // },
-    
+
     orgType: {
       type: String,
     },
@@ -113,10 +120,9 @@ export default {
       }
 
       ruleListForOrg({ orgType: this.orgType }).then((r) => {
-        this.ruleList = r.data;        
+        this.ruleList = r.data;
         if (r.data && r.data.length > 0) {
-          this.search.ruleId = r.data[0].id; 
-               
+          this.search.ruleId = r.data[0].id;
         }
       });
     },
@@ -145,7 +151,7 @@ export default {
 .DialogCom-div {
   overflow: auto;
 }
-.dialog-footer{
-  margin-top:20px;
+.dialog-footer {
+  margin-top: 20px;
 }
 </style>

+ 3 - 0
src/views/resumption/taskManager/dialog.detail.vue

@@ -26,6 +26,9 @@
                 width="250"
                 prop="pointName"
               >
+                <template slot-scope="scope">
+                  <pre>{{ scope.row.pointName }}</pre>
+                </template>
               </el-table-column>
               <el-table-column
                 label="履职区域"