Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

payne

2024-04-23 98702bbaadf789a36bf1d16223964f4966a933e1

Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

 iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,114 @@
import { axios } from '@/utils/request'

/**
 * æŸ¥è¯¢å®¢æˆ·æ¡£æ¡ˆ
 *
 * @author ly
 */
export function BaseCustomerPage (parameter) {
  return axios({
    url: '/BaseCustomer/page',
    method: 'get',
    params: parameter
  })
}

/**
 * å®¢æˆ·æ¡£æ¡ˆåˆ—表
 *
 * @author ly
 */
export function BaseCustomerList (parameter) {
  return axios({
    url: '/BaseCustomer/list',
    method: 'get',
    params: parameter
  })
}

/**
 * æ·»åŠ å®¢æˆ·æ¡£æ¡ˆ
 *
 * @author ly
 */
export function BaseCustomerAdd (parameter) {
  return axios({
    url: '/BaseCustomer/add',
    method: 'post',
    data: parameter
  })
}

/**
 * ç¼–辑客户档案
 *
 * @author ly
 */
export function BaseCustomerEdit (parameter) {
  return axios({
    url: '/BaseCustomer/edit',
    method: 'post',
    data: parameter
  })
}

/**
 * åˆ é™¤å®¢æˆ·æ¡£æ¡ˆ
 *
 * @author ly
 */
export function BaseCustomerDelete (parameter) {
  return axios({
    url: '/BaseCustomer/delete',
    method: 'post',
    data: parameter
  })
}


/**
 * å¯¼å‡ºå®¢æˆ·æ¡£æ¡ˆçš„Excel文件
 *
 * @author ly
 */
export function BaseCustomerToExcel (parameter) {
  return axios({
    url: '/BaseCustomer/toExcel',
    method: 'get',
    params: parameter,
    responseType: 'blob'
  })
}

/**
 * å¯¼å…¥å®¢æˆ·æ¡£æ¡ˆçš„Excel文件
 *
 * @author ly
 */
export function BaseCustomerImportExcel (data, parameter) {
  return axios({
    url: '/BaseCustomer/importExcel',
    method: 'post',
    data: data,
    params: parameter

  })
}


/**
 * ä¸‹è½½å®¢æˆ·æ¡£æ¡ˆçš„Excel导入模板
 *
 * @author ly
 */
export function BaseCustomerDownloadExcelTemplate(parameter) {
  return axios({
    url: '/BaseCustomer/downloadExcelTemplate',
    method: 'get',
    params: parameter,
    responseType: 'blob'
  })
}




 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,124 @@
<template>
  <a-modal
    title="新增客户档案"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
        <a-form :form="form">
        <a-form-item label="客户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户编号" v-decorator="['custCode', {rules: [{required: true, message: '请输入客户编号！'}]}]" />
        </a-form-item>
        <a-form-item label="客户中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户中文名称" v-decorator="['custChinaName', {rules: [{required: true, message: '请输入客户中文名称！'}]}]" />
        </a-form-item>
        <a-form-item label="客户英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户英文名称" v-decorator="['custEnglishName']" />
        </a-form-item>
        <a-form-item label="助记码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入助记码" v-decorator="['mnemonicCode']" />
        </a-form-item>
        <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入类型" style="width: 100%" v-decorator="['custType', {rules: [{required: true, message: '请输入类型！'}]}]" />
        </a-form-item>
        <a-form-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入类型名称" v-decorator="['custTypeName']" />
        </a-form-item>
        <a-form-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入联系人" v-decorator="['linkMan']" />
        </a-form-item>
        <a-form-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入电话" v-decorator="['phone']" />
        </a-form-item>
        <a-form-item label="电子邮件" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入电子邮件" v-decorator="['email']" />
        </a-form-item>
        <a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入邮编" v-decorator="['zipCode']" />
        </a-form-item>
        <a-form-item label="省份" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入省份" v-decorator="['province']" />
        </a-form-item>
        <a-form-item label="城市" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入城市" v-decorator="['city']" />
        </a-form-item>
        <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入地址" v-decorator="['address']" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
</template>

<script>
  import moment from 'moment'
  import {
  BaseCustomerAdd
  } from '@/api/modular/main/WmsBase/BaseCustomerManage'
  export default {
  data () {
  return {
  labelCol: {
  xs: { span: 24 },
  sm: { span: 5 }
  },
  wrapperCol: {
  xs: { span: 24 },
  sm: { span: 15 }
  },
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      }
    },
    methods: {
    moment,
      // åˆå§‹åŒ–方法
      add (record) {
        this.visible = true
        this.$nextTick(() => {

        });
      },
      /**
       * æäº¤è¡¨å•
       */
      handleSubmit () {
        const { form: { validateFields } } = this
        this.confirmLoading = true
        validateFields((errors, values) => {
          if (!errors) {
            for (const key in values) {
              if (typeof (values[key]) === 'object') {
                values[key] = JSON.stringify(values[key])
              }
            }
            BaseCustomerAdd(values).then((res) => {
              if (res.success) {
                this.$message.success('新增成功')
                this.confirmLoading = false
                this.$emit('ok', values)
                this.handleCancel()
              } else {
                this.$message.error('新增失败：' + JSON.stringify(res.message))
              }
            }).finally((res) => {
              this.confirmLoading = false
            })
          } else {
            this.confirmLoading = false
          }
        })
      },
      handleCancel () {
        this.form.resetFields()
        this.visible = false
      }
    }
  }
</script>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,151 @@
<template>
  <a-modal
    title="编辑客户档案"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-form-item label="客户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户编号" v-decorator="['custCode', {rules: [{required: true, message: '请输入客户编号！'}]}]" />
        </a-form-item>
        <a-form-item label="客户中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户中文名称" v-decorator="['custChinaName', {rules: [{required: true, message: '请输入客户中文名称！'}]}]" />
        </a-form-item>
        <a-form-item label="客户英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户英文名称" v-decorator="['custEnglishName']" />
        </a-form-item>
        <a-form-item label="助记码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入助记码" v-decorator="['mnemonicCode']" />
        </a-form-item>
        <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入类型" style="width: 100%" v-decorator="['custType', {rules: [{required: true, message: '请输入类型！'}]}]" />
        </a-form-item>
        <a-form-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入类型名称" v-decorator="['custTypeName']" />
        </a-form-item>
        <a-form-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入联系人" v-decorator="['linkMan']" />
        </a-form-item>
        <a-form-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入电话" v-decorator="['phone']" />
        </a-form-item>
        <a-form-item label="电子邮件" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入电子邮件" v-decorator="['email']" />
        </a-form-item>
        <a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入邮编" v-decorator="['zipCode']" />
        </a-form-item>
        <a-form-item label="省份" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入省份" v-decorator="['province']" />
        </a-form-item>
        <a-form-item label="城市" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入城市" v-decorator="['city']" />
        </a-form-item>
        <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入地址" v-decorator="['address']" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
      </a-form>
    </a-spin>
  </a-modal>
</template>

<script>
import moment from 'moment'
  import {
  BaseCustomerEdit
  } from '@/api/modular/main/WmsBase/BaseCustomerManage'
  export default {
  data () {
  return {
  Id: 0,
  labelCol: {
  xs: { span: 24 },
  sm: { span: 5 }
  },
  wrapperCol: {
  xs: { span: 24 },
  sm: { span: 15 }
  },
  record: {},
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      }
    },
    methods: {
    moment,
      // åˆå§‹åŒ–方法
      edit (record) {
        this.visible = true;
        this.Id = record.id;
        this.$nextTick(() => {
        });
        //深度拷贝 ç§»é™¤VUE的监听，防止INDEX页面值变动
        this.record = JSON.parse(JSON.stringify(record))
        this.$nextTick(() => {
          this.form.setFieldsValue(
            {
              id: record.id,
              custCode: record.custCode,
              custChinaName: record.custChinaName,
              custEnglishName: record.custEnglishName,
              mnemonicCode: record.mnemonicCode,
              custType: record.custType,
              custTypeName: record.custTypeName,
              linkMan: record.linkMan,
              phone: record.phone,
              email: record.email,
              zipCode: record.zipCode,
              province: record.province,
              city: record.city,
              address: record.address,
              isDisabled: record.isDisabled
            }
          )
        })
      },
      handleSubmit () {
        const { form: { validateFields } } = this
        this.confirmLoading = true
        validateFields((errors, values) => {
          if (!errors) {
            for (const key in values) {
              if (values[key] == null) continue
              if (typeof (values[key]) === 'object') {
                values[key] = JSON.stringify(values[key])
                 this.record[key] = values[key]
              } else {
                 this.record[key] = values[key]
              }
            }
            BaseCustomerEdit(this.record).then((res) => {
              if (res.success) {
                this.$message.success('编辑成功')
                this.confirmLoading = false
                this.$emit('ok', this.record)
                this.handleCancel()
              } else {
                this.$message.error('编辑失败：' + JSON.stringify(res.message))
              }
            }).finally((res) => {
              this.confirmLoading = false
            })
          }else{
            this.confirmLoading = false
          } 
        });
      },
      handleCancel () {
        this.form.resetFields()
        this.visible = false
      }
    }
  }
</script>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/excelForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,181 @@
<template>
  <a-modal
    :width="850"
    :destroyOnClose="true"
    :visible="visible"
    :forceRender="true"
    title="批量导入"
    cancelText="取消上传"
    okText="开始上传"
    @cancel="handleCancel"
    @ok="handleSubmit">
    <a-spin :spinning="confirmLoading">
      <a-row :span="24">
        <span>请选择要导入的数据文件（Excel格式）</span>
      </a-row>
      <p></p>
      <a-row>
        <a-col :span="16">
          <a-upload-dragger accept=".xlsx,.xls" :multiple="false" :customRequest="customRequest" @change="handleChange" :beforeUpload="beforeUpload">
            <a-icon style="font-size: 40px;" type="cloud-upload" />
          </a-upload-dragger>
        </a-col>
        <!--<a-col :span="8">
          <span>导入模式：</span>
          <a-select
            style="width: 130px"
            placeholder="请选择导入模式"
            v-model="importExcelType">
            <a-select-option
              v-for="(item,index) in importExcelTypeData"
              :key="index"
              :value="item.code">{{ item.name }}
            </a-select-option>
          </a-select>
        </a-col>-->
      </a-row>
      <a-row :span="24">
        <!--<a-button @click="showDemand" style="width: 150px;text-align: left;" type="link" v-show="!detailed">
          ç‚¹å‡»æŸ¥çœ‹æ–‡ä»¶ä¸Šä¼ è¦æ±‚
        </a-button>-->
        <span>【</span>
        <a-button style="width: 90px;text-align: left;" @click="baseCustomerDownloadExcelTemplate" type="link">下载导入模板</a-button>，填写并上传
        <span>】</span>
        <a-button @click="showDemand" style="width: 150px;text-align: left;" type="link" v-show="detailed">
          æ”¶èµ·
        </a-button>
      </a-row>
      <a-row v-show="detailed" style="background: #fef4e8; height: 30px;" :span="24">
        <a-breadcrumb>
          <a-breadcrumb-item style="line-height: 30px;color: #faad14;margin-left: 18px;">文件上传要求</a-breadcrumb-item>
        </a-breadcrumb>
      </a-row>
      <pre v-show="detailed">
        <div v-html="demandText"></div>
      </pre>
      <a-table v-show="detailed" :columns="columns" :data-source="dataList" :rowKey="(record) => record.processID" :pagination="false"></a-table>
      <pre v-show="detailed">
        <div v-html="columnText"></div>
      </pre>
    </a-spin>
  </a-modal>
</template>

