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

pages/map.vue

+<template>
+    <div class="flex">
+        <div v-width="300">
+              <h2>
+            {{files.length}}
+        </h2>
+        <ul>
+            <li v-for="li in files" @click="load(li)">
+                {{li}}
+            </li>
+        </ul>
+        <Table :columns="column" :data="data"></Table>
+        </div>
+      
+      <div class="fg" v-html="txt">
+
+      </div>
+    </div>
+</template>
+
+<script>
+    const indexFiles = require.context(`./`, true, /\.vue$/)
+    // const fs = require('fs')
+    export default {
+        name: '',
+        layout:'empty',
+
+        data() {
+            return {
+                files:[],
+                txt:"",
+            }
+
+        },
+        mounted(){
+            this.files=indexFiles.keys();
+            console.log("vvv",this.files)
+        },
+        methods:{
+            load(f){
+                // fs.readFile('map.vue',(e,d)=>{
+                //     if(!e){
+                //         this.txt=d.toString();
+                //     }else{
+                //         this.txt="Erro!"
+                //     }
+                // })
+            }
+        }
+    }
+</script>
+
+<style lang="less">
+    
+</style>
\ No newline at end of file

pages/mesPlan/index.vue

@@ -710,6 +710,7 @@ export default {
                     this.$Message.success("订单送审成功!");
                     this.$refs.grid.load();
                     this.sendViewModal = false;
+                    this.$refs.grid.cancelBatch();
                 } else {
                     this.$Message.error("订单送审失败!");
                 }
@@ -742,6 +743,7 @@ export default {
         },
         //确定派发
         sendOk() {
+            
             this.$refs.orderSend.$refs["formValidate"].validate(valid => {
                 if (valid) {
                     let ids = this.arrayIds;
@@ -760,6 +762,7 @@ export default {
                                     this.$refs.grid.load();
                                     this.sendModal = false;
                                     this.$Message.success("派发成功");
+                                    this.$refs.grid.cancelBatch();
                                 } else {
                                     this.sendModal = false;
                                     this.$Message.error("派发失败");

pages/produce/execute/taskTime/index.vue

@@ -69,7 +69,7 @@
 
             </p>
         </Card>
-        <a class="gs_card gs_add" @click="addItem" v-show="this.waitHours != 0">
+        <a class="gs_card gs_add" @click="addItem" v-show="this.waitHours != 0&&topInfoShow.subWorkHourStatus!=1">
             <Icon type="ios-add" style="vertical-align: middle" />
         </a>
     </div>
@@ -299,6 +299,7 @@ export default {
                     }).then((res) => {
                         if (res.success) {
                             this.$Message.success("已提交");
+                            this.Initload();
                             this.laodHorse();
                         } else {
                             this.$Message.error("提交失败...");

pages/technology/add.vue

@@ -280,11 +280,11 @@ export default {
         },
         // 克隆工艺
         getcloneData() {
-            let parmese = {
-                headerId: this.eid,
-                code: this.entity.code,
-            };
-            Api.getCloneHeader(parmese)
+            // let parmese = {
+            //     headerId: this.eid,
+            //     code: this.entity.code,
+            // };
+            Api.getCloneHeader(this.entity)
                 .then((r) => {
                     if (r.success) {
                         this.$Message.success("克隆成功");
@@ -328,9 +328,10 @@ export default {
             }).then((r) => {
                 this.entity = r.result;
                 this.entity.isEffect = parseInt(r.result.isEffect);
-                this.entity.id = 0;
+                 this.getCodNumber();
+                //this.entity.id = 0;
             });
-            this.getCodNumber();
+           
         },
         getCodNumber() {
             Api.getCodeNumber({