工艺案例&工艺提醒新增信息

pages/produce/execute/ProcessCase/add.vue

@@ -41,9 +41,9 @@ export default {
         content: "",
         filePath: "",
         filePaths: "",
-        dispatchId: null,
-        routingDetailId: null,
-        routingHeaderId: null,
+        dispatchId: this.$route.query.id,
+        routingDetailId: this.$route.query.headid,
+        routingHeaderId: this.$route.query.routid,
         type: 1
       },
       rules: {

pages/produce/execute/ProcessCase/detail.vue

 <template>
-    <div class="detail">
-
-        <Row>
-<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
-<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
-<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
-<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
-<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
-<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
-<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed>
-<Filed :span="12" :name="l('title')">{{entity.title}}</Filed>
-<Filed :span="12" :name="l('creator')">{{entity.creator}}</Filed>
-<Filed :span="12" :name="l('filePath')">{{entity.filePath}}</Filed>
-<Filed :span="12" :name="l('filePaths')">{{entity.filePaths}}</Filed>
-        </Row>
-       
-    </div>
+  <div class="detail">
+    <Row>
+      <Filed :span="24" :name="l('title')">{{entity.title}}</Filed>
+      <Filed :span="24" :name="l('creationTime')">{{entity.creationTime}}</Filed>
+      <Filed :span="24" :name="l('creator')">{{entity.creator}}</Filed>
+      <Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
+      <Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
+      <Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
+      <Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
+      <Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
+      <Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed>
+      <Filed :span="24" :name="l('filePath')">{{entity.filePath}}</Filed>
+      <!-- <Filed :span="12" :name="l('filePaths')">{{entity.filePaths}}</Filed> -->
+    </Row>
+  </div>
 </template>
 <script>
-    import Api from './api'
-    export default {
-        name: 'Add',
-        data() {
-            return {
-                entity: {},
-                rules: {
-                    name: [{ required: true, message: '必填', trigger: 'blur' }],
-                    code: [{ required: true, message: '必填', trigger: 'blur' }]
-                }
-            }
-        },
-        props: {
-            eid: Number
-        },
-        mounted() {
-            if (this.eid > 0) {
-                this.load(this.eid);
-            }
-        },
-        methods: {
-            load(v) {
-                Api.get({ id: v }).then(r => {
-                    this.entity = r.result;
-                    this.$emit('on-load')
-                })
-            },
-            handleClose() {
-                this.$emit('on-close')
-            },
-      l(key) {
-          key = "process_case" + "." + key;
-          return this.$t(key)
+import Api from "./api";
+export default {
+  name: "Add",
+  data() {
+    return {
+      entity: {},
+      rules: {
+        name: [{ required: true, message: "必填", trigger: "blur" }],
+        code: [{ required: true, message: "必填", trigger: "blur" }]
       }
-        },
-        watch: {
-            eid(v) {
-                if (v > 0) {
-                    this.load(v);
-                }
-            }
-        }
+    };
+  },
+  props: {
+    eid: Number
+  },
+  mounted() {
+    if (this.eid > 0) {
+      this.load(this.eid);
     }
+  },
+  methods: {
+    load(v) {
+      Api.get({ id: v }).then(r => {
+        this.entity = r.result;
+        this.$emit("on-load");
+      });
+    },
+    handleClose() {
+      this.$emit("on-close");
+    },
+    l(key) {
+      key = "process_case" + "." + key;
+      return this.$t(key);
+    }
+  },
+  watch: {
+    eid(v) {
+      if (v > 0) {
+        this.load(v);
+      }
+    }
+  }
+};
 </script>
\ No newline at end of file

pages/produce/execute/ProcessCase/index.vue

@@ -76,7 +76,7 @@
         </div> -->
       </template>
     </DataGrid>
-    <Modal v-model="modal" :title="title" width="1200" footer-hide>
+    <Modal v-model="modal" :title="title" width="800" footer-hide>
       <component :is="detail" :eid="curId" @on-close="cancel" @on-ok="ok" />
     </Modal>
     <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel" :mask-closable="false">
@@ -95,7 +95,7 @@ export default {
   head: {
     title: "工艺案例",
     author: "henq",
-    description: "process_case  6/1/2020 5:06:34 PM"
+    // description: "process_case  6/1/2020 5:06:34 PM"
   },
   data() {
     return {
@@ -246,7 +246,7 @@ export default {
   },
   methods: {
     laodparme() {
-      console.log(555);
+      // console.log(555);
       this.$refs.grid.reload(condition);
     },
     changeCards(carData) {

pages/produce/execute/ProcessCheck/guidance/add.vue

@@ -41,9 +41,9 @@ export default {
         content: "",
         filePath: "",
         filePaths: "",
-        dispatchId: null,
-        routingDetailId: null,
-        routingHeaderId: null,
+        dispatchId: this.$route.query.id,
+        routingDetailId: this.$route.query.headid,
+        routingHeaderId: this.$route.query.routid,
         type: 2
       },
       rules: {

pages/produce/execute/components/orderlist.vue

@@ -77,6 +77,7 @@ export default {
           orderId: item.orderId,
           executeId: item.executeId,
           headid: item.routingHeaderId,
+          routid: item.routingDetailId,//工序ID
           dispatchStatus: item.status
         }
       });

pages/produce/orderlist.vue

@@ -27,7 +27,10 @@
         <Button :icon="iconInfo" shape="circle" :title="titleInfo" @click="changeShwo"></Button>
       </template>
       <template slot="card" slot-scope="{row}">
-        <div class="body" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.status)">
+        <div
+          class="body"
+          @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.status)"
+        >
           <Row class="title-i">
             <Col :span="10" class="order-code">{{row.productName}}</Col>
             <Col :span="10" class="order-code">{{row.mesCode}}</Col>
@@ -182,6 +185,7 @@ export default {
                         params.row.orderId,
                         params.row.executeId,
                         params.row.routingHeaderId,
+                        params.row.routingDetailId,
                         params.row.status
                       )
                   }
@@ -212,11 +216,18 @@ export default {
     search() {
       this.$refs.grid.reload(this.easySearch);
     },
-    toExecute(id, orderId, executeId,headid,status) {
+    toExecute(id, orderId, executeId, headid, routingDetailId, status) {
       //跳转到对应操作页面  获取id:this.$route.query.id
       this.$router.push({
         path: "/produce/execute",
-        query: { id: id, orderId: orderId, executeId: executeId,headid:headid,dispatchStatus:status }
+        query: {
+          id: id, //工单ID
+          orderId: orderId, //订单id
+          executeId: executeId, //订单执行表id
+          headid: headid, //工艺规程id
+          routid: routingDetailId, //工序ID
+          dispatchStatus: status
+        }
       });
     },
     tdStyle(val) {
@@ -280,7 +291,7 @@ export default {
       //返回img需要显示的src值
       let tempUrl = "";
       if (url && url.length > 0) {
-        tempUrl = this.downUrl +url;
+        tempUrl = this.downUrl + url;
       } else {
         tempUrl = iconImg + "noPic_product.png";
       }