<script>
  import { downloadFile, checkFile, parseExcelFieldText, parseDemandText } from '@/utils/util'

  import { BaseCustomerImportExcel, BaseCustomerDownloadExcelTemplate} from '@/api/modular/main/WmsBase/BaseCustomerManage'
  import { sysExcelTemplateGetColumnList } from '@/api/modular/system/excelTemplateManage'
  export default {
  components: {
  },
  data() {
  return {
  visible: false,
  detailed: false,
  confirmLoading: false,
  fileList: [],
  importExcelTypeData: [],
  importExcelType: '1',
  uploadFile: null,
  columns: [],
  dataList: [],
  demandText:'',
  columnText: ''
  }
  },
  methods: {
  index() {
  this.visible = true;
  this.importExcelTypeData = this.$options.filters['dictData']('import_excel_type')
  this.demandText = parseDemandText("baseCustomerDownloadExcelTemplate")
  window.downloadFile = this.baseCustomerDownloadExcelTemplate;
  this.getTable();
  },
  showDemand() {
  this.detailed = !this.detailed;
  },
  customRequest(document) {
  this.uploadFile = document
  },
  getTable() {
  sysExcelTemplateGetColumnList({className: "BaseCustomer"}).then(res =>
  {
  if (res.success) {
  this.columns =[];
  this.dataList = [{}];
  res.data.forEach(x => {
  this.columns.push({
  dataIndex: x.columnName,
  key: x.columnName,
  title: x.columnComment
  });
  this.dataList[0][x.columnName] = x.isRequired ? "必填" : "非必填"
  });
  this.columnText = parseExcelFieldText(res.data);
  }
  });
  },
  beforeUpload(fileInfo) {
  let res = checkFile(fileInfo, 1073741824, ['.xlsx', '.xls']);
  if (!res.success) {
  this.$message.warning(res.msg)
  return false
  }
  setTimeout(() => {this.uploadFile.onSuccess(this.uploadFile.file)}, 1000)
  },
  handleChange(fileInfo) {
  if (fileInfo.file.status === 'error') {
  fileInfo.fileList.splice(0, 1)
  }
  if (fileInfo.file.status === 'done') {
  if (fileInfo.fileList.length > 1) {
  fileInfo.fileList.splice(0, 1)
  }
  this.fileList = fileInfo.file
  }
  },
  handleSubmit() {
  this.confirmLoading = true
  const formData = new FormData()
  formData.append('file', this.uploadFile.file)
  BaseCustomerImportExcel(formData, {importExcelType: this.importExcelType}).then(res => {
  this.$message.success('操作成功')
  this.confirmLoading = false
  this.$emit('ok', [])
  this.handleCancel()
  }).finally((res)=>{this.confirmLoading = false})
  },
  handleCancel() {
  this.visible = false
  this.detailed = false
  },
  baseCustomerDownloadExcelTemplate() {
  BaseCustomerDownloadExcelTemplate({version: "v2"}).then((res) => {
  downloadFile(res);
  }).catch((err) => {
  this.$message.error('下载错误：获取文件流错误' + err)
  })
  }
  }
  }
</script>

<style scoped>
::v-deep .ant-upload.ant-upload-drag {
  position: relative;
  width: 140px;
  height: 135px;
  text-align: center;
  background: #fafafa;
  border: 1px dashed #d9d9d9;
  border-radius: 2px;
  cursor: pointer;
  -webkit-transition: border-color 0.3s;
  transition: border-color 0.3s;
}
::v-deep .ant-btn:focus:not(.ant-btn-primary):not(.ant-btn-danger), .ant-btn:hover:not(.ant-btn-primary):not(.ant-btn-danger) {
  color: #ffc53d;
  border-color: white;
}
</style>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,712 @@
<template>
  <div ref="boxOutWrap" class="boxOutWrap">
    <div ref="boxForm" class="boxForm">  
    <a-card :bordered="false" :bodyStyle="tstyle">

      <div class="table-page-search-wrapper" v-if="hasPerm('BaseCustomer:page')">
        <a-form layout="inline">
          <a-row :gutter="48">
            <a-col :md="8" :sm="24">
              <a-form-item label="客户编号">
                <a-input v-model="queryParam.custCode" allow-clear placeholder="请输入客户编号"/>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="24">
              <a-form-item label="客户中文名称">
                <a-input v-model="queryParam.custChinaName" allow-clear placeholder="请输入客户中文名称"/>
              </a-form-item>
            </a-col><template v-if="advanced">
              <a-col :md="8" :sm="24">
                <a-form-item label="客户英文名称">
                  <a-input v-model="queryParam.custEnglishName" allow-clear placeholder="请输入客户英文名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="助记码">
                  <a-input v-model="queryParam.mnemonicCode" allow-clear placeholder="请输入助记码"/>
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="类型">
                  <a-input-number v-model="queryParam.custType" style="width: 100%" allow-clear placeholder="请输入类型"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="类型名称">
                  <a-input v-model="queryParam.custTypeName" allow-clear placeholder="请输入类型名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="联系人">
                  <a-input v-model="queryParam.linkMan" allow-clear placeholder="请输入联系人"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="电话">
                  <a-input v-model="queryParam.phone" allow-clear placeholder="请输入电话"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="电子邮件">
                  <a-input v-model="queryParam.email" allow-clear placeholder="请输入电子邮件"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="邮编">
                  <a-input v-model="queryParam.zipCode" allow-clear placeholder="请输入邮编"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="省份">
                  <a-input v-model="queryParam.province" allow-clear placeholder="请输入省份"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="城市">
                  <a-input v-model="queryParam.city" allow-clear placeholder="请输入城市"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="地址">
                  <a-input v-model="queryParam.address" allow-clear placeholder="请输入地址"/>
                </a-form-item>
              </a-col>
            <a-col :md="8" :sm="24">
                <a-form-item label="是否禁用">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled" placeholder="请选择是否禁用">
                        <a-select-option v-for="(item,index) in isDisabledData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
                  <!--年月日时分秒-->
            <!--时间范围-->

                <a-col :md="8" :sm="24">
                    <a-form-item label="创建时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.createdTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangecreatedTime"/>

                    </a-form-item>
                </a-col>
                      <!--年月日时分秒-->
            <!--时间范围-->

                <a-col :md="8" :sm="24">
                    <a-form-item label="更新时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.updatedTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangeupdatedTime"/>

                    </a-form-item>
                </a-col>
			
              <a-col :md="8" :sm="24">
                <a-form-item label="创建者名称">
                  <a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建者名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="修改者名称">
                  <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改者名称"/>
                </a-form-item>
              </a-col>    </template>

            <a-col :md="8" :sm="24" >
              <span class="table-page-search-submitButtons">
                <a-button type="primary" @click="$refs.table.refresh(true)" >查询</a-button>
                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
                <a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '收起' : '展开' }}
                  <a-icon :type="advanced ? 'up' : 'down'"/>
                </a>
              </span>
            </a-col>

          </a-row>
        </a-form>
      </div>
    </a-card>
    </div>
    <a-card :bordered="false">
      <s-table
        ref="table"
        :columns="columns"
        :data="loadData"
        :alert="true"
        @changeTablePage="pageInfo = $event"
        :scroll="{x: true,y:tableHeight}"
        :rowKey="(record) => record.id"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
        <template class="table-operator" slot="operator" v-if="hasPerm('BaseCustomer:add')" >
        <div ref="actionBar" class="actionBar">
            <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
            å¯¼å…¥
          </a-button>
          <a-button type="info" v-if="hasPerm('BaseCustomer:exportExcel')" icon="download" @click="BaseCustomerToExcel()">
            å¯¼å‡º
          </a-button>
            <a-button type="primary" v-if="hasPerm('BaseCustomer:add')" icon="plus" @click="$refs.addForm.add()">新增客户档案</a-button>
        </div>
        </template>
          <span slot="isDisabledscopedSlots" slot-scope="text">
            <div v-if="text===true ">
                <a-tag color="green">是</a-tag>
            </div>
            <div v-else-if="text==false">
                <a-tag color="volcano">否</a-tag>
            </div>
            <div v-else=""></div>
            </span>
          <span slot="action" slot-scope="text, record">
			
            <a v-if="hasPerm('BaseCustomer:edit')" @click="$refs.editForm.edit(record)">编辑</a>
          <a-divider type="vertical" v-if="hasPerm('BaseCustomer:edit') & hasPerm('BaseCustomer:delete')"/>
          <a-popconfirm v-if="hasPerm('BaseCustomer:delete')" placement="topRight" title="确认删除？" @confirm="() => BaseCustomerDelete(record)">
            <a>删除</a>
          </a-popconfirm>
        </span>
      </s-table>
      <add-form ref="addForm" @ok="handleOk" />
      <edit-form ref="editForm" @ok="handleOk" />
      <excel-form ref="excelForm" @ok="handleOk" />
    </a-card>
  </div>
</template>
<script>
    import { STable } from '@/components'
    import moment from 'moment'
    import { BaseCustomerPage, BaseCustomerDelete, BaseCustomerToExcel } from '@/api/modular/main/WmsBase/BaseCustomerManage'
    //自定义table高度
    import setTableHtMixin from '@/mixins/handleTableHt.js'
    import addForm from './addForm.vue'
    import { exportExcel } from '@/utils/exportToExcel'
    import { downloadFile } from '@/utils/util'
    import editForm from './editForm.vue'
    import excelForm from './excelForm.vue'
    export default {
    mixins: [setTableHtMixin],
    components: {
    STable,
    addForm,
    editForm,
    excelForm
    },
    data () {
    return {
    advanced: false, // é«˜çº§æœç´¢ å±•å¼€/关闭
    queryParam: {},
     pageInfo: {
        current: 1,
        pageSize: 10
      },
    columns: [
    {
    title:'序号',
    width: '60px',
    align: 'center',
    customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
    },
    {
    title: '客户编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'custCode'
    },
    {
    title: '客户中文名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'custChinaName'
    },
    {
    title: '客户英文名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'custEnglishName'
    },
    {
    title: '助记码',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'mnemonicCode'
    },
    {
    title: '类型',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '80px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '80px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'custType'
    },
    {
    title: '类型名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'custTypeName'
    },
    {
    title: '联系人',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'linkMan'
    },
    {
    title: '电话',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'phone'
    },
    {
    title: '电子邮件',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'email'
    },
    {
    title: '邮编',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'zipCode'
    },
    {
    title: '省份',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'province'
    },
    {
    title: '城市',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'city'
    },
    {
    title: '地址',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'address'
    },
    {
    title: '是否禁用',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'isDisabled',
    scopedSlots: { customRender: 'isDisabledscopedSlots' }
    },
    {
    title: '创建时间',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'createdTime'
    },
    {
    title: '更新时间',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'updatedTime'
    },
    {
    title: '创建者名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'createdUserName'
    },
    {
    title: '修改者名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'updatedUserName'
    }
    ],
    tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
    // åŠ è½½æ•°æ®æ–¹æ³• å¿…须为 Promise å¯¹è±¡
    loadData: parameter => {
    return BaseCustomerPage(Object.assign(parameter, this.switchingDate())).then((res) => {
    return res.data
    })
    },
    selectedRowKeys: [],
    selectedRows: []
    }
    },
    created () {
    if (this.hasPerm('BaseCustomer:edit') || this.hasPerm('BaseCustomer:delete')) {
    this.columns.push({
    title: '操作',
    width: '150px',
    dataIndex: 'action',
    scopedSlots: { customRender: 'action' }
    })
    }
    const path = this.$route.path
    const columnStr = window.localStorage.getItem(path)
    if(columnStr) {
    var _columns = JSON.parse(columnStr)
    this.columns.forEach(element => {
    var fObj = _columns.find((item, index) => {
    return item.dataIndex === element.dataIndex;
    })
    if(fObj!=undefined && fObj!=null){
    element.checked=fObj.checked;
    }
    });
    }
    const isDisabledOption = this.$options
    this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')

    this.handleTableHt() //设置主表表格高度
    window.addEventListener(
    'resize',
    () => {
    this.handleTableHt() // ç›‘听屏幕大小改变表格高度
    },
    false
    )
	
    },
    methods: {
    moment,
    /**
    * æŸ¥è¯¢å‚数组装
    */
    switchingDate () {
    const obj = JSON.parse(JSON.stringify(this.queryParam))
    return obj
    },
    BaseCustomerDelete (record) {
    BaseCustomerDelete(record).then((res) => {
    if (res.success) {
    this.$message.success('删除成功')
    this.$refs.table.refresh()
    } else {
    this.$message.error('删除失败') // + res.message
    }
    })
    },


    BaseCustomerToExcel() {
    this.loading = true
    let entozh = {};
    const path = this.$route.path;
    if (window.localStorage.getItem(path)) {
    JSON.parse(window.localStorage.getItem(path)).forEach(item => {
    if (item.dataIndex != 'action' && item.checked) {
    entozh[item.dataIndex] = item.title
    }
    })
    } else { //直接点导出
    this.columns.forEach(item => {
    if (item.dataIndex != 'action') {
    entozh[item.dataIndex] = item.title
    }
    })
    }
    BaseCustomerPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
    this.loading = false;
    //需要截取日期的字段
    var arrDataCutout = this.columns.filter(v => v.customCutout == true);
    res.data.rows.forEach(item => {
    var arrKeys = Object.keys(item);
    arrKeys.forEach(key => {
    var strFieldDic = key + 'Data';
    //枚举转值
    if (this[strFieldDic] && this[strFieldDic].length > 0) {
    let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
    if (arrFieldDic.length > 0) {
    item[key] = arrFieldDic[0]?.name || '没有枚举值';
    }
    }
    // æ—¥æœŸæˆªå–
    if (arrDataCutout.length > 0) {
    arrDataCutout.forEach(itemIn => {
    if (key == itemIn.dataIndex && item[key]) {
    item[key] = item[key].split(" ")[0]
    }
    })
    }
    });
    })
    exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
    }).catch((err) => {
    this.loading = false
    this.$message.error('下载错误：获取文件流错误' + err)
    })
    },


    toggleAdvanced () {
    this.advanced = !this.advanced
    this.handleTableHt() //设置主表表格高度
    },
    onChangecreatedTime(date, dateString) {
      this.queryParam.createdTime = dateString
    },
    onChangeupdatedTime(date, dateString) {
      this.queryParam.updatedTime = dateString
    },
    handleOk () {
    this.$refs.table.refresh()
    },
    onSelectChange (selectedRowKeys, selectedRows) {
    this.selectedRowKeys = selectedRowKeys
    this.selectedRows = selectedRows
    }
    }
    }
