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

layouts/default.vue

@@ -85,8 +85,6 @@ export default {
 
           // const openNames = getSiderSubmenu(path, menuSider);
           // this.$store.commit("admin/menu/setOpenNames", openNames);
-        } else {
-          this.$Message.error("加载产品树失败!");
         } 
       });
     },

pages/aps/aps/components/excute.vue

 <template>
-  <div style="padding: 0;" class="excute">
-    <DataGrid
-      style="margin-top:2px; margin-bottom: -5px;"
-      :columns="columns"
-      ref="grid"
-      :easy="false"
-      :high="false"
-      :set="false"
-      :border="false"
-      :data="data1"
-      :height="gridHeight"
-      :page="false"
-      :size="size"
-    ></DataGrid>
-    <Modal v-model="editModal" title="编辑" footer-hide width="800">
+<div style="padding: 0;" class="excute">
+    <DataGrid style="margin-top:2px; margin-bottom: -5px;" :columns="columns" ref="grid" :easy="false" :high="false" :set="false" :border="false" :data="data1" :height="gridHeight" :page="false" :size="size"></DataGrid>
+    <Modal v-model="editModal" title="编辑" footer-hide width="1000">
         <Edit :row="rowData" @on-close="cancel" @on-option-ok="addOk" />
     </Modal>
     <Modal v-model="insertlModal" :title="insertTItle" @on-ok="insertOk" @on-cancel="cancel">
         <p>确定进行 {{ insertTItle }} 操作？</p>
     </Modal>
     <Modal v-model="setParsModal" title="工序参数设置" footer-hide width="1000">
-      <Add
-        @on-parameter-ok="addOk"
-        @on-close="cancel"
-        :opTaskPk="setParams.opTaskPk"
-        :partTaskPk="setParams.partTaskPk"
-        :taskSeq="setParams.taskSeq"
-        :count="setParams.count"
-        :row="rowData"
-      />
+        <Add @on-parameter-ok="addOk" @on-close="cancel" :opTaskPk="setParams.opTaskPk" :partTaskPk="setParams.partTaskPk" :taskSeq="setParams.taskSeq" :count="setParams.count" :row="rowData" />
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "../api";
 import Edit from "./edit";
