processview

pages/handle/examine3/detail.vue

@@ -8,7 +8,7 @@
 </template>
 <script>
 import Api from '../api'
-import Processview from '../../processDesign/Process/processview.vue'
+import Processview from '../../technology/processview.vue'
 
 export default {
   name: 'detail',
@@ -40,7 +40,7 @@ export default {
     load(v) {
       Api.get({ Id: this.idVal }).then((r) => {
         if (r.success) {
-          this.$refs.processview.loaddata(r.result.fromIds)
+          this.$refs.processview.load(r.result.fromIds)
         } else {
           this.$Message.error('加载失败')
         }

pages/technology/processview.vue

@@ -41,7 +41,7 @@
               <Col span="9">
                 <div class="iview_cont border_none">
                   &nbsp;
-                  <label v-text="formValidate.task_type_str"></label>
+                   <state code="Process.Routing.routingType" :value="formValidate.routingType+''"  type="text"></state>
                 </div>
               </Col>
             </Row>
@@ -52,16 +52,16 @@
               <Col span="9">
                 <div class="iview_cont">
                   &nbsp;
-                  <label v-text="formValidate.versiondesc"></label>
+                  <state code="Process.Routing.version" :value="formValidate.versionid+''"  type="text"></state>
                 </div>
               </Col>
               <Col span="3">
-                <div class="row_label">研制方式</div>
+                <div class="row_label">工艺阶段</div>
               </Col>
               <Col span="9">
                 <div class="iview_cont border_none">
                   &nbsp;
-                  <label v-text="formValidate.development_mode_str"></label>
+                  <state code="Process.Routing.phase" :value="formValidate.phase+''"  type="text"></state>
                 </div>
               </Col>
             </Row>
@@ -165,19 +165,19 @@
               <tbody>
                 <template v-for="(item5,index5) in formValidate.details">
                   <tr>
-                    <td class="tl">{{item5.taskseq}}</td>
+                    <td class="tl">{{item5.taskSeq}}</td>
                     <td class="tl">{{item5.name}}</td>
                     <td class="tl">
-                      <div v-html="item5.task_content" class="tohtml"></div>
+                      <div v-html="item5.taskContent" class="tohtml"></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.taskSeq}}</td>
                     <td class="tl">{{item6.name}}</td>
                     <td class="tl">
-                      <div v-html="item6.task_content" class="tohtml"></div>
+                      <div v-html="item6.taskContent" class="tohtml"></div>
                     </td>
                     <td class="tl">{{item6.operator}}</td>
                     <td class="tl">{{item6.proofreader}}</td>
@@ -211,9 +211,9 @@
               <tbody>
                 <template v-for="(item7,index7) in formValidate.qcards">
                   <tr>
-                    <td class="tl">{{item7.taskseq}}</td>
-                    <td class="tl">{{item7.check_content}}</td>
-                    <td class="tl">{{item7.checkresult}}</td>
+                    <td class="tl">{{item7.taskSeq}}</td>
+                    <td class="tl">{{item7.checkContent}}</td>
+                    <td class="tl">{{item7.checkResult}}</td>
                     <td class="tl">{{item7.result}}</td>
                     <td class="tl">{{item7.checker}}</td>
                     <td class="tl">{{item7.remarks}}</td>
@@ -233,6 +233,7 @@
   </div>
 </template>
 <script>
+import Api from "./api";
 import service from "@/plugins/request";
 export default {
   name: "processview",
@@ -274,7 +275,7 @@ export default {
     load(v) {
       this.circleModal = true;
       this.dataSatus = false;
-      var url = `${designUrl}/routingheader/getprocessinfo?headerid=` + v;
+      var url = `${technologyUrl}routingheader/getprocessinfo?headerid=` + v;
       service
         .get(`${url}`)
         .then(response => {
@@ -303,19 +304,53 @@ export default {
     loadImg() {
       this.nameList = [];
       this.formValidate.files = [];
-      //查询上传到文件服务器上的文件
-      this.$http.sysUser.getFile(this.parms).then(res => {
-        if (res.data != [] && res.data.length > 0) {
-          res.data.forEach(data => {
-            let objImag = {};
-            objImag.fileName = data.fileName;
-            objImag.url = data.downloadPath;
-            objImag.id = data.id;
-            this.nameList.push(objImag);
-          });
-          this.formValidate.files = this.nameList;
-        }
-      });
+      if (this.eid == undefined) {
+        let pars = {
+          conditions: [
+            {
+              fieldName: "code",
+              fieldValue: this.formValidate.code,
+              conditionalType: "Equal"
+            }
+          ]
+        };
+        Api.paged(pars)
+          .then(res => {
+            if (res.result.items[0].fileId) {
+              this.parms.eid = res.result.items[0].fileId;
+            } else {
+              this.parms.eid = this.$u.guid(); //未上传过文件
+            }
+            //查询上传到文件服务器上的文件
+            this.$http.sysUser.getFile(this.parms).then(res => {
+              if (res.data != [] && res.data.length > 0) {
+                res.data.forEach(data => {
+                  let objImag = {};
+                  objImag.fileName = data.fileName;
+                  objImag.url = data.downloadPath;
+                  objImag.id = data.id;
+                  this.nameList.push(objImag);
+                });
+                this.formValidate.files = this.nameList;
+              }
+            });
+          })
+          .catch(err => {});
+      } else {
+        //查询上传到文件服务器上的文件
+        this.$http.sysUser.getFile(this.parms).then(res => {
+          if (res.data != [] && res.data.length > 0) {
+            res.data.forEach(data => {
+              let objImag = {};
+              objImag.fileName = data.fileName;
+              objImag.url = data.downloadPath;
+              objImag.id = data.id;
+              this.nameList.push(objImag);
+            });
+            this.formValidate.files = this.nameList;
+          }
+        });
+      }
     }
   },
   watch: {
@@ -324,12 +359,11 @@ export default {
         this.load(v);
       }
     },
-     uid(v) {
+    uid(v) {
       if (v != 0) {
-        this.parms.eid=v
+        this.parms.eid = v;
       }
-    },
-
+    }
   }
 };
 </script>
@@ -353,6 +387,5 @@ export default {
   position: relative;
   border: 0px solid #eee;
 }
-
 </style>