工艺规程设置

components/page/dataGrid.vue

@@ -12,7 +12,9 @@
           />
         </slot>
       </div>&nbsp;
-      <Button v-if="high" @click="modalSearch=true"  type="text"><Icon type="md-search" />高级</Button>
+      <Button v-if="high" @click="modalSearch=true" type="text">
+        <Icon type="md-search" />高级
+      </Button>
       <div class="searchBack">
         <slot name="searchBack"></slot>
       </div>
@@ -39,6 +41,7 @@
       :data="list"
       :height="tableHeight"
       :draggable="draggable"
+      :size="size"
       ref="table"
       class="tableCommon"
       @on-expand="expand"
@@ -113,10 +116,10 @@
 
 <script>
 export default {
-  name: 'DataGrid',
+  name: "DataGrid",
   data() {
     return {
-      keys: '',
+      keys: "",
       selectItems: [],
       footerToolbar: false,
       modalSearch: false,
@@ -135,7 +138,7 @@ export default {
       userConfig: null, //用户页面配置信息。,
       // userId: 1
       userId: this.$store.state.userInfo.userId
-    }
+    };
   },
   props: {
     border: {
@@ -155,7 +158,11 @@ export default {
     },
     placeholder: {
       type: String,
-      default: '请输入关键字'
+      default: "请输入关键字"
+    },
+    size: {
+      type: String,
+      default: "default "
     },
     height: {
       type: Number,
@@ -195,7 +202,7 @@ export default {
       // 当作table使用，直接显示数据
       type: Array,
       default: function() {
-        return []
+        return [];
       }
     },
     columns: {
@@ -206,23 +213,23 @@ export default {
     action: {
       //接口地址
       type: String,
-      default: ''
+      default: ""
     },
     conditions: {
       //查询条件
       type: Object,
       default: function() {
         return {
-          keys: { op: 'name', value: '', default: true }
-        }
+          keys: { op: "name", value: "", default: true }
+        };
       }
     },
     type: {
       type: String,
-      default: 'table',
+      default: "table",
       validator: function(value) {
         // 这个值必须匹配下列字符串中的一个
-        return ['table', 'card', 'list'].indexOf(value) !== -1
+        return ["table", "card", "list"].indexOf(value) !== -1;
       }
     },
     span: {
@@ -231,71 +238,71 @@ export default {
     }
   },
   created() {
-    this.columns.forEach((u) => {
+    this.columns.forEach(u => {
       if (!u.hide) {
-        u.hide = false
+        u.hide = false;
       }
-    })
-    this.columnsCur = this.$u.clone(this.columns)
+    });
+    this.columnsCur = this.$u.clone(this.columns);
   },
   mounted() {
-    if (this.data&&this.data.length>0) {
-      this.list = this.data
-      return
+    if (this.data && this.data.length > 0) {
+      this.list = this.data;
+      return;
     }
-    this.keys = ''
-    this.intY()
-    if (this.lazy==true) {
+    this.keys = "";
+    this.intY();
+    if (this.lazy == true) {
       return;
     }
-    this.loadUserConfig()
+    this.loadUserConfig();
     if (this.height === 0) {
       window.onresize = () => {
         ///浏览器窗口大小变化
         return (() => {
-          window.screenHeight = window.innerHeight
-          this.tableHeight = window.screenHeight - this.firstY - 60
-        })()
-      }
+          window.screenHeight = window.innerHeight;
+          this.tableHeight = window.screenHeight - this.firstY - 60;
+        })();
+      };
     } else {
-      this.tableHeight = this.height
+      this.tableHeight = this.height;
     }
     //注册拖拽事件。
-    this.$dragging.$on('dragend', (e) => {
+    this.$dragging.$on("dragend", e => {
       // console.log("dragend",e);
-      this.saveUserconfig()
-    })
+      this.saveUserconfig();
+    });
   },
   methods: {
     //数据加载
     load() {
       if (this.height == 0) {
-        this.tableHeight = window.innerHeight - this.firstY - 60
+        this.tableHeight = window.innerHeight - this.firstY - 60;
       }
       if (this.action) {
-        this.$api.post(this.action, this.search).then((r) => {
-          this.list = r.result.items
-          this.search.total = r.result.totalCount
-        })
+        this.$api.post(this.action, this.search).then(r => {
+          this.list = r.result.items;
+          this.search.total = r.result.totalCount;
+        });
       }
     },
     columnInit() {
       if (this.userConfig) {
-        var curColumns = []
-        var config = JSON.parse(this.userConfig.content)
+        var curColumns = [];
+        var config = JSON.parse(this.userConfig.content);
         // console.warn("2:列比对",config)
         if (config.length == this.columnsCur.length) {
-          config.map((u) => {
-            var item = this.columnsCur.filter((c) => {
-              return c.key == u.key
-            })
+          config.map(u => {
+            var item = this.columnsCur.filter(c => {
+              return c.key == u.key;
+            });
             if (item[0]) {
-              item[0].hide = u.hide
-              curColumns.push(item[0])
+              item[0].hide = u.hide;
+              curColumns.push(item[0]);
             }
-          })
+          });
           // console.warn("3:初始化列")
-          this.columnsCur = curColumns
+          this.columnsCur = curColumns;
         }
       }
     },
@@ -303,210 +310,209 @@ export default {
       var query = {
         conditions: [
           {
-            fieldName: 'creatorUserId',
+            fieldName: "creatorUserId",
             fieldValue: this.userId,
-            conditionalType: 'Equal'
+            conditionalType: "Equal"
           },
           {
-            fieldName: 'component',
-            fieldValue: 'Grid',
-            conditionalType: 'Equal'
+            fieldName: "component",
+            fieldValue: "Grid",
+            conditionalType: "Equal"
           },
           {
-            fieldName: 'page',
+            fieldName: "page",
             fieldValue: window.location.pathname,
-            conditionalType: 'Equal'
+            conditionalType: "Equal"
           }
         ],
         pageSize: 1
-      }
-      this.$api.post(`${window.systemUrl}/config/list`, query).then((r) => {
+      };
+      this.$api.post(`${window.systemUrl}/config/list`, query).then(r => {
         if (r.success) {
           if (r.result.length == 1) {
-            this.userConfig = r.result[0]
+            this.userConfig = r.result[0];
             //  console.warn("1:加载用户配置")
-            this.columnInit()
+            this.columnInit();
           }
           if (!this.configLoad) {
-            this.easySearch()
+            this.easySearch();
           }
-          this.configLoad = true
+          this.configLoad = true;
         }
-      })
+      });
     },
     saveUserconfig() {
-      let url = `${window.systemUrl}/config/update`
-      var content = []
-      this.columnsCur.map((u) => {
+      let url = `${window.systemUrl}/config/update`;
+      var content = [];
+      this.columnsCur.map(u => {
         content.push({
           key: u.key,
           hide: u.hide
-        })
-      })
+        });
+      });
       if (!this.userConfig) {
-        url = `${window.systemUrl}/config/create`
+        url = `${window.systemUrl}/config/create`;
         var data = {
           page: window.location.pathname,
-          component: 'Grid',
+          component: "Grid",
           key: this.$u.guid(),
           content: JSON.stringify(content)
-        }
-        this.$api.post(url, data).then((r) => {
-          this.loadUserConfig()
-        })
+        };
+        this.$api.post(url, data).then(r => {
+          this.loadUserConfig();
+        });
       } else {
-        this.userConfig.content = JSON.stringify(content)
-        this.$api.post(url, this.userConfig)
+        this.userConfig.content = JSON.stringify(content);
+        this.$api.post(url, this.userConfig);
       }
     },
     //展开
     expand(row, status) {
-      this.$emit('on-expand', row, status)
+      this.$emit("on-expand", row, status);
     },
     //拖拽
     onDragDrop(a, b) {
-      this.$emit('on-drag-drop', a, b)
+      this.$emit("on-drag-drop", a, b);
     },
     easySearch() {
       if (this.conditions && this.conditions.keys.default) {
         //判断没有传入条件的用默认的查询
-        this.conditions.keys.value = this.keys
+        this.conditions.keys.value = this.keys;
       }
-      this.reload(this.conditions)
+      this.reload(this.conditions);
     },
     undoConfig() {
       //列设置恢复初始化
-      this.columnsCur = this.$u.clone(this.columns)
-      this.saveUserconfig()
+      this.columnsCur = this.$u.clone(this.columns);
+      this.saveUserconfig();
     },
     complexSearch() {
-      var search = this.$refs.search.$children.filter((u) => {
-        return u.condition
-      })
+      var search = this.$refs.search.$children.filter(u => {
+        return u.condition;
+      });
       if (search) {
-        var conditions = search[0].condition
-        this.reload(conditions)
+        var conditions = search[0].condition;
+        this.reload(conditions);
       }
     },
     reload(conditions) {
-      var where = []
+      var where = [];
       if (conditions) {
-        Object.keys(conditions).forEach((u) => {
-          let v = conditions[u].value
-          let op = conditions[u].op
+        Object.keys(conditions).forEach(u => {
+          let v = conditions[u].value;
+          let op = conditions[u].op;
           if (!this.$u.isNull(v)) {
-            if (op == 'Range') {
-              let times = []
-              v.map((u) => {
+            if (op == "Range") {
+              let times = [];
+              v.map(u => {
                 if (!this.$u.isNull(u)) {
-                  times.push(this.$u.toTime(u))
+                  times.push(this.$u.toTime(u));
                 }
-              })
-              v = times.join(',')
-            } else if (op.indexOf('In') > -1) {
-              v = v.join(',')
+              });
+              v = times.join(",");
+            } else if (op.indexOf("In") > -1) {
+              v = v.join(",");
             }
             if (!this.$u.isNull(v)) {
               where.push({
                 fieldName: u,
                 fieldValue: v,
                 conditionalType: op
-              })
+              });
             }
           }
-        })
+        });
       }
-      this.search.pageIndex = 1
-      this.search.conditions = where
-      this.load()
+      this.search.pageIndex = 1;
+      this.search.conditions = where;
+      this.load();
     },
     pageChange(page) {
-      this.search.page = page
-      this.search.pageIndex = page
-      this.load()
+      this.search.page = page;
+      this.search.pageIndex = page;
+      this.load();
     },
     pageSizeChange(size) {
-      this.search.pageSize = size
-      this.search.pageIndex = 1
-      this.load()
+      this.search.pageSize = size;
+      this.search.pageIndex = 1;
+      this.load();
     },
     columnChange(item, i) {
-      item.hide = !item.hide
-      this.$set(this.columnsCur, item, i)
-      this.saveUserconfig()
+      item.hide = !item.hide;
+      this.$set(this.columnsCur, item, i);
+      this.saveUserconfig();
     },
     selectionChange(items) {
-      this.$emit('on-selection-change', items)
-      this.selectItems = items
-      this.footerToolbar = items.length > 0
+      this.$emit("on-selection-change", items);
+      this.selectItems = items;
+      this.footerToolbar = items.length > 0;
     },
     onSelect(rows, row) {
-      this.$emit('on-selection-change', rows, row)
+      this.$emit("on-selection-change", rows, row);
     },
     intY() {
       if (this.$refs.table != undefined) {
-        this.firstY = this.$refs.table.$el.getBoundingClientRect().top
+        this.firstY = this.$refs.table.$el.getBoundingClientRect().top;
       }
     },
     selectAll(status) {
-      this.$refs.table.selectAll(status)
-    },
+      this.$refs.table.selectAll(status);
+    }
   },
   computed: {
     columnsNow() {
-      var cols = this.columnsCur.filter((u) => {
+      var cols = this.columnsCur.filter(u => {
         if (u.code) {
           u.render = (h, params) => {
-            let values = u.key
-            let type = 'text'
+            let values = u.key;
+            let type = "text";
             if (u.category) {
-              type = u.category
+              type = u.category;
             }
-            return h('state', {
+            return h("state", {
               props: {
                 code: u.code,
                 type: type,
-                value: params.row[values] + ''
+                value: params.row[values] + ""
               }
-            })
-          }
+            });
+          };
         }
-        if (u.type == 'user') {
+        if (u.type == "user") {
           u.render = (h, params) => {
-            let values = u.key
-            return h('User', {
+            let values = u.key;
+            return h("User", {
               props: {
                 value: params.row[values]
               }
-            })
-          }
+            });
+          };
         }
-        if (u.type == 'date' || u.type == 'dateTime') {
+        if (u.type == "date" || u.type == "dateTime") {
           u.render = (h, params) => {
-            let values = u.key
-            return h('DTSpan', {
+            let values = u.key;
+            return h("DTSpan", {
               props: {
                 type: u.type,
                 value: params.row[values]
               }
-            })
-          }
+            });
+          };
         }
-        return !u.hide
-      })
-      return cols
+        return !u.hide;
+      });
+      return cols;
     }
   },
