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

components/page/files.vue

@@ -82,7 +82,6 @@ export default {
       per: 0,
       vshowPro: false,
       Photo: true,
-      showList: true,
       isactive: 0
     };
   },
@@ -137,9 +136,7 @@ export default {
       this.per = 0;
       this.vshowPro = true;
     },
-    // change(event) {
-    //   this.$emit('on-change', event)
-    // },
+    
     //上传成功文件
     uploadSuccess(response, file, fileList) {
       if (this.Photos) {

pages/produce/execute/ProcessCheck/index.vue

@@ -35,11 +35,11 @@ export default {
     };
   },
   created() {
-    this.id = Number(this.$route.query.row.routingHeaderId); //工艺规程id
+    this.id = Number(this.$route.query.headid); //工艺规程id
     //this.uId = ""; //工艺规程文件id
     ApiProcess.get({ id: this.id }).then(r => {
       if (r.success && r.result) {
-        if (r.result.fileId != "") {
+        if (r.result.fileId&&r.result.fileId != "") {
           this.uId = r.result.fileId;
         } else {
           this.uId = this.$u.guid();
@@ -58,7 +58,8 @@ export default {
     openSaveTip(key) {
       this.id = key;
       if (this.id == "1") {
-        this.id = Number(this.$route.query.row.routingHeaderId); //工艺规程id
+        this.id = Number(this.$route.query.headid); //工艺规程id
+        //this.uId = ""; //工艺规程文件id
         this.detail = () => import("../../../technology/processview");
       }
       //if(this.id == "1"){ this.detail = () => import("./components/setupDetails");}
@@ -81,7 +82,6 @@ export default {
   background: white;
   border: 1px solid #ccc;
   border-top: 0;
-  height: 100px;
   overflow-y: auto;
 }
 </style>

pages/produce/execute/execute.less

@@ -480,7 +480,7 @@
 }
 
 .tech_box{
-    height: calc(100vh - 165px);
+    height: calc(100vh - 110px);
     .ivu-layout-header{
         height: 50px;
     }

pages/produce/orderlist.vue

 
 <template>
   <div class="aps-r">
-    <!-- <Button @click="toExecute">工单执行</Button> -->
     <DataGrid
       :columns="columns"
       ref="grid"
@@ -12,7 +11,6 @@
       :lazy="true"
       :conditions="easySearch"
       :action="action"
-      :set="set"
       :gutter="40"
     >
       <template slot="easySearch">
@@ -29,7 +27,7 @@
         <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)">
+        <div class="body" @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId)">
           <Row class="title-i">
             <Col :span="10" class="order-code">{{row.productName}}</Col>
             <Col :span="10" class="order-code">{{row.mesCode}}</Col>
@@ -181,7 +179,8 @@ export default {
                       this.toExecute(
                         params.row.id,
                         params.row.orderId,
-                        params.row.executeId
+                        params.row.executeId,
+                        params.row.routingHeaderId
                       )
                   }
                 },
@@ -191,7 +190,6 @@ export default {
           }
         }
       ],
-      set: false,
       typeInfo: "card",
       iconInfo: "md-apps",
       titleInfo: "卡片模式",
@@ -201,10 +199,6 @@ export default {
   created() {
     let oldStr = localStorage.getItem("admin");
     let userlist = this.$store.getters.getUser(2);
-    // console.info(userlist)
-    // console.warn(localStorage)
-    // console.warn("02",sessionStorage)
-    // console.log("user",oldStr)
   },
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
@@ -216,11 +210,11 @@ export default {
     search() {
       this.$refs.grid.reload(this.easySearch);
     },
-    toExecute(id, orderId, executeId) {
+    toExecute(id, orderId, executeId,headid) {
       //跳转到对应操作页面  获取id:this.$route.query.id
       this.$router.push({
         path: "/produce/execute",
-        query: { id: id, orderId: orderId, executeId: executeId }
+        query: { id: id, orderId: orderId, executeId: executeId,headid:headid }
       });
     },
     tdStyle(val) {
@@ -239,12 +233,10 @@ export default {
     changeShwo() {
       //显示模式切换
       if (this.typeInfo == "card") {
-        this.set = true;
         this.typeInfo = "table";
         this.iconInfo = "md-list";
         this.titleInfo = "列表模式";
       } else {
-        this.set = false;
         this.typeInfo = "card";
         this.iconInfo = "md-apps";
         this.titleInfo = "卡片模式";

src/assets/css/execute.css

@@ -440,7 +440,7 @@
   bottom: 1px;
 }
 .tech_box {
-  height: calc(100vh - 165px);
+  height: calc(100vh - 110px);
 }
 .tech_box .ivu-layout-header {
   height: 50px;