processview富文本显示

pages/aps/aps/components/excute.vue

@@ -65,7 +65,7 @@ export default {
       columns: [
         { title: " ", width: 130 },
         {
-          key: "insert_flag", 
+          key: "insert_flag",
           title: this.l("insert_flag"),
           align: "center",
           high: true,
@@ -92,7 +92,8 @@ export default {
                     color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa"
                   },
                   on: {
-                    click: () => this.changeFlag(params.row.op_task_pk, params.index)
+                    click: () =>
+                      this.changeFlag(params.row.op_task_pk, params.index)
                   }
                 })
               ]
@@ -118,6 +119,14 @@ export default {
           title: this.l("task_name"),
           align: "left",
           easy: true,
+          high: true,
+          hide: true
+        },
+        {
+          key: "taskseq_des",
+          title: this.l("task_name"),
+          align: "left",
+          easy: true,
           high: true
         },
         {
@@ -162,21 +171,21 @@ export default {
           title: this.l("setup_time"),
           align: "right",
           high: true,
-          type: "outputTime",
+          type: "outputTime"
         },
         {
           key: "run_time",
           title: this.l("run_time"),
           align: "right",
           high: true,
-          type: "outputTime",
+          type: "outputTime"
         },
         {
           key: "outside_time",
           title: this.l("outside_time"),
           align: "right",
           high: true,
-          type: "outputTime",
+          type: "outputTime"
         },
         {
           key: "transport_time",
@@ -184,7 +193,7 @@ export default {
           align: "right",
           high: true,
           hide: true,
-          type: "outputTime",
+          type: "outputTime"
         },
         {
           key: "check_time",
@@ -192,7 +201,7 @@ export default {
           align: "right",
           high: true,
           hide: true,
-          type: "outputTime",
+          type: "outputTime"
         },
         {
           key: "efficiency_value",
@@ -281,14 +290,6 @@ export default {
           hide: true
         },
 
-        {
-          key: "taskseq_des",
-          title: this.l("taskseq_des"),
-          align: "left",
-          easy: true,
-          high: true,
-          hide: true
-        },
         {
           key: "workshopcode",
           title: this.l("workshopcode"),
@@ -414,7 +415,10 @@ export default {
       //this.loadData(this.row)
       if (this.data1[this.rowIndex].insert_flag == 1) {
         //根据插单数据状态进行插单或取消插单操作
-        let params1 = { partTaskPks: [], opTaskPks: [this.data1[this.rowIndex].op_task_pk] };
+        let params1 = {
+          partTaskPks: [],
+          opTaskPks: [this.data1[this.rowIndex].op_task_pk]
+        };
         Api.cancelinsertorder(params1)
           .then(res => {
             if (res.success) {
@@ -428,7 +432,10 @@ export default {
             this.$Message.error("数据异常！");
           });
       } else {
-        let params = { partTaskPks: [], opTaskPks: [this.data1[this.rowIndex].op_task_pk] };
+        let params = {
+          partTaskPks: [],
+          opTaskPks: [this.data1[this.rowIndex].op_task_pk]
+        };
         Api.saveinsertorder(params)
           .then(res => {
             if (res.success) {

pages/processDesign/Process/processview.vue

@@ -298,14 +298,18 @@
               <tr>
                 <td class="tl">{{item5.taskseq}}</td>
                 <td class="tl">{{item5.name}}</td>
-                <td class="tl">{{item5.task_content}}</td>
+                <td class="tl">
+                 <div v-html="item5.task_content" ></div>
+                </td>
                 <td class="tl">{{item5.operator}}</td>
                 <td class="tl">{{item5.proofreader}}</td>
               </tr>
               <tr v-for="(item6,index6) in item5.step">
                 <td class="tl">{{item6.taskseq}}</td>
                 <td class="tl">{{item6.name}}</td>
-                <td class="tl">{{item6.task_content}}</td>
+                <td class="tl">
+                 <div v-html="item6.task_content" ></div>
+                </td>
                 <td class="tl">{{item6.operator}}</td>
                 <td class="tl">{{item6.proofreader}}</td>
               </tr>

pages/processManage/Process/processview.vue

@@ -17,13 +17,10 @@
               <label v-text="formValidate.code"></label>
             </div>
           </Col>
-          <Col span="5">
-            <div class="row_label box"></div>
-          </Col>
           <Col span="3">
             <div class="row_label">任务类型</div>
           </Col>
-          <Col span="4">
+          <Col span="9">
             <div class="iview_cont border_none">
               <label v-text="formValidate.task_type_str"></label>
             </div>
@@ -38,13 +35,10 @@
               <label v-text="formValidate.versiondesc"></label>
             </div>
           </Col>
-          <Col span="5">
-            <div class="row_label box"></div>
-          </Col>
           <Col span="3">
             <div class="row_label">研制方式</div>
           </Col>
-          <Col span="4">
+          <Col span="9">
             <div class="iview_cont border_none">
               <label v-text="formValidate.development_mode_str"></label>
             </div>
@@ -261,7 +255,7 @@
           <h2>工艺内容</h2>
         </Row>
         <Row class="table_row row03 auto_row">
-          <div style="min-height:300px" class="tex_in10">{{formValidate.remark}}</div>
+           <div style="min-height:300px" v-html="formValidate.remark" class="tex_in10"></div>
         </Row>
         <Row class="table_row center row_title">
           <h2>工艺附图</h2>
@@ -297,14 +291,18 @@
               <tr>
                 <td class="tl">{{item5.taskseq}}</td>
                 <td class="tl">{{item5.name}}</td>
-                <td class="tl">{{item5.task_content}}</td>
+                <td class="tl">
+                 <div v-html="item5.task_content" ></div>
+                 </td>
                 <td class="tl">{{item5.operator}}</td>
                 <td class="tl">{{item5.proofreader}}</td>
               </tr>
               <tr v-for="(item6,index6) in item5.step">
                 <td class="tl">{{item6.taskseq}}</td>
                 <td class="tl">{{item6.name}}</td>
-                <td class="tl">{{item6.task_content}}</td>
+                <td class="tl">
+                <div v-html="item6.task_content" ></div>
+                </td>
                 <td class="tl">{{item6.operator}}</td>
                 <td class="tl">{{item6.proofreader}}</td>
               </tr>