</script>
<style lang="less">
  .table-operator {
    margin-bottom: 18px;
  }
  button {
    margin-right: 8px;
  }
</style>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue

@@ -1,463 +1,500 @@
<template>
  <div ref="boxOutWrap" class="boxOutWrap">
    <div ref="boxForm" class="boxForm">  
    <a-card :bordered="false" :bodyStyle="tstyle">

      <div class="table-page-search-wrapper" v-if="hasPerm('WmsFactory:page')">
        <a-form layout="inline">
          <a-row :gutter="48">
            <a-col :md="8" :sm="24">
              <a-form-item label="编号">
                <a-input v-model="queryParam.factoryCode" allow-clear placeholder="请输入编号"/>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="24">
              <a-form-item label="名称">
                <a-input v-model="queryParam.factoryName" allow-clear placeholder="请输入名称"/>
              </a-form-item>
            </a-col><template v-if="advanced">
    <div ref="boxForm" class="boxForm">
      <a-card :bordered="false" :bodyStyle="tstyle">
        <div class="table-page-search-wrapper" v-if="hasPerm('WmsFactory:page')">
          <a-form layout="inline">
            <a-row :gutter="48">
              <a-col :md="8" :sm="24">
                <a-form-item label="地址">
                  <a-input v-model="queryParam.factoryAddress" allow-clear placeholder="请输入地址"/>
                </a-form-item>
              </a-col>
            <a-col :md="8" :sm="24">
                <a-form-item label="是否禁用">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled" placeholder="请选择是否禁用">
                        <a-select-option v-for="(item,index) in isDisabledData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
                  <!--年月日时分秒-->
            <!--时间范围-->

                <a-col :md="8" :sm="24">
                    <a-form-item label="创建时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.createdTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangecreatedTime"/>

                    </a-form-item>
                </a-col>
                      <!--年月日时分秒-->
            <!--时间范围-->

                <a-col :md="8" :sm="24">
                    <a-form-item label="更新时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.updatedTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangeupdatedTime"/>

                    </a-form-item>
                </a-col>
			
              <a-col :md="8" :sm="24">
                <a-form-item label="创建者名称">
                  <a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建者名称"/>
                <a-form-item label="编号">
                  <a-input v-model="queryParam.factoryCode" allow-clear placeholder="请输入编号" />
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="修改者名称">
                  <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改者名称"/>
                </a-form-item>
              </a-col>    </template>
                <a-form-item label="名称">
                  <a-input v-model="queryParam.factoryName" allow-clear placeholder="请输入名称" />
                </a-form-item> </a-col
              ><template v-if="advanced">
                <a-col :md="8" :sm="24">
                  <a-form-item label="地址">
                    <a-input v-model="queryParam.factoryAddress" allow-clear placeholder="请输入地址" />
                  </a-form-item>
                </a-col>
                <a-col :md="8" :sm="24">
                  <a-form-item label="是否禁用">
                    <a-select
                      :allowClear="true"
                      style="width: 100%"
                      v-model="queryParam.isDisabled"
                      placeholder="请选择是否禁用"
                    >
                      <a-select-option v-for="(item, index) in isDisabledData" :key="index" :value="item.code">{{
                        item.name
                      }}</a-select-option>
                    </a-select>
                  </a-form-item>
                </a-col>
                <!--年月日时分秒-->
                <!--时间范围-->

            <a-col :md="8" :sm="24" >
              <span class="table-page-search-submitButtons">
                <a-button type="primary" @click="$refs.table.refresh(true)" >查询</a-button>
                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
                <a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '收起' : '展开' }}
                  <a-icon :type="advanced ? 'up' : 'down'"/>
                </a>
              </span>
            </a-col>
                <a-col :md="8" :sm="24">
                  <a-form-item label="创建时间">
                    <a-range-picker
                      style="width: 100%"
                      :placeholder="['开始时间', '结束时间']"
                      :show-time="{
                        format: 'HH:mm:ss',
                        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                      }"
                      v-model="queryParam.createdTime"
                      value-format="YYYY-MM-DD HH:mm:ss"
                      format="YYYY-MM-DD HH:mm:ss"
                      @change="onChangecreatedTime"
                    />
                  </a-form-item>
                </a-col>
                <!--年月日时分秒-->
                <!--时间范围-->

          </a-row>
        </a-form>
      </div>
    </a-card>
    </div>
                <a-col :md="8" :sm="24">
                  <a-form-item label="更新时间">
                    <a-range-picker
                      style="width: 100%"
                      :placeholder="['开始时间', '结束时间']"
                      :show-time="{
                        format: 'HH:mm:ss',
                        defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                      }"
                      v-model="queryParam.updatedTime"
                      value-format="YYYY-MM-DD HH:mm:ss"
                      format="YYYY-MM-DD HH:mm:ss"
                      @change="onChangeupdatedTime"
                    />
                  </a-form-item>
                </a-col>

                <a-col :md="8" :sm="24">
                  <a-form-item label="创建者名称">
                    <a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建者名称" />
                  </a-form-item>
                </a-col>
                <a-col :md="8" :sm="24">
                  <a-form-item label="修改者名称">
                    <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改者名称" />
                  </a-form-item>
                </a-col>
              </template>

              <a-col :md="8" :sm="24">
                <span class="table-page-search-submitButtons">
                  <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
                  <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
                  <a @click="toggleAdvanced" style="margin-left: 8px">
                    {{ advanced ? '收起' : '展开' }}
                    <a-icon :type="advanced ? 'up' : 'down'" />
                  </a>
                </span>
              </a-col>
            </a-row>
          </a-form>
        </div>
      </a-card>
    </div>
    <a-card :bordered="false">
      <s-table
        ref="table"
        :columns="columns"
        :data="loadData"
        :alert="true"
        @changeTablePage="pageInfo = $event"
        :scroll="{x: true,y:tableHeight}"
        :rowKey="(record) => record.id"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
        <template class="table-operator" slot="operator" v-if="hasPerm('WmsFactory:add')" >
        <div ref="actionBar" class="actionBar">
            <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
            å¯¼å…¥
          </a-button>
          <a-button type="info" v-if="hasPerm('WmsFactory:exportExcel')" icon="download" @click="WmsFactoryToExcel()">
            å¯¼å‡º
          </a-button>
            <a-button type="primary" v-if="hasPerm('WmsFactory:add')" icon="plus" @click="$refs.addForm.add()">新增工厂信息表</a-button>
        </div>
        </template>
          <span slot="isDisabledscopedSlots" slot-scope="text">
            <div v-if="text===true ">
                <a-tag color="green">是</a-tag>
            </div>
            <div v-else-if="text==false">
                <a-tag color="volcano">否</a-tag>
            </div>
            <div v-else=""></div>
            </span>
          <span slot="action" slot-scope="text, record">
			
            <a v-if="hasPerm('WmsFactory:edit')" @click="$refs.editForm.edit(record)">编辑</a>
          <a-divider type="vertical" v-if="hasPerm('WmsFactory:edit') & hasPerm('WmsFactory:delete')"/>
          <a-popconfirm v-if="hasPerm('WmsFactory:delete')" placement="topRight" title="确认删除？" @confirm="() => WmsFactoryDelete(record)">
        @changeTablePage="pageInfo = $event"
        :scroll="{ x: true, y: tableHeight }"
        :rowKey="record => record.id"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
      >
        <template class="table-operator" slot="operator" v-if="hasPerm('WmsFactory:add')">
          <div ref="actionBar" class="actionBar">
            <a-button
              type="info"
              v-if="hasPerm('sysExcelTemplate:importExcel')"
              icon="upload"
              @click="$refs.excelForm.index()"
            >
              å¯¼å…¥
            </a-button>
            <a-button type="info" v-if="hasPerm('WmsFactory:exportExcel')" icon="download" @click="WmsFactoryToExcel()">
              å¯¼å‡º
            </a-button>
            <a-button type="primary" v-if="hasPerm('WmsFactory:add')" icon="plus" @click="$refs.addForm.add()"
              >新增工厂信息表</a-button
            >
          </div>
        </template>
        <span slot="isDisabledscopedSlots" slot-scope="text">
          <div v-if="text === true">
            <a-tag color="green">是</a-tag>
          </div>
          <div v-else-if="text == false">
            <a-tag color="volcano">否</a-tag>
          </div>
          <div v-else=""></div>
        </span>
        <span slot="action" slot-scope="text, record">
          <a v-if="hasPerm('WmsFactory:edit')" @click="$refs.editForm.edit(record)">编辑</a>
          <a-divider type="vertical" v-if="hasPerm('WmsFactory:edit') & hasPerm('WmsFactory:delete')" />
          <a-popconfirm
            v-if="hasPerm('WmsFactory:delete')"
            placement="topRight"
            title="确认删除？"
            @confirm="() => WmsFactoryDelete(record)"
          >
            <a>删除</a>
          </a-popconfirm>
        </span>
      </s-table>
      <add-form ref="addForm" @ok="handleOk" />
      <edit-form ref="editForm" @ok="handleOk" />
      <excel-form ref="excelForm" @ok="handleOk" />
      <excel-form ref="excelForm" @ok="handleOk" />
    </a-card>
  </div>
