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

pages/aps/aps/index.vue

@@ -545,7 +545,7 @@ export default {
       this.addModal = true;
     },
     getUserDepart() {
-      alert("5656565");
+     // alert("5656565");
       // Api.getUserDepart().then(res=>{
       //   console.log("11111",res)
       //   return res
@@ -586,7 +586,6 @@ export default {
         arryIds.push(objIds);
       });
       parmsOrderpriority.alls = arryIds;
-      // alert(JSON.stringify(parmsOrderpriority));
       Api.orderpriority(parmsOrderpriority)
         .then(res => {
           if (res.success) {

pages/technology/index.vue

@@ -380,8 +380,6 @@ export default {
     },
     // 详情页面
     view(row) {
-      // this.$router.push("technology/details");
-      // window.open("/technology/details","_blank")
       this.viewModal = true;
       this.titleObj = {
         code: row.code,

pages/workflow/process/index.vue

@@ -24,21 +24,9 @@
     <Modal v-model="editModal" title="编辑" footer-hide :mask-closable="false">
       <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
     </Modal>
-    <!-- <Modal v-model="designModal" title="流程设计" :mask-closable="false" fullscreen footer-hide>
-      <Design :eid="curId" />
-    </Modal> -->
         <Modal v-model="designModal" title="流程设计" :mask-closable="false" fullscreen footer-hide>
       <component :is="flowDesign" :eid="curId" />
     </Modal>
-    <!-- <Modal
-      v-model="deletelModal"
-      title="删除"
-      @on-ok="removeOk"
-      @on-cancel="cancel"
-      :mask-closable="false"
-    >
-      <p>确定删除？</p>
-    </Modal> -->
     <Modal
       v-model="disableModal"
       title="禁用"
@@ -63,14 +51,12 @@
 import Api from './api'
 import Add from './add'
 import Edit from './edit'
-// import Design from './design'
 import Search from './search'
 export default {
   name: 'list',
   components: {
     Add,
     Edit,
-    // Design,
     Search
   },
   data() {
@@ -89,7 +75,6 @@ export default {
       addModal: false,
       editModal: false,
       designModal: false,
-      deletelModal: false,
       disableModal: false,
       enableModal: false,
       curId: '0',
@@ -272,7 +257,6 @@ export default {
       Api.delete({ id: id}).then((r) => {
         if (r.success) {
           this.$refs.grid.load()
-          this.deletelModal = false
           this.$Message.success('删除成功')
         }
       })
@@ -282,7 +266,6 @@ export default {
       this.addModal = false
       this.designModal = false
       this.editModal = false
-      this.deletelModal = false
       this.disableModal = false
       this.enableModal = false
     },