Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

pages/bug/component/add.vue

@@ -33,6 +33,7 @@
           <i-quill
             v-model="bugForm.content"
             :height="600"
+            v-paste="handleImg"
           />
         </FormItem>
       </Row>

pages/handle/examine3/index.vue

 <template>
   <div style="padding:40px 0">
     <Detail :idVal="detailId" />
-    <Process ref="userProcess" :idVal="detailId" />
+    <Process ref="userProcess" :idVal="detailId" style="width:80%"/>
     <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
       <Form
         :model="formMyCheck"

pages/processDesign/Process/processview.vue

@@ -15,17 +15,17 @@
           </Col>
           <Col span="9">
             <div class="iview_cont">
+              &nbsp;
               <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">
+              &nbsp;
               <label v-text="formValidate.task_type_str"></label>
             </div>
           </Col>
@@ -36,17 +36,17 @@
           </Col>
           <Col span="9">
             <div class="iview_cont">
+              &nbsp;
               <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">
+              &nbsp;
               <label v-text="formValidate.development_mode_str"></label>
             </div>
           </Col>
@@ -262,7 +262,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>工艺附图（magics文件或打印数据文件eosjz截图）</h2>
@@ -353,12 +353,12 @@
   </div>
 </template>
 <script>
-import service from '@/plugins/request'
+import service from "@/plugins/request";
 export default {
-  name: 'processview',
+  name: "processview",
   data() {
     return {
-      filesurl: '',
+      filesurl: "",
       downUrl: fileUrlDown,
       formValidate: {
         // name: '可乐叉烧',
@@ -466,7 +466,7 @@ export default {
           // }
         ]
       }
-    }
+    };
   },
   props: {
     //设置工艺、创建工艺
@@ -477,26 +477,23 @@ export default {
   },
   methods: {
     loaddata(headerID) {
-      var url = `${designUrl}/routingheader/getprocessinfo?headerid=` + headerID
-      service.get(`${url}`).then((response) => {
-        this.formValidate = response.result
+      var url =
+        `${designUrl}/routingheader/getprocessinfo?headerid=` + headerID;
+      service.get(`${url}`).then(response => {
+        this.formValidate = response.result;
 
-        if (this.formValidate.change_order_code == '') {
-          this.formValidate.change_order_date = ''
+        if (this.formValidate.change_order_code == "") {
+          this.formValidate.change_order_date = "";
+        }
+        if (typeof this.formValidate.production_batch == "undefined") {
+          this.formValidate.production_batch = "&nbsp";
         }
-       if (typeof(this.formValidate.production_batch) == "undefined")
-{
-   this.formValidate.production_batch = '&nbsp'
-}
-
-if (typeof(this.formValidate.print_data_name) == "undefined")
-{
-   this.formValidate.print_data_name = '&nbsp'
-}
 
-      
-      })
+        if (typeof this.formValidate.print_data_name == "undefined") {
+          this.formValidate.print_data_name = "&nbsp";
+        }
+      });
     }
   }
-}
+};
 </script>