</template>
<script>
    import { STable } from '@/components'
    import moment from 'moment'
    import { WmsFactoryPage, WmsFactoryDelete, WmsFactoryToExcel } from '@/api/modular/main/WmsBase/WmsFactoryManage'
    //自定义table高度
    import setTableHtMixin from '@/mixins/handleTableHt.js'
    import addForm from './addForm.vue'
    import { exportExcel } from '@/utils/exportToExcel'
    import { downloadFile } from '@/utils/util'
    import editForm from './editForm.vue'
    import excelForm from './excelForm.vue'
    export default {
    mixins: [setTableHtMixin],
    components: {
    STable,
    addForm,
    editForm,
    excelForm
    },
    data () {
    return {
    advanced: false, // é«˜çº§æœç´¢ å±•å¼€/关闭
    queryParam: {},
     pageInfo: {
import { STable } from '@/components'
import moment from 'moment'
import { WmsFactoryPage, WmsFactoryDelete, WmsFactoryToExcel } from '@/api/modular/main/WmsBase/WmsFactoryManage'
//自定义table高度
import setTableHtMixin from '@/mixins/handleTableHt.js'
import addForm from './addForm.vue'
import { exportExcel } from '@/utils/exportToExcel'
import { downloadFile } from '@/utils/util'
import editForm from './editForm.vue'
import excelForm from './excelForm.vue'
export default {
  mixins: [setTableHtMixin],
  components: {
    STable,
    addForm,
    editForm,
    excelForm
  },
  data() {
    return {
      advanced: false, // é«˜çº§æœç´¢ å±•å¼€/关闭
      queryParam: {},
      pageInfo: {
        current: 1,
        pageSize: 10
      },
    columns: [
    {
    title:'序号',
    width: '60px',
    align: 'center',
    customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
    },
    {
    title: '编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'factoryCode'
    },
    {
    title: '名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'factoryName'
    },
    {
    title: '地址',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'factoryAddress'
    },
    {
    title: '是否禁用',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'isDisabled',
    scopedSlots: { customRender: 'isDisabledscopedSlots' }
    },
    {
    title: '创建时间',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'createdTime'
    },
    {
    title: '更新时间',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'updatedTime'
    },
    {
    title: '创建者名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'createdUserName'
    },
    {
    title: '修改者名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'updatedUserName'
    }
    ],
    tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
    // åŠ è½½æ•°æ®æ–¹æ³• å¿…须为 Promise å¯¹è±¡
    loadData: parameter => {
    return WmsFactoryPage(Object.assign(parameter, this.switchingDate())).then((res) => {
    return res.data
    })
    },
    selectedRowKeys: [],
    selectedRows: []
    }
    },
    created () {
    if (this.hasPerm('WmsFactory:edit') || this.hasPerm('WmsFactory:delete')) {
    this.columns.push({
    title: '操作',
    width: '150px',
    dataIndex: 'action',
    scopedSlots: { customRender: 'action' }
    })
    }
    const path = this.$route.path
    const columnStr = window.localStorage.getItem(path)
    if(columnStr) {
    var _columns = JSON.parse(columnStr)
    this.columns.forEach(element => {
    var fObj = _columns.find((item, index) => {
    return item.dataIndex === element.dataIndex;
    })
    if(fObj!=undefined && fObj!=null){
    element.checked=fObj.checked;
    }
    });
    }
    const isDisabledOption = this.$options
    this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
      columns: [
        {
          title: '序号',
          width: '60px',
          align: 'center',
          customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
        },
        {
          title: '编号',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'factoryCode'
        },
        {
          title: '名称',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'factoryName'
        },
        {
          title: '地址',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'factoryAddress'
        },
        {
          title: '是否禁用',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'isDisabled',
          scopedSlots: { customRender: 'isDisabledscopedSlots' }
        },
        {
          title: '创建时间',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'createdTime'
        },
        {
          title: '更新时间',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'updatedTime'
        },
        {
          title: '创建者名称',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'createdUserName'
        },
        {
          title: '修改者名称',
          align: 'center',
          customHeaderCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          customCell: () => {
            return {
              style: {
                'min-width': '120px' //最小列宽设置
              }
            }
          },
          sorter: true,
          dataIndex: 'updatedUserName'
        }
      ],
      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
      // åŠ è½½æ•°æ®æ–¹æ³• å¿…须为 Promise å¯¹è±¡
      loadData: parameter => {
        return WmsFactoryPage(Object.assign(parameter, this.switchingDate())).then(res => {
          return res.data
        })
      },
      selectedRowKeys: [],
      selectedRows: []
    }
  },
  created() {
    if (this.hasPerm('WmsFactory:edit') || this.hasPerm('WmsFactory:delete')) {
      this.columns.push({
        title: '操作',
        width: '150px',
        dataIndex: 'action',
        scopedSlots: { customRender: 'action' }
      })
    }
    const path = this.$route.path
    const columnStr = window.localStorage.getItem(path)
    if (columnStr) {
      var _columns = JSON.parse(columnStr)
      this.columns.forEach(element => {
        var fObj = _columns.find((item, index) => {
          return item.dataIndex === element.dataIndex
        })
        if (fObj != undefined && fObj != null) {
          element.checked = fObj.checked
        }
      })
    }
    const isDisabledOption = this.$options
    this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')

    this.handleTableHt() //设置主表表格高度
    window.addEventListener(
    'resize',
    () => {
    this.handleTableHt() // ç›‘听屏幕大小改变表格高度
    },
    false
    )
	
    },
    methods: {
    moment,
    /**
    * æŸ¥è¯¢å‚数组装
    */
    switchingDate () {
    const obj = JSON.parse(JSON.stringify(this.queryParam))
    return obj
    },
    WmsFactoryDelete (record) {
    WmsFactoryDelete(record).then((res) => {
    if (res.success) {
    this.$message.success('删除成功')
    this.$refs.table.refresh()
    } else {
    this.$message.error('删除失败') // + res.message
    }
    })
    },
    this.handleTableHt() //设置主表表格高度
    window.addEventListener(
      'resize',
      () => {
        this.handleTableHt() // ç›‘听屏幕大小改变表格高度
      },
      false
    )
  },
  methods: {
    moment,
    /**
     * æŸ¥è¯¢å‚数组装
     */
    switchingDate() {
      const obj = JSON.parse(JSON.stringify(this.queryParam))
      return obj
    },
    WmsFactoryDelete(record) {
      WmsFactoryDelete(record).then(res => {
        if (res.success) {
          this.$message.success('删除成功')
          this.$refs.table.refresh()
        } else {
          this.$message.error('删除失败') // + res.message
        }
      })
    },

    WmsFactoryToExcel() {
      this.loading = true
      let entozh = {}
      const path = this.$route.path
      if (window.localStorage.getItem(path)) {
        JSON.parse(window.localStorage.getItem(path)).forEach(item => {
          if (item.dataIndex != 'action' && item.checked) {
            entozh[item.dataIndex] = item.title
          }
        })
      } else {
        //直接点导出
        this.columns.forEach(item => {
          if (item.dataIndex != 'action') {
            entozh[item.dataIndex] = item.title
          }
        })
      }
      WmsFactoryPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam))
        .then(res => {
          this.loading = false
          //需要截取日期的字段
          var arrDataCutout = this.columns.filter(v => v.customCutout == true)
          res.data.rows.forEach(item => {
            var arrKeys = Object.keys(item)
            arrKeys.forEach(key => {
              var strFieldDic = key + 'Data'
              //枚举转值
              if (this[strFieldDic] && this[strFieldDic].length > 0) {
                let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]))
                if (arrFieldDic.length > 0) {
                  item[key] = arrFieldDic[0]?.name || '没有枚举值'
                }
              }
              // æ—¥æœŸæˆªå–
              if (arrDataCutout.length > 0) {
                arrDataCutout.forEach(itemIn => {
                  if (key == itemIn.dataIndex && item[key]) {
                    item[key] = item[key].split(' ')[0]
                  }
                })
              }
            })
          })
          exportExcel(res.data.rows, entozh, 'xlsx', `${this.$route.meta.title}`)
        })
        .catch(err => {
          this.loading = false
          this.$message.error('下载错误：获取文件流错误' + err)
        })
    },

    WmsFactoryToExcel() {
    this.loading = true
    let entozh = {};
    const path = this.$route.path;
    if (window.localStorage.getItem(path)) {
    JSON.parse(window.localStorage.getItem(path)).forEach(item => {
    if (item.dataIndex != 'action' && item.checked) {
    entozh[item.dataIndex] = item.title
    }
    })
    } else { //直接点导出
    this.columns.forEach(item => {
    if (item.dataIndex != 'action') {
    entozh[item.dataIndex] = item.title
    }
    })
    }
    WmsFactoryPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
    this.loading = false;
    //需要截取日期的字段
    var arrDataCutout = this.columns.filter(v => v.customCutout == true);
    res.data.rows.forEach(item => {
    var arrKeys = Object.keys(item);
    arrKeys.forEach(key => {
    var strFieldDic = key + 'Data';
    //枚举转值
    if (this[strFieldDic] && this[strFieldDic].length > 0) {
    let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
    if (arrFieldDic.length > 0) {
    item[key] = arrFieldDic[0]?.name || '没有枚举值';
    }
    }
    // æ—¥æœŸæˆªå–
    if (arrDataCutout.length > 0) {
    arrDataCutout.forEach(itemIn => {
    if (key == itemIn.dataIndex && item[key]) {
    item[key] = item[key].split(" ")[0]
    }
    })
    }
    });
    })
    exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
    }).catch((err) => {
    this.loading = false
    this.$message.error('下载错误：获取文件流错误' + err)
    })
    },


    toggleAdvanced () {
    this.advanced = !this.advanced
    this.handleTableHt() //设置主表表格高度
    },
    onChangecreatedTime(date, dateString) {
      this.queryParam.createdTime = dateString
    },
    onChangeupdatedTime(date, dateString) {
      this.queryParam.updatedTime = dateString
    },
    handleOk () {
    this.$refs.table.refresh()
    },
    onSelectChange (selectedRowKeys, selectedRows) {
    this.selectedRowKeys = selectedRowKeys
    this.selectedRows = selectedRows
    }
    }
    }
    toggleAdvanced() {
      this.advanced = !this.advanced
      this.handleTableHt() //设置主表表格高度
    },
    onChangecreatedTime(date, dateString) {
      this.queryParam.createdTime = dateString
    },
    onChangeupdatedTime(date, dateString) {
      this.queryParam.updatedTime = dateString
    },
    handleOk() {
      this.$refs.table.refresh()
    },
    onSelectChange(selectedRowKeys, selectedRows) {
      this.selectedRowKeys = selectedRowKeys
      this.selectedRows = selectedRows
    }
  }
}
</script>
<style lang="less">
  .table-operator {
    margin-bottom: 18px;
  }
  button {
    margin-right: 8px;
  }
.table-operator {
  margin-bottom: 18px;
}
button {
  margin-right: 8px;
}
</style>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue

@@ -177,6 +177,8 @@
            å¯¼å‡º
          </a-button>
            <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">新增物料信息表</a-button>
            <!-- è‡ªå®šä¹‰ -->
            <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.tabForm.add()">新增tab</a-button>
        </div>
        </template>
          <span slot="isDisabledscopedSlots" slot-scope="text">
@@ -200,6 +202,9 @@
      <add-form ref="addForm" @ok="handleOk" />
      <edit-form ref="editForm" @ok="handleOk" />
      <excel-form ref="excelForm" @ok="handleOk" />
      <!-- è‡ªå®šä¹‰ -->
      <tab-form ref="tabForm" @ok="handleOk" />

    </a-card>
  </div>
</template>
@@ -210,6 +215,9 @@
    //自定义table高度
    import setTableHtMixin from '@/mixins/handleTableHt.js'
    import addForm from './addForm.vue'
//自定义
    import tabForm from './tabForm.vue'

    import { exportExcel } from '@/utils/exportToExcel'
    import { downloadFile } from '@/utils/util'
    import editForm from './editForm.vue'