@@ -43,7 +24,9 @@ export default {
         Add
     },
     props: {
-    rowId: { type: Number }
+        rowId: {
+            type: Number
+        }
     },
     data() {
         return {
@@ -62,8 +45,10 @@ export default {
             curId: 0,
             gridHeight: 150,
             size: "small",
-      columns: [
-        { title: " ", width: 130 },
+            columns: [{
+                    title: " ",
+                    width: 130
+                },
                 {
                     key: "insert_flag",
                     title: this.l("insert_flag"),
@@ -72,11 +57,9 @@ export default {
                     width: 60,
                     render: (h, params) => {
                         return h(
-              "Tooltip",
-              {
+                            "Tooltip", {
                                 props: {
-                  content:
-                    params.row.insert_flag == 1 ? "取消插单" : "进行插单",
+                                    content: params.row.insert_flag == 1 ? "取消插单" : "进行插单",
                                     placement: "top"
                                 },
                                 class: "ico"
@@ -84,10 +67,8 @@ export default {
                             [
                                 h("Icon", {
                                     attrs: {
-                    type:
-                      params.row.insert_flag == 1
-                        ? "ios-flag"
-                        : "ios-flag-outline",
+                                        type: params.row.insert_flag == 1 ?
+                                            "ios-flag" : "ios-flag-outline",
                                         size: 20,
                                         color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa"
                                     },
@@ -333,7 +314,9 @@ export default {
                     width: 140,
                     align: "center",
                     render: (h, params) => {
-            return h("div", { class: "action" }, [
+                        return h("div", {
+                            class: "action"
+                        }, [
                             h("op", {
                                 attrs: {
                                     icon: "md-options",
@@ -341,7 +324,9 @@ export default {
                                     oprate: "detail",
                                     title: "工序参数设置"
                                 },
-                on: { click: () => this.openParms(params.row) }
+                                on: {
+                                    click: () => this.openParms(params.row)
+                                }
                             }),
                             h("op", {
                                 attrs: {
@@ -350,7 +335,9 @@ export default {
                                     title: "編輯工序",
                                     oprate: "edit"
                                 },
-                on: { click: () => this.edit(params.row) }
+                                on: {
+                                    click: () => this.edit(params.row)
+                                }
                             }),
                             h("op", {
                                 attrs: {
@@ -360,7 +347,9 @@ export default {
                                     oprate: "delete",
                                     msg: "确认要刪除工序吗？"
                                 },
-                on: { click: () => this.remove(params.row, params.index) }
+                                on: {
+                                    click: () => this.remove(params.row, params.index)
+                                }
                             })
                         ]);
                     }
@@ -383,7 +372,10 @@ export default {
     mounted() {
         this.loadData(this.rowId);
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     methods: {
@@ -514,6 +506,7 @@ export default {
     }
 };
 </script>
+
 <style lang="less">
 .excute table tr th span,
 .excute table tr td {

pages/mesPlan/index.vue

@@ -297,11 +297,11 @@ export default {
                     type: "date"
                 },
                 {
-                    key: "creatorUserId",
+                    key: "creator",
                     title: this.$t("creatorUserId"),
                     align: "left",
                     high: true,
-                    type: "user"
+                    // type: "user"
                 },
                 {
                     key: "creationTime",
@@ -310,22 +310,22 @@ export default {
                     high: true,
                     width: 180
                 },
-                {
-                    key: "lastModifierUserId",
-                    title: this.$t("lastModifierUserId"),
-                    hide: true,
-                    align: "left",
-                    high: true,
-                    type: "user"
-                },
-                {
-                    key: "lastModificationTime",
-                    title: this.$t("lastModificationTime"),
-                    hide: true,
-                    align: "center",
-                    high: true,
-                    width: 180
-                },
+                // {
+                //     key: "lastModifierUserId",
+                //     title: this.$t("lastModifierUserId"),
+                //     hide: true,
+                //     align: "left",
+                //     high: true,
+                //     type: "user"
+                // },
+                // {
+                //     key: "lastModificationTime",
+                //     title: this.$t("lastModificationTime"),
+                //     hide: true,
+                //     align: "center",
+                //     high: true,
+                //     width: 180
+                // },
                 {
                     title: "操作",
                     key: "action",

pages/produce/orderlist.vue

@@ -366,10 +366,10 @@ export default {
                 overflow: hidden;
                 border: #cacbd0 dashed 1px;
 
-                img {
+                //img {
                 //   width: 90px;
                 //   height: 90px;
-                }
+                //}
             }
 
             .row {

pages/workflow/process/design.vue

 <template>
-  <div class="Design">
+<div class="Design">
     <Timeline>
         <TimelineItem v-for="(node,i) in nodes" :key="node.id">
             <Badge :count="i+1" type="primary" slot="dot"></Badge>
@@ -10,7 +10,7 @@
                         &nbsp;(
                         <state code="workflow.form.audit.type" :value="node.operation" />)
                         <Icon type="md-build" />
-              <Icon v-if="node.isFixed" type="ios-lock" color="orange" title="人员固定"/>
+                        <Icon v-if="node.isFixed" type="ios-lock" color="orange" title="人员固定" />
                     </a>
                 </div>
                 <div v-if="node.userIds&&node.userIds.length>0">
@@ -19,10 +19,7 @@
                 </div>
                 <div v-if="node.roleList&&node.roleList.length>0">
                     审批角色：
-            <span
-              v-for="(role,k) in node.roleList"
-              class="mr10"
-            >{{role.name}}({{role.userIdList.length}})</span>
+                    <span v-for="(role,k) in node.roleList" class="mr10">{{role.name}}({{role.userIdList.length}})</span>
                 </div>
             </div>
         </TimelineItem>
@@ -33,8 +30,9 @@
     <Modal v-model="startModal" title="开始节点编辑" footer-hide width="800">
         <StartEdit :eid="startId" @on-close="cancel" @on-ok="addOk" />
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from './api'
 import Edit from './node'
@@ -58,24 +56,29 @@ export default {
     props: {
         eid: String
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch('loadDictionary') // 加载数据字典
     },
-  mounted(){
+    mounted() {
         this.load(this.eid)
     },
     methods: {
         load(v) {
-      alert(v)
-      Api.detail({ id: v }).then((r) => {
+            //alert(v)
+            Api.detail({
+                id: v
+            }).then((r) => {
                 this.nodes = r.result.nodes
                 // this.$emit('on-load')
             })
         },
         edit(id, i) {
-      if (i== 0) {
-        this.startModal=true
-        this.startId=id;
+            if (i == 0) {
+                this.startModal = true
+                this.startId = id;
             } else {
                 this.editModal = true
                 this.curId = id
@@ -109,14 +112,17 @@ export default {
     }
 }
 </script>
+
 <style lang="less">
 .Design {
     background: white;
     padding: 20px 50px;
+
     .node {
         .title {
             font-size: 14px;
             font-weight: bold;
+
             .auditedTime {
                 font-size: 12px;
                 color: #ddd;