From 98702bbaadf789a36bf1d16223964f4966a933e1 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 17:06:49 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/excelForm.vue | 181 ++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs | 316 ++++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue | 124 +
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue | 897 ++++++------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue | 151 ++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue | 136 ++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml | 481 +++++++
iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js | 114 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/IBaseCustomerService.cs | 22
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue | 11
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Map/BaseCustomerMapper.cs | 18
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs | 520 +++++++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer.vue | 115 +
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 158 ++
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue | 712 ++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs | 107 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx | 0
17 files changed, 3,632 insertions(+), 431 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js
new file mode 100644
index 0000000..9f2dc11
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Web/src/api/modular/main/WmsBase/BaseCustomerManage.js
@@ -0,0 +1,114 @@
+锘縤mport { 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
+ })
+}
+
+
+/**
+ * 瀵煎嚭瀹㈡埛妗ｆ鐨凟xcel鏂囦欢
+ *
+ * @author ly
+ */
+export function BaseCustomerToExcel (parameter) {
+ return axios({
+ url: '/BaseCustomer/toExcel',
+ method: 'get',
+ params: parameter,
+ responseType: 'blob'
+ })
+}
+
+/**
+ * 瀵煎叆瀹㈡埛妗ｆ鐨凟xcel鏂囦欢
+ *
+ * @author ly
+ */
+export function BaseCustomerImportExcel (data, parameter) {
+ return axios({
+ url: '/BaseCustomer/importExcel',
+ method: 'post',
+ data: data,
+ params: parameter
+
+ })
+}
+
+
+/**
+ * 涓嬭浇瀹㈡埛妗ｆ鐨凟xcel瀵煎叆妯℃澘
+ *
+ * @author ly
+ */
+export function BaseCustomerDownloadExcelTemplate(parameter) {
+ return axios({
+ url: '/BaseCustomer/downloadExcelTemplate',
+ method: 'get',
+ params: parameter,
+ responseType: 'blob'
+ })
+}
+
+
+
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/addForm.vue
new file mode 100644
index 0000000..98ee481
--- /dev/null
+++ b/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>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/editForm.vue
new file mode 100644
index 0000000..56a3beb
--- /dev/null
+++ b/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>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/excelForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/excelForm.vue
new file mode 100644
index 0000000..3f7ba25
--- /dev/null
+++ b/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>璇烽�夋嫨瑕佸鍏ョ殑鏁版嵁鏂囦欢锛圗xcel鏍煎紡锛�</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>
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/BaseCustomer/index.vue
new file mode 100644
index 0000000..8bb4943
--- /dev/null
+++ b/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'
+ //鑷畾涔塼able楂樺害
+ 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>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue
index db1ae51..e7dc390 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsFactory/index.vue
+++ b/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'
- //鑷畾涔塼able楂樺害
- 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'
+//鑷畾涔塼able楂樺害
+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>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
index 3744a08..9666405 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
+++ b/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 @@
//鑷畾涔塼able楂樺害
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 {
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
new file mode 100644
index 0000000..574cf4b
--- /dev/null
+++ b/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>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addForm.vue
new file mode 100644
index 0000000..faa2ec8
--- /dev/null
+++ b/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="璇疯緭鍏RP缂栧彿" 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="璇疯緭鍏BC鍒嗙被鍚嶇О" v-decorator="['aBCClassName']" />
+ </a-form-item>
+ <a-form-item label="ABC鍒嗙被" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+ <a-input-number placeholder="璇疯緭鍏BC鍒嗙被" 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>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer.vue
new file mode 100644
index 0000000..a2bfea8
--- /dev/null
+++ b/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>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
index 1b5e653..5046de5 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Admin.NET.Application.xml
+++ b/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>
+ 鏍规嵁鐗堟湰涓嬭浇瀹㈡埛妗ｆ鐨凟xcel瀵煎叆妯℃澘
+ </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>
宸ュ巶淇℃伅琛ㄦ煡璇㈠弬鏁�
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
new file mode 100644
index 0000000..b8be889
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
@@ -0,0 +1,520 @@
+锘縰sing 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>
+ /// 鏍规嵁鐗堟湰涓嬭浇瀹㈡埛妗ｆ鐨凟xcel瀵煎叆妯℃澘
+ /// </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
+ }
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
new file mode 100644
index 0000000..0ff0c25
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
@@ -0,0 +1,316 @@
+锘縰sing 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
+ {
+
+ }
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs
new file mode 100644
index 0000000..7c22cfa
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerOutput.cs
@@ -0,0 +1,107 @@
+锘縰sing 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; }
+
+ }
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/IBaseCustomerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/IBaseCustomerService.cs
new file mode 100644
index 0000000..15741fe
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/IBaseCustomerService.cs
@@ -0,0 +1,22 @@
+锘縰sing 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);
+ }
+}
\ No newline at end of file
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Map/BaseCustomerMapper.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Map/BaseCustomerMapper.cs
new file mode 100644
index 0000000..f17fd66
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Map/BaseCustomerMapper.cs
@@ -0,0 +1,18 @@
+锘縰sing 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>()
+ ;
+ }
+ }
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx
new file mode 100644
index 0000000..0b5541f
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/BaseCustomerImport.xlsx
Binary files differ
--
Gitblit v1.9.3