@@ -220,7 +228,8 @@
    STable,
    addForm,
    editForm,
    excelForm
    excelForm,
    tabForm //自定义
    },
    data () {
    return {

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,158 @@
<template>
  <a-modal
    title="新增物料信息"
    :width="900"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel"
  >
    <a-spin :spinning="confirmLoading">
      <!-- tab -->
      <a-tabs default-active-key="1" @change="callback">
        <a-tab-pane key="1" tab="基本信息">
         <add-form ref="addForm" @ok="handleOk" />
        </a-tab-pane>
        <a-tab-pane key="2" tab="控制属性" force-render>
          Content of Tab Pane 2
        </a-tab-pane>
        <a-tab-pane key="3" tab="批次属性">
          Content of Tab Pane 3
        </a-tab-pane>
        <a-tab-pane key="4" tab="替代品管理">
          Content of Tab Pane 4
        </a-tab-pane>
        <a-tab-pane key="5" tab="客户">
          <add-form-base-customer ref="addFormBaseCustomer" @ok="handleOk" />
        </a-tab-pane>
        
        <a-tab-pane key="7" tab="包装关系">
          Content of Tab Pane 6
        </a-tab-pane>
      </a-tabs>

    </a-spin>
  </a-modal>
</template>

<script>
import { WmsMaterialAdd, GetAreas, GetStations } from '@/api/modular/main/WmsMaterialManage'
import addForm from './tabItem/addForm.vue'
import addFormBaseCustomer from './tabItem/addFormBaseCustomer.vue'

export default {
  components: {
    // STable,
    addForm,
    addFormBaseCustomer,

    // editForm,
    // excelForm
  },
  data() {
    return {
      labelCol: {
        // xs: { span: 24 },
        // sm: { span: 5 }
        span: 8
      },
      wrapperCol: {
        // xs: { span: 24 },
        // sm: { span: 15 }
        span: 13
      },
      inspectionMethodData: [],
      materialTypeData: [],
      areaNameParameterData: [],
      stationNameParameterData: [],
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this)
    }
  },
  methods: {
    // åˆå§‹åŒ–方法
    add(record) {
      this.visible = true
      this.$nextTick(() => {
        this.getSelects()
      })
      const materialTypeOption = this.$options
      this.materialTypeData = materialTypeOption.filters['dictData']('material_type')
      const inspectionMethodOption = this.$options
      this.inspectionMethodData = inspectionMethodOption.filters['dictData']('material_inspection')
    },
    getSelects() {
      if (this.areaNameParameterData.length <= 0 || this.stationNameParameterData.length <= 0) {
        this.confirmLoading = true
        Promise.all([GetAreas(), GetStations()])
          .then(response => {
            this.areaNameParameterData = response[0].data || []
            this.stationNameParameterData = response[1].data || []
            this.confirmLoading = false
          })
          .catch(() => {
            this.confirmLoading = false
          })
      }
    },
    /**
     * æäº¤è¡¨å•
     */
    handleSubmit() {
      const {
        form: { validateFields }
      } = this
      this.confirmLoading = true
      validateFields((errors, values) => {
        if (!errors) {
          if (this.$getObjectType(values.areas) === 'array') {
            values.areaIds = values.areas.join(',')
            values.areaNameParameterArr = values.areas.map(val => {
              return this.parseSelectName(val, 'areaId', 'areaName', 'areaNameParameterData')
            })
            values.areaNameParameter = values.areaNameParameterArr.join(',')
          }
          if (this.$getObjectType(values.stations) === 'array') {
            values.stationIds = values.stations.join(',')
            values.stationNameParameterArr = values.stations.map(val => {
              return this.parseSelectName(val, 'stationId', 'stationName', 'stationNameParameterData')
            })
            values.stationNameParameter = values.stationNameParameterArr.join(',')
          }
          WmsMaterialAdd(values)
            .then(res => {
              if (res.success) {
                this.$message.success('新增成功')
                this.confirmLoading = false
                this.$emit('ok', values)
                this.handleCancel()
              } else {
                this.$message.error('新增失败：' + JSON.stringify(res.message))
              }
            })
            .finally(res => {
              this.confirmLoading = false
            })
        } else {
          this.confirmLoading = false
        }
      })
    },
    parseSelectName(val, field, nfield, pfield) {
      let res = val
      for (let i = 0; i < this[pfield].length; i++) {
        if (val === this[pfield][i][field]) {
          res = this[pfield][i][nfield]
          break
        }
      }
      return res
    },
    handleCancel() {
      this.form.resetFields()
      this.visible = false
    }
  }
}
</script>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,136 @@
<template>
  <!-- åŸºæœ¬ä¿¡æ¯ -->
     <a-form :form="form">
        <a-form-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料名称" v-decorator="['materialName', {rules: [{required: true, message: '请输入物料名称！'}]}]" />
        </a-form-item>
        <a-form-item label="物料编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料编号" v-decorator="['materialCode', {rules: [{required: true, message: '请输入物料编号！'}]}]" />
        </a-form-item>
        <a-form-item label="ERP编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入ERP编号" v-decorator="['erpCode']" />
        </a-form-item>
        <a-form-item label="物料类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料类型名称" v-decorator="['materialTypeName']" />
        </a-form-item>
        <a-form-item label="物料类型描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料类型描述" v-decorator="['materialTypeDescr']" />
        </a-form-item>
        <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入物料类型" style="width: 100%" v-decorator="['materialType']" />
        </a-form-item>
        <a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料组" v-decorator="['materialGroup']" />
        </a-form-item>
        <a-form-item label="ABC分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入ABC分类名称" v-decorator="['aBCClassName']" />
        </a-form-item>
        <a-form-item label="ABC分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入ABC分类" style="width: 100%" v-decorator="['aBCClass']" />
        </a-form-item>
        <a-form-item label="物料规格" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入物料规格" v-decorator="['materialSpec']" />
        </a-form-item>
        <a-form-item label="默认入库库位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入默认入库库位" v-decorator="['inPlaceCode']" />
        </a-form-item>
        <a-form-item label="库存单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入库存单位" v-decorator="['materialUnit']" />
        </a-form-item>
        <a-form-item label="采购单位" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入采购单位" v-decorator="['pOUnit']" />
        </a-form-item>
        <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入颜色" v-decorator="['color']" />
        </a-form-item>
        <a-form-item label="重量" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入重量" v-decorator="['weight']" />
        </a-form-item>
        <a-form-item label="标包数量" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入标包数量" v-decorator="['sNP']" />
        </a-form-item>
        <a-form-item label="换算率" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入换算率" v-decorator="['translateRate']" />
        </a-form-item>
        <a-form-item label="批次属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入批次属性规则" v-decorator="['batchRuleId']" />
        </a-form-item>
        <a-form-item label="控制属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入控制属性规则" v-decorator="['controlRuleId']" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入描述" v-decorator="['materialDesc']" />
        </a-form-item>
      </a-form>
</template>

<script>
  import moment from 'moment'
  import {
  WmsMaterialAdd
  } from '@/api/modular/main/WmsBase/WmsMaterialManage'
  export default {
  data () {
  return {
  labelCol: {
  xs: { span: 24 },
  sm: { span: 5 }
  },
  wrapperCol: {
  xs: { span: 24 },
  sm: { span: 15 }
  },
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      }
    },
    methods: {
    moment,
      // åˆå§‹åŒ–方法
      add (record) {
        this.visible = true
        this.$nextTick(() => {

        });
      },
      /**
       * æäº¤è¡¨å•
       */
      handleSubmit () {
        const { form: { validateFields } } = this
        this.confirmLoading = true
        validateFields((errors, values) => {
          if (!errors) {
            for (const key in values) {
              if (typeof (values[key]) === 'object') {
                values[key] = JSON.stringify(values[key])
              }
            }
            WmsMaterialAdd(values).then((res) => {
              if (res.success) {
                this.$message.success('新增成功')
                this.confirmLoading = false
                this.$emit('ok', values)
                this.handleCancel()
              } else {
                this.$message.error('新增失败：' + JSON.stringify(res.message))
              }
            }).finally((res) => {
              this.confirmLoading = false
            })
          } else {
            this.confirmLoading = false
          }
        })
      },
      handleCancel () {
        this.form.resetFields()
        this.visible = false
      }
    }
  }
</script>

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,115 @@
<template>
  <!-- æ–°å¢žå®¢æˆ·æ¡£æ¡ˆ -->
  <a-form :form="form">
        <a-form-item label="客户编号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户编号" v-decorator="['custCode', {rules: [{required: true, message: '请输入客户编号！'}]}]" />
        </a-form-item>
        <a-form-item label="客户中文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户中文名称" v-decorator="['custChinaName', {rules: [{required: true, message: '请输入客户中文名称！'}]}]" />
        </a-form-item>
        <a-form-item label="客户英文名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入客户英文名称" v-decorator="['custEnglishName']" />
        </a-form-item>
        <a-form-item label="助记码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入助记码" v-decorator="['mnemonicCode']" />
        </a-form-item>
        <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入类型" style="width: 100%" v-decorator="['custType', {rules: [{required: true, message: '请输入类型！'}]}]" />
        </a-form-item>
        <a-form-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入类型名称" v-decorator="['custTypeName']" />
        </a-form-item>
        <a-form-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入联系人" v-decorator="['linkMan']" />
        </a-form-item>
        <a-form-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入电话" v-decorator="['phone']" />
        </a-form-item>
        <a-form-item label="电子邮件" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入电子邮件" v-decorator="['email']" />
        </a-form-item>
        <a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入邮编" v-decorator="['zipCode']" />
        </a-form-item>
        <a-form-item label="省份" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入省份" v-decorator="['province']" />
        </a-form-item>
        <a-form-item label="城市" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入城市" v-decorator="['city']" />
        </a-form-item>
        <a-form-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input placeholder="请输入地址" v-decorator="['address']" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />
        </a-form-item>
      </a-form>
</template>

<script>
  import moment from 'moment'
  import {
  BaseCustomerAdd
  } from '@/api/modular/main/WmsBase/BaseCustomerManage'
  export default {
  data () {
  return {
  labelCol: {
  xs: { span: 24 },
  sm: { span: 5 }
  },
  wrapperCol: {
  xs: { span: 24 },
  sm: { span: 15 }
  },
        visible: false,
        confirmLoading: false,
        form: this.$form.createForm(this)
      }
    },
    methods: {
    moment,
      // åˆå§‹åŒ–方法
      add (record) {
        this.visible = true
        this.$nextTick(() => {

        });
      },
      /**
       * æäº¤è¡¨å•
       */
      handleSubmit () {
        const { form: { validateFields } } = this
        this.confirmLoading = true
        validateFields((errors, values) => {
          if (!errors) {
            for (const key in values) {
              if (typeof (values[key]) === 'object') {
                values[key] = JSON.stringify(values[key])
              }
            }
            BaseCustomerAdd(values).then((res) => {
              if (res.success) {
                this.$message.success('新增成功')
                this.confirmLoading = false
                this.$emit('ok', values)
                this.handleCancel()
              } else {
                this.$message.error('新增失败：' + JSON.stringify(res.message))
              }
            }).finally((res) => {
              this.confirmLoading = false
            })
          } else {
            this.confirmLoading = false
          }
        })
      },
      handleCancel () {
        this.form.resetFields()
        this.visible = false
      }
    }
  }
</script>

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml

@@ -15368,6 +15368,487 @@
            <param name="Aisle"></param>
            <returns></returns>
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerService">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆæœåŠ¡
            </summary>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Page(Admin.NET.Application.BaseCustomerSearch)">
            <summary>
            åˆ†é¡µæŸ¥è¯¢å®¢æˆ·æ¡£æ¡ˆ
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.ListNonPageAsync(Admin.NET.Application.BaseCustomerSearchNonPage)">
            <summary>
            ä¸åˆ†é¡µæŸ¥è¯¢å®¢æˆ·æ¡£æ¡ˆåˆ—表
            </summary>
            <param name="input">客户档案查询参数</param>
            <returns>(客户档案)实例列表</returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Get(Admin.NET.Application.QueryeBaseCustomerInput)">
            <summary>
            èŽ·å–客户档案
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.List(Admin.NET.Application.BaseCustomerInput)">
            <summary>
            èŽ·å–客户档案列表
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Add(Admin.NET.Application.AddBaseCustomerInput)">
            <summary>
            å¢žåŠ å®¢æˆ·æ¡£æ¡ˆ
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Delete(Admin.NET.Application.DeleteBaseCustomerInput)">
            <summary>
            åˆ é™¤å®¢æˆ·æ¡£æ¡ˆ
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.Update(Admin.NET.Application.UpdateBaseCustomerInput)">
            <summary>
            æ›´æ–°å®¢æˆ·æ¡£æ¡ˆ
            </summary>
            <param name="input"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.ImportExcelAsync(Microsoft.AspNetCore.Http.IFormFile)">
            <summary>
            Excel模板导入客户档案功能
            </summary>
            <param name="file">Excel模板文件</param>
            <returns>导入的记录数</returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.CommonImport(System.Data.DataTable,System.Int32)">
            <summary>
             DataTable转换实体对象列表
            </summary>
            <param name="dataTable"></param>
            <param name="dataStartLine">模版列名开始行</param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.DownloadExcelTemplate(System.String)">
            <summary>
            æ ¹æ®ç‰ˆæœ¬ä¸‹è½½å®¢æˆ·æ¡£æ¡ˆçš„Excel导入模板
            </summary>
            <param name="version">模板版本</param>
            <returns>下载的模板文件</returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.CheckExisit(Admin.NET.Core.BaseCustomer,System.Boolean)">
            <summary>
            æ ¹æ®è”合主键验证数据是否已存在-数据库
            </summary>
            <param name="input"></param>
            <param name="isEdit"></param>
            <returns></returns>
        </member>
        <member name="M:Admin.NET.Application.BaseCustomerService.CheckExisitForImport(System.Collections.Generic.List{Admin.NET.Core.BaseCustomer})">
            <summary>
            æ ¹æ®è”合主键验证数据是否已存在-导入时验证
            </summary>
            <param name="inputs"></param>
            <returns></returns>
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerSearch">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆæŸ¥è¯¢å‚æ•°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.CustCode">
            <summary>
            å®¢æˆ·ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.CustChinaName">
            <summary>
            å®¢æˆ·ä¸­æ–‡åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.CustEnglishName">
            <summary>
            å®¢æˆ·è‹±æ–‡åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.MnemonicCode">
            <summary>
            åŠ©è®°ç 
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.CustType">
            <summary>
            ç±»åž‹
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.CustTypeName">
            <summary>
            ç±»åž‹åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.LinkMan">
            <summary>
            è”系人
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.Phone">
            <summary>
            ç”µè¯
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.Email">
            <summary>
            ç”µå­é‚®ä»¶
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.ZipCode">
            <summary>
            é‚®ç¼–
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.Province">
            <summary>
            çœä»½
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.City">
            <summary>
            åŸŽå¸‚
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.Address">
            <summary>
            åœ°å€
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearch.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerSearchNonPage">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆä¸åˆ†é¡µæŸ¥è¯¢å‚æ•°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.CustCode">
            <summary>
            å®¢æˆ·ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.CustChinaName">
            <summary>
            å®¢æˆ·ä¸­æ–‡åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.CustEnglishName">
            <summary>
            å®¢æˆ·è‹±æ–‡åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.MnemonicCode">
            <summary>
            åŠ©è®°ç 
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.CustType">
            <summary>
            ç±»åž‹
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.CustTypeName">
            <summary>
            ç±»åž‹åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.LinkMan">
            <summary>
            è”系人
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.Phone">
            <summary>
            ç”µè¯
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.Email">
            <summary>
            ç”µå­é‚®ä»¶
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.ZipCode">
            <summary>
            é‚®ç¼–
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.Province">
            <summary>
            çœä»½
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.City">
            <summary>
            åŸŽå¸‚
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.Address">
            <summary>
            åœ°å€
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerSearchNonPage.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆè¾“入参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.CustCode">
            <summary>
            å®¢æˆ·ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.CustChinaName">
            <summary>
            å®¢æˆ·ä¸­æ–‡åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.CustEnglishName">
            <summary>
            å®¢æˆ·è‹±æ–‡åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.MnemonicCode">
            <summary>
            åŠ©è®°ç 
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.CustType">
            <summary>
            ç±»åž‹
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.CustTypeName">
            <summary>
            ç±»åž‹åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.LinkMan">
            <summary>
            è”系人
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.Phone">
            <summary>
            ç”µè¯
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.Email">
            <summary>
            ç”µå­é‚®ä»¶
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.ZipCode">
            <summary>
            é‚®ç¼–
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.Province">
            <summary>
            çœä»½
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.City">
            <summary>
            åŸŽå¸‚
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.Address">
            <summary>
            åœ°å€
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerInput.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="T:Admin.NET.Application.AddBaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆæ–°å¢žå‚æ•°
            </summary>
        </member>
        <member name="T:Admin.NET.Application.DeleteBaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆåˆ é™¤å‚æ•°
            </summary>
        </member>
        <member name="T:Admin.NET.Application.UpdateBaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆæ›´æ–°å‚æ•°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.UpdateBaseCustomerInput.Id">
            <summary>
            Id主键
            </summary>
        </member>
        <member name="T:Admin.NET.Application.QueryeBaseCustomerInput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆèŽ·å–单个参数
            </summary>
        </member>
        <member name="T:Admin.NET.Application.BaseCustomerOutput">
            <summary>
            å®¢æˆ·æ¡£æ¡ˆè¾“出参数
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.CustCode">
            <summary>
            å®¢æˆ·ç¼–号
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.CustChinaName">
            <summary>
            å®¢æˆ·ä¸­æ–‡åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.CustEnglishName">
            <summary>
            å®¢æˆ·è‹±æ–‡åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.MnemonicCode">
            <summary>
            åŠ©è®°ç 
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.CustType">
            <summary>
            ç±»åž‹
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.CustTypeName">
            <summary>
            ç±»åž‹åç§°
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.LinkMan">
            <summary>
            è”系人
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.Phone">
            <summary>
            ç”µè¯
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.Email">
            <summary>
            ç”µå­é‚®ä»¶
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.ZipCode">
            <summary>
            é‚®ç¼–
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.Province">
            <summary>
            çœä»½
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.City">
            <summary>
            åŸŽå¸‚
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.Address">
            <summary>
            åœ°å€
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.IsDisabled">
            <summary>
            æ˜¯å¦ç¦ç”¨
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.Id">
            <summary>
            Id主键
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.CreatedTime">
            <summary>
            åˆ›å»ºæ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.UpdatedTime">
            <summary>
            æ›´æ–°æ—¶é—´
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.CreatedUserName">
            <summary>
            åˆ›å»ºè€…名称
            </summary>
        </member>
        <member name="P:Admin.NET.Application.BaseCustomerOutput.UpdatedUserName">
            <summary>
            ä¿®æ”¹è€…名称
            </summary>
        </member>
        <member name="T:Admin.NET.Application.WmsFactorySearch">
            <summary>
            å·¥åŽ‚信息表查询参数

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,520 @@
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection;
using Furion.DynamicApiController;
using Furion.FriendlyException;
using Admin.NET.Core;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using System.Linq.Dynamic.Core;
using Microsoft.AspNetCore.Http;
using System.Text;
using System.Web;
using System.ComponentModel;
using System.Data;
namespace Admin.NET.Application
{
    /// <summary>
    /// å®¢æˆ·æ¡£æ¡ˆæœåŠ¡
    /// </summary>
    [ApiDescriptionSettings("WmsBase", Name = "BaseCustomer", Order = 100)]
    [Route("api")]
    public class BaseCustomerService : IBaseCustomerService, IDynamicApiController, ITransient
    {
        private readonly IRepository<BaseCustomer,MasterDbContextLocator> _baseCustomerRep;
        private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
        private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
        private readonly ISysExcelTemplateService _sysExcelTemplateService;
        private readonly static object _lock = new();

        public BaseCustomerService(
            IRepository<BaseCustomer,MasterDbContextLocator> baseCustomerRep
            ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
            ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
            ,ISysExcelTemplateService sysExcelTemplateService
        )
        {
            _baseCustomerRep = baseCustomerRep;
         _sysDictTypeRep = sysDictTypeRep;
         _sysDictDataRep = sysDictDataRep;
         _sysExcelTemplateService = sysExcelTemplateService;
        }

        /// <summary>
        /// åˆ†é¡µæŸ¥è¯¢å®¢æˆ·æ¡£æ¡ˆ
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("BaseCustomer/page")]
        public async Task<PageResult<BaseCustomerOutput>> Page([FromQuery] BaseCustomerSearch input)
        {
            var baseCustomers = await _baseCustomerRep.DetachedEntities
                                     .Where(!string.IsNullOrEmpty(input.CustCode), u => u.CustCode == input.CustCode)
                                     .Where(!string.IsNullOrEmpty(input.CustChinaName), u => EF.Functions.Like(u.CustChinaName, $"%{input.CustChinaName.Trim()}%"))
                                     .Where(!string.IsNullOrEmpty(input.CustEnglishName), u => u.CustEnglishName == input.CustEnglishName)
                                     .Where(!string.IsNullOrEmpty(input.MnemonicCode), u => u.MnemonicCode == input.MnemonicCode)
                                     .Where(input.CustType != null, u => u.CustType == input.CustType)
                                     .Where(!string.IsNullOrEmpty(input.CustTypeName), u => u.CustTypeName == input.CustTypeName)
                                     .Where(!string.IsNullOrEmpty(input.LinkMan), u => u.LinkMan == input.LinkMan)
                                     .Where(!string.IsNullOrEmpty(input.Phone), u => u.Phone == input.Phone)
                                     .Where(!string.IsNullOrEmpty(input.Email), u => u.Email == input.Email)
                                     .Where(!string.IsNullOrEmpty(input.ZipCode), u => u.ZipCode == input.ZipCode)
                                     .Where(!string.IsNullOrEmpty(input.Province), u => u.Province == input.Province)
                                     .Where(!string.IsNullOrEmpty(input.City), u => u.City == input.City)
                                     .Where(!string.IsNullOrEmpty(input.Address), u => u.Address == input.Address)
                                     .Where(input.IsDisabled != null, u => u.IsDisabled == input.IsDisabled)
                                     .Where(input.CreatedTime!=null, u => u.CreatedTime>=  Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
                                     .Where(input.UpdatedTime!=null, u => u.UpdatedTime>=  Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
                                     .Where(!string.IsNullOrEmpty(input.CreatedUserName), u => u.CreatedUserName == input.CreatedUserName)
                                     .Where(!string.IsNullOrEmpty(input.UpdatedUserName), u => u.UpdatedUserName == input.UpdatedUserName)
                                     .OrderBy(PageInputOrder.OrderBuilder<BaseCustomerSearch>(input))
                                     .ProjectToType<BaseCustomerOutput>()
                                     .ToADPagedListAsync(input.PageNo, input.PageSize);
            return baseCustomers;
        }

        /// <summary>
        /// ä¸åˆ†é¡µæŸ¥è¯¢å®¢æˆ·æ¡£æ¡ˆåˆ—表
        /// </summary>
        /// <param name="input">客户档案查询参数</param>
        /// <returns>(客户档案)实例列表</returns>
        [HttpGet("BaseCustomer/listNonPage")]
        public async Task<List<BaseCustomerOutput>> ListNonPageAsync([FromQuery] BaseCustomerSearchNonPage input)
        {
            var pCustCode = input.CustCode?.Trim() ?? "";
            var pCustChinaName = input.CustChinaName?.Trim() ?? "";
            var pCustEnglishName = input.CustEnglishName?.Trim() ?? "";
            var pMnemonicCode = input.MnemonicCode?.Trim() ?? "";
            var pCustType = input.CustType;
            var pCustTypeName = input.CustTypeName?.Trim() ?? "";
            var pLinkMan = input.LinkMan?.Trim() ?? "";
            var pPhone = input.Phone?.Trim() ?? "";
            var pEmail = input.Email?.Trim() ?? "";
            var pZipCode = input.ZipCode?.Trim() ?? "";
            var pProvince = input.Province?.Trim() ?? "";
            var pCity = input.City?.Trim() ?? "";
            var pAddress = input.Address?.Trim() ?? "";
            var pIsDisabled = input.IsDisabled;
            var pCreatedTime = input.CreatedTime;
            var pUpdatedTime = input.UpdatedTime;
            var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
            var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
            var baseCustomers = await _baseCustomerRep.DetachedEntities
                .Where(!string.IsNullOrEmpty(pCustCode), u => u.CustCode == pCustCode)
                .Where(!string.IsNullOrEmpty(pCustChinaName), u => EF.Functions.Like(u.CustChinaName, $"%{pCustChinaName}%")) 
                .Where(!string.IsNullOrEmpty(pCustEnglishName), u => u.CustEnglishName == pCustEnglishName)
                .Where(!string.IsNullOrEmpty(pMnemonicCode), u => u.MnemonicCode == pMnemonicCode)
                .Where(pCustType != null, u => u.CustType == pCustType)
                .Where(!string.IsNullOrEmpty(pCustTypeName), u => u.CustTypeName == pCustTypeName)
                .Where(!string.IsNullOrEmpty(pLinkMan), u => u.LinkMan == pLinkMan)
                .Where(!string.IsNullOrEmpty(pPhone), u => u.Phone == pPhone)
                .Where(!string.IsNullOrEmpty(pEmail), u => u.Email == pEmail)
                .Where(!string.IsNullOrEmpty(pZipCode), u => u.ZipCode == pZipCode)
                .Where(!string.IsNullOrEmpty(pProvince), u => u.Province == pProvince)
                .Where(!string.IsNullOrEmpty(pCity), u => u.City == pCity)
                .Where(!string.IsNullOrEmpty(pAddress), u => u.Address == pAddress)
                .Where(pIsDisabled != null, u => u.IsDisabled == pIsDisabled)
           .Where(input.CreatedTime!=null, u => u.CreatedTime>=  Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
           .Where(input.UpdatedTime!=null, u => u.UpdatedTime>=  Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
                .Where(!string.IsNullOrEmpty(pCreatedUserName), u => u.CreatedUserName == pCreatedUserName)
                .Where(!string.IsNullOrEmpty(pUpdatedUserName), u => u.UpdatedUserName == pUpdatedUserName)
            .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
            .ProjectToType<BaseCustomerOutput>()
            .ToListAsync();
            return baseCustomers;
        }

         /// <summary>
        /// èŽ·å–客户档案
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("BaseCustomer/detail")]
        public async Task<BaseCustomerOutput> Get([FromQuery] QueryeBaseCustomerInput input)
        {
            return (await _baseCustomerRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id)).Adapt<BaseCustomerOutput>();
        }

        /// <summary>
        /// èŽ·å–客户档案列表
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpGet("BaseCustomer/list")]
        public async Task<List<BaseCustomerOutput>> List([FromQuery] BaseCustomerInput input)
        {
            return await _baseCustomerRep.DetachedEntities.ProjectToType<BaseCustomerOutput>().ToListAsync();
        }    

        #region å¢žã€åˆ ã€æ”¹

        /// <summary>
        /// å¢žåŠ å®¢æˆ·æ¡£æ¡ˆ
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("BaseCustomer/add")]
        public async Task Add(AddBaseCustomerInput input)
        {
            var baseCustomer = input.Adapt<BaseCustomer>();
                        //验证
            await CheckExisit(baseCustomer);

            baseCustomer.CreatedUserId = baseCustomer.UpdatedUserId = SysHelper.GetUserId();
            baseCustomer.CreatedUserName = baseCustomer.UpdatedUserName = SysHelper.GetUserName();
            baseCustomer.CreatedTime = baseCustomer.UpdatedTime = SysHelper.GetNowTime();
            await _baseCustomerRep.InsertAsync(baseCustomer);
        }

        /// <summary>
        /// åˆ é™¤å®¢æˆ·æ¡£æ¡ˆ
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("BaseCustomer/delete")]
        public async Task Delete(DeleteBaseCustomerInput input)
        {
            var baseCustomer = await _baseCustomerRep.FirstOrDefaultAsync(u => u.Id == input.Id);
            await _baseCustomerRep.DeleteAsync(baseCustomer);
            
        }

        /// <summary>
        /// æ›´æ–°å®¢æˆ·æ¡£æ¡ˆ
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("BaseCustomer/edit")]
        public async Task Update(UpdateBaseCustomerInput input)
        {
            var isExist = await _baseCustomerRep.AnyAsync(u => u.Id == input.Id, false);
            if (!isExist) throw Oops.Oh(ErrorCode.D1002);

            var baseCustomer = input.Adapt<BaseCustomer>();
            //验证
            await CheckExisit(baseCustomer,true);

            baseCustomer.UpdatedUserId = SysHelper.GetUserId();
            baseCustomer.UpdatedUserName = SysHelper.GetUserName();
            baseCustomer.UpdatedTime = SysHelper.GetNowTime();
            await _baseCustomerRep.UpdateAsync(baseCustomer,ignoreNullValues:true);
        }

        #endregion

        #region å¯¼å…¥

        /// <summary>
        /// Excel模板导入客户档案功能
        /// </summary>
        /// <param name="file">Excel模板文件</param>
        /// <returns>导入的记录数</returns>
        [HttpPost("BaseCustomer/importExcel")]
        public async Task<int> ImportExcelAsync(IFormFile file)
        { 
            int _HeadStartLine = 2;//第1行是说明,第2行是列名
            int _DataStartLine = 3;//第3行开始是数据

            DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
            var addList =await CommonImport(importDataTable, _DataStartLine);

            lock (_lock)
            {
                _baseCustomerRep.InsertAsync(addList);
               
            }
            await Task.CompletedTask;
            return addList.Count;
        }

        /// <summary>
        ///  DataTable转换实体对象列表
        /// </summary>
        /// <param name="dataTable"></param>
        /// <param name="dataStartLine">模版列名开始行</param>
        /// <returns></returns>
        private async Task<List<BaseCustomer>> CommonImport(DataTable dataTable, int dataStartLine)
        {

            var details = new List<BaseCustomer>();
            int index = dataStartLine;//模版列名开始行
            foreach (System.Data.DataRow row in dataTable.Rows)
            {
                index++;

               //导入模版定制化代码（替换模版使用）
                                          
                           var addItem = new BaseCustomer()
                            {
                               CreatedTime = SysHelper.GetNowTime(),
                               CreatedUserId = SysHelper.GetUserId(),
                               CreatedUserName = SysHelper.GetUserName(),
                               UpdatedTime = SysHelper.GetNowTime(),
                               UpdatedUserId = SysHelper.GetUserId(),
                               UpdatedUserName = SysHelper.GetUserName()
                             };
                          #region å®šä¹‰å˜é‡
                           var _CustCode = "";//客户编号
                           var _CustChinaName = "";//客户中文名称
                           var _CustEnglishName = "";//客户英文名称
                           var _MnemonicCode = "";//助记码
                           var _CustType = "";//类型
                           var _CustTypeName = "";//类型名称
                           var _LinkMan = "";//联系人
                           var _Phone = "";//电话
                           var _Email = "";//电子邮件
                           var _ZipCode = "";//邮编
                           var _Province = "";//省份
                           var _City = "";//城市
                           var _Address = "";//地址
                           var _IsDisabled = "";//是否禁用
                           var _Id = "";//Id主键
                          #endregion
                          
                          
                          #region å–值
                           _CustCode = row["客户编号"]?.ToString() ;
                           _CustChinaName = row["客户中文名称"]?.ToString() ;
                           _CustEnglishName = row["客户英文名称"]?.ToString() ;
                           _MnemonicCode = row["助记码"]?.ToString() ;
                           _CustType = row["类型"]?.ToString() ;
                           _CustTypeName = row["类型名称"]?.ToString() ;
                           _LinkMan = row["联系人"]?.ToString() ;
                           _Phone = row["电话"]?.ToString() ;
                           _Email = row["电子邮件"]?.ToString() ;
                           _ZipCode = row["邮编"]?.ToString() ;
                           _Province = row["省份"]?.ToString() ;
                           _City = row["城市"]?.ToString() ;
                           _Address = row["地址"]?.ToString() ;
                           _IsDisabled = row["是否禁用"]?.ToString() ;
                           _Id = row["Id主键"]?.ToString() ;
                          #endregion
                          
                          
                          #region éªŒè¯
                          
                          if (string.IsNullOrEmpty(_CustCode))
                          {
                            throw Oops.Oh($"第{index}行[客户编号]{_CustCode}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_CustCode))
                          {
                                addItem.CustCode = (string)_CustCode;
                           }
                          
                          if (string.IsNullOrEmpty(_CustChinaName))
                          {
                            throw Oops.Oh($"第{index}行[客户中文名称]{_CustChinaName}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_CustChinaName))
                          {
                                addItem.CustChinaName = (string)_CustChinaName;
                           }
                          if(!string.IsNullOrEmpty(_CustEnglishName))
                          {
                                addItem.CustEnglishName = (string)_CustEnglishName;
                           }
                          if(!string.IsNullOrEmpty(_MnemonicCode))
                          {
                                addItem.MnemonicCode = (string)_MnemonicCode;
                           }
                          
                          if (string.IsNullOrEmpty(_CustType))
                          {
                            throw Oops.Oh($"第{index}行[类型]{_CustType}不能为空！");
                          }
                          
                          if(!string.IsNullOrEmpty(_CustType))
                          {
                              if (!int.TryParse(_CustType, out int outCustType)&&!string.IsNullOrEmpty(_CustType))
                              {
                                 throw Oops.Oh($"第{index}行[类型]{_CustType}值不正确！");
                              }
                              if (outCustType <= 0&&!string.IsNullOrEmpty(_CustType))
                              {
                                 throw Oops.Oh($"第{index}行[类型]{_CustType}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.CustType = outCustType;
                              }
                          
                          }
                          if(!string.IsNullOrEmpty(_CustTypeName))
                          {
                                addItem.CustTypeName = (string)_CustTypeName;
                           }
                          if(!string.IsNullOrEmpty(_LinkMan))
                          {
                                addItem.LinkMan = (string)_LinkMan;
                           }
                          if(!string.IsNullOrEmpty(_Phone))
                          {
                                addItem.Phone = (string)_Phone;
                           }
                          if(!string.IsNullOrEmpty(_Email))
                          {
                                addItem.Email = (string)_Email;
                           }
                          if(!string.IsNullOrEmpty(_ZipCode))
                          {
                                addItem.ZipCode = (string)_ZipCode;
                           }
                          if(!string.IsNullOrEmpty(_Province))
                          {
                                addItem.Province = (string)_Province;
                           }
                          if(!string.IsNullOrEmpty(_City))
                          {
                                addItem.City = (string)_City;
                           }
                          if(!string.IsNullOrEmpty(_Address))
                          {
                                addItem.Address = (string)_Address;
                           }
                          if(!string.IsNullOrEmpty(_IsDisabled))
                          {
                            if(!_IsDisabled.Equals("是") && !_IsDisabled.Equals("否"))
                             {
                               throw Oops.Oh($"第{index}行[是否禁用]{_IsDisabled}值不正确！");
                             }
                             else
                             {
                               bool outIsDisabled = _IsDisabled.Equals("是") ? true : false;
                               addItem.IsDisabled = outIsDisabled;
                             }
                             }
                          
                          if(!string.IsNullOrEmpty(_Id))
                          {
                              if (!long.TryParse(_Id, out long outId)&&!string.IsNullOrEmpty(_Id))
                              {
                                 throw Oops.Oh($"第{index}行[Id主键]{_Id}值不正确！");
                              }
                              if (outId <= 0&&!string.IsNullOrEmpty(_Id))
                              {
                                 throw Oops.Oh($"第{index}行[Id主键]{_Id}值不能小于等于0！");
                              }
                              else
                              {
                                 addItem.Id = outId;
                              }
                          
                          }
                          #endregion
                          

              
                details.Add(addItem);
            }
              //验重
              await CheckExisitForImport(details);
            
            return details;
        }

        /// <summary>
        /// æ ¹æ®ç‰ˆæœ¬ä¸‹è½½å®¢æˆ·æ¡£æ¡ˆçš„Excel导入模板
        /// </summary>
        /// <param name="version">模板版本</param>
        /// <returns>下载的模板文件</returns>
        [HttpGet("BaseCustomer/downloadExcelTemplate")]
        public IActionResult DownloadExcelTemplate([FromQuery] string version)
        {
            string _path = TemplateConst.EXCEL_TEMPLATEFILE_导入模版路径 + $"\\BaseCustomer{TemplateConst.EXCEL_TEMPLATEFILE_导入模版名称后缀}.xlsx";
            var fileName = HttpUtility.UrlEncode($"导入模板(客户档案).xlsx", Encoding.GetEncoding("UTF-8"));
            return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
        }

        #endregion

        #region ç§æœ‰æ–¹æ³•

        /// <summary>
        /// æ ¹æ®è”合主键验证数据是否已存在-数据库
        /// </summary>
        /// <param name="input"></param>
        /// <param name="isEdit"></param>
        /// <returns></returns>
        private async Task CheckExisit( BaseCustomer input,bool isEdit=false)
        {
           

           
           bool isExist = false;
           if (!isEdit)//新增
           {
                   //数据是否存在重复
                   isExist = await _baseCustomerRep.AnyAsync(u =>
                                   u.CustCode.Equals(input.CustCode)
                   ,false);
          }
           else//编辑 
          {

          
                
                 //当前编辑数据以外是否存在重复
                  isExist = await _baseCustomerRep.AnyAsync(u => 
                                    u.Id != input.Id
                                    &&u.CustCode.Equals(input.CustCode)
                    ,false);
               }
               
        

            if (isExist) throw Oops.Oh(ErrorCode.E0001);
       }
        
        /// <summary>
        /// æ ¹æ®è”合主键验证数据是否已存在-导入时验证
        /// </summary>
        /// <param name="inputs"></param>
        /// <returns></returns>
        private async Task CheckExisitForImport(List<BaseCustomer> inputs)
        { 
            //根据联合主键验证表格中中是否已存在相同数据  
                 if (inputs?.Count <= 0)
                 {
                     throw Oops.Oh($"导入数据不能为空");
                 }
                 //数据是否重复
                 var existExcelItem = inputs.GroupBy(g => new {
                                               g.CustCode
                                               })
                                               .Where(g => g.Count() > 1)
                                               .Select(s => new {
                                               s.Key.CustCode
                                               }).FirstOrDefault();
                 if (existExcelItem != null)
                 {
                   var baseCustomer = existExcelItem.Adapt<BaseCustomer>();
                   var item= existExcelItem.Adapt<BaseCustomer>();
                   throw Oops.Oh($"导入的表格中,客户编号[{item.CustCode}]已存在");
                 }
                      



    //根据联合主键验证数据库中是否已存在相同数据
                 var existDBItem = await _baseCustomerRep.DetachedEntities.FirstOrDefaultAsync(w=> 
                                                                         inputs.Select(s=>""
                                                                           +s.CustCode
                                                                        )
                                                                        .Contains(""
                                                                         +w.CustCode
                  ));
                  if (existDBItem != null)
                 {
                   var baseCustomer = existExcelItem.Adapt<BaseCustomer>();
                   var item= existExcelItem.Adapt<BaseCustomer>();
                   throw Oops.Oh($"系统中,客户编号[{item.CustCode}]已存在");
                 }
        }

        #endregion
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,316 @@
using Admin.NET.Core;
using Admin.NET.Core.Service;
using System.ComponentModel.DataAnnotations;

namespace Admin.NET.Application
{    
    
    /// <summary>
    /// å®¢æˆ·æ¡£æ¡ˆæŸ¥è¯¢å‚æ•°
    /// </summary>
    public class BaseCustomerSearch : PageInputBase
    {
        /// <summary>
        /// å®¢æˆ·ç¼–号
        /// </summary>
        public virtual string CustCode { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ä¸­æ–‡åç§°
        /// </summary>
        public virtual string CustChinaName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·è‹±æ–‡åç§°
        /// </summary>
        public virtual string CustEnglishName { get; set; }
        
        /// <summary>
        /// åŠ©è®°ç 
        /// </summary>
        public virtual string MnemonicCode { get; set; }
        
        /// <summary>
        /// ç±»åž‹
        /// </summary>
        public virtual int? CustType { get; set; }
        
        /// <summary>
        /// ç±»åž‹åç§°
        /// </summary>
        public virtual string CustTypeName { get; set; }
        
        /// <summary>
        /// è”系人
        /// </summary>
        public virtual string LinkMan { get; set; }
        
        /// <summary>
        /// ç”µè¯
        /// </summary>
        public virtual string Phone { get; set; }
        
        /// <summary>
        /// ç”µå­é‚®ä»¶
        /// </summary>
        public virtual string Email { get; set; }
        
        /// <summary>
        /// é‚®ç¼–
        /// </summary>
        public virtual string ZipCode { get; set; }
        
        /// <summary>
        /// çœä»½
        /// </summary>
        public virtual string Province { get; set; }
        
        /// <summary>
        /// åŸŽå¸‚
        /// </summary>
        public virtual string City { get; set; }
        
        /// <summary>
        /// åœ°å€
        /// </summary>
        public virtual string Address { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public virtual List<string> CreatedTime { get; set; }
        
        /// <summary>
        /// æ›´æ–°æ—¶é—´
        /// </summary>
        public virtual List<string> UpdatedTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…名称
        /// </summary>
        public virtual string CreatedUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹è€…名称
        /// </summary>
        public virtual string UpdatedUserName { get; set; }
        
    }

        /// <summary>
    /// å®¢æˆ·æ¡£æ¡ˆä¸åˆ†é¡µæŸ¥è¯¢å‚æ•°
    /// </summary>
    public class BaseCustomerSearchNonPage : PageInputNonPageBase
    {
        /// <summary>
        /// å®¢æˆ·ç¼–号
        /// </summary>
        public virtual string CustCode { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ä¸­æ–‡åç§°
        /// </summary>
        public virtual string CustChinaName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·è‹±æ–‡åç§°
        /// </summary>
        public virtual string CustEnglishName { get; set; }
        
        /// <summary>
        /// åŠ©è®°ç 
        /// </summary>
        public virtual string MnemonicCode { get; set; }
        
        /// <summary>
        /// ç±»åž‹
        /// </summary>
        public virtual int? CustType { get; set; }
        
        /// <summary>
        /// ç±»åž‹åç§°
        /// </summary>
        public virtual string CustTypeName { get; set; }
        
        /// <summary>
        /// è”系人
        /// </summary>
        public virtual string LinkMan { get; set; }
        
        /// <summary>
        /// ç”µè¯
        /// </summary>
        public virtual string Phone { get; set; }
        
        /// <summary>
        /// ç”µå­é‚®ä»¶
        /// </summary>
        public virtual string Email { get; set; }
        
        /// <summary>
        /// é‚®ç¼–
        /// </summary>
        public virtual string ZipCode { get; set; }
        
        /// <summary>
        /// çœä»½
        /// </summary>
        public virtual string Province { get; set; }
        
        /// <summary>
        /// åŸŽå¸‚
        /// </summary>
        public virtual string City { get; set; }
        
        /// <summary>
        /// åœ°å€
        /// </summary>
        public virtual string Address { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
         public virtual List<DateTimeOffset>? CreatedTime { get; set; }
        
        /// <summary>
        /// æ›´æ–°æ—¶é—´
        /// </summary>
         public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…名称
        /// </summary>
        public virtual string CreatedUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹è€…名称
        /// </summary>
        public virtual string UpdatedUserName { get; set; }
        
    }

    /// <summary>
    /// å®¢æˆ·æ¡£æ¡ˆè¾“入参数
    /// </summary>
    public class BaseCustomerInput
    {
        /// <summary>
        /// å®¢æˆ·ç¼–号
        /// </summary>
        [Required(ErrorMessage = "客户编号不能为空")]
        public virtual string CustCode { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ä¸­æ–‡åç§°
        /// </summary>
        [Required(ErrorMessage = "客户中文名称不能为空")]
        public virtual string CustChinaName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·è‹±æ–‡åç§°
        /// </summary>
        public virtual string CustEnglishName { get; set; }
        
        /// <summary>
        /// åŠ©è®°ç 
        /// </summary>
        public virtual string MnemonicCode { get; set; }
        
        /// <summary>
        /// ç±»åž‹
        /// </summary>
        [Required(ErrorMessage = "类型不能为空")]
        public virtual int CustType { get; set; }
        
        /// <summary>
        /// ç±»åž‹åç§°
        /// </summary>
        public virtual string CustTypeName { get; set; }
        
        /// <summary>
        /// è”系人
        /// </summary>
        public virtual string LinkMan { get; set; }
        
        /// <summary>
        /// ç”µè¯
        /// </summary>
        public virtual string Phone { get; set; }
        
        /// <summary>
        /// ç”µå­é‚®ä»¶
        /// </summary>
        public virtual string Email { get; set; }
        
        /// <summary>
        /// é‚®ç¼–
        /// </summary>
        public virtual string ZipCode { get; set; }
        
        /// <summary>
        /// çœä»½
        /// </summary>
        public virtual string Province { get; set; }
        
        /// <summary>
        /// åŸŽå¸‚
        /// </summary>
        public virtual string City { get; set; }
        
        /// <summary>
        /// åœ°å€
        /// </summary>
        public virtual string Address { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public virtual bool? IsDisabled { get; set; }
        
    }

    /// <summary>
    /// å®¢æˆ·æ¡£æ¡ˆæ–°å¢žå‚æ•°
    /// </summary>
    public class AddBaseCustomerInput : BaseCustomerInput
    {
    }

    /// <summary>
    /// å®¢æˆ·æ¡£æ¡ˆåˆ é™¤å‚æ•°
    /// </summary>
    public class DeleteBaseCustomerInput : BaseId
    {
    }

    /// <summary>
    /// å®¢æˆ·æ¡£æ¡ˆæ›´æ–°å‚æ•°
    /// </summary>
    public class UpdateBaseCustomerInput : BaseCustomerInput
    {
        /// <summary>
        /// Id主键
        /// </summary>
        [Required(ErrorMessage = "Id主键不能为空")]
        public long? Id { get; set; }
        
    }

    /// <summary>
    /// å®¢æˆ·æ¡£æ¡ˆèŽ·å–单个参数
    /// </summary>
    public class QueryeBaseCustomerInput : BaseId
    {

    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,107 @@
using Admin.NET.Core.Util.LowCode.Dto;
using System;

namespace Admin.NET.Application
{
    /// <summary>
    /// å®¢æˆ·æ¡£æ¡ˆè¾“出参数
    /// </summary>
    public class BaseCustomerOutput
    {
        /// <summary>
        /// å®¢æˆ·ç¼–号
        /// </summary>
        public string CustCode { get; set; }
        
        /// <summary>
        /// å®¢æˆ·ä¸­æ–‡åç§°
        /// </summary>
        public string CustChinaName { get; set; }
        
        /// <summary>
        /// å®¢æˆ·è‹±æ–‡åç§°
        /// </summary>
        public string CustEnglishName { get; set; }
        
        /// <summary>
        /// åŠ©è®°ç 
        /// </summary>
        public string MnemonicCode { get; set; }
        
        /// <summary>
        /// ç±»åž‹
        /// </summary>
        public int CustType { get; set; }
        
        /// <summary>
        /// ç±»åž‹åç§°
        /// </summary>
        public string CustTypeName { get; set; }
        
        /// <summary>
        /// è”系人
        /// </summary>
        public string LinkMan { get; set; }
        
        /// <summary>
        /// ç”µè¯
        /// </summary>
        public string Phone { get; set; }
        
        /// <summary>
        /// ç”µå­é‚®ä»¶
        /// </summary>
        public string Email { get; set; }
        
        /// <summary>
        /// é‚®ç¼–
        /// </summary>
        public string ZipCode { get; set; }
        
        /// <summary>
        /// çœä»½
        /// </summary>
        public string Province { get; set; }
        
        /// <summary>
        /// åŸŽå¸‚
        /// </summary>
        public string City { get; set; }
        
        /// <summary>
        /// åœ°å€
        /// </summary>
        public string Address { get; set; }
        
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }
        
        /// <summary>
        /// Id主键
        /// </summary>
        public long? Id { get; set; }
        
        /// <summary>
        /// åˆ›å»ºæ—¶é—´
        /// </summary>
        public DateTimeOffset? CreatedTime { get; set; }
        
        /// <summary>
        /// æ›´æ–°æ—¶é—´
        /// </summary>
        public DateTimeOffset? UpdatedTime { get; set; }
        
        /// <summary>
        /// åˆ›å»ºè€…名称
        /// </summary>
        public string CreatedUserName { get; set; }
        
        /// <summary>
        /// ä¿®æ”¹è€…名称
        /// </summary>
        public string UpdatedUserName { get; set; }
        
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/IBaseCustomerService.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
using Admin.NET.Core;
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;

namespace Admin.NET.Application
{
    public interface IBaseCustomerService
    {
        Task<BaseCustomerOutput> Get([FromQuery] QueryeBaseCustomerInput input);
        Task<List<BaseCustomerOutput>> List([FromQuery] BaseCustomerInput input);
        Task<PageResult<BaseCustomerOutput>> Page([FromQuery] BaseCustomerSearch input);
        Task<List<BaseCustomerOutput>> ListNonPageAsync([FromQuery] BaseCustomerSearchNonPage input);
        
        Task Add(AddBaseCustomerInput input);
        Task Update(UpdateBaseCustomerInput input);
        Task Delete(DeleteBaseCustomerInput input);
        Task<int> ImportExcelAsync(IFormFile file);
        IActionResult DownloadExcelTemplate(string version);
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Map/BaseCustomerMapper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
using Mapster;
using Admin.NET.Core;

namespace Admin.NET.Application
{
    public class BaseCustomerMapper : IRegister
    {
        public void Register(TypeAdapterConfig config)
        {
            config.ForType<AddBaseCustomerInput, BaseCustomer>()
            ;
            config.ForType<UpdateBaseCustomerInput, BaseCustomer>()
            ;
            config.ForType<BaseCustomer, BaseCustomerOutput>()
            ;
        }
    }
}

 iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx

Binary files differ