-  watch:{
-    "data.length"(){
-      this.list=this.data;
+  watch: {
+    "data.length"() {
+      this.list = this.data;
     },
-    "height"()
-    {
-      this.tableHeight=this.height;
+    height() {
+      this.tableHeight = this.height;
     }
   }
-}
+};
 </script>
 
 <style lang="less" scoped>
@@ -515,7 +521,6 @@ export default {
   // height: 100%;
   .tableCommon {
     width: 100%;
-   
   }
   .tip {
     display: inline;
@@ -531,7 +536,7 @@ export default {
     font-size: 14px;
     padding: 0 2px;
   }
- 
+
   .tableCommon tr td .ivu-table-cell {
     padding: 0 5px;
   }
@@ -602,4 +607,5 @@ export default {
     color: #249e91;
   }
 }
+
 </style>
\ No newline at end of file

i18n/locale/zh-CN.js

 export default {
-    locale: 'zh-CN',
-    language: '简体中文',
-    menu: {
-        i18n: '多语言'
+  locale: 'zh-CN',
+  language: '简体中文',
+  menu: {
+    i18n: '多语言'
+  },
+  page: {
+    login: {
+      title: '登录',
+      remember: '自动登录',
+      forgot: '忘记密码',
+      submit: '登录',
+      other: '其它登录方式',
+      signup: '注册账户'
     },
-    page: {
-        login: {
-            title: '登录',
-            remember: '自动登录',
-            forgot: '忘记密码',
-            submit: '登录',
-            other: '其它登录方式',
-            signup: '注册账户'
-        },
-        register: {
-            title: '注册',
-            submit: '注册',
-            other: '使用已有账户登录'
-        },
-        exception: {
-            e403: '抱歉，你无权访问该页面',
-            e404: '抱歉，你访问的页面不存在',
-            e500: '抱歉，服务器出错了',
-            btn: '返回首页'
-        },
-        i18n: {
-            content: '你好，很高兴认识你！'
-        }
+    register: {
+      title: '注册',
+      submit: '注册',
+      other: '使用已有账户登录'
     },
-    user: {
-        id: 'ID',
-        userName: '姓名',
-        name: '姓名',
-        cardTypeId: '卡类型ID',
-        cardNo: '员工编号',
-        gender: '性别',
-        birthday: '出生年月',
-        title: '职称',
-        workLicense: '上岗证',
-        equipment: '可操控设备',
-        email: '邮箱',
-        phone: '电话',
-        department: '所属部门',
-        jobName: '职位名称',
-        role: '角色',
-        account: '用户帐号',
-        employeeNo: '员工编号',
-        modifyTime: '修改时间',
-        remark: '备注',
-        degreeId: '学历',
-        degree: '学历',
-        departmentId: '部门id',
-        national: '国籍',
-        status: '状态',
-        creatorUserId: '创建人',
-        creationTime: '创建时间',
-        lastModifierUserId: '最后修改人',
-        lastModificationTime: '最后修改时间',
-        accountId: '用户账号',
-        isDeleted: '是否删除',
-        positionId: '职位',
-        licensedToWork: '上岗证',
-        titleId: '职称',
-        jobNo: '工号',
-        departmentTitle: '所属部门',
-        roleTitles: '角色名称',
-        enableEquip: '可操控设备'
+    exception: {
+      e403: '抱歉，你无权访问该页面',
+      e404: '抱歉，你访问的页面不存在',
+      e500: '抱歉，服务器出错了',
+      btn: '返回首页'
     },
-    resource: {
-        id: '编号',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        resourceId: '资源编号',
-        resourceCode: '资源编号',
-        nameOfResource: '资源名称',
-        specifications: '规格',
-        measuringUnit: '计量单位',
-        qualityCharacteristics: '质量特性',
-        batchNo: '批次号',
-        storeId: '库位ID',
-        storeTitle: '库位',
-        state: '状态',
-        resourceType: '资源类型',
-        totalNum: '总数',
-        numberAvailable: '库存',
-        count: '数量',
-        action: '操作',
-        creationTime: '操作时间',
-        libraryTube: '操作人',
-    },
-    MaterialPowder: {
-        code: '粉末编码',
-        name: '名称',
-        brand: '牌号',
-        specifications: '规格',
-        originalManufacturer: '原厂家',
-        batch: '批次号',
-        totalInventory: '入库总量(kg)',
-        remainingAmount: '剩余量(kg)',
-        remainingAmount1: '实际剩余量(kg)',
-        changeState: '盈亏',
-        unitPrice: '单价(元/kg)',
-        certificateOfApproval: '合格证',
-        storeId: '库位Id',
-        storeTitle: '库位',
-        location: '位置',
-        category: '类别',
-        reinspectionDate: '复验日期',
-        reinspectionStatus: '复验状态',
-        id: '编号',
-        creationTime: '创建时间',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        deletionTime: '',
-        deleterUserId: '',
-        isDeleted: '',
-        creator: "经办人",
-        creatorUserId: "经办人Id",
-        storeCode: '入库编号',
-        minNum: '最低库存',
-        remark: '备注',
-        total: '总数',
-        batchNo: '批次号',
-    },
-    waitReview: {
-        id: '',
-        brand: '粉末牌号',
-        name: '粉末名称',
-        specifications: '粉末规格',
-        batchNo: '批次号',
-        originalManufacturer: '生产厂家',
-        reinspectionDate: '复验日期',
-        remainingAmount: '库存余量',
-        storeId: '货架号',
-        location: '所处位置',
-        category: '粉末类别',
-        reinspectionStatus: '复验状态',
-    },
-    MaterialPlacode: {
-        id: '',
-        substrateCoding: '基板编码',
-        name: '名称',
-        brand: '牌号',
-        specifications: '规格',
-        baseMaterial: '基板材质',
-        materialNumber: '材料编号',
-        applyToEquipment: '适用设备',
-        thickness: '厚度(mm)',
-        state: '状态',
-        location: '所处位置',
-        inventory: '库存',
-        minNum: '最低库存',
-        availableInStock: '可用库存',
-        remainingAmount1: '实际库存',
-        creator: '经办人',
-        storeId: '库位Id',
-        storeTitle: '库位',
-        changeState: '盈亏',
-        remark: '备注',
-        total: '总数',
-        code: '基板编码',
+    i18n: {
+      content: '你好，很高兴认识你！'
+    }
+  },
+  user: {
+    id: 'ID',
+    userName: '姓名',
+    name: '姓名',
+    cardTypeId: '卡类型ID',
+    cardNo: '员工编号',
+    gender: '性别',
+    birthday: '出生年月',
+    title: '职称',
+    workLicense: '上岗证',
+    equipment: '可操控设备',
+    email: '邮箱',
+    phone: '电话',
+    department: '所属部门',
+    jobName: '职位名称',
+    role: '角色',
+    account: '用户帐号',
+    employeeNo: '员工编号',
+    modifyTime: '修改时间',
+    remark: '备注',
+    degreeId: '学历',
+    degree: '学历',
+    departmentId: '部门id',
+    national: '国籍',
+    status: '状态',
+    creatorUserId: '创建人',
+    creationTime: '创建时间',
+    lastModifierUserId: '最后修改人',
+    lastModificationTime: '最后修改时间',
+    accountId: '用户账号',
+    isDeleted: '是否删除',
+    positionId: '职位',
+    licensedToWork: '上岗证',
+    titleId: '职称',
+    jobNo: '工号',
+    departmentTitle: '所属部门',
+    roleTitles: '角色名称',
+    enableEquip: '可操控设备'
+  },
+  resource: {
+    id: '编号',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    resourceId: '资源编号',
+    resourceCode: '资源编号',
+    nameOfResource: '资源名称',
+    specifications: '规格',
+    measuringUnit: '计量单位',
+    qualityCharacteristics: '质量特性',
+    batchNo: '批次号',
+    storeId: '库位ID',
+    storeTitle: '库位',
+    state: '状态',
+    resourceType: '资源类型',
+    totalNum: '总数',
+    numberAvailable: '库存',
+    count: '数量',
+    action: '操作',
+    creationTime: '操作时间',
+    libraryTube: '操作人',
+  },
+  MaterialPowder: {
+    code: '粉末编码',
+    name: '名称',
+    brand: '牌号',
+    specifications: '规格',
+    originalManufacturer: '原厂家',
+    batch: '批次号',
+    totalInventory: '入库总量(kg)',
+    remainingAmount: '剩余量(kg)',
+    remainingAmount1: '实际剩余量(kg)',
+    changeState: '盈亏',
+    unitPrice: '单价(元/kg)',
+    certificateOfApproval: '合格证',
+    storeId: '库位Id',
+    storeTitle: '库位',
+    location: '位置',
+    category: '类别',
+    reinspectionDate: '复验日期',
+    reinspectionStatus: '复验状态',
+    id: '编号',
+    creationTime: '创建时间',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    deletionTime: '',
+    deleterUserId: '',
+    isDeleted: '',
+    creator: "经办人",
+    creatorUserId: "经办人Id",
+    storeCode: '入库编号',
+    minNum: '最低库存',
+    remark: '备注',
+    total: '总数',
+    batchNo: '批次号',
+  },
+  waitReview: {
+    id: '',
+    brand: '粉末牌号',
+    name: '粉末名称',
+    specifications: '粉末规格',
+    batchNo: '批次号',
+    originalManufacturer: '生产厂家',
+    reinspectionDate: '复验日期',
+    remainingAmount: '库存余量',
+    storeId: '货架号',
+    location: '所处位置',
+    category: '粉末类别',
+    reinspectionStatus: '复验状态',
+  },
+  MaterialPlacode: {
+    id: '',
+    substrateCoding: '基板编码',
+    name: '名称',
+    brand: '牌号',
+    specifications: '规格',
+    baseMaterial: '基板材质',
+    materialNumber: '材料编号',
+    applyToEquipment: '适用设备',
+    thickness: '厚度(mm)',
+    state: '状态',
+    location: '所处位置',
+    inventory: '库存',
+    minNum: '最低库存',
+    availableInStock: '可用库存',
+    remainingAmount1: '实际库存',
+    creator: '经办人',
+    storeId: '库位Id',
+    storeTitle: '库位',
+    changeState: '盈亏',
+    remark: '备注',
+    total: '总数',
+    code: '基板编码',
 
-    },
-    MaterialScraper: {
-        id: '编号',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        code: '刮刀编号',
-        materialSpecification: '材质/规格',
-        applyEquipment: '适用设备',
-        freeCount: '剩余套数',
-        remainingAmount1: '实际套数',
-        inCount: '入库套数',
-        quantityCount: '每套数量(片)',
-        price: '单价(元/套)',
-        storageTime: '入库时间',
-        location: '所处位置',
-        minNum: '最低库存',
-        creator: '经办人',
-        storeId: '库位Id',
-        storeTitle: '库位',
-        changeState: '盈亏',
-        remark: '备注',
-        total: '总数',
-        specifications: '材质/规格',
-        applyToEquipment: '适用设备',
-        unitPrice: '单价(元/套)',
-    },
-    order_material: {
-        id: '编号',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '',
-        deleterUserId: '',
-        deletionTime: '',
-        code: '料单编号',
-        name: '料单名称',
-        platesnum: '基板数量',
-        quotaPerBoard: '每板定额',
-        fileTemplate: '文件模版',
-        remarks: '备注',
-        extend: '扩展字段',
-        orderids: '订单编号',
-        status: '料单状态',
-    },
-    menu: {
-        id: '',
-        creationTime: '',
-        creatorUserId: '',
-        lastModificationTime: '',
-        lastModifierUserId: '',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        name: '名称',
-        upId: '父级',
-        upTitle: '上级名称',
-        type: '类型',
-        code: '编码',
-        icon: '图标',
-        target: '打开方式',
-        url: '地址',
-        status: '显示',
-        description: '备注',
-        source: '来源',
-        app: '系统',
-        priority: '排序',
-    },
-    order_material: {
-        id: '编号',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '',
-        deleterUserId: '',
-        deletionTime: '',
-        code: '料单编号',
-        name: '料单名称',
-        platesnum: '基板数量',
-        quotaPerBoard: '每板定额',
-        fileTemplate: '文件模版',
-        remarks: '备注',
-        extend: '扩展字段',
-        orderids: '订单编号',
-        status: '料单状态',
-    },
-    business_code_config: {
-        id: '编号',
-        businessName: '业务名称',
-        businessCode: '业务代号',
-        prefix: '编码前缀',
-        maxSerial: '最大序列号',
-        day: '清零规则',
-        remark: '备注',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-    },
-    method: {
-        id: 'Id',
-        title: '名称',
-        methodDescription: '方法描述',
-        controller: '模块',
-        controllerDescription: '模块描述',
-        service: '服务',
-        serviceDescription: '服务描述',
-        url: '地址',
-        httpMethod: '方法',
-        level: '级别',
-        creatorUserId: '创建人呢',
-        lastModificationTime: '修改时间',
-        lastModifierUserId: '修改人',
-        isDeleted: '是否删除',
-        deletionTime: '删除时间',
-        deleterUserId: '删除用户',
-        creationTime: '创建时间',
-    },
-    mes_order_watch: { //订单监控
-        id: '',
-        status: '订单状态',
-        mesCode: '订单编号',
-        demandStartDate: '计划开始时间',
-        demandFinishDate: '计划结束时间',
-        actualStartDate: '实际开始时间',
-        actualFinishDate: '实际结束时间',
-        productName: '产品名称',
-        drawnNumber: '图号',
-        routingType: '工艺类型',
-        orderWarning: '订单预警',
-        startWarning: '开工预警',
-        finishWarning: '完工预警',
-        jindu: '订单进度',
-        startCount: '开工数',
-        stopCount: '暂停数',
-        finishCount: '完工数',
-        remark: '备注',
-        productingpreparationpeople: '车间',
+  },
+  MaterialScraper: {
+    id: '编号',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    code: '刮刀编号',
+    materialSpecification: '材质/规格',
+    applyEquipment: '适用设备',
+    freeCount: '剩余套数',
+    remainingAmount1: '实际套数',
+    inCount: '入库套数',
+    quantityCount: '每套数量(片)',
+    price: '单价(元/套)',
+    storageTime: '入库时间',
+    location: '所处位置',
+    minNum: '最低库存',
+    creator: '经办人',
+    storeId: '库位Id',
+    storeTitle: '库位',
+    changeState: '盈亏',
+    remark: '备注',
+    total: '总数',
+    specifications: '材质/规格',
+    applyToEquipment: '适用设备',
+    unitPrice: '单价(元/套)',
+  },
+  order_material: {
+    id: '编号',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '',
+    deleterUserId: '',
+    deletionTime: '',
+    code: '料单编号',
+    name: '料单名称',
+    platesnum: '基板数量',
+    quotaPerBoard: '每板定额',
+    fileTemplate: '文件模版',
+    remarks: '备注',
+    extend: '扩展字段',
+    orderids: '订单编号',
+    status: '料单状态',
+  },
+  menu: {
+    id: '',
+    creationTime: '',
+    creatorUserId: '',
+    lastModificationTime: '',
+    lastModifierUserId: '',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    name: '名称',
+    upId: '父级',
+    upTitle: '上级名称',
+    type: '类型',
+    code: '编码',
+    icon: '图标',
+    target: '打开方式',
+    url: '地址',
+    status: '显示',
+    description: '备注',
+    source: '来源',
+    app: '系统',
+    priority: '排序',
+  },
+  order_material: {
+    id: '编号',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '',
+    deleterUserId: '',
+    deletionTime: '',
+    code: '料单编号',
+    name: '料单名称',
+    platesnum: '基板数量',
+    quotaPerBoard: '每板定额',
+    fileTemplate: '文件模版',
+    remarks: '备注',
+    extend: '扩展字段',
+    orderids: '订单编号',
+    status: '料单状态',
+  },
+  business_code_config: {
+    id: '编号',
+    businessName: '业务名称',
+    businessCode: '业务代号',
+    prefix: '编码前缀',
+    maxSerial: '最大序列号',
+    day: '清零规则',
+    remark: '备注',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+  },
+  method: {
+    id: 'Id',
+    title: '名称',
+    methodDescription: '方法描述',
+    controller: '模块',
+    controllerDescription: '模块描述',
+    service: '服务',
+    serviceDescription: '服务描述',
+    url: '地址',
+    httpMethod: '方法',
+    level: '级别',
+    creatorUserId: '创建人呢',
+    lastModificationTime: '修改时间',
+    lastModifierUserId: '修改人',
+    isDeleted: '是否删除',
+    deletionTime: '删除时间',
+    deleterUserId: '删除用户',
+    creationTime: '创建时间',
+  },
+  mes_order_watch: { //订单监控
+    id: '',
+    status: '订单状态',
+    mesCode: '订单编号',
+    demandStartDate: '计划开始时间',
+    demandFinishDate: '计划结束时间',
+    actualStartDate: '实际开始时间',
+    actualFinishDate: '实际结束时间',
+    productName: '产品名称',
+    drawnNumber: '图号',
+    routingType: '工艺类型',
+    orderWarning: '订单预警',
+    startWarning: '开工预警',
+    finishWarning: '完工预警',
+    jindu: '订单进度',
+    startCount: '开工数',
+    stopCount: '暂停数',
+    finishCount: '完工数',
+    remark: '备注',
+    productingpreparationpeople: '车间',
 
-        detailId: '工序Id',
-        taskSeq: '工序号',
-        detailName: '工序名称',
-        routingCode: '工艺文件编号',
-        userNames: '人员名称',
-        userIds: '',
-        routingHeaderId: '工艺规程id',
-        dispatchExecuteId: '工单执行表id'
-    },
-    order_pause: {
-        id: '',
-        creationTime: '暂停时间',
-        creatorUserId: '',
-        creator: '暂停人',
-        lastModificationTime: '恢复时间',
-        lastModifierUserId: '',
-        laster: '恢复人',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        orderId: '订单id',
-        mesCode: '订单编号',
-        productId: '产品id',
-        productName: '产品名称',
-        drawnNumber: '产品图号',
-        pauseCause: '暂停原因',
-        remark: '描述',
-        path: '附件路径',
-        relatedPerson: '相关人员',
-        relatedPersoner: '相关人员',
-    },
-    waitOpened: {
-        id: '',
-        orderId: '订单主键',
-        serialNumber: '合格证编号',
-        mesCode: '订单编号',
-        drawnNumber: '图号',
-        productId: '产品id',
-        productName: '产品名称',
-        quantity: '计划数量',
-        productQuantity: '合格数量',
-        actualFinishDate: '完成时间',
-        productingPreparationPeople: '承制单位',
-        uncertificateQuantity: '待开具数量',
-        status: '状态',
-        userUnit: '用户单位',
-        taskBased: '任务依据',
-        productCode: '产品代号（图号）',
-        productSerialNumber: '产品编号',
-        productStatus: '产品状态',
-        materialCode: '原材料牌号',
-        materialSerialNumber: '原材料批次号',
-        addMaterialBatch: '增材制造批次号',
-        materialCertificationNumber: '原材合格证编号',
-        conclusion: '结论',
-        examUser: '检验员',
-        approveUser: '批准人',
-        approveDate: '批准时间',
-        remark: '备注',
-        certificateId: '合格证主键',
-        name: '检验项目',
-        require: '检验要求',
-        result: '测试结果',
-        creationTime: '创建时间',
-        examDate: '检验时间',
-    },
-    StoreroomLocation: { //库房库位
-        upId: '',
-        materialType: '',
-        storeroomTiitle: '',
-        storeroomId: '',
-        recommend: '',
-        status: '',
-        sizes: '',
-        levels: '',
-        departmentType: '',
-        userName: '',
-        userIds: '',
-        title: '库位名称',
-        material_type: '所属资源',
-        department_name: '所属部门',
-        user_name: '库管员',
-        description: '位置',
-    },
-    bug: { //bug
-        id: 'ID',
-        level: '级别',
-        title: '标题',
-        pagePath: '地址',
-        status: '状态',
-        creationTime: '创建时间',
-        createor: '创建人',
-        creatorUserId: '创建人',
-        lastModificationTime: '处理时间',
-        auditUser: '处理人',
-        alloter: '指派给',
-        lastModifierUserId: '处理人',
-        content: '内容',
-        remark: 'bug处理',
-        time: '工时',
-        actionName: '处理人',
-        workHours: '工时',
-    },
-    DipartLocation: {
-        name: "部门",
-        organizationType: "组织类型",
-        status: '是否生产班组',
-        departcode: '部门编号',
-        department: '部门名称',
-        cityName: '省市县',
-        creationTime: '创建时间',
-        upMent: '上级部门',
-    },
-    instance: {
-        id: '主键',
-        workflowStatus: '工作流状态', //处理中\1；审核通过\2；终止\3；     
-        instanceId: '流程Id',
-        name: '名称',
-        status: '状态', //启用0;禁用1；
-        version: '版本',
-        processingStatus: '审核状态',
-        rejectStatus: '驳回状态',
-        endStatus: '完成状态',
-        terminateStatus: '终止状态',
-        creationTime: '创建时间', //记录创建时间
-        creatorUserId: '创建人Id',
-        creator: "创建人",
-        baseDataUrl: '基础表单地址',
-        updateBaseStatusUrl: '更新状态地址',
+    detailId: '工序Id',
+    taskSeq: '工序号',
+    detailName: '工序名称',
+    routingCode: '工艺文件编号',
+    userNames: '人员名称',
+    userIds: '',
+    routingHeaderId: '工艺规程id',
+    dispatchExecuteId: '工单执行表id'
+  },
+  order_pause: {
+    id: '',
+    creationTime: '暂停时间',
+    creatorUserId: '',
+    creator: '暂停人',
+    lastModificationTime: '恢复时间',
+    lastModifierUserId: '',
+    laster: '恢复人',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    orderId: '订单id',
+    mesCode: '订单编号',
+    productId: '产品id',
+    productName: '产品名称',
+    drawnNumber: '产品图号',
+    pauseCause: '暂停原因',
+    remark: '描述',
+    path: '附件路径',
+    relatedPerson: '相关人员',
+    relatedPersoner: '相关人员',
+  },
+  waitOpened: {
+    id: '',
+    orderId: '订单主键',
+    serialNumber: '合格证编号',
+    mesCode: '订单编号',
+    drawnNumber: '图号',
+    productId: '产品id',
+    productName: '产品名称',
+    quantity: '计划数量',
+    productQuantity: '合格数量',
+    actualFinishDate: '完成时间',
+    productingPreparationPeople: '承制单位',
+    uncertificateQuantity: '待开具数量',
+    status: '状态',
+    userUnit: '用户单位',
+    taskBased: '任务依据',
+    productCode: '产品代号（图号）',
+    productSerialNumber: '产品编号',
+    productStatus: '产品状态',
+    materialCode: '原材料牌号',
+    materialSerialNumber: '原材料批次号',
+    addMaterialBatch: '增材制造批次号',
+    materialCertificationNumber: '原材合格证编号',
+    conclusion: '结论',
+    examUser: '检验员',
+    approveUser: '批准人',
+    approveDate: '批准时间',
+    remark: '备注',
+    certificateId: '合格证主键',
+    name: '检验项目',
+    require: '检验要求',
+    result: '测试结果',
+    creationTime: '创建时间',
+    examDate: '检验时间',
+  },
+  StoreroomLocation: { //库房库位
+    upId: '',
+    materialType: '',
+    storeroomTiitle: '',
+    storeroomId: '',
+    recommend: '',
+    status: '',
+    sizes: '',
+    levels: '',
+    departmentType: '',
+    userName: '',
+    userIds: '',
+    title: '库位名称',
+    material_type: '所属资源',
+    department_name: '所属部门',
+    user_name: '库管员',
+    description: '位置',
+  },
+  bug: { //bug
+    id: 'ID',
+    level: '级别',
+    title: '标题',
+    pagePath: '地址',
+    status: '状态',
+    creationTime: '创建时间',
+    createor: '创建人',
+    creatorUserId: '创建人',
+    lastModificationTime: '处理时间',
+    auditUser: '处理人',
+    alloter: '指派给',
+    lastModifierUserId: '处理人',
+    content: '内容',
+    remark: 'bug处理',
+    time: '工时',
+    actionName: '处理人',
+    workHours: '工时',
+  },
+  DipartLocation: {
+    name: "部门",
+    organizationType: "组织类型",
+    status: '是否生产班组',
+    departcode: '部门编号',
+    department: '部门名称',
+    cityName: '省市县',
+    creationTime: '创建时间',
+    upMent: '上级部门',
+  },
+  instance: {
+    id: '主键',
+    workflowStatus: '工作流状态', //处理中\1；审核通过\2；终止\3；     
+    instanceId: '流程Id',
+    name: '名称',
+    status: '状态', //启用0;禁用1；
+    version: '版本',
+    processingStatus: '审核状态',
+    rejectStatus: '驳回状态',
+    endStatus: '完成状态',
+    terminateStatus: '终止状态',
+    creationTime: '创建时间', //记录创建时间
+    creatorUserId: '创建人Id',
+    creator: "创建人",
+    baseDataUrl: '基础表单地址',
+    updateBaseStatusUrl: '更新状态地址',
 
-    },
-    form: {
-        id: '',
-        formId: '对应表单主键',
-        name: '表单名称',
-        status: '状态',
-        version: '版本',
-        creationTime: '创建时间',
-        creator: "创建人",
-        creatorUserId: '创建人Id',
-        lastModificationTime: '处理时间',
-        lastModifierUserId: '处理人',
-        deleterUserId: '',
-        deletionTime: '',
-        isDeleted: '',
+  },
+  form: {
+    id: '',
+    formId: '对应表单主键',
+    name: '表单名称',
+    status: '状态',
+    version: '版本',
+    creationTime: '创建时间',
+    creator: "创建人",
+    creatorUserId: '创建人Id',
+    lastModificationTime: '处理时间',
+    lastModifierUserId: '处理人',
+    deleterUserId: '',
+    deletionTime: '',
+    isDeleted: '',
 
 
-    },
-    form_column: {
-        id: '',
-        formId: '表单主键',
-        cnName: '中文名称',
-        enName: '英文名称',
-        dataType: '数据类型',
-        dicSource: '',
-        dataLength: '数据长度',
-        required: '必填',
-        controlType: '控件类型',
-        dicSource: '字典项',
-        align: '对齐方式',
-        remark: '备注',
-        creationTime: '创建时间',
-        creatorUserId: '创造者的用户id',
-        lastModificationTime: '最后修改时间',
-        lastModifierUserId: '最后修改的用户id',
-        isDeleted: '被删除',
-        deleterUserId: '删除人的用户id',
-        deletionTime: '删除时间',
-    },
-    Message: {
-        id: '',
-        creationTime: '',
-        creatorUserId: '',
-        lastModificationTime: '',
-        lastModifierUserId: '',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        title: '标题',
-        content: '内容',
-        state: '状态',
-    },
-    node: {
-        id: '',
-        schemaId: '工作流Id',
-        formId: '表单',
-        name: '节点名称',
-        operation: '审核类型',
-        rejectOption: '驳回类型',
-        category: '类别',
-        userIdList: "审批人",
-        roleIdList: "审批角色",
-        isFixed: "固定",
-        // creationTime:'创建时间',
-        // creatorUserId:'创造者的用户id',
-        // lastModificationTime:'最后修改时间',
-        // lastModifierUserId:'最后修改的用户id',
-        // isDeleted:'被删除',
-        // deleterUserId:'删除人的用户id',
-        // deletionTime:'删除时间',
-    },
-    orderInfo: { //订单详细信息
-        id: '',
-        orderId: '订单主键',
-        mesCode: '订单编号',
-        drawnNumber: '图号',
-        productId: '产品id',
-        productName: '产品名称',
-        taskType: '任务类型',
-        quantity: '计划数量',
-        stage: '阶段',
-        quantity: '数量',
-        materialId: '材料',
-        routing_Method: '工艺方法',
-        outer_Envelope_Size: '外包络尺寸',
-        demandStartDate: '开始时间',
-        demandFinishDate: '完成时间',
-        qualifiedQuantity: '合格数量',
-        guestName: '甲方客户',
-        printSupply: '3D打印承制单',
-        functionaryOffice: '厂内责任机关',
-        mainDepartmentId: '厂内主体责任部门',
-        status: '状态',
-        taskInputDate: '任务输入日期',
-        taskRequire: '任务节点要求',
-        putintDocmentCode: '甲方投产输入文件（编号）',
-        technologyDocmentCode: '甲方技术输入文件（编号）',
-        outerDrawnNumber: '外部图号/模型号',
-        modelVersion: '模型版本',
-        taskCode: '甲方任务号',
-        designer: '甲方设计人员',
-        officeFunctionary: '厂内机关负责人',
-        mainRoutingPeople: '厂内主工艺人员',
-        remark: '备注',
-        batchNumber: '批次号',
-        projectNumber: '项目号',
-        urgencyLevel: '紧急程度',
+  },
+  form_column: {
+    id: '',
+    formId: '表单主键',
+    cnName: '中文名称',
+    enName: '英文名称',
+    dataType: '数据类型',
+    dicSource: '',
+    dataLength: '数据长度',
+    required: '必填',
+    controlType: '控件类型',
+    dicSource: '字典项',
+    align: '对齐方式',
+    remark: '备注',
+    creationTime: '创建时间',
+    creatorUserId: '创造者的用户id',
+    lastModificationTime: '最后修改时间',
+    lastModifierUserId: '最后修改的用户id',
+    isDeleted: '被删除',
+    deleterUserId: '删除人的用户id',
+    deletionTime: '删除时间',
+  },
+  Message: {
+    id: '',
+    creationTime: '',
+    creatorUserId: '',
+    lastModificationTime: '',
+    lastModifierUserId: '',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    title: '标题',
+    content: '内容',
+    state: '状态',
+  },
+  node: {
+    id: '',
+    schemaId: '工作流Id',
+    formId: '表单',
+    name: '节点名称',
+    operation: '审核类型',
+    rejectOption: '驳回类型',
+    category: '类别',
+    userIdList: "审批人",
+    roleIdList: "审批角色",
+    isFixed: "固定",
+    // creationTime:'创建时间',
+    // creatorUserId:'创造者的用户id',
+    // lastModificationTime:'最后修改时间',
+    // lastModifierUserId:'最后修改的用户id',
+    // isDeleted:'被删除',
+    // deleterUserId:'删除人的用户id',
+    // deletionTime:'删除时间',
+  },
+  orderInfo: { //订单详细信息
+    id: '',
+    orderId: '订单主键',
+    mesCode: '订单编号',
+    drawnNumber: '图号',
+    productId: '产品id',
+    productName: '产品名称',
+    taskType: '任务类型',
+    quantity: '计划数量',
+    stage: '阶段',
+    quantity: '数量',
+    materialId: '材料',
+    routing_Method: '工艺方法',
+    outer_Envelope_Size: '外包络尺寸',
+    demandStartDate: '开始时间',
+    demandFinishDate: '完成时间',
+    qualifiedQuantity: '合格数量',
+    guestName: '甲方客户',
+    printSupply: '3D打印承制单',
+    functionaryOffice: '厂内责任机关',
+    mainDepartmentId: '厂内主体责任部门',
+    status: '状态',
+    taskInputDate: '任务输入日期',
+    taskRequire: '任务节点要求',
+    putintDocmentCode: '甲方投产输入文件（编号）',
+    technologyDocmentCode: '甲方技术输入文件（编号）',
+    outerDrawnNumber: '外部图号/模型号',
+    modelVersion: '模型版本',
+    taskCode: '甲方任务号',
+    designer: '甲方设计人员',
+    officeFunctionary: '厂内机关负责人',
+    mainRoutingPeople: '厂内主工艺人员',
+    remark: '备注',
+    batchNumber: '批次号',
+    projectNumber: '项目号',
+    urgencyLevel: '紧急程度',
 
-    },
-    materialInfo: { //料单送审详情
-        id: '',
-        documentCode: '文档编号',
-        platesNum: '板数',
-        perBoard: '每板定额',
-        powderName: '粉末名称',
-        powderBrand: '粉末牌号',
-        powderSpec: '粉末规格',
-        powderCategory: '粉末类别',
-        powderTotal: '预估粉末总量',
-        partHeight: '预估零件高度',
-        PlacodeName: '基板名称',
-        PlacodeBrand: '基板牌号',
-        PlacodeSpec: '基板规格',
-        PlacodeDevice: '基板适用设备',
-        Placodeland: '基板厚度下限',
-        PlacodeTotal: '基板总量',
-        ScraperSpec: '刮刀规格',
-        ScraperTotal: '刮刀数量',
-        remark: '备注'
-    },
-    Unqualified: {
-        unqualifiedCode: "审理单编号",
-        department: "申请部门",
-        customer: "客户名称",
-        outsourcing: "外包供方名称",
-        product: "产品名称",
-        material: "材料牌号",
-        quantity: "数量",
-        code: "代号",
-        problemDesc: "问题描述",
-        inspectionPerson: "检验员",
-        inspectionDate: "检验日期",
-    },
-    handleList: { //待办事宜
-        id: 'id',
-        schemaId: '审批类型Id',
-        schemaName: '审批类型',
-        code: '编号',
-        status: '状态',
-        startRecordId: '开始节点Id',
-        currentNodeId: '当前环节Id',
-        currentNodeName: '当前环节',
-        nextNodeId: '下一环节Id',
-        nextNodeName: '下一环节',
-        creatorUserId: '创建用户Id',
-        creator: '创建人',
-        creationTime: '创建时间',
-    },
-    processList: { //工艺规程列表
-        id: 'id',
-        productName: '产品名称',
-        name: '工艺名称',
-        routingType: '',
-        routingTypeDesc: '工艺类型',
-        version: '文档版本',
-        code: '规程编号',
-    },
-    OrderDataReview: { //数据审查
-        id: 'id',
-        code: '文件编号',
-        creationTime: '创建时间',
-        creatorUserId: '创建用户Id',
-        lastModificationTime: '最后修改时间',
-        lastModifierUserId: '最后修改人id',
-        repair_file_name: '修复文件',
-        repair_file_notes: '',
-        repair_file_status: '修复文件状态',
-        repair_file_url: '修复文件地址',
-        slicing_file_name: '切片文件',
-        slicing_file_notes: '',
-        slicing_file_status: '切片文件状态',
-        slicing_file_url: '切片文件地址',
-        supporting_file_name: '支撑文件',
-        supporting_file_url: "支撑文件地址",
-        supporting_file_notes: '',
-        supporting_file_status: '支撑文件状态',
-    },
-    Customer: { //客户管理
-        id: '',
-        creationTime: '',
-        creatorUserId: '',
-        lastModificationTime: '',
-        lastModifierUserId: '',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        name: '客户名称',
-        abbre: '客户简称',
-        address: '邮政地址',
-        principal: '负责人',
-        telephone: '办公电话',
-        mobile: '手机',
-        type: '客户类型',
-        area: '客户区域',
-        isInform: '是否报备',
-        status: '状态',
-        notes: '备注',
-        code: '客户编码',
-        trade: '行业',
-    },
-    Shop: {
-        id: '',
-        creationTime: '',
-        creatorUserId: '',
-        lastModificationTime: '',
-        lastModifierUserId: '',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        name: '组织名称',
-        upId: '上层组织id',
-        customerId: '客户id',
-        principal: '负责人',
-        telephone: '办公电话',
-        mobile: '手机',
-        status: '状态',
-        notes: '备注',
-    },
-    Project: {
-        id: '',
-        creationTime: '',
-        creatorUserId: '',
-        lastModificationTime: '',
-        lastModifierUserId: '',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        name: '项目名称',
-        customerId: '客户Id',
-        shopId: '主管部门',
-        stage: '销售阶段',
-        principal: '负责人',
-        isInform: '是否报备',
-        status: '状态',
-        notes: '备注',
-        budget: '预算（元）',
-    },
-    Follow: {
-        id: '',
-        creationTime: '',
-        creatorUserId: '',
-        lastModificationTime: '',
-        lastModifierUserId: '',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        projectId: '项目Id',
-        customerId: '客户Id',
-        userId: '销售人员Id',
-        type: '跟进类型',
-        time: '跟进时间',
-        deliverable: '跟进交付物',
-        arrange: '后续安排',
-        principal: '负责人',
-        status: '状态',
-        notes: '备注',
-        accessory: '上传'
-    },
-    Contract: {
-        id: '',
-        creationTime: '',
-        creatorUserId: '',
-        lastModificationTime: '',
-        lastModifierUserId: '',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        projectId: '项目编号',
-        name: '名称',
-        accessory: '附件',
-        userId: '销售人员',
-        proceeds: '已收款',
-        status: '状态',
-        notes: '备注',
-    },
-    // 工厂日历
-    calendar_class: {
-        id: '',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '删除人',
-        deletionTime: '删除时间',
-        deleterUserId: '删除人',
-        title: '班次名称',
-        startTime: '开始时间',
-        endTime: '结束时间',
-        startendTime: '班次时间',
-        workHours: '工作时长',
-    },
-    calendar_holiday: {
-        id: '',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '删除人',
-        deletionTime: '删除时间',
-        deleterUserId: '删除人',
-        title: '节日名称',
-        startTime: '开始时间',
-        days: '工作时长(小时)',
-        status: '状态',
-        endTime: '结束时间',
-    },
-    calendar_overtime: {
-        id: '',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '删除人',
-        deletionTime: '删除时间',
-        deleterUserId: '删除人',
-        title: '日历名称',
-        restType: '',
-        holidayId: '',
-        holidayTitle: '关联节假日',
-        status: '',
-    },
-    calendar_work: {
-        id: '',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '删除人',
-        deletionTime: '删除时间',
-        deleterUserId: '删除人',
-        title: '日历名称',
-        calendarClassId: '',
-        calendarClassTitle: '关联班次',
-        calendarClassStart: '开始时间',
-        calendarClassEnd: '结束时间',
-        workHours: '工作时长',
-    },
-    Connector: {
-        id: '',
-        creationTime: '',
-        creatorUserId: '',
-        lastModificationTime: '',
-        lastModifierUserId: '',
-        isDeleted: '',
-        deletionTime: '',
-        deleterUserId: '',
-        name: '人员名称',
-        shopId: '组织id',
-        duties: '职务',
-        telephone: '办公电话',
-        mobile: '手机',
-        status: '状态',
-        notes: '备注',
-        customerId: '客户Id',
-        shopName: '组织名称',
-    },
-    mes_order: {
-        id: '',
-        upId: '父订单id',
-        mesCode: '订单编号',
-        taskType: '任务类型',
-        productId: '产品表主键',
-        stage: '阶段',
-        materialId: '材料表主键',
-        quantity: '数量',
-        guestName: '甲方客户',
-        printSupply: '3D打印承制单位',
-        functionaryOffice: '厂内责任机关',
-        mainDepartmentId: '厂内主主体责任部门',
-        remark: '备注',
-        taskInputDate: '创建日期',
-        taskRequire: '任务接点要求',
-        putintDocmentCode: '上传文件名称',
-        technologyDocmentCode: '上传文件名称',
-        outerDrawnNumber: '外部图号/模型号',
-        modelVersion: '模型版本',
-        taskCode: '甲方任务号',
-        designer: '甲方设计人员',
-        officeFunctionary: '厂内机关负责人',
-        mainRoutingPeople: '厂内主工艺人员',
-        status: '订单状态',
-        workHours: '工时',
-        printPeriod: '打印周期',
-        equipment: '设备',
-        materialWeight: '材料重量',
-        isSupportingFinish: '配套状态',//是否配套，0 未配套，1 已配套
-        demandStartDate: '投料时间',
-        demandFinishDate: '节点时间',
-        actualStartDate: '订单实际开始时间，实际为第一道工序的开始时间',
-        actualFinishDate: '订单实际结束时间，实际为最后一道工序的结束时间',
-        isDeleted: '是否被删除，0 : 否，1 是',
-        creatorUserId: '记录创建人',
-        creationTime: '创建时间',
-        lastModifierUserId: '修改人',
-        lastModificationTime: '修改时间',
-        orderQuotationStatus: '报价状态',
-        distributeMainRouting: '(派发)工艺人员',
-        mainRoutingFinishDate: '工艺完成时间',
-        majorRoutingPeople: '专业工艺人员',
-        majorRoutingFinishDate: '专业工艺完成时间',
-        checkUpPeople: '校对人员',
-        checkUpFinishDate: '校对完成时间',
-        productingPreparationPeople: '生产准备人员',
-        productingPreparationFinishDate: '生产准备完成时间',
-        quotationPeople: '订单报价人员',
-        quotationFinishDate: '订单报价完成时间',
-        routingMethod: '工艺方法',
-        outerEnvelopeSize: '外包络尺寸',
-        divideMark: '分解标记:1-已分解',//1-已分解
-        productCode: '产品序号',
-        productName: '产品名称',
-        drawnNumber: '产品图号',
-        qualifiedQuantity: '合格数量',
-        uncertificateQuantity: '待开具数量',
-        mainRoutingSetStatus: '工艺状态',
-        majorRoutingSetStatus: '',
-        materialBillSetStatus: '',
-        routingDataSetStatus: '',
-        rootId: '',
-        mainRoutingExecuteStatus: '',
-        majorRoutingExecuteStatus: '',
-        mainRoutingActualStartDate: '',
-        mainRoutingActualFinishDate: '',
-        majorRoutingActualStartDate: '',
-        majorRoutingActualFinishDate: '',
-        batchNumber: '批次号',
-        projectNumber: '项目号',
-        urgencyLevel: '紧急程度',
-        materialName: '材料名称',
-        isPreschedule: '移入排产',
-        spareQty: '(APS)备件数量',
-        demandStart: '(APS)投料时间',
-        demandFinish: '(APS)节点时间',
-        partNamePro: '(APS)产品名称增强',
-        selection: '多选',
-        DistributeMainRouting: '工艺人员',
-        MainRoutingFinishDate: '完成时间',
-    },
-    mes_part_task_plan_simulate: {
-        id: '',
-        part_task_pk: '计划编号',
-        priority: '优先级',
-        plan_qty: '排产数量',
-        spare_qty: '备件数量',
-        plan_start: '计划排产开始',
-        plan_finish: '计划排产结束',
-        notes: '备注',
-        demand_start: '计划要求开始',
-        demand_finish: '计划要求结束',
-        insert_flag: '插单',
-        badjustflag: '',
-    },//多租户-服务器数据源
-    host: {
-        id: '',
-        name: '数据源名称',
-        ip: '服务器地址',
-        user: '用户名',
-        password: '密码',
-        port: 'ssh端口',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '是否删除',
-        deletionTime: '删除时间',
-        deleterUserId: '删除人',
-    },//多租户-公司
-    tanant: {
-        id: '',
-        name: '公司名称',
-        code: '公司编码',
-        typeId: '公司类型',
-        startTime: '服务开始时间',
-        endTime: '服务结束时间',
-        initialized: '是否已初始化',
-        dataSourceId: '数据源',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '是否删除',
-        deletionTime: '删除时间',
-        deleterUserId: '删除人',
-        hostId: '服务器',
-    },
-    data_source: {
-        id: '',
-        hostId: '数据源ID',
-        port: '端口',
-        userName: '用户名',
-        password: '密码',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '更新时间',
-        lastModifierUserId: '更新人',
-        isDeleted: '是否删除',
-        deletionTime: '删除时间',
-        deleterUserId: '删除人',
-    },
-    mes_part_task_execute: { //排产方案的 
-        pARTTASKPK: '',
-        cLASSID: '产品Id',
-        pARTID: '产品Id',
-        oRDERID: '',
-        pARTTASKID: '计划Id',
-        bATCHNUM: '批次号',
-        pLANSTART: '计划排产开始',
-        pLANFINISH: '计划排产结束',
-        aCTUALSTART: '',
-        aCTUALFINISH: '',
-        dEMANDSTART: '要求开始时间',
-        dEMANDFINISH: '要求结束时间',
-        pLANQTY: '计划数量',
-        sPAREQTY: '',
-        pRODUCEDQTY: '',
-        pASSEDQTY: '',
-        sCRAPPEDQTY: '',
-        rEWORKQTY: '',
-        tASKTYPE: '任务类型',
-        iNSERTFLAG: '插单',
-        tASKFLAG: '',
-        sTATUS: '状态',
-        nOTES: '',
-        lOCKFLAG: '',
-        sCHEDULEID: '排产方案',
-    },
+  },
+  materialInfo: { //料单送审详情
+    id: '',
+    documentCode: '文档编号',
+    platesNum: '板数',
+    perBoard: '每板定额',
+    powderName: '粉末名称',
+    powderBrand: '粉末牌号',
+    powderSpec: '粉末规格',
+    powderCategory: '粉末类别',
+    powderTotal: '预估粉末总量',
+    partHeight: '预估零件高度',
+    PlacodeName: '基板名称',
+    PlacodeBrand: '基板牌号',
+    PlacodeSpec: '基板规格',
+    PlacodeDevice: '基板适用设备',
+    Placodeland: '基板厚度下限',
+    PlacodeTotal: '基板总量',
+    ScraperSpec: '刮刀规格',
+    ScraperTotal: '刮刀数量',
+    remark: '备注'
+  },
+  Unqualified: {
+    unqualifiedCode: "审理单编号",
+    department: "申请部门",
+    customer: "客户名称",
+    outsourcing: "外包供方名称",
+    product: "产品名称",
+    material: "材料牌号",
+    quantity: "数量",
+    code: "代号",
+    problemDesc: "问题描述",
+    inspectionPerson: "检验员",
+    inspectionDate: "检验日期",
+  },
+  handleList: { //待办事宜
+    id: 'id',
+    schemaId: '审批类型Id',
+    schemaName: '审批类型',
+    code: '编号',
+    status: '状态',
+    startRecordId: '开始节点Id',
+    currentNodeId: '当前环节Id',
+    currentNodeName: '当前环节',
+    nextNodeId: '下一环节Id',
+    nextNodeName: '下一环节',
+    creatorUserId: '创建用户Id',
+    creator: '创建人',
+    creationTime: '创建时间',
+  },
+  processList: { //工艺规程列表
+    id: 'id',
+    productName: '产品名称',
+    name: '工艺名称',
+    routingType: '',
+    routingTypeDesc: '工艺类型',
+    version: '文档版本',
+    code: '规程编号',
+  },
+  OrderDataReview: { //数据审查
+    id: 'id',
+    code: '文件编号',
+    creationTime: '创建时间',
+    creatorUserId: '创建用户Id',
+    lastModificationTime: '最后修改时间',
+    lastModifierUserId: '最后修改人id',
+    repair_file_name: '修复文件',
+    repair_file_notes: '',
+    repair_file_status: '修复文件状态',
+    repair_file_url: '修复文件地址',
+    slicing_file_name: '切片文件',
+    slicing_file_notes: '',
+    slicing_file_status: '切片文件状态',
+    slicing_file_url: '切片文件地址',
+    supporting_file_name: '支撑文件',
+    supporting_file_url: "支撑文件地址",
+    supporting_file_notes: '',
+    supporting_file_status: '支撑文件状态',
+  },
+  Customer: { //客户管理
+    id: '',
+    creationTime: '',
+    creatorUserId: '',
+    lastModificationTime: '',
+    lastModifierUserId: '',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    name: '客户名称',
+    abbre: '客户简称',
+    address: '邮政地址',
+    principal: '负责人',
+    telephone: '办公电话',
+    mobile: '手机',
+    type: '客户类型',
+    area: '客户区域',
+    isInform: '是否报备',
+    status: '状态',
+    notes: '备注',
+    code: '客户编码',
+    trade: '行业',
+  },
+  Shop: {
+    id: '',
+    creationTime: '',
+    creatorUserId: '',
+    lastModificationTime: '',
+    lastModifierUserId: '',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    name: '组织名称',
+    upId: '上层组织id',
+    customerId: '客户id',
+    principal: '负责人',
+    telephone: '办公电话',
+    mobile: '手机',
+    status: '状态',
+    notes: '备注',
+  },
+  Project: {
+    id: '',
+    creationTime: '',
+    creatorUserId: '',
+    lastModificationTime: '',
+    lastModifierUserId: '',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    name: '项目名称',
+    customerId: '客户Id',
+    shopId: '主管部门',
+    stage: '销售阶段',
+    principal: '负责人',
+    isInform: '是否报备',
+    status: '状态',
+    notes: '备注',
+    budget: '预算（元）',
+  },
+  Follow: {
+    id: '',
+    creationTime: '',
+    creatorUserId: '',
+    lastModificationTime: '',
+    lastModifierUserId: '',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    projectId: '项目Id',
+    customerId: '客户Id',
+    userId: '销售人员Id',
+    type: '跟进类型',
+    time: '跟进时间',
+    deliverable: '跟进交付物',
+    arrange: '后续安排',
+    principal: '负责人',
+    status: '状态',
+    notes: '备注',
+    accessory: '上传'
+  },
+  Contract: {
+    id: '',
+    creationTime: '',
+    creatorUserId: '',
+    lastModificationTime: '',
+    lastModifierUserId: '',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    projectId: '项目编号',
+    name: '名称',
+    accessory: '附件',
+    userId: '销售人员',
+    proceeds: '已收款',
+    status: '状态',
+    notes: '备注',
+  },
+  // 工厂日历
+  calendar_class: {
+    id: '',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '删除人',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    title: '班次名称',
+    startTime: '开始时间',
+    endTime: '结束时间',
+    startendTime: '班次时间',
+    workHours: '工作时长',
+  },
+  calendar_holiday: {
+    id: '',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '删除人',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    title: '节日名称',
+    startTime: '开始时间',
+    days: '工作时长(小时)',
+    status: '状态',
+    endTime: '结束时间',
+  },
+  calendar_overtime: {
+    id: '',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '删除人',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    title: '日历名称',
+    restType: '',
+    holidayId: '',
+    holidayTitle: '关联节假日',
+    status: '',
+  },
+  calendar_work: {
+    id: '',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '删除人',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    title: '日历名称',
+    calendarClassId: '',
+    calendarClassTitle: '关联班次',
+    calendarClassStart: '开始时间',
+    calendarClassEnd: '结束时间',
+    workHours: '工作时长',
+  },
+  Connector: {
+    id: '',
+    creationTime: '',
+    creatorUserId: '',
+    lastModificationTime: '',
+    lastModifierUserId: '',
+    isDeleted: '',
+    deletionTime: '',
+    deleterUserId: '',
+    name: '人员名称',
+    shopId: '组织id',
+    duties: '职务',
+    telephone: '办公电话',
+    mobile: '手机',
+    status: '状态',
+    notes: '备注',
+    customerId: '客户Id',
+    shopName: '组织名称',
+  },
+  mes_order: {
+    id: '',
+    upId: '父订单id',
+    mesCode: '订单编号',
+    taskType: '任务类型',
+    productId: '产品表主键',
+    stage: '阶段',
+    materialId: '材料表主键',
+    quantity: '数量',
+    guestName: '甲方客户',
+    printSupply: '3D打印承制单位',
+    functionaryOffice: '厂内责任机关',
+    mainDepartmentId: '厂内主主体责任部门',
+    remark: '备注',
+    taskInputDate: '创建日期',
+    taskRequire: '任务接点要求',
+    putintDocmentCode: '上传文件名称',
+    technologyDocmentCode: '上传文件名称',
+    outerDrawnNumber: '外部图号/模型号',
+    modelVersion: '模型版本',
+    taskCode: '甲方任务号',
+    designer: '甲方设计人员',
+    officeFunctionary: '厂内机关负责人',
+    mainRoutingPeople: '厂内主工艺人员',
+    status: '订单状态',
+    workHours: '工时',
+    printPeriod: '打印周期',
+    equipment: '设备',
+    materialWeight: '材料重量',
+    isSupportingFinish: '配套状态', //是否配套，0 未配套，1 已配套
+    demandStartDate: '投料时间',
+    demandFinishDate: '节点时间',
+    actualStartDate: '订单实际开始时间，实际为第一道工序的开始时间',
+    actualFinishDate: '订单实际结束时间，实际为最后一道工序的结束时间',
+    isDeleted: '是否被删除，0 : 否，1 是',
+    creatorUserId: '记录创建人',
+    creationTime: '创建时间',
+    lastModifierUserId: '修改人',
+    lastModificationTime: '修改时间',
+    orderQuotationStatus: '报价状态',
+    distributeMainRouting: '(派发)工艺人员',
+    mainRoutingFinishDate: '工艺完成时间',
+    majorRoutingPeople: '专业工艺人员',
+    majorRoutingFinishDate: '专业工艺完成时间',
+    checkUpPeople: '校对人员',
+    checkUpFinishDate: '校对完成时间',
+    productingPreparationPeople: '生产准备人员',
+    productingPreparationFinishDate: '生产准备完成时间',
+    quotationPeople: '订单报价人员',
+    quotationFinishDate: '订单报价完成时间',
+    routingMethod: '工艺方法',
+    outerEnvelopeSize: '外包络尺寸',
+    divideMark: '分解标记:1-已分解', //1-已分解
+    productCode: '产品序号',
+    productName: '产品名称',
+    drawnNumber: '产品图号',
+    qualifiedQuantity: '合格数量',
+    uncertificateQuantity: '待开具数量',
+    mainRoutingSetStatus: '工艺状态',
+    majorRoutingSetStatus: '',
+    materialBillSetStatus: '',
+    routingDataSetStatus: '',
+    rootId: '',
+    mainRoutingExecuteStatus: '',
+    majorRoutingExecuteStatus: '',
+    mainRoutingActualStartDate: '',
+    mainRoutingActualFinishDate: '',
+    majorRoutingActualStartDate: '',
+    majorRoutingActualFinishDate: '',
+    batchNumber: '批次号',
+    projectNumber: '项目号',
+    urgencyLevel: '紧急程度',
+    materialName: '材料名称',
+    isPreschedule: '移入排产',
+    spareQty: '(APS)备件数量',
+    demandStart: '(APS)投料时间',
+    demandFinish: '(APS)节点时间',
+    partNamePro: '(APS)产品名称增强',
+    selection: '多选',
+    DistributeMainRouting: '工艺人员',
+    MainRoutingFinishDate: '完成时间',
+  },
+  mes_plan: {
+    id: '',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '删除人',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    mesCode: '订单编号',
+    taskType: '任务类型',
+    productId: '产品主键',
+    quantity: '数量',
+    remark: '备注',
+    taskRequire: '任务节点要求',
+    status: '订单状态',
+    divideMark: '分解标记:1-已分解;0-未分解',
+    productCode: '产品序号:No1~No99',
+    productName: '产品名称',
+    drawnNumber: '图号',
+    rootId: '根节点Id',
+    batchNumber: '批次号',
+    projectNumber: '项目号',
+    urgencyLevel: '紧急程度',
+    productingPreparationPeople: '生产准备(主制车间)',
+    productingPreparationFinishDate: '生产准备完成时间',
+    quotationPeople: '订单报价人员',
+    quotationFinishDate: '订单报价完成时间',
+    upId: '父订单id',
+    demandStartDate: '投料时间',
+    demandFinishDate: '节点时间',
+  },
+  mes_part_task_plan_simulate: {
+    id: '',
+    part_task_pk: '计划编号',
+    priority: '优先级',
+    plan_qty: '排产数量',
+    spare_qty: '备件数量',
+    plan_start: '计划排产开始',
+    plan_finish: '计划排产结束',
+    notes: '备注',
+    demand_start: '计划要求开始',
+    demand_finish: '计划要求结束',
+    insert_flag: '插单',
+    badjustflag: '',
+  }, //多租户-服务器数据源
+  host: {
+    id: '',
+    name: '数据源名称',
+    ip: '服务器地址',
+    user: '用户名',
+    password: '密码',
+    port: 'ssh端口',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '是否删除',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+  }, //多租户-公司
+  tanant: {
+    id: '',
+    name: '公司名称',
+    code: '公司编码',
+    typeId: '公司类型',
+    startTime: '服务开始时间',
+    endTime: '服务结束时间',
+    initialized: '是否已初始化',
+    dataSourceId: '数据源',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '是否删除',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    hostId: '服务器',
+  },
+  data_source: {
+    id: '',
+    hostId: '数据源ID',
+    port: '端口',
+    userName: '用户名',
+    password: '密码',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '是否删除',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+  },
+  mes_part_task_execute: { //排产方案的 
+    pARTTASKPK: '',
+    cLASSID: '产品Id',
+    pARTID: '产品Id',
+    oRDERID: '',
+    pARTTASKID: '计划Id',
+    bATCHNUM: '批次号',
+    pLANSTART: '计划排产开始',
+    pLANFINISH: '计划排产结束',
+    aCTUALSTART: '',
+    aCTUALFINISH: '',
+    dEMANDSTART: '要求开始时间',
+    dEMANDFINISH: '要求结束时间',
+    pLANQTY: '计划数量',
+    sPAREQTY: '',
+    pRODUCEDQTY: '',
+    pASSEDQTY: '',
+    sCRAPPEDQTY: '',
+    rEWORKQTY: '',
+    tASKTYPE: '任务类型',
+    iNSERTFLAG: '插单',
+    tASKFLAG: '',
+    sTATUS: '状态',
+    nOTES: '',
+    lOCKFLAG: '',
+    sCHEDULEID: '排产方案',
+  },
 
-    mes_op_task_execute: {//子表
-        iD: '',
-        oPTASKPK: '工单Id',
-        pARTTASKPK: '计划Id',
-        tASKSEQ: '工序号',
-        tASKNAME: '工序名称',
-        pLANFINISH: '计划排产结束',
-        pLANSTART: '计划排产开始',
-        aCTUALFINISH: '',
-        aCTUALSTART: '',
-        sHOPID: '车间Id',
-        eQUIPID: '设备编号',
-        eQUIPTYPE: '设备类型',
-        sINGLEOUT: '单间产出',
-        rUNTIME: '单件工时',
-        sETUPTIME: '准备工时',
-        pUTINTOQTY: '投产数量',
-        tRANSPORTTIME: '转运工时',
-        cHECKTIME: '检验工时',
-        dISPATCHQTY: '派工数量',
-        pRODUCEDQTY: '',
-        pASSEDQTY: '',
-        sCRAPPEDQTY: '',
-        rEWORKQTY: '',
-        tASKTYPE: '任务类型',
-        tASKFLAG: '',
-        iNSERTFLAG: '插单',
-        sTATUS: '状态',
-        nOTES: '备注',
-        lOCKFLAG: '',
-        routingHEADERID: '工艺规程Id',
-        rOUTINGDETAILID: '工序Id',
-        isSynchronization: '',
-        outsideTime: '外协时间',
-        sCHEDULEID: '排产方案编号',
-    },
-    mes_op_task_plan_simulate: {  //参数设置的表
-        id: '',
-        op_task_pk: '工单编号',
-        part_task_pk: '计划编号',
-        task_seq: '工序号',
-        task_name: '工序名称',
-        put_into_qty: '投产数量',
-        plan_start: '计划排产开始',
-        plan_finish: '计划排产结束',
-        setup_time: '准备工时',
-        run_time: '单件工时',
-        transport_time: '转运时间',
-        check_time: '检验时间',
-        efficiency_value: '效率系数',
-        singleout: '单件产出',
-        first_equip: '设备编号',
-        equip_type: '设备类型',
-        cal_id: '连班策略',
-        machine_rule: '设备优先规则',
-        plan_method: '重叠转序',
-        over_time: '六日加班',
-        isdiscrete: '是否离散',
-        discrete_value: '离散值',
-        multi_machine: '多台分配',
-        notes: '备注',
-        insert_flag: '插单',
-        important_flag:"插单",
-        outside_time: '外协时间',
-        discrete_percent: '离散度',
-        taskseq_des: '',
-        workshopcode: '',
-        routing_detail_id: '',
-        routing_header_id: '',
-        comb_param: '',
-        rule_qty: '',
-        taskSeq: '工序号',
-        efficiencyValue: '效率系数',
-        calId: '连班策略',
-        overTime: '六日加班',
-        isDiscrete: '是否离散',
-        multipleEquip: "是否多台安排设备",// 否  是
-        multipleEquipIds: "设备id", //用英文逗号分隔
-        discrete: '离散值',
-    },
-    routing_header:{
-        id:'',
-        creationTime:'',
-        creatorUserId:'',
-        lastModificationTime:'',
-        lastModifierUserId:'',
-        deleterUserId:'',
-        deletionTime:'',
-        classId:'类id',
-        unicode:'unicode',
-        name:'工艺名称',
-        code:'工艺编号',
-        productId:'产品id',
-        productName:'产品名称',
-        productCode:'产品图号',
-        version:'工艺文件版本',
-        author:'编制人',
-        departmentId:'',
-        isMain:'',
-        upId:'',
-        upDetailId:'',
-        routingType:'工艺类型',
-        status:'',
-        approvalStatus:'状态',
-        remark:'工艺说明',
-        roufile:'多媒体附件',
-        approvalStatusRemark:'',
-        auditUserId1:'审核人',
-        auditUserId2:'审批人',
-        isDeleted:'',
-        platesnum:'',
-        isEffect:'',
-        developmentMode:'研制方式',
-        changeOrderCode:'更改单编号',
-        changeOrderDate:'更改单日期',
-        changeMethod:'更改办法',
-        taskType:'任务类型',
-             },
-    routing_detail: {
-        id: '',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '修改时间',
-        lastModifierUserId: '修改人',
-        isDeleted: '是否删除',
-        deleterUserId: '删除人',
-        deletionTime: '删除时间',
-        classId: '',
-        routingHeaderId: '工艺ID',
-        name: '工序名',
-        taskSeq: '工序号',
-        description: '工序名称详细描述',
-        taskContent: '工序内容',
-        resourceId: '设备',
-        resourceType: '设备类型',
-        runtime: '单件排产工时',
-        performancehours: '绩效工时',
-        
-        setupTime: '工序准备工时',
-        transportTime: '转运工时',
-        checkTime: '检验工时',
-        checkFlag: '检验标识',
-        efficiencyValue: '效率系数',
-        singleOut: '单件产出',
-        isOutside: '是否外协',
-        departmentId: '工序的承制单位',
-        isImportant: '是否关键工序',
-        milestoneId: '里程碑',
-        phaseId: '阶段',
-        status: '状态',
-        remark: '备注',
-        extend: '扩展字段',
-        outsideTime: '外协工期',
-    },
-    RoutingSupporting: {
-        id: '',
-        routingHeaderId: '工艺规程ID',
-        routingHeaderId: '工艺规程ID',
-        routingDetailId: '工序ID',
-        routingStepId: '工步ID',
-        isDeleted: '删除人',
-        deletionTime: '删除时间',
-        deleterUserId: '删除人',
-        routingHeaderId: '工艺规程ID',
-        routingDetailId: '工序ID',
-        routingStepId: '工步ID',
-        quantity: '数量',
-        singlequantity: '总计数量',
-        
-        materialId: '物料id',
-        materialType: '物料类型',
-        materialNumber: '物料编号',
-        nameMaterial: '物料名称',
-        state: '状态',
-        extend: '扩展字段',
-        remark: '备注',
-        brand: '牌号',
-        specifications: '规格',
-        xhgg: '型号规格',
-        texture: '材质',
-        procurementStandards: '采购标准',
-        qualityGrade: '质量等级',
-        state: '状态',
-        extend: '扩展字段',
-        remark: '备注',
-    },
-    routing_step: {
-        id: '',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '修改时间',
-        lastModifierUserId: '修改人',
-        isDeleted: '是否删除',
-        deleterUserId: '删除人',
-        deletionTime: '删除时间',
-        routingHeaderId: '工艺',
-        routingDetailId: '工序',
-        classId: '',
-        stepSeq: '工步号',
-        name: '名称',
-        description: '描述',
-        status: '状态',
-        remark: '备注',
-        stepContent: '工步内容',
-        extend: '扩展字段',
-    },
-    routing_qc_card: {
-        id: '',
-        creationTime: '创建时间',
-        creatorUserId: '创建人',
-        lastModificationTime: '修改时间',
-        lastModifierUserId: '修改人',
-        isDeleted: '是否删除',
-        deleterUserId: '删除人',
-        deletionTime: '删除时间',
-        routingHeaderId: '工艺',
-        routingDetailId: '工序',
-        routingStepId: '工步',
-        checkContent: '检验内容',
-        checkType: '检验标记',
-        checkParams: '参数名称',
-        measurementUnit: '单位',
-        fillintype: '汇报类型',
-        qualityTemplate: '模板',
-        isphotograph: '是否拍照',
-        status: '状态',
-        extend: '扩展字段',
-        remark: '备注',
-        productionRequirement: '生产要求',
-        standard: '标准指标',
-        qualityTemplateName: '模板文件名称',
-    }
-}
+  mes_op_task_execute: { //子表
+    iD: '',
+    oPTASKPK: '工单Id',
+    pARTTASKPK: '计划Id',
+    tASKSEQ: '工序号',
+    tASKNAME: '工序名称',
+    pLANFINISH: '计划排产结束',
+    pLANSTART: '计划排产开始',
+    aCTUALFINISH: '',
+    aCTUALSTART: '',
+    sHOPID: '车间Id',
+    eQUIPID: '设备编号',
+    eQUIPTYPE: '设备类型',
+    sINGLEOUT: '单间产出',
+    rUNTIME: '单件工时',
+    sETUPTIME: '准备工时',
+    pUTINTOQTY: '投产数量',
+    tRANSPORTTIME: '转运工时',
+    cHECKTIME: '检验工时',
+    dISPATCHQTY: '派工数量',
+    pRODUCEDQTY: '',
+    pASSEDQTY: '',
+    sCRAPPEDQTY: '',
+    rEWORKQTY: '',
+    tASKTYPE: '任务类型',
+    tASKFLAG: '',
+    iNSERTFLAG: '插单',
+    sTATUS: '状态',
+    nOTES: '备注',
+    lOCKFLAG: '',
+    routingHEADERID: '工艺规程Id',
+    rOUTINGDETAILID: '工序Id',
+    isSynchronization: '',
+    outsideTime: '外协时间',
+    sCHEDULEID: '排产方案编号',
+  },
+  mes_op_task_plan_simulate: { //参数设置的表
+    id: '',
+    op_task_pk: '工单编号',
+    part_task_pk: '计划编号',
+    task_seq: '工序号',
+    task_name: '工序名称',
+    put_into_qty: '投产数量',
+    plan_start: '计划排产开始',
+    plan_finish: '计划排产结束',
+    setup_time: '准备工时',
+    run_time: '单件工时',
+    transport_time: '转运时间',
+    check_time: '检验时间',
+    efficiency_value: '效率系数',
+    singleout: '单件产出',
+    first_equip: '设备编号',
+    equip_type: '设备类型',
+    cal_id: '连班策略',
+    machine_rule: '设备优先规则',
+    plan_method: '重叠转序',
+    over_time: '六日加班',
+    isdiscrete: '是否离散',
+    discrete_value: '离散值',
+    multi_machine: '多台分配',
+    notes: '备注',
+    insert_flag: '插单',
+    important_flag: "插单",
+    outside_time: '外协时间',
+    discrete_percent: '离散度',
+    taskseq_des: '',
+    workshopcode: '',
+    routing_detail_id: '',
+    routing_header_id: '',
+    comb_param: '',
+    rule_qty: '',
+    taskSeq: '工序号',
+    efficiencyValue: '效率系数',
+    calId: '连班策略',
+    overTime: '六日加班',
+    isDiscrete: '是否离散',
+    multipleEquip: "是否多台安排设备", // 否  是
+    multipleEquipIds: "设备id", //用英文逗号分隔
+    discrete: '离散值',
+  },
+  routing_header: {
+    id: '',
+    creationTime: '',
+    creatorUserId: '',
+    lastModificationTime: '',
+    lastModifierUserId: '',
+    deleterUserId: '',
+    deletionTime: '',
+    classId: '类id',
+    unicode: 'unicode',
+    name: '工艺名称',
+    code: '工艺编号',
+    productId: '产品id',
+    productName: '产品名称',
+    productCode: '产品图号',
+    version: '工艺文件版本',
+    author: '编制人',
+    departmentId: '',
+    isMain: '',
+    upId: '',
+    upDetailId: '',
+    routingType: '工艺类型',
+    status: '',
+    approvalStatus: '状态',
+    remark: '工艺说明',
+    roufile: '多媒体附件',
+    approvalStatusRemark: '',
+    auditUserId1: '审核人',
+    auditUserId2: '审批人',
+    isDeleted: '',
+    platesnum: '',
+    isEffect: '',
+    developmentMode: '研制方式',
+    changeOrderCode: '更改单编号',
+    changeOrderDate: '更改单日期',
+    changeMethod: '更改办法',
+    taskType: '任务类型',
+  },
+  routing_detail: {
+    id: '',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '修改时间',
+    lastModifierUserId: '修改人',
+    isDeleted: '是否删除',
+    deleterUserId: '删除人',
+    deletionTime: '删除时间',
+    classId: '',
+    routingHeaderId: '工艺ID',
+    name: '工序名',
+    taskSeq: '工序号',
+    description: '工序名称详细描述',
+    taskContent: '工序内容',
+    resourceId: '设备',
+    resourceType: '设备类型',
+    runtime: '单件排产工时',
+    performancehours: '绩效工时',
+
+    setupTime: '工序准备工时',
+    transportTime: '转运工时',
+    checkTime: '检验工时',
+    checkFlag: '检验标识',
+    efficiencyValue: '效率系数',
+    singleOut: '单件产出',
+    isOutside: '是否外协',
+    departmentId: '工序的承制单位',
+    isImportant: '是否关键工序',
+    milestoneId: '里程碑',
+    phaseId: '阶段',
+    status: '状态',
+    remark: '备注',
+    extend: '扩展字段',
+    outsideTime: '外协工期',
+  },
+  RoutingSupporting: {
+    id: '',
+    routingHeaderId: '工艺规程ID',
+    routingHeaderId: '工艺规程ID',
+    routingDetailId: '工序ID',
+    routingStepId: '工步ID',
+    isDeleted: '删除人',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    routingHeaderId: '工艺规程ID',
+    routingDetailId: '工序ID',
+    routingStepId: '工步ID',
+    quantity: '数量',
+    singlequantity: '总计数量',
+
+    materialId: '物料id',
+    materialType: '物料类型',
+    materialNumber: '物料编号',
+    nameMaterial: '物料名称',
+    state: '状态',
+    extend: '扩展字段',
+    remark: '备注',
+    brand: '牌号',
+    specifications: '规格',
+    xhgg: '型号规格',
+    texture: '材质',
+    procurementStandards: '采购标准',
+    qualityGrade: '质量等级',
+    state: '状态',
+    extend: '扩展字段',
+    remark: '备注',
+  },
+  routing_step: {
+    id: '',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '修改时间',
+    lastModifierUserId: '修改人',
+    isDeleted: '是否删除',
+    deleterUserId: '删除人',
+    deletionTime: '删除时间',
+    routingHeaderId: '工艺',
+    routingDetailId: '工序',
+    classId: '',
+    stepSeq: '工步号',
+    name: '名称',
+    description: '描述',
+    status: '状态',
+    remark: '备注',
+    stepContent: '工步内容',
+    extend: '扩展字段',
+  },
+  routing_qc_card: {
+    id: '',
+    creationTime: '创建时间',
+    creatorUserId: '创建人',
+    lastModificationTime: '修改时间',
+    lastModifierUserId: '修改人',
+    isDeleted: '是否删除',
+    deleterUserId: '删除人',
+    deletionTime: '删除时间',
+    routingHeaderId: '工艺',
+    routingDetailId: '工序',
+    routingStepId: '工步',
+    checkContent: '检验内容',
+    checkType: '检验标记',
+    checkParams: '参数名称',
+    measurementUnit: '单位',
+    fillintype: '汇报类型',
+    qualityTemplate: '模板',
+    isphotograph: '是否拍照',
+    status: '状态',
+    extend: '扩展字段',
+    remark: '备注',
+    productionRequirement: '生产要求',
+    standard: '标准指标',
+    qualityTemplateName: '模板文件名称',
+  }
+}
\ No newline at end of file

layouts/basic-layout/index.vue

@@ -21,8 +21,8 @@
                         <i-header-fullscreen v-if="isDesktop && showFullscreen" />
                         <i-header-notice v-if="showNotice" />
                         <i-header-user />
-                        <i-header-i18n v-if="showI18n" />
-                        <i-header-setting v-if="enableSetting && !isMobile" />
+                        <!-- <i-header-i18n v-if="showI18n" />
+                        <i-header-setting v-if="enableSetting && !isMobile" /> -->
                     </div>
                 </Header>
             </transition>

layouts/basic-layout/product.vue

@@ -14,6 +14,13 @@
                   </a>
                 </td>
               </tr>
+              <tr>
+                <td class="t_title">
+                  <a class="a_goIndex" @click="goIndexTwo">
+                    <b class="title">首页二</b>
+                  </a>
+                </td>
+              </tr>
               <tr v-for="(item,i) in filterSider">
                 <td class="t_title">
                   <b class="title"
@@ -44,8 +51,8 @@
         <i-header-fullscreen v-if="isDesktop && showFullscreen" />
         <i-header-notice v-if="showNotice" />
         <i-header-user />
-        <i-header-i18n v-if="showI18n" />
-        <i-header-setting v-if="enableSetting && !isMobile" />
+        <!-- <i-header-i18n v-if="showI18n" />
+        <i-header-setting v-if="enableSetting && !isMobile" /> -->
       </div>
     </Header>
     <Content class="i-layout-content">
@@ -287,6 +294,9 @@ export default {
     goIndex(){
       this.$router.push("/")
     },
+    goIndexTwo(){
+      this.$router.push("/home")
+    }
   },
   mounted() {
     document.addEventListener("scroll", this.handleScroll, { passive: true });

layouts/default.vue

@@ -2,8 +2,8 @@
   <MainLayout />
 </template>
 <script>
-import MainLayout from "./basic-layout";
-// import MainLayout from "./basic-layout/product";
+// import MainLayout from "./basic-layout";
+import MainLayout from "./basic-layout/product";
 // 配置
 import Setting from "@/setting";
 // 方法

pages/aps/aps/components/excute.vue

 <template>
-  <div style="padding: 0;">
+  <div style="padding: 0;" class="excute">
     <DataGrid
       style="margin-top: -25px; margin-bottom: -25px;"
       :columns="columns"
@@ -11,16 +11,12 @@
       :data="data1"
       :page="false"
       :height="gridHeight"
+      :size="size"
     ></DataGrid>
     <Modal v-model="editModal" title="编辑" footer-hide width="800">
       <Edit :row="rowData" @on-close="cancel" @on-option-ok="addOk" />
     </Modal>
-    <Modal
-      v-model="insertlModal"
-      :title="insertTItle"
-      @on-ok="insertOk"
-      @on-cancel="cancel"
-    >
+    <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">
@@ -43,10 +39,10 @@ export default {
   name: "list",
   components: {
     Edit,
-    Add,
+    Add
   },
   props: {
-    rowId: { type: Number },
+    rowId: { type: Number }
   },
   data() {
     return {
@@ -54,8 +50,8 @@ export default {
       easySearch: {
         keys: {
           op: "task_seq",
-          value: null,
-        },
+          value: null
+        }
       },
       setParsModal: false,
       editModal: false,
@@ -64,6 +60,7 @@ export default {
       rowIndex: null,
       curId: 0,
       gridHeight: 50,
+      size: "small",
       columns: [
         { key: "id", title: this.l("id"), hide: true, align: "left" },
         { title: " ", width: 130 },
@@ -80,9 +77,9 @@ export default {
                 props: {
                   content:
                     params.row.important_flag == 1 ? "取消插单" : "进行插单",
-                  placement: "top",
+                  placement: "top"
                 },
-                class: "ico",
+                class: "ico"
               },
               [
                 h("Icon", {
@@ -92,43 +89,43 @@ export default {
                         ? "ios-flag"
                         : "ios-flag-outline",
                     size: 20,
-                    color: params.row.important_flag == 1 ? "#2680EB" : "#aaa",
+                    color: params.row.important_flag == 1 ? "#2680EB" : "#aaa"
                   },
                   on: {
-                    click: () => this.changeFlag(params.row.id, params.index),
-                  },
-                }),
+                    click: () => this.changeFlag(params.row.id, params.index)
+                  }
+                })
               ]
             );
-          },
+          }
         },
         {
           key: "task_seq",
           title: this.l("task_seq"),
           align: "left",
           easy: true,
-          high: true,
+          high: true
         },
         {
           key: "op_task_pk",
           title: this.l("op_task_pk"),
           align: "left",
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "task_name",
           title: this.l("task_name"),
           align: "left",
           easy: true,
-          high: true,
+          high: true
         },
         {
           key: "part_task_pk",
           title: this.l("part_task_pk"),
           align: "left",
           high: true,
-          hide: true,
+          hide: true
         },
 
         {
@@ -136,7 +133,7 @@ export default {
           title: this.l("put_into_qty"),
           align: "left",
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "plan_start",
@@ -144,7 +141,7 @@ export default {
           align: "center",
           high: true,
           width: 140,
-          hide: true,
+          hide: true
         },
         {
           key: "plan_finish",
@@ -152,52 +149,52 @@ export default {
           align: "center",
           high: true,
           width: 140,
-          hide: true,
+          hide: true
         },
         {
           key: "first_equip",
           title: this.l("first_equip"),
           align: "left",
           easy: true,
-          high: true,
+          high: true
         },
         {
           key: "setup_time",
           title: this.l("setup_time"),
           align: "right",
-          high: true,
+          high: true
         },
         {
           key: "run_time",
           title: this.l("run_time"),
           align: "right",
-          high: true,
+          high: true
         },
         {
           key: "outside_time",
           title: this.l("outside_time"),
           align: "right",
-          high: true,
+          high: true
         },
         {
           key: "transport_time",
           title: this.l("transport_time"),
           align: "right",
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "check_time",
           title: this.l("check_time"),
           align: "right",
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "efficiency_value",
           title: this.l("efficiency_value"),
           align: "right",
-          high: true,
+          high: true
         },
         {
           key: "machine_rule",
@@ -205,14 +202,14 @@ export default {
           align: "center",
           easy: true,
           high: true,
-          width: 140,
+          width: 140
         },
         {
           key: "singleout",
           title: this.l("singleout"),
           align: "left",
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "equip_type",
@@ -220,7 +217,7 @@ export default {
           align: "left",
           easy: true,
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "first_equip",
@@ -228,48 +225,48 @@ export default {
           align: "left",
           easy: true,
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "cal_id",
           title: this.l("cal_id"),
           align: "left",
           easy: true,
-          high: true,
+          high: true
         },
         {
           key: "plan_method",
           title: this.l("plan_method"),
           align: "left",
           easy: true,
-          high: true,
+          high: true
         },
         {
           key: "over_time",
           title: this.l("over_time"),
           align: "left",
           easy: true,
-          high: true,
+          high: true
         },
         {
           key: "isdiscrete",
           title: this.l("isdiscrete"),
           align: "center",
           easy: true,
-          high: true,
+          high: true
         },
         {
           key: "discrete_value",
           title: this.l("discrete_value"),
           align: "right",
-          high: true,
+          high: true
         },
         {
           key: "multi_machine",
           title: this.l("multi_machine"),
           align: "center",
           easy: true,
-          high: true,
+          high: true
         },
         {
           key: "notes",
@@ -277,7 +274,7 @@ export default {
           align: "left",
           easy: true,
           high: true,
-          hide: true,
+          hide: true
         },
 
         {
@@ -286,7 +283,7 @@ export default {
           align: "left",
           easy: true,
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "workshopcode",
@@ -294,21 +291,21 @@ export default {
           align: "left",
           easy: true,
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "routing_detail_id",
           title: this.l("routing_detail_id"),
           align: "left",
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "routing_header_id",
           title: this.l("routing_header_id"),
           align: "left",
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "comb_param",
@@ -316,14 +313,14 @@ export default {
           align: "left",
           easy: true,
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "rule_qty",
           title: this.l("rule_qty"),
           align: "left",
           high: true,
-          hide: true,
+          hide: true
         },
         {
           title: "操作",
@@ -337,32 +334,32 @@ export default {
                   icon: "md-options",
                   type: "icon",
                   oprate: "detail",
-                  title: "工序参数设置",
+                  title: "工序参数设置"
                 },
-                on: { click: () => this.openParms(params.row) },
+                on: { click: () => this.openParms(params.row) }
               }),
               h("op", {
                 attrs: {
-                  icon: "ios-create",
+                  icon: "md-create",
                   type: "icon",
                   title: "編輯工序",
-                  oprate: "edit",
+                  oprate: "edit"
                 },
-                on: { click: () => this.edit(params.row) },
+                on: { click: () => this.edit(params.row) }
               }),
               h("op", {
                 attrs: {
                   icon: "ios-trash",
                   type: "icon",
                   title: "删除工序",
-                  oprate: "delete",
-                  msg: "确认要刪除工序吗？",
+                  oprate: "edit",
+                  msg: "确认要刪除工序吗？"
                 },
-                on: { click: () => this.remove(params.row, params.index) },
-              }),
+                on: { click: () => this.remove(params.row, params.index) }
+              })
             ]);
-          },
-        },
+          }
+        }
       ],
       data1: [],
       insertTItle: "插单",
@@ -372,10 +369,10 @@ export default {
         opTaskPk: 0, //工单ID
         partTaskPk: 0, //生产计划ID
         taskSeq: "", //工序编号
-        count: 0,//生产计划数量
-      }, 
+        count: 0 //生产计划数量
+      },
       //设置参数结束
-      rowData:{},//编辑时传入行数据
+      rowData: {} //编辑时传入行数据
     };
   },
   mounted() {
@@ -388,12 +385,12 @@ export default {
     //根据点击副组件传过来id进行加载数据
     loadData(expendId) {
       let params = {
-        id: expendId,
+        id: expendId
       };
-      Api.getbyorderid(params).then((res) => {
+      Api.getbyorderid(params).then(res => {
         if (res.success) {
           this.gridHeight = 50;
-          this.gridHeight = (res.result.length + 1) * 51;
+          this.gridHeight = (res.result.length + 1) * 42;
           this.data1 = res.result;
         }
       });
@@ -430,7 +427,7 @@ export default {
         opTaskPk: row.op_task_pk,
         partTaskPk: row.part_task_pk,
         taskSeq: row.task_seq,
-        count: row.put_into_qty,
+        count: row.put_into_qty
       };
       this.setParsModal = true;
     },
@@ -450,9 +447,9 @@ export default {
       this.selectRoutingDetail = row;
       let params = {
         partPk: this.selectRoutingDetail.part_task_pk,
-        detailIdstr: this.selectRoutingDetail.routing_detail_id,
+        detailIdstr: this.selectRoutingDetail.routing_detail_id
       };
-      Api.removeoptasksimluate(params).then((r) => {
+      Api.removeoptasksimluate(params).then(r => {
         if (r.success) {
           this.$Message.success("删除成功");
           this.data1.splice(this.rowIndex, 1);
@@ -477,8 +474,12 @@ export default {
     l(key) {
       let vkey = "mes_op_task_plan_simulate" + "." + key;
       return this.$t(vkey) || key;
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang="less"></style>
+<style lang="less">
+.excute table tr th span,.excute table tr td {
+  font-size: 10px;
+}
+</style>

pages/aps/aps/index.vue

@@ -31,6 +31,11 @@
         <Search />
       </template>
       <template slot="buttons">
+        <Button
+          type="primary"
+          @click="goResults"
+          style="background:#515A6E;border:solid 1px #515A6E"
+        >查看历史方案</Button>
         <Button type="primary" @click="openApsModal">APS排产</Button>
       </template>
       <template slot="batch">
@@ -229,7 +234,8 @@ export default {
                 attrs: {
                   icon: "md-options",
                   type: "icon",
-                  title: "工序参数设置"
+                  title: "工序参数设置",
+                   oprate: "edit",
                 },
                 on: { click: () => this.openAddModel(2, params.row) }
               }),
@@ -238,7 +244,7 @@ export default {
                   icon: "md-return-left",
                   type: "icon",
                   title: "移出排产池",
-                  oprate: "delete",
+                  oprate: "edit",
                   msg: "确认要移出排产吗？"
                 },
                 on: { click: () => this.remove(params.row.part_task_pk) }
@@ -248,7 +254,7 @@ export default {
                   icon: "md-refresh",
                   type: "icon",
                   title: "恢复工序",
-                  oprate: "delete",
+                  oprate: "edit",
                   msg: "确认要恢复工序吗？"
                 },
                 on: { click: () => this.refresh(params.row.part_task_pk) }
@@ -386,6 +392,13 @@ export default {
         this.$Message.error("请设置基准日期");
       }
     },
+    //查看历史方案
+    goResults() {
+      this.$router.push({
+        path: "/aps/results"
+        // params: { customerId: id }
+      });
+    },
     //确定aps排产
     apsOk() {
       this.circleModal = true;
@@ -422,7 +435,7 @@ export default {
                               this.$Message.success("排产计算成功");
                               this.circleModal = false;
                               this.$router.push({
-                                name: "aps-results"
+                                path: "/aps/results"
                                 // params: { customerId: id }
                               });
                             } else {

pages/aps/results/index.vue

@@ -89,7 +89,7 @@ export default {
         },
         {
           title: "零件图号",
-          key: "part_id",
+          key: "part_number",
           align: "center"
         },
         {

pages/aps/results/table-expand.vue

@@ -24,32 +24,32 @@
       </Col>
     </Row>
     <Row v-for="(item,index) in dataList" :key="item.id">
-      <Col span="4">
-        <span class="expand-value">{{ item.op_task_pk }}</span>
+      <Col span="4" class="expand-value">
+        <span>{{ item.task_seq }}</span>
       </Col>
-      <Col span="3">
-        <span class="expand-value">{{ item.task_name }}</span>
+      <Col span="3" class="expand-value">
+        <span>{{ item.task_name }}</span>
       </Col>
-      <Col span="3">
-        <span class="expand-value">{{ item.put_into_qty }}</span>
+      <Col span="3" class="expand-value">
+        <span>{{ item.put_into_qty }}</span>
       </Col>
-      <Col span="3">
-        <span class="expand-value">{{ item.dispatch_qty }}</span>
+      <Col span="3" class="expand-value">
+        <span>{{ item.dispatch_qty }}</span>
       </Col>
-      <Col span="4">
-        <span class="expand-value">{{ item.plan_start }}</span>
+      <Col span="4" class="expand-value">
+        <span>{{ item.plan_start }}</span>
       </Col>
-      <Col span="4">
-        <span class="expand-value">{{ item.plan_finish }}</span>
+      <Col span="4" class="expand-value">
+        <span>{{ item.plan_finish }}</span>
       </Col>
-      <Col span="3">
-        <span class="expand-value">{{ row.equip_id }}</span>
+      <Col span="3" class="expand-value">
+        <span>{{ item.equip_id }}</span>
       </Col>
     </Row>
   </div>
 </template>
 <script>
-import Api from './api'
+import Api from "./api";
 export default {
   props: {
     row: Object
@@ -57,33 +57,36 @@ export default {
   data() {
     return {
       dataList: []
-    }
+    };
   },
   mounted() {
-    this.getList(this.row)
+    this.getList(this.row);
   },
   methods: {
     getList(row) {
       Api.getdetail({
         part_task_pk: row.id,
         scheduleId: row.schedule_id
-      }).then((r) => {
+      }).then(r => {
         if (r.success) {
-          this.dataList = r.result
+          this.dataList = r.result;
         }
-      })
+      });
     }
   }
-}
+};
 </script>
 <style lang='less'>
 .result-aps {
   .expand-row {
     text-align: center;
+    margin: 5px 0;
+    font-weight: bold;
+  }
+  .expand-value {
+    text-align: center;
+    margin: 3px 0;
   }
-  // .ivu-row {
-  //   font-weight: bold !important;
-  // }
 }
 td.ivu-table-expanded-cell {
   padding: 0 !important;

pages/crm/sales/detail.vue

@@ -12,7 +12,7 @@
       <Filed :span="12" :name="l('status')">
         <state code="crm.sales.status" :value="entity.status" />
       </Filed>
-      <Filed :span="12" :name="l('deliverable')">{{entity.deliverable}}</Filed>
+      <Filed :span="24" :name="l('deliverable')">{{entity.deliverable}}</Filed>
       <Filed :span="24" :name="l('arrange')">{{entity.arrange}}</Filed>
       <Filed :span="24" :name="l('notes')">{{entity.notes}}</Filed>
     </Row>

pages/crm/sales/projectList.vue

@@ -108,7 +108,7 @@
     <Modal v-model="editModal" title="编辑" footer-hide>
       <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
     </Modal>
-    <Modal v-model="detailModal" title="详情" footer-hide>
+    <Modal v-model="detailModal" title="详情" footer-hide width="1000">
       <Detail :eid="curId" />
     </Modal>
     <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">

pages/home/api.js

+import Api from '@/plugins/request'
+export default {
+    getUserInfo(params) {
+        return Api.get(`${systemUrl}/user/getuserinfo`, params);
+    },
+    // 获取打你审批数据
+    getpaged(params) {
+        return Api.post(`${workflowUrl}/instance/getpaged`, params);
+    },
+}
\ No newline at end of file

pages/home/component/approval.vue

+
+
+<template>
+  <div>
+    <Card class="todolist">
+      <p class="row_head">
+        <Icon type="md-contact" class="f20" />
+        <span class="ml10">待审批</span>
+        <a class="row_more fr" @click="toivew">更多</a>
+      </p>
+      <div class="row_card_body">
+        <Table border :columns="columns1" :data="data1" height="230"></Table>
+      </div>
+    </Card>
+    <Modal v-model="viewModal" width="800" title="详情">
+      <Row class="mo_cont">
+        <Col span="12" class="label">
+          <span class="title">编号：</span>
+          {{viewData.code}}
+        </Col>
+        <Col span="12" class="label">
+          <span class="title">审批类型：</span>
+          {{viewData.schemaName}}
+        </Col>
+        <Col span="12" class="label">
+          <span class="title">当前环节：</span>
+          {{viewData.currentNodeName}}
+        </Col>
+        <Col span="12" class="label">
+          <span class="title">下一环节：</span>
+          {{viewData.nextNodeName}}
+        </Col>
+        <Col span="12" class="label">
+          <span class="title">创建人：</span>
+          {{viewData.creator}}
+        </Col>
+        <Col span="12" class="label">
+          <span class="title">创建时间：</span>
+          {{viewData.creationTime}}
+        </Col>
+      </Row>
+    </Modal>
+  </div>
+</template>
+<script>
+import Api from "../api";
+export default {
+  name: "Approval",
+  data() {
+    return {
+      imgUrl: iconImg,
+      viewModal: false, //详情弹框
+      viewData: {}, //详情数据
+      columns1: [
+        { type: "index", title: "序号", width: 70, align: "center" },
+        { key: "schemaName", title: "类别", align: "center", width: 150 },
+        { key: "currentNodeName", title: "环节", align: "center" },
+        { key: "nextNodeName", title: "下一环节", align: "center" },
+        { key: "creationTime", title: "创建时间", align: "center", width: 170 },
+        {
+          key: "id",
+          title: "操作",
+          align: "center",
+          width: 90,
+          render: (h, parmse) => {
+            return h("div", { class: "action" }, [
+              h(
+                "op",
+                {
+                  attrs: {
+                    oprate: "add"
+                  },
+                  on: {
+                    click: () => {
+                      this.viewRow(parmse.row);
+                    }
+                  }
+                },
+                "查看"
+              )
+            ]);
+          }
+        }
+      ],
+      data1: []
+    };
+  },
+  created() {
+    this.getlaoed();
+  },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
+  methods: {
+    getlaoed() {
+      let parme = {
+        pageIndex: 1,
+        pageSize: 20,
+        conditions: [
+          { fieldName: "type", fieldValue: 2, conditionalType: "Equal" }
+        ]
+      };
+      Api.getpaged(parme).then(res => {
+        let arry = res.result.items;
+        let arr = arry.slice(0, 4);
+        this.data1 = arr;
+      });
+    },
+    viewRow(rowData) {
+      this.viewModal = true;
+      this.viewData = rowData;
+    },
+    toivew() {
+      var info = { id: "123", message: "成功" };
+      this.$router.push({ name: "handle", params: info });
+      // tab(1)
+    }
+  },
+  mounted() {}
+};
+</script>
+<style lang="less" scoped>
+.row_head {
+  height: 30px;
+  color: #249e91;
+  a {
+    color: #249e91;
+  }
+}
+.mo_cont {
+  border-top: 1px solid #ddd;
+  border-left: 1px solid #ddd;
+  .label {
+    display: table-cell;
+    border-bottom: 1px solid #ddd;
+    border-right: 1px solid #ddd;
+    //  margin: 0 0 -1px -1px;
+    line-height: 30px;
+    box-sizing: border-box;
+    .title {
+      background: #e8eaf1;
+      display: inline-block;
+      width: 100px;
+      text-align: right;
+      padding: 0 5px;
+    }
+  }
+}
+</style>
\ No newline at end of file

pages/home/component/unreadMessage.vue

+
+
+<template>
+  <Card class="todolist">
+    <p class="row_head">
+      <Icon type="ios-chatbubbles" class="f20" />
+      <Badge :count="3" :offset="[9,-5]">
+        <span class="ml10">未读消息</span>
+      </Badge>
+      <a href class="row_more fr">更多</a>
+    </p>
+    <div class="msg">
+      <Row v-for="(item,index) in listTask" :key="index" class="row-text">
+        <Col :span="2">
+          <div></div>
+        </Col>
+        <Col :span="6">{{index+1}}&nbsp&nbsp {{item.name}}</Col>
+        <Col :span="8">
+          {{item.data}}
+          <Icon type="md-link" />
+        </Col>
+        <Col :span="8">{{item.Date}}</Col>
+      </Row>
+    </div>
+  </Card>
+</template>
+<script>
+export default {
+  name: "UnreadMessage",
+  data() {
+    return {
+      imgUrl: iconImg,
+      listTask: [
+        {
+          name: "张飞",
+          data: "生产订单缺料",
+          Date: "2020-03-12 11.30"
+        },
+        {
+          name: "张飞",
+          data: "送审订单待审批",
+          Date: "2020-03-12 11.30"
+        },
+        {
+          name: "张飞",
+          data: "排产未完成",
+          Date: "2020-03-12 11.30"
+        },
+        {
+          name: "张飞",
+          data: "物料补料中",
+          Date: "2020-03-12 11.30"
+        },
+        {
+          name: "张飞",
+          data: "物料补料中",
+          Date: "2020-03-12 11.30"
+        },
+        {
+          name: "张飞",
+          data: "物料补料中",
+          Date: "2020-03-12 11.30"
+        }
+      ]
+    };
+  },
+  methods: {
+    link() {
+      console.log("路径");
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.row_head {
+  height: 35px;
+  line-height: 30px;
+  color: #0099ff;
+}
+.msg {
+  height: 225px;
+  overflow-y: auto;
+  .row-text {
+    height: 40px;
+    line-height: 40px;
+    border-top: 1px solid #eee;
+  }
+}
+</style>
\ No newline at end of file

pages/home/index.vue

+<template>
+  <div class="home">
+    <Card class="card-user">
+      <div class="img-header">
+        <img src="@/assets/images/home/user.png" />
+      </div>
+      <div class="user-text">
+        <p>你好：张飞，欢迎登陆MES系统!</p>
+        <p>
+          <span>xx公司/xx车间xx班组</span> &nbsp &nbsp
+          <span>工艺技术员</span>
+        </p>
+      </div>
+      <div class="incon-carousel">
+        <div class="bg-b">
+          <Icon type="ios-arrow-back" />
+        </div>
+        <div class="bg bg0">
+          <Icon type="ios-cube" />
+          <p>电子对账单</p>
+        </div>
+        <div class="bg bg1">
+          <Icon type="md-mail" />
+          <p>站内邮件</p>
+        </div>
+        <div class="bg bg2">
+          <Icon type="md-map" />
+          <p>站内邮件</p>
+        </div>
+        <div class="bg bg3">
+          <Icon type="ios-cube" />
+          <p>电子对账单</p>
+        </div>
+        <div class="bg bg0">
+          <Icon type="ios-cube" />
+          <p>电子对账单</p>
+        </div>
+        <div class="bg bg1">
+          <Icon type="md-mail" />
+          <p>站内邮件</p>
+        </div>
+        <div class="bg bg2">
+          <Icon type="md-mail" />
+          <p>站内邮件</p>
+        </div>
+        <div class="bg-l">
+          <Icon type="ios-arrow-forward" />
+        </div>
+      </div>
+    </Card>
+    <div class="card-list">
+      <div class="bg-b">
+        <Icon type="ios-arrow-back" />
+      </div>
+      <Card
+        v-for="(item,index) in listTask"
+        :key="index"
+        :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))"
+        @click.native="goPage(item)"
+      >
+        <div class="leftIco">
+          <img class="img_icon" src="@/assets/imgicon/u1640.png" alt />
+        </div>
+        <div class="text-p">
+          <p>{{item.totalUrl}}</p>
+          <p>{{item.name}}</p>
+        </div>
+      </Card>
+      <div class="bg-l">
+        <Icon type="ios-arrow-forward" />
+      </div>
+    </div>
+    <Row class="table" :gutter="16">
+      <Col :span="12">
+        <Approval ref="approval" />
+      </Col>
+      <Col :span="12">
+        <UnreadMessage />
+      </Col>
+    </Row>
+    <div class="url-img"></div>
+  </div>
+</template>
+<script>
+import Api from "./api";
+import Approval from "./component/approval";
+import UnreadMessage from "./component/unreadMessage";
+export default {
+  components: {
+    Approval,
+    UnreadMessage
+  },
+  data() {
+    return {
+      listTask: [],
+      imgUrl: iconImg
+    };
+  },
+  created() {
+    this.get();
+  },
+  methods: {
+    get() {
+      let list = [];
+      let url = `${systemUrl}/backlog/get`;
+      this.$api.get(url).then(r => {
+        list = r.result;
+        list.forEach(data => {
+          // console.log(data.totalUrl)
+          let ulrt = `http://${address}:` + data.totalUrl;
+          data.totalUrl = 0;
+          this.$api.get(ulrt).then(r => {
+            return (data.totalUrl = r.result);
+          });
+        });
+        console.log(list);
+        this.listTask = list;
+      });
+    },
+    goPage(u) {
+      // alert(u.menuUrl)
+      this.$router.push(u.menuUrl);
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.home {
+  padding: 10px 0;
+  .card-user {
+    height: 100px;
+    .img-header {
+      margin-top: -8px;
+      float: left;
+    }
+    .user-text {
+      float: left;
+      p {
+        margin: 10px;
+      }
+    }
+    .incon-carousel {
+      float: right;
+      //   margin-top: 8px;
+      width: 800px;
+      .bg-b {
+        float: left;
+        margin-top: 10px;
+        font-size: 30px;
+        color: #dcdfe6;
+      }
+      .bg-l {
+        float: right;
+        margin-top: 10px;
+        font-size: 30px;
+        color: #dcdfe6;
+      }
+      .bg {
+        text-align: center;
+        width: 100px;
+        float: left;
+        .ivu-icon {
+          font-size: 35px;
+        }
+        p {
+          margin-top: 8px;
+        }
+      }
+      .bg0 {
+        .ivu-icon {
+          color: #ffc300;
+        }
+      }
+      .bg1 {
+        .ivu-icon {
+          color: #0099ff;
+        }
+      }
+      .bg2 {
+        .ivu-icon {
+          color: #ff7a8b;
+        }
+      }
+      .bg3 {
+        .ivu-icon {
+          color: #ffc300;
+        }
+      }
+    }
+  }
+  .card-list {
+    display: flex;
+    display: -webkit-flex;
+    margin-top: 15px;
+    justify-content: space-around;
+    .bg-b {
+      margin-top: 18px;
+      font-size: 30px;
+      color: #dcdfe6;
+      width: 35px;
+    }
+    .bg-l {
+      margin-top: 18px;
+      font-size: 30px;
+      color: #dcdfe6;
+      width: 35px;
+    }
+
+    .img_bg01 {
+      background-color: #ff9100;
+      width: 200px;
+      cursor: pointer;
+      background: linear-gradient(to left, #ff9100, #ffcf87);
+    }
+    .img_bg02 {
+      width: 200px;
+      cursor: pointer;
+      background: linear-gradient(to left, #003fd4, #8ac7fc);
+    }
+    .img_bg03 {
+      cursor: pointer;
+      width: 200px;
+      background: linear-gradient(to left, #fe1b1b, #fc9c92);
+    }
+    .img_bg04 {
+      cursor: pointer;
+      width: 200px;
+      background: linear-gradient(to left, #249e91, #79ece0);
+    }
+    .img_icon {
+      width: 24px;
+      margin: 23% 0 0 0;
+    }
+    .text-p {
+      text-align: center;
+      color: #fff;
+      p:first-child {
+        font-size: 20px;
+        font-weight: bold;
+        margin-bottom: 5px;
+      }
+    }
+  }
+  .url-img {
+    width: 100%;
+    height: 370px;
+    background: url("../../assets/images/home/echars.png") no-repeat;
+    background-size: 100% 100%;
+  }
+  .table {
+    margin-top: 15px;
+  }
+}
+</style>
\ No newline at end of file

pages/mesPlan/add.vue

+    <template>
+  <Form ref="form" :model="entity" :rules="rules" :label-width="90">
+    <Row>
+      <Col :span="12">
+        <FormItem :label="l('mesCode')" prop="mesCode">
+          <Input v-model="entity.mesCode"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('taskType')" prop="taskType">
+          <Dictionary code="mes.mes_plan.task_type" v-model="entity.taskType"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('productId')" prop="productId">
+          <InputNumber v-model="entity.productId"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('quantity')" prop="quantity">
+          <InputNumber v-model="entity.quantity"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="24">
+        <FormItem :label="l('remark')" prop="remark">
+          <Input v-model="entity.remark" type="textarea" :rows="5"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="24">
+        <FormItem :label="l('taskRequire')" prop="taskRequire">
+          <Input v-model="entity.taskRequire" type="textarea" :rows="5"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('status')" prop="status">
+          <Dictionary code="mes.mes_plan.status" v-model="entity.status"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('divideMark')" prop="divideMark">
+          <Dictionary code="mes.mes_plan.divide_mark" v-model="entity.divideMark"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="24">
+        <FormItem :label="l('productCode')" prop="productCode">
+          <Input v-model="entity.productCode" type="textarea" :rows="5"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('productName')" prop="productName">
+          <Input v-model="entity.productName"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('drawnNumber')" prop="drawnNumber">
+          <Input v-model="entity.drawnNumber"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('rootId')" prop="rootId">
+          <InputNumber v-model="entity.rootId"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('batchNumber')" prop="batchNumber">
+          <Input v-model="entity.batchNumber"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('projectNumber')" prop="projectNumber">
+          <Input v-model="entity.projectNumber"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('urgencyLevel')" prop="urgencyLevel">
+          <Dictionary code="mes.mes_plan.urgency_level" v-model="entity.urgencyLevel"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('productingPreparationPeople')" prop="productingPreparationPeople">
+          <InputNumber v-model="entity.productingPreparationPeople"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem
+          :label="l('productingPreparationFinishDate')"
+          prop="productingPreparationFinishDate"
+        >
+          <DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('quotationPeople')" prop="quotationPeople">
+          <InputNumber v-model="entity.quotationPeople"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('quotationFinishDate')" prop="quotationFinishDate">
+          <DatePicker type="date" v-model="entity.quotationFinishDate"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('upId')" prop="upId">
+          <InputNumber v-model="entity.upId"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('demandStartDate')" prop="demandStartDate">
+          <DatePicker type="date" v-model="entity.demandStartDate"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('demandFinishDate')" prop="demandFinishDate">
+          <DatePicker type="date" v-model="entity.demandFinishDate"></DatePicker>
+        </FormItem>
+      </Col>
+    </Row>
+    <FormItem>
+      <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
+      <Button @click="handleClose" class="ml20">取消</Button>
+    </FormItem>
+  </Form>
+</template>
+    <script>
+import Api from "./api";
+export default {
+  name: "Add",
+  data() {
+    return {
+      disabled: false,
+      entity: {},
+      rules: {
+        name: [{ required: true, message: "必填", trigger: "blur" }]
+      }
+    };
+  },
+  props: {
+    v: Object
+  },
+  methods: {
+    handleSubmit() {
+      this.$refs.form.validate(v => {
+        if (v) {
+          this.disabled = true;
+          Api.create(this.entity)
+            .then(r => {
+              this.disabled = false;
+              if (r.success) {
+                this.$Message.success("保存成功");
+                this.$emit("on-ok");
+              } else {
+                this.$Message.error("保存失败");
+              }
+            })
+            .catch(err => {
+              this.disabled = false;
+              this.$Message.error("保存失败");
+              console.warn(err);
+            });
+        }
+      });
+    },
+    handleClose() {
+      this.$emit("on-close");
+    },
+    l(key) {
+      key = "mes_plan" + "." + key;
+      return this.$t(key);
+    }
+  },
+  watch: {
+    v() {
+      this.entity = this.$u.clone(this.v);
+    }
+  }
+};
+</script>

pages/mesPlan/api.js

+import Api from '@/plugins/request'
+export default {
+  index: `${PlanUrl}/mesplan/paged`,
+  paged(params) {
+    return Api.post(`${PlanUrl}/mesplan/paged`, params);
+  },
+  get(params) {
+    return Api.get(`${PlanUrl}/mesplan/get`, params);
+  },
+  create(params) {
+    return Api.post(`${PlanUrl}/mesplan/create`, params);
+  },
+  update(params) {
+    return Api.post(`${PlanUrl}/mesplan/update`, params);
+  },
+  //删除：
+  delete(params) {
+    return Api.delete(`${PlanUrl}/mesplan/delete`, {
+      params: params
+    });
+  },
+}

pages/mesPlan/detail.vue

+<template>
+  <div class="detail">
+    <Row>
+      <Filed :span="12" :name="l('mesCode')">{{entity.mesCode}}</Filed>
+      <Filed :span="12" :name="l('taskType')">{{entity.taskType}}</Filed>
+      <Filed :span="12" :name="l('productId')">{{entity.productId}}</Filed>
+      <Filed :span="12" :name="l('quantity')">{{entity.quantity}}</Filed>
+      <Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
+      <Filed :span="24" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
+      <Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
+      <Filed :span="12" :name="l('divideMark')">{{entity.divideMark}}</Filed>
+      <Filed :span="24" :name="l('productCode')">{{entity.productCode}}</Filed>
+      <Filed :span="12" :name="l('productName')">{{entity.productName}}</Filed>
+      <Filed :span="12" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed>
+      <Filed :span="12" :name="l('rootId')">{{entity.rootId}}</Filed>
+      <Filed :span="12" :name="l('batchNumber')">{{entity.batchNumber}}</Filed>
+      <Filed :span="12" :name="l('projectNumber')">{{entity.projectNumber}}</Filed>
+      <Filed :span="12" :name="l('urgencyLevel')">{{entity.urgencyLevel}}</Filed>
+      <Filed
+        :span="12"
+        :name="l('productingPreparationPeople')"
+      >{{entity.productingPreparationPeople}}</Filed>
+      <Filed
+        :span="12"
+        :name="l('productingPreparationFinishDate')"
+      >{{entity.productingPreparationFinishDate}}</Filed>
+      <Filed :span="12" :name="l('quotationPeople')">{{entity.quotationPeople}}</Filed>
+      <Filed :span="12" :name="l('quotationFinishDate')">{{entity.quotationFinishDate}}</Filed>
+      <Filed :span="12" :name="l('upId')">{{entity.upId}}</Filed>
+      <Filed :span="12" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed>
+      <Filed :span="12" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</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
+  },
+  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 = "mes_plan" + "." + key;
+      return this.$t(key);
+    }
+  },
+  watch: {
+    eid(v) {
+      if (v != 0) {
+        this.load(v);
+      }
+    }
+  }
+};
+</script>

pages/mesPlan/edit.vue

+<template>
+  <Form ref="form" :model="entity" :rules="rules" :label-width="90">
+    <Row>
+      <Col :span="12">
+        <FormItem :label="l('mesCode')" prop="mesCode">
+          <Input v-model="entity.mesCode"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('taskType')" prop="taskType">
+          <Dictionary code="mes.mes_plan.task_type" v-model="entity.taskType"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('productId')" prop="productId">
+          <InputNumber v-model="entity.productId"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('quantity')" prop="quantity">
+          <InputNumber v-model="entity.quantity"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="24">
+        <FormItem :label="l('remark')" prop="remark">
+          <Input v-model="entity.remark" type="textarea" :rows="5"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="24">
+        <FormItem :label="l('taskRequire')" prop="taskRequire">
+          <Input v-model="entity.taskRequire" type="textarea" :rows="5"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('status')" prop="status">
+          <Dictionary code="mes.mes_plan.status" v-model="entity.status"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('divideMark')" prop="divideMark">
+          <Dictionary code="mes.mes_plan.divide_mark" v-model="entity.divideMark"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="24">
+        <FormItem :label="l('productCode')" prop="productCode">
+          <Input v-model="entity.productCode" type="textarea" :rows="5"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('productName')" prop="productName">
+          <Input v-model="entity.productName"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('drawnNumber')" prop="drawnNumber">
+          <Input v-model="entity.drawnNumber"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('rootId')" prop="rootId">
+          <InputNumber v-model="entity.rootId"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('batchNumber')" prop="batchNumber">
+          <Input v-model="entity.batchNumber"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('projectNumber')" prop="projectNumber">
+          <Input v-model="entity.projectNumber"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('urgencyLevel')" prop="urgencyLevel">
+          <Dictionary code="mes.mes_plan.urgency_level" v-model="entity.urgencyLevel"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('productingPreparationPeople')" prop="productingPreparationPeople">
+          <InputNumber v-model="entity.productingPreparationPeople"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem
+          :label="l('productingPreparationFinishDate')"
+          prop="productingPreparationFinishDate"
+        >
+          <DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('quotationPeople')" prop="quotationPeople">
+          <InputNumber v-model="entity.quotationPeople"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('quotationFinishDate')" prop="quotationFinishDate">
+          <DatePicker type="date" v-model="entity.quotationFinishDate"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('upId')" prop="upId">
+          <InputNumber v-model="entity.upId"></InputNumber>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('demandStartDate')" prop="demandStartDate">
+          <DatePicker type="date" v-model="entity.demandStartDate"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12">
+        <FormItem :label="l('demandFinishDate')" prop="demandFinishDate">
+          <DatePicker type="date" v-model="entity.demandFinishDate"></DatePicker>
+        </FormItem>
+      </Col>
+    </Row>
+    <FormItem>
+      <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
+      <Button @click="handleClose" class="ml20">取消</Button>
+    </FormItem>
+  </Form>
+</template>
+<script>
+import Api from "./api";
+export default {
+  name: "Edit",
+  data() {
+    return {
+      disabled: false,
+      entity: {},
+      rules: {
+        name: [{ required: true, message: "必填", trigger: "blur" }]
+      }
+    };
+  },
+  props: {
+    eid: Number
+  },
+  methods: {
+    load(v) {
+      Api.get({ id: v }).then(r => {
+        this.entity = r.result;
+        this.$emit("on-load");
+      });
+    },
+    handleSubmit() {
+      this.$refs.form.validate(v => {
+        if (v) {
+          this.disabled = true;
+          Api.update(this.entity)
+            .then(r => {
+              this.disabled = false;
+              if (r.success) {
+                this.$Message.success("保存成功");
+                this.$emit("on-ok");
+              } else {
+                this.$Message.error("保存失败");
+              }
+            })
+            .catch(err => {
+              this.disabled = false;
+              this.$Message.error("保存失败");
+              console.warn(err);
+            });
+        }
+      });
+    },
+    handleClose() {
+      this.$emit("on-close");
+    },
+    l(key) {
+      key = "mes_plan" + "." + key;
+      return this.$t(key);
+    }
+  },
+  watch: {
+    eid(v) {
+      if (v != 0) {
+        this.load(v);
+      }
+    }
+  }
+};
+</script>

pages/mesPlan/index.vue

+<template>
+  <Layout class="full">
+    <Sider hide-trigger :style="{background: '#fff'}" width="260">
+      <div class="zh-tree" :style="{height:treeHeight+'px'}">
+        <h3 class="zh-title">产品结构</h3>
+        <div class="zh-box">
+          <Input search placeholder="请输入查询条件" v-model="treeInputSearch" />
+          <Tree
+            :data="searchList"
+            :style="{height:(treeHeight-95)+'px'}"
+            style="overflow:auto;width:215px;"
+            @on-select-change="selectTreeNode"
+          ></Tree>
+        </div>
+      </div>
+    </Sider>
+    <Content class="content">
+      <DataGrid :columns="columns" ref="grid" :action="action">
+        <template slot="easySearch">
+          <Form ref="formInline" :model="easySearch" inline>
+            <FormItem prop="keys">
+              <Input
+                placeholder="请输入关键字订单编号/备注/任务节点要求/产品序号:No1~No99/产品名称/图号/批次号/项目号"
+                v-model="easySearch.keys.value"
+              />
+            </FormItem>
+            <FormItem>
+              <Button type="primary" @click="search">查询</Button>
+            </FormItem>
+          </Form>
+        </template>
+        <template slot="searchForm">
+          <Search />
+        </template>
+        <template slot="buttons">
+          <Button type="primary" @click="addModal=true">新增</Button>
+        </template>
+      </DataGrid>
+      <Modal v-model="addModal" title="新增" footer-hide>
+        <Add @on-close="cancel" @on-ok="addOk" />
+      </Modal>
+      <Modal v-model="editModal" title="编辑" footer-hide>
+        <Edit :eid="curId" @on-close="cancel" @on-ok="addOk" />
+      </Modal>
+      <Modal v-model="detailModal" title="详情">
+        <Detail :eid="curId" />
+      </Modal>
+      <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
+        <p>确定删除？</p>
+      </Modal>
+    </Content>
+  </Layout>
+</template>
+<script>
+import Api from "./api";
+import Add from "./add";
+import Edit from "./edit";
+import Detail from "./detail";
+import Search from "./search";
+export default {
+  name: "list",
+  components: {
+    Add,
+    Edit,
+    Detail,
+    Search
+  },
+  data() {
+    return {
+      action: Api.index,
+      easySearch: {
+        keys: {
+          op:
+            "mesCode,productCode,productName,drawnNumber,batchNumber,projectNumber",
+          value: null
+        }
+      },
+      addModal: false,
+      editModal: false,
+      detailModal: false,
+      deletelModal: false,
+      curId: 0,
+      columns: [
+        {
+          key: "mesCode",
+          title: this.l("mesCode"),
+          align: "left",
+          easy: true,
+          high: true
+        },
+        {
+          key: "taskType",
+          title: this.l("taskType"),
+          align: "left",
+          high: true,
+          code: "mes.mes_plan.task_type"
+        },
+        {
+          key: "quantity",
+          title: this.l("quantity"),
+          align: "left",
+          high: true
+        },
+        {
+          key: "taskRequire",
+          title: this.l("taskRequire"),
+          align: "left",
+          easy: true,
+          high: true,
+          hide: true
+        },
+        {
+          key: "status",
+          title: this.l("status"),
+          align: "left",
+          high: true,
+          code: "mes.mes_plan.status"
+        },
+        {
+          key: "productCode",
+          title: this.l("productCode"),
+          align: "left",
+          easy: true,
+          high: true,
+          hide: true
+        },
+        {
+          key: "productName",
+          title: this.l("productName"),
+          align: "left",
+          easy: true,
+          high: true
+        },
+        {
+          key: "drawnNumber",
+          title: this.l("drawnNumber"),
+          align: "left",
+          easy: true,
+          high: true
+        },
+        {
+          key: "batchNumber",
+          title: this.l("batchNumber"),
+          align: "left",
+          easy: true,
+          high: true
+        },
+        {
+          key: "projectNumber",
+          title: this.l("projectNumber"),
+          align: "left",
+          easy: true,
+          high: true
+        },
+        {
+          key: "urgencyLevel",
+          title: this.l("urgencyLevel"),
+          align: "left",
+          high: true,
+          code: "mes.mes_plan.urgency_level"
+        },
+        {
+          key: "productingPreparationPeople",
+          title: this.l("productingPreparationPeople"),
+          align: "left",
+          high: true,
+          hide: true
+        },
+        {
+          key: "productingPreparationFinishDate",
+          title: this.l("productingPreparationFinishDate"),
+          align: "left",
+          high: true,
+          hide: true
+        },
+        {
+          key: "quotationPeople",
+          title: this.l("quotationPeople"),
+          align: "left",
+          high: true,
+          hide: true
+        },
+        {
+          key: "quotationFinishDate",
+          title: this.l("quotationFinishDate"),
+          align: "left",
+          high: true,
+          hide: true
+        },
+        {
+          key: "demandStartDate",
+          title: this.l("demandStartDate"),
+          align: "left",
+          high: true,
+          hide: true
+        },
+        {
+          key: "demandFinishDate",
+          title: this.l("demandFinishDate"),
+          align: "left",
+          high: true,
+          hide: true
+        },
+        {
+          title: "操作",
+          key: "action",
+          width: 140,
+          align: "center",
+          render: (h, params) => {
+            return h("div", { class: "action" }, [
+              h(
+                "op",
+                {
+                  attrs: { oprate: "detail" },
+                  on: { click: () => this.detail(params.row.id) }
+                },
+                "查看"
+              ),
+              h(
+                "op",
+                {
+                  attrs: { oprate: "edit" },
+                  on: { click: () => this.edit(params.row.id) }
+                },
+                "编辑"
+              ),
+              h(
+                "op",
+                {
+                  attrs: { oprate: "remove" },
+                  on: { click: () => this.remove(params.row.id) }
+                },
+                "删除"
+              )
+            ]);
+          }
+        }
+      ],
+       treeData: [],
+      treeInputSearch: "",
+      ocolumn: [],
+      treeHeight: "",
+      tableHeight: "",
+      ids: [],
+      orderSearchForm: {
+        productId: "", //产品id
+        productName: "", //产品名称
+        taskType: "", //任务类型
+        stage: "", //阶段
+        materialId: "", //材料
+        quantity: null, //数量
+        guestName: "", //甲方客户
+        printSupply: "", //3D打印承制单位
+        functionaryOffice: "", //厂内责任机关
+        mainDepartmentId: "", //厂内责任主体部门ID
+        taskRequire: "", //任务接点要求
+        putintDocmentCode: "", //甲方投产输入文件编号
+        technologyDocmentCode: "", //甲方技术输入文件编号
+        outerDrawnNumber: "", //外部图号/模型号
+        modelVersion: "", //模型版本
+        taskCode: "", //甲方任务号
+        designer: "", //甲方设计人员
+        officeFunctionary: "", //厂内机关负责人
+        mainRoutingPeople: "", //厂内主工艺人员
+        routing_Method: "", //工艺方法
+        outer_Envelope_Size: "", //包装尺寸
+        demandStartDate: "", //开始时间
+        demandFinishDate: "", //完成时间
+        remark: "", //备注
+        projectNumber: "", //项目号
+        batchNumber: "", //批次号
+        urgencyLevel: null //紧急程度
+      },
+      list: [],
+      data1: [],
+      selectdata: [],
+      //以下为手写死数据集：
+      orderCatList: [], //订单类型下拉
+      outerCodeList: [], //型号外部代码下拉
+      missionCodeList: [], //任务号下拉
+      stageList: [], //阶段下拉
+      materailList: [], //材料下拉
+      routingAccessList: [], //工艺方法下拉
+      drawNumberList: [], //图号下拉
+      docNameList: [], //文档名称下拉
+      ownerGustList: [], //甲方客户下拉
+      mainDeptList: [], //厂内主体部门下拉
+      taskTypeList: [], //任务类型
+      statusList: [] //状态类型
+    };
+  },
+  created() {
+    this.treeHeight = window.innerHeight - 150;
+  },
+  mounted() {
+    this.initTree();
+    this.tableHeight = window.innerHeight - 220;
+    this.$refs.CustomTable.getTableHeight(this.tableHeight);
+    window.onresize = () => {
+      ///浏览器窗口大小变化
+      return (() => {
+        window.screenHeight = window.innerHeight;
+        this.treeHeight = window.screenHeight - 150;
+        this.tableHeight = window.screenHeight - 220;
+        this.$refs.CustomTable.getTableHeight(this.tableHeight);
+      })();
+    };
+  },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
+  computed: {
+    searchList() {
+      let nodeList = this.treeData;
+      var text = this.treeInputSearch;
+      var newNodeList = [];
+      function searchTree(nodeLists, value) {
+        for (let i = 0; i < nodeLists.length; i++) {
+          if (nodeLists[i].title.indexOf(value) != -1) {
+            newNodeList.push(nodeLists[i]);
+          } else if (nodeLists[i].children.length > 0) {
+            searchTree(nodeLists[i].children, value);
+          }
+        }
+      }
+      if (text != "") {
+        searchTree(nodeList, text);
+      } else {
+        return nodeList;
+      }
+      return newNodeList;
+    }
+  },
+  methods: {
+    addOk() {
+      this.$refs.grid.load();
+      this.addModal = false;
+      this.detailModal = false;
+      this.editModal = false;
+      this.curId = 0;
+    },
+    search() {
+      this.$refs.grid.reload(this.easySearch);
+    },
+    detail(id) {
+      this.detailModal = true;
+      this.curId = id;
+    },
+    edit(id) {
+      this.editModal = true;
+      this.curId = id;
+    },
+
+    remove(id) {
+      this.deletelModal = true;
+      this.curId = id;
+    },
+    removeOk() {
+      Api.delete({ id: this.curId }).then(r => {
+        if (r.success) {
+          this.$refs.grid.load();
+          this.deletelModal = false;
+          this.$Message.success("删除成功");
+        }
+      });
+    },
+    removeCancel() {
+      this.deletelModal = false;
+    },
+    cancel() {
+      this.curId = 0;
+      this.addModal = false;
+      this.detailModal = false;
+      this.editModal = false;
+      this.deletedlModal = false;
+    },
+    l(key) {
+      let vkey = "mes_plan" + "." + key;
+      return this.$t(vkey) || key;
+    },
+    //new start
+    initTree() {
+      var sumData = [];
+      this.$http.order.getallselecttree().then(res => {
+          alert(JSON.stringify(res))
+        if (res.result) {
+          for (var i = 0; i < res.result.length; i++) {
+            sumData = sumData.concat(res.result[i]);
+          }
+          this.treeData = sumData;
+          this.data1 = JSON.parse(JSON.stringify(sumData));
+        } else {
+          this.$Message.error("加载产品树失败!");
+        }
+      });
+    },
+    selectTreeNode(value) {
+      if (value.length > 0) {
+        this.ids = [];
+        this.getAllIds(value);
+        if (this.ids.length > 0) {
+          this.orderSearchForm.productId = this.ids.join(",");
+        } else {
+          this.orderSearchForm.productId = "-1";
+          this.orderSearchForm.productName = "";
+        }
+        this.$refs.CustomTable.easySearch(this.orderSearchForm);
+      }
+    },
+    //得到此树节点下所有是产品的productId
+    getAllIds(trees) {
+      trees.forEach((data, index) => {
+        var that = this;
+        if (data.isProduct) {
+          this.ids.push(data.productId);
+        }
+        if (data.children.length > 0) {
+          this.getAllIds(data.children);
+        }
+      });
+    },
+    handleSelect(data) {
+      if (data.length > 0) {
+        this.selectdata = [];
+        this.selectdata = data;
+        this.list = [];
+        this.list.push({ label: data[0].title, value: data[0].id });
+        //this.formValidate.classType=data[0].id;
+        if (data[0].isProduct == "1") {
+          this.orderSearchForm.productName = data[0].id;
+          this.orderSearchForm.productId = data[0].productId;
+        } else {
+          this.$Message.error("此节点不是产品,请选择产品节点!");
+        }
+      }
+    },
+    renderContent(h, { root, node, data }) {
+      //渲染树的样式
+      return h(
+        "span",
+        {
+          style: {
+            color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
+            cursor: "pointer"
+          },
+          on: {
+            click: () => {
+              let arrTree = [];
+              arrTree.push(data);
+              this.handleSelect(arrTree); //手动选择树节点
+            }
+          }
+        },
+        data.title
+      );
+    },
+  }
+};
+</script>
+<style lang="less" scoped>
+.full {
+  margin-top: 0;
+  .content {
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file

pages/mesPlan/search.vue

+<template>
+  <Form ref="form" :model="condition" :label-width="90">
+    <Row>
+      <Col :span="12" :v-if="condition.id.show">
+        <FormItem :label="l('id')" prop="id">
+          <Input v-model="condition.id.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.creationTime.show">
+        <FormItem :label="l('creationTime')" prop="creationTime">
+          <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.creatorUserId.show">
+        <FormItem :label="l('creatorUserId')" prop="creatorUserId">
+          <Input v-model="condition.creatorUserId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.lastModificationTime.show">
+        <FormItem :label="l('lastModificationTime')" prop="lastModificationTime">
+          <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.lastModifierUserId.show">
+        <FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId">
+          <Input v-model="condition.lastModifierUserId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.isDeleted.show">
+        <FormItem :label="l('isDeleted')" prop="isDeleted">
+          <Input v-model="condition.isDeleted.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.deletionTime.show">
+        <FormItem :label="l('deletionTime')" prop="deletionTime">
+          <DatePicker type="daterange" v-model="condition.deletionTime.value"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.deleterUserId.show">
+        <FormItem :label="l('deleterUserId')" prop="deleterUserId">
+          <Input v-model="condition.deleterUserId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.mesCode.show">
+        <FormItem :label="l('mesCode')" prop="mesCode">
+          <Input v-model="condition.mesCode.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.taskType.show">
+        <FormItem :label="l('taskType')" prop="taskType">
+          <Dictionary code="mes.mes_plan.task_type" v-model="condition.taskType.value"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.productId.show">
+        <FormItem :label="l('productId')" prop="productId">
+          <Input v-model="condition.productId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.quantity.show">
+        <FormItem :label="l('quantity')" prop="quantity">
+          <Input v-model="condition.quantity.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="24" :v-if="condition.remark.show">
+        <FormItem :label="l('remark')" prop="remark">
+          <Input v-model="condition.remark.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="24" :v-if="condition.taskRequire.show">
+        <FormItem :label="l('taskRequire')" prop="taskRequire">
+          <Input v-model="condition.taskRequire.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.status.show">
+        <FormItem :label="l('status')" prop="status">
+          <Dictionary code="mes.mes_plan.status" v-model="condition.status.value"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.divideMark.show">
+        <FormItem :label="l('divideMark')" prop="divideMark">
+          <Dictionary code="mes.mes_plan.divide_mark" v-model="condition.divideMark.value"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="24" :v-if="condition.productCode.show">
+        <FormItem :label="l('productCode')" prop="productCode">
+          <Input v-model="condition.productCode.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.productName.show">
+        <FormItem :label="l('productName')" prop="productName">
+          <Input v-model="condition.productName.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.drawnNumber.show">
+        <FormItem :label="l('drawnNumber')" prop="drawnNumber">
+          <Input v-model="condition.drawnNumber.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.rootId.show">
+        <FormItem :label="l('rootId')" prop="rootId">
+          <Input v-model="condition.rootId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.batchNumber.show">
+        <FormItem :label="l('batchNumber')" prop="batchNumber">
+          <Input v-model="condition.batchNumber.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.projectNumber.show">
+        <FormItem :label="l('projectNumber')" prop="projectNumber">
+          <Input v-model="condition.projectNumber.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.urgencyLevel.show">
+        <FormItem :label="l('urgencyLevel')" prop="urgencyLevel">
+          <Dictionary code="mes.mes_plan.urgency_level" v-model="condition.urgencyLevel.value"></Dictionary>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.productingPreparationPeople.show">
+        <FormItem :label="l('productingPreparationPeople')" prop="productingPreparationPeople">
+          <Input v-model="condition.productingPreparationPeople.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.productingPreparationFinishDate.show">
+        <FormItem
+          :label="l('productingPreparationFinishDate')"
+          prop="productingPreparationFinishDate"
+        >
+          <DatePicker type="daterange" v-model="condition.productingPreparationFinishDate.value"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.quotationPeople.show">
+        <FormItem :label="l('quotationPeople')" prop="quotationPeople">
+          <Input v-model="condition.quotationPeople.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.quotationFinishDate.show">
+        <FormItem :label="l('quotationFinishDate')" prop="quotationFinishDate">
+          <DatePicker type="daterange" v-model="condition.quotationFinishDate.value"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.upId.show">
+        <FormItem :label="l('upId')" prop="upId">
+          <Input v-model="condition.upId.value"></Input>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.demandStartDate.show">
+        <FormItem :label="l('demandStartDate')" prop="demandStartDate">
+          <DatePicker type="daterange" v-model="condition.demandStartDate.value"></DatePicker>
+        </FormItem>
+      </Col>
+      <Col :span="12" :v-if="condition.demandFinishDate.show">
+        <FormItem :label="l('demandFinishDate')" prop="demandFinishDate">
+          <DatePicker type="daterange" v-model="condition.demandFinishDate.value"></DatePicker>
+        </FormItem>
+      </Col>
+    </Row>
+  </Form>
+</template>
+<script>
+import Api from "./api";
+export default {
+  name: "Add",
+  data() {
+    return {
+      condition: {
+        id: { op: "Equal", value: null, show: false },
+        creationTime: { op: "Range", value: null, show: false },
+        creatorUserId: { op: "Equal", value: null, show: false },
+        lastModificationTime: { op: "Range", value: null, show: false },
+        lastModifierUserId: { op: "Equal", value: null, show: false },
+        isDeleted: { op: "Equal", value: null, show: false },
+        deletionTime: { op: "Range", value: null, show: false },
+        deleterUserId: { op: "Equal", value: null, show: false },
+        mesCode: { op: "Equal", value: null, show: true },
+        taskType: { op: "Equal", value: null, show: true },
+        productId: { op: "Equal", value: null, show: true },
+        quantity: { op: "Equal", value: null, show: true },
+        remark: { op: "Equal", value: null, show: true },
+        taskRequire: { op: "Equal", value: null, show: true },
+        status: { op: "Equal", value: null, show: true },
+        divideMark: { op: "Equal", value: null, show: true },
+        productCode: { op: "Equal", value: null, show: true },
+        productName: { op: "Equal", value: null, show: true },
+        drawnNumber: { op: "Equal", value: null, show: true },
+        rootId: { op: "Equal", value: null, show: true },
+        batchNumber: { op: "Equal", value: null, show: true },
+        projectNumber: { op: "Equal", value: null, show: true },
+        urgencyLevel: { op: "Equal", value: null, show: true },
+        productingPreparationPeople: { op: "Equal", value: null, show: true },
+        productingPreparationFinishDate: {
+          op: "Range",
+          value: null,
+          show: true
+        },
+        quotationPeople: { op: "Equal", value: null, show: true },
+        quotationFinishDate: { op: "Range", value: null, show: true },
+        upId: { op: "Equal", value: null, show: true },
+        demandStartDate: { op: "Range", value: null, show: true },
+        demandFinishDate: { op: "Range", value: null, show: true }
+      }
+    };
+  },
+  methods: {
+    handleClose() {
+      this.$emit("on-close");
+    },
+    l(key) {
+      key = "mes_plan" + "." + key;
+      return this.$t(key);
+    }
+  }
+};
+</script>

pages/processManage/setProcess/index.vue

@@ -413,7 +413,7 @@ export default {
         operatorIdList: [] //操作员id
       }, //确定保存后返回数据
 
-       orderSearchForm: {
+      orderSearchForm: {
         productId: "", //产品id
         productName: "", //产品名称
         taskType: "", //任务类型
@@ -440,7 +440,9 @@ export default {
         remark: "", //备注
         projectNumber: "", //项目号
         batchNumber: "", //批次号
-        urgencyLevel: null //紧急程度
+        urgencyLevel: null, //紧急程度
+        MaxResultCount:10,
+        SkipCount:0,
       },
       formValidate: {
         id: "",
@@ -517,6 +519,8 @@ export default {
           fixed: "left"
         },
         { title: "图号", key: "drawnNumber", width: 120 },
+        { title: "项目号", key: "projectNumber", width: 120 },
+        { title: "批次号", key: "batchNumber", width: 120 },
 
         { title: "数量", key: "quantity", width: 80, align: "center" },
 
@@ -762,7 +766,7 @@ export default {
 
       this.orderSearchForm.SkipCount =
         (num - 1) * this.orderSearchForm.MaxResultCount;
-
+console.log(this.orderSearchForm.SkipCount);
       this.loaddata(this.orderSearchForm);
     },
     pageSizeChange(limit) {
@@ -777,30 +781,13 @@ export default {
       // url =
       //   `${PlanUrl}/mesorder/getpagedmesordersforpdefm?ProcessUserType=` + params
       // }else{
-      this.orderSearchForm = {
-        productId: params.productId,
-        taskType: params.taskType, //任务类型
-        stage: params.stage, //阶段
-        materialId: params.materialId, //材料
-        quantity: params.quantity, //数量
-        guestName: params.guestName, //甲方客户
-        printSupply: params.printSupply, //3D打印承制单位
-        functionaryOffice: params.functionaryOffice, //厂内责任机关
-        mainDepartmentId: params.mainDepartmentId, //厂内责任主体部门ID
-        taskRequire: params.taskRequire, //任务接点要求
-        putintDocmentCode: params.putintDocmentCode, //甲方投产输入文件编号
-        technologyDocmentCode: params.technologyDocmentCode, //甲方技术输入文件编号
-        outerDrawnNumber: params.outerDrawnNumber, //外部图号/模型号
-        modelVersion: params.modelVersion, //模型版本
-        taskCode: params.taskCode, //甲方任务号
-        status: params.status, //订单状态
-        simpleSearch: typeof params == "string" ? params : params.simpleSearch, //快速搜索
-        SkipCount: this.orderSearchForm.SkipCount,
-        MaxResultCount: this.orderSearchForm.MaxResultCount,
-        ProcessUserType: this.tabstatus,
-        ProductingPreparation: this.ProductingPreparationPeople,
-        RoutingSetStatus: this.orderSearchForm.RoutingSetStatus
-      };
+      
+        this.orderSearchForm.simpleSearch= typeof params == "string" ? params : params.simpleSearch, //快速搜索
+      
+        this.orderSearchForm.ProcessUserType= this.tabstatus,
+        this.orderSearchForm.ProductingPreparation= this.ProductingPreparationPeople,
+        this.orderSearchForm.RoutingSetStatus= this.orderSearchForm.RoutingSetStatus
+      
 
       url =
         `${PlanUrl}/mesorder/getpagedmesordersforpdefm?` +

pages/qc/dataTrace/index.vue

@@ -17,16 +17,28 @@
     <div class="tableBox mb10" :style="{height:tbHeight}">
       <div class="table">
         <div v-if="listTask.length==0" class="wu_data">暂无数据</div>
-        <Card class="card" v-for="(item,index) in listTask" :key="index">
-          <h3 slot="title">订单编号：{{item.mesCode}}</h3>
-          <ul class="card_body01">
-            <li class="card_line">产品名称：{{item.productName}}</li>
-            <li class="card_line">任务类型：{{item.equipment}}</li>
-          </ul>
-          <p class="footer01">
-            <a class="footer_btn" href="#" @click.event="reviewFn(item)">追 溯</a>
-          </p>
-        </Card>
+        <Row :gutter="16">
+          <Col span="6" v-for="(item,index) in listTask" :key="index">
+            <Card class="card">
+              <h3 slot="title">
+                订单编号：{{item.mesCode}}
+              </h3>
+              <ul class="card_body01">
+                  <li class="card_line">
+                      产品名称：{{item.productName}}
+                  </li>
+                  <li class="card_line">
+                      任务类型：{{item.equipment}}
+                  </li>
+              </ul>
+              <p class="footer01">
+                <a class="footer_btn" href="#" @click.event="reviewFn(item)">
+                    追  溯
+                </a>
+              </p>
+            </Card>
+          </Col>
+        </Row>        
       </div>
       <div v-show="noData" class="no_data">
         <h3>暂无数据</h3>
@@ -492,18 +504,14 @@ li {
   text-align: center;
   line-height: 800px;
 }
-.card {
-  width: 375px;
+.card{
   margin: 10px 0 10px 20px;
 }
 .wu_data {
   margin: 200px auto;
   font-size: 18px;
 }
-/* .card_body01{
-  margin: 0 0 10px 0;
-} */
-.card_line {
+.card_line{
   height: 30px;
   line-height: 30px;
 }