Merge remote-tracking branch 'origin/main'

SC-web/src/views/scm/basicInformation/material/index.vue

@@ -29,6 +29,8 @@
             </el-button>
             <el-button type="text" icon="el-icon-download" @click="exportData()">导出
             </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">导入
+            </el-button>
             <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
@@ -40,7 +42,9 @@
             <screenfull isContainer/>
           </div>
         </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
+                    @selection-change="handleSelectionChange" border>
+          <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
           <el-table-column prop="itemCode" label="物料编码" width="0" align="left"
           />
           <el-table-column prop="itemName" label="物料名称" width="0" align="left"
@@ -96,7 +100,8 @@
             </template>
           </el-table-column>
         </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@@ -120,7 +125,7 @@
         detailVisible: false,
         query: {
           itemCode: undefined,
-                                itemName:undefined,
+          itemName: undefined
         },
         treeProps: {
           children: 'children',
@@ -133,8 +138,8 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         },
         formVisible: false,
         exportBoxVisible: false,
@@ -152,16 +157,16 @@
           { prop: 'financialName', label: '类别名称' },
           { prop: 'itemId', label: 'ERP物料ID' },
           { prop: 'errorMessage', label: '错误信息' },
-                    {prop: 'effectiveStatus', label: '生效状态'},
+          { prop: 'effectiveStatus', label: '生效状态' }
         ],
-                                primaryUnitOmeasureOptions:[{"fullName":"千克","id":"1"},{"fullName":"吨","id":"0"}],
-                            primaryUnitOmeasureProps:{"label":"fullName","value":"id"},
-                                purchaseFlagOptions:[{"fullName":"是","id":"Y"},{"fullName":"否","id":"N"}],
-                            purchaseFlagProps:{"label":"fullName","value":"id"},
-                                salesFlagOptions:[{"fullName":"是","id":"Y"},{"fullName":"否","id":"N"}],
-                            salesFlagProps:{"label":"fullName","value":"id"},
-                                effectiveStatusOptions:[{"fullName":"生效","id":"Y"},{"fullName":"不生效","id":"N"}],
-                            effectiveStatusProps:{"label":"fullName","value":"id"},
+        primaryUnitOmeasureOptions: [{ 'fullName': '千克', 'id': '1' }, { 'fullName': '吨', 'id': '0' }],
+        primaryUnitOmeasureProps: { 'label': 'fullName', 'value': 'id' },
+        purchaseFlagOptions: [{ 'fullName': '是', 'id': 'Y' }, { 'fullName': '否', 'id': 'N' }],
+        purchaseFlagProps: { 'label': 'fullName', 'value': 'id' },
+        salesFlagOptions: [{ 'fullName': '是', 'id': 'Y' }, { 'fullName': '否', 'id': 'N' }],
+        salesFlagProps: { 'label': 'fullName', 'value': 'id' },
+        effectiveStatusOptions: [{ 'fullName': '生效', 'id': 'Y' }, { 'fullName': '不生效', 'id': 'N' }],
+        effectiveStatusProps: { 'label': 'fullName', 'value': 'id' }
       }
     },
     computed: {
@@ -185,20 +190,20 @@
         this.initData()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
           menuId: this.menuId
-                };
+        }
         request({
           url: `/api/example/Material/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
+          var _list = []
           for (let i = 0; i < res.data.list.length; i++) {
-                        let _data = res.data.list[i];
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -221,10 +226,10 @@
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -235,7 +240,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -253,7 +258,7 @@
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -287,8 +292,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         }
         this.initData()
       },