diff --git a/SC-web/src/views/scm/basicInformation/material/index.vue b/SC-web/src/views/scm/basicInformation/material/index.vue
index 265a37d4..15edca7f 100644
--- a/SC-web/src/views/scm/basicInformation/material/index.vue
+++ b/SC-web/src/views/scm/basicInformation/material/index.vue
@@ -1,307 +1,312 @@
 <template>
-    <div class="JNPF-common-layout">
+  <div class="JNPF-common-layout">
 
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                                            <el-col :span="6">
-                                <el-form-item label="物料编码">
-                                        <el-input v-model="query.itemCode" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                        <el-col :span="6">
-                                <el-form-item label="物料名称">
-                                        <el-input v-model="query.itemName" placeholder="请输入" clearable>  </el-input>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div class="JNPF-common-layout-main JNPF-flex-main">
-                <div class="JNPF-common-head">
-                    <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="itemCode" label="物料编码" width="0" align="left"
-/>
-                            <el-table-column prop="itemName" label="物料名称" width="0" align="left"
-/>
-                            <el-table-column prop="description" label="物料说明" width="0" align="left"
-/>
-                                <el-table-column label="主单位名称" width="0" prop="primaryUnitOmeasure" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.primaryUnitOmeasure | dynamicText(primaryUnitOmeasureOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="是否可采购" width="0" prop="purchaseFlag" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.purchaseFlag | dynamicText(purchaseFlagOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="是否可销售 " width="0" prop="salesFlag" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.salesFlag | dynamicText(salesFlagOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="outArea" label="默认出库区" width="0" align="left"
-/>
-                            <el-table-column prop="inArea" label="默认入库区" width="0" align="left"
-/>
-                            <el-table-column prop="standardCost" label="标准成本" width="0" align="left"
-/>
-                            <el-table-column prop="financial" label="财务类别" width="0" align="left"
-/>
-                            <el-table-column prop="financialName" label="类别名称" width="0" align="left"
-/>
-                            <el-table-column prop="itemId" label="ERP物料ID" width="0" align="left"
-/>
-                            <el-table-column prop="errorMessage" label="错误信息" width="0" align="left"
-/>
-                                <el-table-column label="生效状态" width="0" prop="effectiveStatus" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.effectiveStatus | dynamicText(effectiveStatusOptions) }}
-                                    </template>
-                                </el-table-column>
-                        <el-table-column label="操作" fixed="right"
-                                         width="100" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                            </template>
-                        </el-table-column>
-                </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
-            </div>
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="物料编码">
+              <el-input v-model="query.itemCode" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物料名称">
+              <el-input v-model="query.itemName" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            </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>
+          <div class="JNPF-common-head-right">
+            <el-tooltip effect="dark" content="刷新" placement="top">
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                       @click="reset()"/>
+            </el-tooltip>
+            <screenfull isContainer/>
+          </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <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"
+          />
+          <el-table-column prop="description" label="物料说明" width="0" align="left"
+          />
+          <el-table-column label="主单位名称" width="0" prop="primaryUnitOmeasure" algin="left"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.primaryUnitOmeasure | dynamicText(primaryUnitOmeasureOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="是否可采购" width="0" prop="purchaseFlag" algin="left"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.purchaseFlag | dynamicText(purchaseFlagOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="是否可销售 " width="0" prop="salesFlag" algin="left"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.salesFlag | dynamicText(salesFlagOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="outArea" label="默认出库区" width="0" align="left"
+          />
+          <el-table-column prop="inArea" label="默认入库区" width="0" align="left"
+          />
+          <el-table-column prop="standardCost" label="标准成本" width="0" align="left"
+          />
+          <el-table-column prop="financial" label="财务类别" width="0" align="left"
+          />
+          <el-table-column prop="financialName" label="类别名称" width="0" align="left"
+          />
+          <el-table-column prop="itemId" label="ERP物料ID" width="0" align="left"
+          />
+          <el-table-column prop="errorMessage" label="错误信息" width="0" align="left"
+          />
+          <el-table-column label="生效状态" width="0" prop="effectiveStatus" algin="left"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.effectiveStatus | dynamicText(effectiveStatusOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right"
+                           width="100">
+            <template slot-scope="scope">
+              <el-button type="text"
+                         @click="addOrUpdateHandle(scope.row.id)">编辑
+              </el-button>
+              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
+      </div>
     </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+  </div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+  import request from '@/utils/request'
+  import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+  import JNPFForm from './Form'
+  import ExportBox from './ExportBox'
+  import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+  import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                itemCode:undefined,
-                                itemName:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'itemCode', label: '物料编码'},
-                    {prop: 'itemName', label: '物料名称'},
-                    {prop: 'description', label: '物料说明'},
-                    {prop: 'primaryUnitOmeasure', label: '主单位名称'},
-                    {prop: 'purchaseFlag', label: '是否可采购'},
-                    {prop: 'salesFlag', label: '是否可销售 '},
-                    {prop: 'outArea', label: '默认出库区'},
-                    {prop: 'inArea', label: '默认入库区'},
-                    {prop: 'standardCost', label: '标准成本'},
-                    {prop: 'financial', label: '财务类别'},
-                    {prop: 'financialName', label: '类别名称'},
-                    {prop: 'itemId', label: 'ERP物料ID'},
-                    {prop: 'errorMessage', 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"},
-            }
+  export default {
+    components: { JNPFForm, ExportBox, Detail },
+    data() {
+      return {
+        detailVisible: false,
+        query: {
+          itemCode: undefined,
+          itemName: undefined
         },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id'
         },
-        created() {
-                this.initData()
+        list: [],
+        listLoading: true,
+        multipleSelection: [], total: 0,
+        listQuery: {
+          currentPage: 1,
+          pageSize: 20,
+          sort: 'desc',
+          sidx: 'creatorTime'
         },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                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 =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+        formVisible: false,
+        exportBoxVisible: false,
+        columnList: [
+          { prop: 'itemCode', label: '物料编码' },
+          { prop: 'itemName', label: '物料名称' },
+          { prop: 'description', label: '物料说明' },
+          { prop: 'primaryUnitOmeasure', label: '主单位名称' },
+          { prop: 'purchaseFlag', label: '是否可采购' },
+          { prop: 'salesFlag', label: '是否可销售 ' },
+          { prop: 'outArea', label: '默认出库区' },
+          { prop: 'inArea', label: '默认入库区' },
+          { prop: 'standardCost', label: '标准成本' },
+          { prop: 'financial', label: '财务类别' },
+          { prop: 'financialName', label: '类别名称' },
+          { prop: 'itemId', label: 'ERP物料ID' },
+          { prop: 'errorMessage', 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' }
+      }
+    },
+    computed: {
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({ column, prop, order }) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      initData() {
+        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 = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i]
+            _list.push(_data)
+          }
+          this.list = _list
+          this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/example/Material/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/example/Material/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/example/Material/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
-                }
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/Material/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
                 this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
+              }
+            })
+          })
+        }).catch(() => {
+        })
+      },
+      handleSelectionChange(val) {
+        const res = val.map(item => item.id)
+        this.multipleSelection = res
+      },
+      handleBatchRemoveDel() {
+        if (!this.multipleSelection.length) {
+          this.$message({
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500
+          })
+          return
+        }
+        const ids = this.multipleSelection.join()
+        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/example/Material/batchRemove/${ids}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            })
+          })
+        }).catch(() => {
+        })
+      },
+      addOrUpdateHandle(id, isDetail) {
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.JNPFForm.init(id, isDetail)
+        })
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.columnList)
+        })
+      },
+      download(data) {
+        let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
+        request({
+          url: `/api/example/Material/Actions/Export`,
+          method: 'GET',
+          data: query
+        }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery = {
+          currentPage: 1,
+          pageSize: 20,
+          sort: 'desc',
+          sidx: 'creatorTime'
+        }
+        this.initData()
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        for (let key in this.query) {
+          this.query[key] = undefined
         }
+        this.search()
+      }
     }
+  }
 </script>