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

components/page/dataGrid.vue

@@ -100,6 +100,8 @@ export default {
             userConfig: null, //用户页面配置信息。,
             // userId: 1
             userId: this.$store.state.userInfo.userId,
+            treeData: [], //物料数据
+            codeRuleData: [], //物料编码
         };
     },
     props: {
@@ -271,6 +273,9 @@ export default {
         this.$dragging.$on("dragend", (e) => {
             this.saveUserconfig();
         });
+        //物料加载类型数据
+        this.getTreeData();
+        this.getcodeRuleData();
     },
     methods: {
         //数据加载
@@ -513,6 +518,7 @@ export default {
                 const tHeader = []; // 设置Excel的表格第一行的标题
                 const filterVal = []; //list里对象的属性
                 var tempCol = [];
+                var tempCol1 = [];
                 var columnsCur = this.$u.clone(this.columnsNow); //导出列标题信息griddata  this.$refs.grid.columnsCur
                 columnsCur.forEach((el) => {
                     if ((el.hide && !el.import) || (!el.hide && el.key != "action" && el.type != "selection" && el.key != "ico")) {
@@ -522,6 +528,12 @@ export default {
                                 code: el.code
                             }); //临时存放code数据字典的字段及对应的数据字典code
                         }
+                        if (el.materialKey) {
+                            tempCol1.push({
+                                key: el.key,
+                                code: el.materialKey
+                            }); //临时存放物料管理大类和子类列表
+                        }
                         tHeader.push(el.title);
                         filterVal.push(el.key);
                     }
@@ -534,7 +546,19 @@ export default {
                             e[ele.key]
                         );
                     });
+                    //导出数据增加对应的物料管理信息
+                    tempCol1.forEach((elcol1) => {
+                        if (elcol1.code == 1) {
+                            e[elcol1.key] = this.getType1(e[elcol1.key])
+                        } else if (elcol1.code == 2) {
+                            e[elcol1.key] = this.getType2(e[elcol1.key])
+                        } else if (elcol1.code == 3) {
+                            e[elcol1.key] = this.getType3(e[elcol1.key])
+                        }
+                    });
+
                 });
+
                 let nowDate = this.$u.getNowTime(); //年月日时分秒yyyyMMddhhmmss
                 //获取导出数据结束
                 this.$u.outExcel(this.exportTitle +
@@ -545,6 +569,57 @@ export default {
                 );
             });
         },
+        //物料大类和子类的解析start
+        getTreeData() {
+            let data = {
+                conditions: []
+            };
+            this.$api.post(`${material}/category/list`, data).then((r) => {
+                this.treeData = r.result
+            });
+        },
+        getType1(val) {
+            let tempTreeList = this.$u.clone(this.treeData)
+            let rootName = ""
+            tempTreeList.forEach(ele => {
+                if (ele.upId == 0 && ele.id == val) {
+                    rootName = ele.name
+                }
+            })
+            return rootName
+        },
+        getType2(val) {
+            let tempTreeList = this.$u.clone(this.treeData)
+            let childrenName = ""
+            tempTreeList.forEach(ele => {
+                if (ele.upId > 0 && ele.id == val) {
+                    childrenName = ele.name
+                }
+            })
+            return childrenName
+        },
+        //获取编码名称
+        getcodeRuleData() {
+            let data = {
+                conditions: []
+            };
+            this.$api.post(`${material}/coderule/paged`, data).then((r) => {
+                if (r.success) {
+                    this.codeRuleData = r.result.items || []
+                }
+            });
+        },
+        getType3(val) {
+            let codeRuleDataList = this.$u.clone(this.codeRuleData)
+            let codeRuleName = ""
+            codeRuleDataList.forEach(ele => {
+                if (ele.id == val) {
+                    codeRuleName = ele.name
+                }
+            })
+            return codeRuleName
+        },
+        //物料大类和子类的解析end
     },
     computed: {
         columnsNow() {

components/page/import/process.vue

@@ -50,7 +50,7 @@
                 </FormItem>
             </Form>
         </FooterToolbar>
-        <Modal v-model="infoModal" :title="titleInfo" fullscreen>
+        <Modal v-model="infoModal" :title="modalTitles" fullscreen>
             <DataGrid :tool="false" :page="false" :columns="colsIm" :data="dataIm" :height="tdHeightExcel+30" ref="dataImport"></DataGrid>
             <div slot="footer">
                 <Button @click="infoModal=false">关闭</Button>
@@ -236,7 +236,6 @@ export default {
                         }
                     });
                 }
