add:增加物料分区功能；

nladmin-ui/src/views/wms/basedata/material/index.vue

@@ -117,6 +117,7 @@
         <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
         <el-table-column prop="material_spec" show-overflow-tooltip show-tooltip-when-overflow :min-width="flexWidth('material_spec',crud.data,'物料规格')" label="物料规格" />
         <el-table-column prop="material_model" label="物料型号" />
+        <el-table-column prop="ext_id" label="外部标识" />
         <!--        <el-table-column prop="class_name" label="物料分类" width="140"/>-->
         <!--        <el-table-column prop="unit_name" label="计量单位"/>-->
         <!--        <el-table-column prop="standing_time" label="静置时间（分钟）" width="130px"/>-->
@@ -195,7 +196,6 @@ const defaultForm = {
   is_used_time: null,
   is_used: null,
   is_delete: null,
-  ext_id: 'YZHJ',
   material_height_type: null,
   product_series: null
 }

nladmin-ui/src/views/wms/basedata/material/material.js

@@ -62,5 +62,12 @@ export function excelImport(data) {
     data
   })
 }
+export function excelImport1(data) {
+  return request({
+    url: '/api/Materia/excelImport1',
+    method: 'post',
+    data
+  })
+}
 
-export default { add, edit, del, getMaterOptType, isAlongMaterType, getProductSeries, materialSync, excelImport }
+export default { add, edit, del, getMaterOptType, isAlongMaterType, getProductSeries, materialSync, excelImport, excelImport1 }

nladmin-ui/src/views/wms/sch/point/index.vue

@@ -363,13 +363,15 @@
           :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')"
         />
         <el-table-column
-          prop="is_has  _workder"
+          prop="is_has_workder"
           label="是否有工单"
           :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')"
         >
           <template slot-scope="scope">
             {{ scope.row.is_has_workder ? '是' : '否' }}
-          </template>
+          </template>2
+
+          ..
         </el-table-column>
         <!--        <el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">-->
         <!--          <template slot-scope="scope">-->

nladmin-ui/src/views/wms/statement/structivt/index.vue

@@ -77,9 +77,20 @@
         >
           库存导入
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="uploadShow1 = true"
+        >
+          分区信息导入
+        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()" />
+      <UploadDialog1 :dialog-show.sync="uploadShow1" @tableChanged1="crud.toQuery()" />
       <el-table
         ref="table"
         v-loading="crud.loading"
@@ -123,11 +134,12 @@ import crudSectattr from '@/views/wms/basedata/sectattr/sectattr'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
 import UploadDialog from '@/views/wms/basedata/material/UploadDialog.vue'
+import UploadDialog1 from '@/views/wms/basedata/material/UploadDialog1.vue'
 
 export default {
   name: 'Structivt',
   dicts: ['d_lock_type'],
-  components: { UploadDialog, pagination, crudOperation, rrOperation },
+  components: { UploadDialog, UploadDialog1, pagination, crudOperation, rrOperation },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
@@ -146,6 +158,7 @@ export default {
   data() {
     return {
       uploadShow: false,
+      uploadShow1: false,
       sects: [],
       permission: {},
       rules: {}