masterDate

components/page/import/process.vue

 <template>
-<Modal v-model="ImportModal" title="导入" fullscreen footer-hide @on-cancel="cancelModal">
+<Modal v-model="ImportModal" :title="modalTitles" fullscreen footer-hide @on-cancel="cancelModal">
     <div class="table-content">
 
         <div class="table-tools">
@@ -99,6 +99,7 @@ export default {
             columnsIm: this.columns,
             ImportModal: this.open,
             batchImportUrl: '',
+            modalTitles: '导入',
         };
     },
     props: {
@@ -118,6 +119,10 @@ export default {
         open: {
             type: Boolean,
             default: false
+        },
+        modalTitle: {
+            type: String,
+            default: ""
         }
     },
     created() {
@@ -133,6 +138,7 @@ export default {
         //if (this.eid > 0) {
         // this.load(this.eid);
         //}
+        this.modalTitles = "导入到【" + this.modalTitle + "】"
         window.onresize = () => {
             ///浏览器窗口大小变化
             return (() => {
@@ -411,7 +417,10 @@ export default {
         },
         open(v) {
             this.ImportModal = v
-        }
+        },
+        modalTitle(v) {
+            this.modalTitles = "导入到【" + v + "】"
+        },
     },
 };
 </script>

pages/materiel/masterData/masterData.vue

@@ -23,7 +23,7 @@
     <Modal v-model="modal" :title="title" width="1000" footer-hide :mask-closable="false" :fullscreen="fullscreen">
         <component :is="detail" :eid="curId" :rootCategoryId="rootCategoryId" :rowsTable="rowsTable" :nodeInfo="nodeInfo" @on-close="cancel" @on-cancel="cancel" @on-ok="ok" ref="chlidren" />
     </Modal>
-    <ImportExcel ref="importExcel" @on-get-data="getData" :columns="cols" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
+    <ImportExcel ref="importExcel" @on-get-data="getData" :modalTitle="temTitle" :columns="cols" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
 </div>
 </template>
 
@@ -48,6 +48,7 @@ export default {
             rowsTable: [],
             fullscreen: false,
             detail: null,
+            temTitle: "物料管理",
             sets: v => {
                 v.categoryId = this.nodeInfo.categoryId;
                 v.rootCategoryId = this.nodeInfo.rootCategoryId;
@@ -67,6 +68,22 @@ export default {
                     width: 70,
                     align: "center"
                 },
+                {
+                    key: "codeRuleType",
+                    title: "类型",
+                    align: "center",
+                    code: "material.code.type"
+                },
+                {
+                    key: "rootCategoryId",
+                    title: "大类编号",
+                    align: "right",
+                },
+                {
+                    key: "categoryId",
+                    title: "子类编号",
+                    align: "right",
+                },
                 {
                     key: "code",
                     title: "编码",
@@ -405,6 +422,7 @@ export default {
         nodeInfo: {
             handler(newName, oldName) {
                 // console.log("ovo", newName, oldName);
+                this.temTitle = "物料管理（" + newName.rootCategoryName + "）"
                 if (newName.rootCategoryId) {
                     this.initCols(() => {
                         if (newName.categoryId) {
@@ -419,7 +437,7 @@ export default {
             },
             immediate: true,
             deep: true
-        }
+        },
     }
 };
 </script>

pages/resource/resource/index.vue

@@ -38,7 +38,7 @@
         <Modal v-model="modal" :title="title" width="1200" footer-hide :fullscreen="fscreeen">
             <component :is="detail" :eid="curId" :rootName="rootName" :storeTitle="storeTitle" :materialType="materialType" :codeRuleType="codeRuleType" :storeId="storeId" :mcode="mCode" :cartList="this.$u.clone(this.$store.state.cart)" @on-close="cancel" @on-ok="ok" @substr="substr" />
         </Modal>
-        <ImportExcel ref="importExcel" @on-get-data="getData" :columns="columns" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
+        <ImportExcel ref="importExcel" @on-get-data="getData" modalTitle="制造资源" :columns="columns" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
     </Content>
 </Layout>
 </template>
@@ -265,8 +265,7 @@ export default {
                                             title: "删除",
                                         },
                                         class: params.row.totalNum === params.row.numberAvailable ?
-                                            "remove" :
-                                            "disable",
+                                            "remove" : "disable",
                                         on: {
                                             click: () => this.remove(params.row),
                                         },