-
                 arrTitleUse.forEach((elem) => {
                     if (eles[elem.key] && eles[elem.key] != "" && eles[elem.key] != null) {
                         //如果数据字典项对应的DirName字段存在，通过name查询到对应的code，然后赋值
@@ -246,9 +245,9 @@ export default {
                         );
                     }
                 });
+
             })
             this.dataIm = useData;
-
             let tempData = this.$u.clone(this.dataIm);
             this.$emit("on-get-data", tempData)
         },

pages/materiel/masterData/masterData.vue

@@ -47,6 +47,8 @@ export default {
             selectRows: [],
             rowsTable: [],
             fullscreen: false,
+            treeData: [],
+            codeRuleData: [],
             detail: null,
             temTitle: "物料管理",
             sets: v => {
@@ -74,15 +76,40 @@ export default {
                     align: "center",
                     code: "material.code.type"
                 },
+                {
+                    key: "codeRuleId",
+                    title: "编码名称",
+                    materialKey: '3',
+                    render: (h, params) => {
+                        return h(
+                            "span", {},
+                            this.getType3(params.row.codeRuleId)
+                        );
+                    }
+                },
                 {
                     key: "rootCategoryId",
-                    title: "大类编号",
+                    title: "大类",
                     align: "right",
+                    materialKey: '1',
+                    render: (h, params) => {
+                        return h(
+                            "span", {},
+                            this.getType1(params.row.rootCategoryId)
+                        );
+                    }
                 },
                 {
                     key: "categoryId",
-                    title: "子类编号",
+                    title: "子类",
                     align: "right",
+                    materialKey: '2',
+                    render: (h, params) => {
+                        return h(
+                            "span", {},
+                            this.getType2(params.row.categoryId)
+                        );
+                    }
                 },
                 {
                     key: "code",
@@ -214,6 +241,8 @@ export default {
         });
     },
     mounted() {
+        this.getTreeData()
+        this.getcodeRuleData()
         window.onresize = () => {
             ///浏览器窗口大小变化
             return (() => {
@@ -401,6 +430,7 @@ export default {
                     categoryId: this.nodeInfo.categoryId, //左侧树点击的id
                     customProperties: {},
                     rootCategoryId: this.nodeInfo.rootCategoryId, //左侧树点击的数据的最顶层id
+                    codeRuleType: this.nodeInfo.codeRuleType
                 };
                 this.addCol.forEach(el => {
                     obj[el.field] = ele[el.field]
@@ -417,6 +447,57 @@ export default {
 
         },
         //批量导入end
+        //物料大类和子类的解析start
+        getTreeData() {
+            let data = {
+                conditions: []
+            };
+            Api.list(data).then((r) => {
+                this.treeData = r.result
+            });
+        },
+        getType1(val) {
+            let tempTreeList = this.$u.clone(this.treeData)
+            let rootName = ""
+            tempTreeList.forEach(ele => {
+                if (ele.upId == 0 && ele.id == val) {
+                    rootName = ele.name
+                }
+            })
+            return rootName
+        },
+        getType2(val) {
+            let tempTreeList = this.$u.clone(this.treeData)
+            let childrenName = ""
+            tempTreeList.forEach(ele => {
+                if (ele.upId > 0 && ele.id == val) {
+                    childrenName = ele.name
+                }
+            })
+            return childrenName
+        },
+        //获取编码名称
+        getcodeRuleData() {
+            let data = {
+                conditions: []
+            };
+            Api.pagedSlecet(data).then((r) => {
+                if (r.success) {
+                    this.codeRuleData = r.result.items || []
+                }
+            });
+        },
+        getType3(val) {
+            let codeRuleDataList = this.$u.clone(this.codeRuleData)
+            let codeRuleName = ""
+            codeRuleDataList.forEach(ele => {
+                if (ele.id == val) {
+                    codeRuleName = ele.name
+                }
+            })
+            return codeRuleName
+        },
+        //物料大类和子类的解析end
     },
     watch: {
         nodeInfo: {