From d6b83674e0e2a7b9acd288fb657e44f7ef500f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Wed, 9 Nov 2022 15:32:07 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A2=E8=88=B1=E6=89=93=E5=8D=B0=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modular/main/bookingprinttemplate.js |  21 +-
 src/views/main/EDI/123.json                  |  26 --
 src/views/main/Printing/addForm.vue          |  19 +-
 src/views/main/Printing/editForm.vue         | 118 +++++---
 src/views/main/Printing/index.vue            |  23 +-
 src/views/main/WebSiteaccount/addForm.vue    | 240 ++++++++++++++++
 src/views/main/WebSiteaccount/editForm.vue   | 245 ++++++++++++++++
 src/views/main/WebSiteaccount/index.vue      | 279 +++++++++++++++++++
 8 files changed, 887 insertions(+), 84 deletions(-)
 delete mode 100644 src/views/main/EDI/123.json
 create mode 100644 src/views/main/WebSiteaccount/addForm.vue
 create mode 100644 src/views/main/WebSiteaccount/editForm.vue
 create mode 100644 src/views/main/WebSiteaccount/index.vue

diff --git a/src/api/modular/main/bookingprinttemplate.js b/src/api/modular/main/bookingprinttemplate.js
index e1fa829..1fde8b3 100644
--- a/src/api/modular/main/bookingprinttemplate.js
+++ b/src/api/modular/main/bookingprinttemplate.js
@@ -39,10 +39,17 @@ export function BookingPrintTemplateAdd(parameter) {
  * @author Myshipping
  */
 export function BookingPrintTemplateEdit(parameter) {
+  let params = new FormData()
+  params.append('file', parameter.file)
+  Object.keys(parameter.data).forEach(item => {
+    params.append(`${item}`, parameter.data[item])
+  })
+  console.log(parameter)
   return axios({
     url: '/BookingPrintTemplate/edit',
     method: 'post',
-    data: parameter
+    data: params,
+    headers: { 'Content-type': 'multipart/form-data;charset=utf-8' }
   })
 }
 
@@ -73,3 +80,15 @@ export function SysTenantPage() {
     }
   })
 }
+/**
+ * 下载模板文件
+ *
+ * @author Myshipping
+ */
+export function BookingPrintTemplateDownload(parameter) {
+  return axios({
+    url: '/BookingPrintTemplate/download',
+    method: 'get',
+    params: parameter
+  })
+}
diff --git a/src/views/main/EDI/123.json b/src/views/main/EDI/123.json
deleted file mode 100644
index dea6c97..0000000
--- a/src/views/main/EDI/123.json
+++ /dev/null
@@ -1,26 +0,0 @@
-"edicode": "string",
-  "ediname": "string",
-  "serverip": "string",
-  "foldername": "string",
-  "username": "string",
-  "password": "string",
-  "sendcode": "string",
-  "receivecode": "string",
-  "sendname": "string",
-  "sendattn": "string",
-  "sendtel": "string",
-  "sendemail": "string",
-  "sendcompanycode": "string",
-  "sendsubcompanycode": "string",
-  "carrierid": "string",
-  "receiveemail": "string",
-  "receivesiemail": "string",
-  "receiveop": "string",
-  "receivesale": "string",
-  "receivedept": "string",
-  "shippertel": "string",
-  "consigneetel": "string",
-  "notifypartytel": "string",
-  "isusetel": "string",
-  "tenantId": 0,
-  "tenantName": "string"
\ No newline at end of file
diff --git a/src/views/main/Printing/addForm.vue b/src/views/main/Printing/addForm.vue
index 78b83ee..b1a5b29 100644
--- a/src/views/main/Printing/addForm.vue
+++ b/src/views/main/Printing/addForm.vue
@@ -12,15 +12,11 @@
         <a-row>
           <a-col :span="8">
             <a-form-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <!-- <a-input
-                placeholder="请输入类型名称"
-                v-decorator="['typeName', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
-              /> -->
               <a-select
                 placeholder="请输入类型名称"
-                v-decorator="['typeName', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
+                v-decorator="['typeCode', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
               >
-                <a-select-option v-for="item in TypeData" :key="item.id" :value="item.value">
+                <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
                   {{ item.value }}
                 </a-select-option>
               </a-select>
@@ -28,10 +24,6 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="租户名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <!-- <a-input
-                placeholder="请输入租户名称"
-                v-decorator="['tenantName', { rules: [{ required: true, message: '请输入租户名称！' }] }]"
-              /> -->
               <a-select
                 placeholder="请输入租户名称"
                 v-decorator="['tenantName', { rules: [{ required: true, message: '请输入租户名称！' }] }]"
@@ -127,6 +119,13 @@ export default {
               values.tenantId = item.tenantId
             }
           })
+          this.TypeData.forEach(item => {
+            if (values.typeCode == item.code) {
+              console.log(item)
+              values.TypeName = item.value
+            }
+          })
+          console.log(values)
           BookingPrintTemplateAdd({ file: this.file, data: values })
             .then(res => {
               if (res.success) {
diff --git a/src/views/main/Printing/editForm.vue b/src/views/main/Printing/editForm.vue
index b07dd50..5a8a062 100644
--- a/src/views/main/Printing/editForm.vue
+++ b/src/views/main/Printing/editForm.vue
@@ -12,27 +12,41 @@
         <a-row>
           <a-col :span="8">
             <a-form-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
+              <a-select
                 placeholder="请输入类型名称"
-                v-decorator="['typeName', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
-              />
+                v-decorator="['typeCode', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
+              >
+                <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
+                  {{ item.value }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="8">
             <a-form-item label="租户名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
+              <a-select
                 placeholder="请输入租户名称"
                 v-decorator="['tenantName', { rules: [{ required: true, message: '请输入租户名称！' }] }]"
-              />
+              >
+                <a-select-option v-for="item in SysTenantData" :key="item.id" :value="item.name">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-upload :file-list="fileList" :before-upload="beforeUpload" @remove="handleRemove">
-              <a-button>
-                <upload-outlined></upload-outlined>
-                Select File
-              </a-button>
-            </a-upload>
+            <a-form-item>
+              <a-upload
+                name="file"
+                :file-list="fileList"
+                @change="handleChange"
+                :customRequest="customRequest"
+                :multiple="false"
+                :style="{ marginTop: '4px' }"
+              >
+                <a-button> <a-icon type="upload" /> 文件上传 </a-button>
+              </a-upload>
+            </a-form-item>
           </a-col>
         </a-row>
       </a-form>
@@ -41,11 +55,15 @@
 </template>
 
 <script>
-import { BookingPrintTemplateEdit } from '@/api/modular/main/bookingprinttemplate'
+import { BookingPrintTemplateEdit, SysTenantPage } from '@/api/modular/main/bookingprinttemplate'
+import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
-      fileList: '',
+      TypeData: [],
+      SysTenantData: [],
+      file: {},
+      fileList: [],
       labelCol: {
         xs: { span: 24 },
         sm: { span: 7 }
@@ -54,52 +72,45 @@ export default {
         xs: { span: 24 },
         sm: { span: 15 }
       },
-      typeData: [],
       visible: false,
       confirmLoading: false,
-      form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      data: {}
     }
   },
+  mounted() {
+    SysTenantPage().then(res => {
+      console.log(res.data)
+      this.SysTenantData = res.data.rows
+    })
+    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '348569545515077' }).then(res => {
+      this.TypeData = res.data.rows
+      console.log(this.TypeData, 11111)
+    })
+  },
   methods: {
-    beforeUpload(file) {
-      console.log('beforeUpload', file)
+    customRequest(data) {
+      this.file = data.file
     },
-    handleRemove(file) {
-      console.log('handleRemove', file)
+    handleChange(info) {
+      this.fileList = [info.file]
     },
     // 初始化方法
     edit(record) {
+      this.data = record
       console.log(record)
       this.visible = true
       const typeOption = this.$options
       this.typeData = typeOption.filters['dictData']('edi_type')
       setTimeout(() => {
         this.form.setFieldsValue({
-          addr: record.addr,
-          addrEN: record.addrEN,
-          chief: record.chief,
-          city: record.city,
-          createdTime: record.createdTime,
-          createdUserId: record.createdUserId,
-          createdUserName: record.createdUserName,
-          email: record.email,
-          fullName: record.fullName,
-          fullNameEN: record.fullNameEN,
+          typeCode: record.typeCode,
+          typeName: record.typeName,
+          filePath: record.filePath,
+          fileName: record.fileName,
+          tenantName: record.tenantName,
           id: record.id,
-          invAddrTel: record.invAddrTel,
-          invTitle: record.invTitle,
-          isDeleted: record.isDeleted,
-          province: record.province,
-          qq: record.qq,
-          rmbAccount: record.rmbAccount,
-          rmbBank: record.rmbBank,
-          shortName: record.shortName,
-          taxNO: record.taxNO,
-          tel: record.tel,
-          tenantId: record.tenantId,
-          usdAccount: record.usdAccount,
-          usdBank: record.usdBank,
-          webUrl: record.webUrl
+          tenantId: record.tenantId
         })
         console.log(this.form.getFieldsValue())
       }, 100)
@@ -118,8 +129,21 @@ export default {
               values[key] = JSON.stringify(values[key])
             }
           }
-          console.log(this.form, values.id)
-          BookingPrintTemplateEdit(values)
+          this.SysTenantData.forEach(item => {
+            if (values.tenantName == item.tenantName) {
+              values.tenantId = item.tenantId
+            }
+          })
+          this.TypeData.forEach(item => {
+            if (values.typeCode == item.code) {
+              console.log(item)
+              values.TypeName = item.value
+            }
+          })
+          console.log(this.form.getFieldsValue(), 1111)
+          values.id = this.data.id
+          console.log(values)
+          BookingPrintTemplateEdit({ file: this.file, data: values })
             .then(res => {
               if (res.success) {
                 this.$message.success('编辑成功')
@@ -129,8 +153,12 @@ export default {
               } else {
                 this.$message.error('编辑失败') //  + res.message
               }
+              this.file = {}
+              this.fileList = []
             })
             .finally(res => {
+              this.file = {}
+              this.fileList = []
               this.confirmLoading = false
             })
         } else {
diff --git a/src/views/main/Printing/index.vue b/src/views/main/Printing/index.vue
index 37869b7..3f72075 100644
--- a/src/views/main/Printing/index.vue
+++ b/src/views/main/Printing/index.vue
@@ -67,7 +67,11 @@
           :title="item.title"
           :align="item.align"
           v-if="item.checked"
-        ></vxe-column>
+        >
+          <template #default="{ row }" v-if="item.title == '文件名称'">
+            <a @click="FnDFile(row)">{{ row.fileName }}</a>
+          </template>
+        </vxe-column>
         <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
             <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
@@ -101,7 +105,11 @@
   </div>
 </template>
 <script>
-import { BookingPrintTemplatePage, BookingPrintTemplateDelete } from '@/api/modular/main/bookingprinttemplate'
+import {
+  BookingPrintTemplatePage,
+  BookingPrintTemplateDelete,
+  BookingPrintTemplateDownload
+} from '@/api/modular/main/bookingprinttemplate'
 import { DjyCustomerGet, DjyUserConfigAdd } from '@/api/modular/main/CustomerInformationManagement'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
@@ -154,6 +162,17 @@ export default {
     this.init()
   },
   methods: {
+    FnDFile(Data) {
+      BookingPrintTemplateDownload({ id: Data.id }).then(res => {
+        const blob = res
+        let link = document.createElement('a')
+        link.href = URL.createObjectURL(new Blob([blob], { type: 'application/vnd.ms-excel' }))
+        link.download = Data.fileName
+        document.body.appendChild(link)
+        link.click()
+        URL.revokeObjectURL(link.href)
+      })
+    },
     columnChange(data) {
       this.ColumnsQuery = [...data]
       let Data = []
diff --git a/src/views/main/WebSiteaccount/addForm.vue b/src/views/main/WebSiteaccount/addForm.vue
new file mode 100644
index 0000000..792966a
--- /dev/null
+++ b/src/views/main/WebSiteaccount/addForm.vue
@@ -0,0 +1,240 @@
+<template>
+  <a-modal
+    title="新增EDI参数设置"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="EDI类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入EDI类型名称"
+                v-decorator="['ediname', { rules: [{ required: true, message: '请输入EDI类型名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="服务器IP" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入服务器IP"
+                v-decorator="['serverip', { rules: [{ required: true, message: '请输入服务器IP！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="文件夹" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入文件夹"
+                v-decorator="['foldername', { rules: [{ required: true, message: '请输入文件夹！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入用户名"
+                v-decorator="['username', { rules: [{ required: true, message: '请输入用户名！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="密码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入密码"
+                v-decorator="['password', { rules: [{ required: true, message: '请输入密码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送方名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送方名称"
+                v-decorator="['sendname', { rules: [{ required: true, message: '请输入发送方名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="发送方联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送方联系人"
+                v-decorator="['sendattn', { rules: [{ required: true, message: '请输入发送方联系人！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送方电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送方电话"
+                v-decorator="['sendtel', { rules: [{ required: true, message: '请输入发送方电话！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送方邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送方邮箱"
+                v-decorator="['sendemail', { rules: [{ required: true, message: '请输入发送方邮箱！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="接收方邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入接收方邮箱"
+                v-decorator="['receiveemail', { rules: [{ required: true, message: '请输入接收方邮箱！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="接收方操作" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入接收方操作"
+                v-decorator="['receiveop', { rules: [{ required: true, message: '请输入接收方操作！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="接收方销售" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入接收方销售"
+                v-decorator="['receivesale', { rules: [{ required: true, message: '请输入接收方销售！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="接收方部门" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入接收方部门"
+                v-decorator="['receivedept', { rules: [{ required: true, message: '请输入接收方部门！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送人电话"
+                v-decorator="['shippertel', { rules: [{ required: true, message: '请输入发送人电话！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="收货人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入收货人电话"
+                v-decorator="['consigneetel', { rules: [{ required: true, message: '请输入收货人电话！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="通知人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入通知人电话"
+                v-decorator="['notifypartytel', { rules: [{ required: true, message: '请输入通知人电话！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { DjyEdiSettingAdd } from '@/api/modular/main/EDIParameterSettingService'
+
+export default {
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 15 }
+      },
+      typeData: [],
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  methods: {
+    // 初始化方法
+    add(record) {
+      this.visible = true
+      this.typeData = [
+        {
+          code: 10,
+          name: '收货人'
+        },
+        {
+          code: 20,
+          name: '发货人'
+        },
+        {
+          code: 30,
+          name: '通知人'
+        },
+        {
+          code: 40,
+          name: '第二通知人'
+        }
+      ]
+    },
+    /**
+     * 提交表单
+     */
+    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] === null)) {
+              values[key] = JSON.stringify(values[key])
+            }
+          }
+          DjyEdiSettingAdd(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('新增成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error('新增失败') // + res.message
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>
diff --git a/src/views/main/WebSiteaccount/editForm.vue b/src/views/main/WebSiteaccount/editForm.vue
new file mode 100644
index 0000000..ec44252
--- /dev/null
+++ b/src/views/main/WebSiteaccount/editForm.vue
@@ -0,0 +1,245 @@
+<template>
+  <a-modal
+    title="编辑EDI参数设置"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="EDI类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入EDI类型名称"
+                v-decorator="['ediname', { rules: [{ required: true, message: '请输入EDI类型名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="服务器IP" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入服务器IP"
+                v-decorator="['serverip', { rules: [{ required: true, message: '请输入服务器IP！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="文件夹" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入文件夹"
+                v-decorator="['foldername', { rules: [{ required: true, message: '请输入文件夹！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入用户名"
+                v-decorator="['username', { rules: [{ required: true, message: '请输入用户名！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="密码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入密码"
+                v-decorator="['password', { rules: [{ required: true, message: '请输入密码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送方名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送方名称"
+                v-decorator="['sendname', { rules: [{ required: true, message: '请输入发送方名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="发送方联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送方联系人"
+                v-decorator="['sendattn', { rules: [{ required: true, message: '请输入发送方联系人！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送方电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送方电话"
+                v-decorator="['sendtel', { rules: [{ required: true, message: '请输入发送方电话！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送方邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送方邮箱"
+                v-decorator="['sendemail', { rules: [{ required: true, message: '请输入发送方邮箱！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="接收方邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入接收方邮箱"
+                v-decorator="['receiveemail', { rules: [{ required: true, message: '请输入接收方邮箱！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="接收方操作" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入接收方操作"
+                v-decorator="['receiveop', { rules: [{ required: true, message: '请输入接收方操作！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="接收方销售" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入接收方销售"
+                v-decorator="['receivesale', { rules: [{ required: true, message: '请输入接收方销售！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="接收方部门" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入接收方部门"
+                v-decorator="['receivedept', { rules: [{ required: true, message: '请输入接收方部门！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="发送人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入发送人电话"
+                v-decorator="['shippertel', { rules: [{ required: true, message: '请输入发送人电话！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="收货人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入收货人电话"
+                v-decorator="['consigneetel', { rules: [{ required: true, message: '请输入收货人电话！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="通知人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入通知人电话"
+                v-decorator="['notifypartytel', { rules: [{ required: true, message: '请输入通知人电话！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { DjyEdiSettingEdit } from '@/api/modular/main/EDIParameterSettingService'
+export default {
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 7 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 15 }
+      },
+      typeData: [],
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  methods: {
+    // 初始化方法
+    edit(record) {
+      console.log(record)
+      this.visible = true
+      const typeOption = this.$options
+      this.typeData = typeOption.filters['dictData']('edi_type')
+      setTimeout(() => {
+        this.form.setFieldsValue({
+          ediname: record.ediname,
+          serverip: record.serverip,
+          foldername: record.foldername,
+          username: record.username,
+          password: record.password,
+          sendname: record.sendname,
+          sendattn: record.sendattn,
+          sendtel: record.sendtel,
+          sendemail: record.sendemail,
+          receiveemail: record.receiveemail,
+          receiveop: record.receiveop,
+          receivesale: record.receivesale,
+          receivedept: record.receivedept,
+          shippertel: record.shippertel,
+          consigneetel: record.consigneetel,
+          notifypartytel: record.notifypartytel
+        })
+        console.log(this.form.getFieldsValue())
+      }, 100)
+    },
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        console.log(errors, values)
+        if (!errors) {
+          for (const key in values) {
+            console.log(key, 1)
+            if (typeof values[key] === 'object' && !(values[key] === null)) {
+              values[key] = JSON.stringify(values[key])
+            }
+          }
+          console.log(this.form, values.id)
+          DjyEdiSettingEdit(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('编辑成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error('编辑失败') //  + res.message
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>
diff --git a/src/views/main/WebSiteaccount/index.vue b/src/views/main/WebSiteaccount/index.vue
new file mode 100644
index 0000000..e720b3f
--- /dev/null
+++ b/src/views/main/WebSiteaccount/index.vue
@@ -0,0 +1,279 @@
+<template>
+  <div>
+    <a-card :bordered="false" :bodyStyle="tstyle">
+      <div
+        class="table-page-search-wrapper"
+        v-if="hasPerm('BookingTemplate:page')"
+        :class="advanced ? 'Open' : 'Close'"
+      >
+        <a-form layout="inline">
+          <a-row :gutter="48">
+            <a-col :md="18">
+              <a-row :gutter="48">
+                <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
+                  <a-form-item :label="item.title">
+                    <a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="FnGetData">查询</a-button>
+                <a-button style="margin-left: 8px" @click="init">重置</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>
+    <a-card :bordered="false">
+      <vxe-toolbar>
+        <template #buttons>
+          <a-button type="primary" icon="plus" @click="$refs.addForm.add()">
+            新增EDI参数
+          </a-button>
+        </template>
+      </vxe-toolbar>
+      <vxe-table :data="loadData" border :loading="loading" empty-text="没有更多数据了！">
+        <vxe-column type="seq" width="40" fixed="left"></vxe-column>
+        <vxe-column
+          v-for="item in columns"
+          :key="`${item.dataIndex}3`"
+          :field="item.dataIndex"
+          :min-width="item.width"
+          :title="item.title"
+          :align="item.align"
+        ></vxe-column>
+        <vxe-column title="操作" fixed="right" width="200" align="center">
+          <template #default="{ row }">
+            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
+            <a-popconfirm
+              title="请确认删除?"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="
+                e => {
+                  confirm(e, row)
+                }
+              "
+            >
+              <vxe-button type="text">删除</vxe-button>
+            </a-popconfirm>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        :loading="loading"
+        :current-page="queryParam.currentPage"
+        :page-size="queryParam.pageSize"
+        :total="queryParam.totalResult"
+        :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+        @page-change="handlePageChange"
+      >
+      </vxe-pager>
+      <add-form ref="addForm" @ok="handleOk" />
+      <edit-form ref="editForm" @ok="handleOk" />
+    </a-card>
+  </div>
+</template>
+<script>
+import { DjyEdiSettingPage, DjyEdiSettingDelete } from '@/api/modular/main/EDIParameterSettingService'
+import addForm from './addForm.vue'
+import editForm from './editForm.vue'
+import columnSetting from '@/components/tableColumnSetting'
+export default {
+  components: {
+    addForm,
+    editForm,
+    columnSetting
+  },
+  data() {
+    return {
+      // 高级搜索 展开/关闭
+      advanced: false,
+      loading: false,
+      setVisible: false,
+      setVisible1: false,
+      queryParam: {
+        currentPage: 1,
+        pageSize: 10,
+        totalResult: 1
+      },
+      ColumnsQuery: [],
+      columns: [
+        {
+          title: 'EDI类型名称',
+          align: 'center',
+          width: '100',
+          dataIndex: 'ediname'
+        },
+        {
+          title: '服务器IP',
+          align: 'center',
+          width: '80',
+          dataIndex: 'serverip'
+        },
+        {
+          title: '文件夹',
+          align: 'center',
+          width: '80',
+          dataIndex: 'foldername'
+        },
+        {
+          title: '用户名',
+          align: 'center',
+          width: '80',
+          dataIndex: 'username'
+        },
+        {
+          title: '密码',
+          align: 'center',
+          width: '100',
+          dataIndex: 'password'
+        },
+        {
+          title: '发送方名称',
+          align: 'center',
+          width: '100',
+          dataIndex: 'sendname'
+        },
+        {
+          title: '发送方联系人',
+          align: 'center',
+          width: '120',
+          dataIndex: 'sendattn'
+        },
+        {
+          title: '发送方电话',
+          align: 'center',
+          width: '100',
+          dataIndex: 'sendtel'
+        },
+        {
+          title: '发送方邮箱',
+          align: 'center',
+          width: '100',
+          dataIndex: 'sendemail'
+        },
+        {
+          title: '接收方邮箱',
+          align: 'center',
+          width: '100',
+          dataIndex: 'receiveemail'
+        },
+        {
+          title: '接收方操作',
+          align: 'center',
+          width: '100',
+          dataIndex: 'receiveop'
+        },
+        {
+          title: '接收方销售',
+          align: 'center',
+          width: '100',
+          dataIndex: 'receivesale'
+        },
+        {
+          title: '接收方部门',
+          align: 'center',
+          width: '100',
+          dataIndex: 'receivedept'
+        },
+        {
+          title: '发送人电话',
+          align: 'center',
+          width: '100',
+          dataIndex: 'shippertel'
+        },
+        {
+          title: '收货人电话',
+          align: 'center',
+          width: '100',
+          dataIndex: 'consigneetel'
+        },
+        {
+          title: '通知人电话',
+          align: 'center',
+          width: '100',
+          dataIndex: 'notifypartytel'
+        }
+      ],
+      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      // 加载数据方法 必须为 Promise 对象
+      loadData: {}
+    }
+  },
+  created() {},
+  mounted() {
+    this.init()
+  },
+  methods: {
+    toggleAdvanced() {
+      this.advanced = !this.advanced
+    },
+    init() {
+      Object.assign(this.$data, this.$options.data())
+      this.ColumnsQuery = this.columns
+      this.FnGetData()
+    },
+    handlePageChange({ currentPage, pageSize }) {
+      this.queryParam.pageNo = currentPage
+      this.queryParam.pageSize = pageSize
+      this.FnGetData()
+    },
+    FnGetData() {
+      this.loading = true
+      DjyEdiSettingPage(this.queryParam).then(res => {
+        this.loadData = res.data.rows
+        this.loading = false
+        this.queryParam.currentPage = res.data.pageNo
+        this.queryParam.pageSize = res.data.pageSize
+        this.queryParam.totalResult = res.data.totalRows
+      })
+    },
+    /**
+     * 查询参数组装
+     */
+    switchingDate() {
+      const obj = JSON.parse(JSON.stringify(this.queryParam))
+      return obj
+    },
+    confirm(e, data) {
+      this.DjyEdiSettingDelete(data)
+    },
+    DjyEdiSettingDelete(record) {
+      DjyEdiSettingDelete(record).then(res => {
+        if (res.success) {
+          this.$message.success('删除成功')
+          this.FnGetData()
+        } else {
+          this.$message.error('删除失败') // + res.message
+        }
+      })
+    },
+    handleOk() {
+      this.FnGetData()
+    }
+  }
+}
+</script>
+<style lang="less">
+.table-operator {
+  margin-bottom: 18px;
+}
+
+button {
+  margin-right: 8px;
+}
+.Open {
+}
+.Close {
+  height: 45px;
+  overflow: hidden;
+}
+</style>

From 1ccdc1a0b24999c23659960918755bba7bb1f59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Wed, 9 Nov 2022 17:24:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=BD=91=E7=AB=99=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modular/main/WebSiteaccount.js     |  53 ++++++
 src/views/main/Printing/addForm.vue        |   2 +-
 src/views/main/WebSiteaccount/addForm.vue  | 161 +++++--------------
 src/views/main/WebSiteaccount/editForm.vue | 178 +++++----------------
 src/views/main/WebSiteaccount/index.vue    | 121 ++++----------
 5 files changed, 169 insertions(+), 346 deletions(-)
 create mode 100644 src/api/modular/main/WebSiteaccount.js

diff --git a/src/api/modular/main/WebSiteaccount.js b/src/api/modular/main/WebSiteaccount.js
new file mode 100644
index 0000000..6102647
--- /dev/null
+++ b/src/api/modular/main/WebSiteaccount.js
@@ -0,0 +1,53 @@
+import { axios } from '@/utils/request'
+
+/**
+ * 分页查询网站账号维护
+ *
+ * @author Myshipping
+ */
+export function DjyWebsiteAccountConfigPage(parameter) {
+  return axios({
+    url: '/DjyWebsiteAccountConfig/page',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 增加网站账号维护（同一用户、同类型账号不会重复插入）
+ *
+ * @author Myshipping
+ */
+export function DjyWebsiteAccountConfigAdd(parameter) {
+  return axios({
+    url: '/DjyWebsiteAccountConfig/add',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 更新EDI参数设置
+ *
+ * @author Myshipping
+ */
+export function DjyWebsiteAccountConfigEdit(parameter) {
+  return axios({
+    url: '/DjyWebsiteAccountConfig/edit',
+    method: 'post',
+    data: parameter
+  })
+}
+
+/**
+ * 删除EDI参数设置
+ *
+ * @author Myshipping
+ */
+export function DjyWebsiteAccountConfigDelete(parameter) {
+  return axios({
+    url: '/DjyWebsiteAccountConfig/delete',
+    method: 'post',
+    data: parameter
+  })
+}
diff --git a/src/views/main/Printing/addForm.vue b/src/views/main/Printing/addForm.vue
index b1a5b29..55c96c6 100644
--- a/src/views/main/Printing/addForm.vue
+++ b/src/views/main/Printing/addForm.vue
@@ -13,7 +13,7 @@
           <a-col :span="8">
             <a-form-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-select
-                placeholder="请输入类型名称"
+                placeholder="请选择类型名称"
                 v-decorator="['typeCode', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
               >
                 <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
diff --git a/src/views/main/WebSiteaccount/addForm.vue b/src/views/main/WebSiteaccount/addForm.vue
index 792966a..7a96b90 100644
--- a/src/views/main/WebSiteaccount/addForm.vue
+++ b/src/views/main/WebSiteaccount/addForm.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal
-    title="新增EDI参数设置"
+    title="新增账号"
     :width="1100"
     :visible="visible"
     :confirmLoading="confirmLoading"
@@ -11,36 +11,26 @@
       <a-form :form="form">
         <a-row>
           <a-col :span="8">
-            <a-form-item label="EDI类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入EDI类型名称"
-                v-decorator="['ediname', { rules: [{ required: true, message: '请输入EDI类型名称！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="服务器IP" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入服务器IP"
-                v-decorator="['serverip', { rules: [{ required: true, message: '请输入服务器IP！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="文件夹" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入文件夹"
-                v-decorator="['foldername', { rules: [{ required: true, message: '请输入文件夹！' }] }]"
-              />
+            <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <!-- <a-input
+                placeholder="请选择类型"
+                v-decorator="['typeCode', { rules: [{ required: true, message: '请输入EDI类型名称！' }] }]"
+              /> -->
+              <a-select
+                placeholder="请选择类型"
+                v-decorator="['typeCode', { rules: [{ required: true, message: '请选择类型！' }] }]"
+              >
+                <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
+                  {{ item.value }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
           <a-col :span="8">
-            <a-form-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+            <a-form-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
-                placeholder="请输入用户名"
-                v-decorator="['username', { rules: [{ required: true, message: '请输入用户名！' }] }]"
+                placeholder="请输入账号"
+                v-decorator="['account', { rules: [{ required: true, message: '请输入账号！' }] }]"
               />
             </a-form-item>
           </a-col>
@@ -52,99 +42,11 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="8">
-            <a-form-item label="发送方名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入发送方名称"
-                v-decorator="['sendname', { rules: [{ required: true, message: '请输入发送方名称！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="8">
-            <a-form-item label="发送方联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入发送方联系人"
-                v-decorator="['sendattn', { rules: [{ required: true, message: '请输入发送方联系人！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="发送方电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入发送方电话"
-                v-decorator="['sendtel', { rules: [{ required: true, message: '请输入发送方电话！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="发送方邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <a-col :span="19">
+            <a-form-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-input
-                placeholder="请输入发送方邮箱"
-                v-decorator="['sendemail', { rules: [{ required: true, message: '请输入发送方邮箱！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="8">
-            <a-form-item label="接收方邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入接收方邮箱"
-                v-decorator="['receiveemail', { rules: [{ required: true, message: '请输入接收方邮箱！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="接收方操作" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入接收方操作"
-                v-decorator="['receiveop', { rules: [{ required: true, message: '请输入接收方操作！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="接收方销售" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入接收方销售"
-                v-decorator="['receivesale', { rules: [{ required: true, message: '请输入接收方销售！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="8">
-            <a-form-item label="接收方部门" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入接收方部门"
-                v-decorator="['receivedept', { rules: [{ required: true, message: '请输入接收方部门！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="发送人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入发送人电话"
-                v-decorator="['shippertel', { rules: [{ required: true, message: '请输入发送人电话！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="收货人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入收货人电话"
-                v-decorator="['consigneetel', { rules: [{ required: true, message: '请输入收货人电话！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="8">
-            <a-form-item label="通知人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入通知人电话"
-                v-decorator="['notifypartytel', { rules: [{ required: true, message: '请输入通知人电话！' }] }]"
+                placeholder="请输入备注"
+                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
               />
             </a-form-item>
           </a-col>
@@ -155,11 +57,12 @@
 </template>
 
 <script>
-import { DjyEdiSettingAdd } from '@/api/modular/main/EDIParameterSettingService'
-
+import { DjyWebsiteAccountConfigAdd } from '@/api/modular/main/WebSiteaccount'
+import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
+      TypeData: [],
       labelCol: {
         xs: { span: 24 },
         sm: { span: 7 }
@@ -168,12 +71,26 @@ export default {
         xs: { span: 24 },
         sm: { span: 15 }
       },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 21 }
+      },
       typeData: [],
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this)
     }
   },
+  mounted() {
+    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '349716496130117' }).then(res => {
+      this.TypeData = res.data.rows
+      console.log(this.TypeData)
+    })
+  },
   methods: {
     // 初始化方法
     add(record) {
@@ -212,7 +129,7 @@ export default {
               values[key] = JSON.stringify(values[key])
             }
           }
-          DjyEdiSettingAdd(values)
+          DjyWebsiteAccountConfigAdd(values)
             .then(res => {
               if (res.success) {
                 this.$message.success('新增成功')
diff --git a/src/views/main/WebSiteaccount/editForm.vue b/src/views/main/WebSiteaccount/editForm.vue
index ec44252..460f794 100644
--- a/src/views/main/WebSiteaccount/editForm.vue
+++ b/src/views/main/WebSiteaccount/editForm.vue
@@ -11,36 +11,22 @@
       <a-form :form="form">
         <a-row>
           <a-col :span="8">
-            <a-form-item label="EDI类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入EDI类型名称"
-                v-decorator="['ediname', { rules: [{ required: true, message: '请输入EDI类型名称！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="服务器IP" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入服务器IP"
-                v-decorator="['serverip', { rules: [{ required: true, message: '请输入服务器IP！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="文件夹" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入文件夹"
-                v-decorator="['foldername', { rules: [{ required: true, message: '请输入文件夹！' }] }]"
-              />
+            <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-select
+                placeholder="请选择类型"
+                v-decorator="['typeCode', { rules: [{ required: true, message: '请选择类型！' }] }]"
+              >
+                <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
+                  {{ item.value }}
+                </a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row>
           <a-col :span="8">
-            <a-form-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+            <a-form-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
-                placeholder="请输入用户名"
-                v-decorator="['username', { rules: [{ required: true, message: '请输入用户名！' }] }]"
+                placeholder="请输入账号"
+                v-decorator="['account', { rules: [{ required: true, message: '请输入账号！' }] }]"
               />
             </a-form-item>
           </a-col>
@@ -52,99 +38,11 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="8">
-            <a-form-item label="发送方名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入发送方名称"
-                v-decorator="['sendname', { rules: [{ required: true, message: '请输入发送方名称！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="8">
-            <a-form-item label="发送方联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入发送方联系人"
-                v-decorator="['sendattn', { rules: [{ required: true, message: '请输入发送方联系人！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="发送方电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入发送方电话"
-                v-decorator="['sendtel', { rules: [{ required: true, message: '请输入发送方电话！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="发送方邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入发送方邮箱"
-                v-decorator="['sendemail', { rules: [{ required: true, message: '请输入发送方邮箱！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="8">
-            <a-form-item label="接收方邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入接收方邮箱"
-                v-decorator="['receiveemail', { rules: [{ required: true, message: '请输入接收方邮箱！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="接收方操作" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入接收方操作"
-                v-decorator="['receiveop', { rules: [{ required: true, message: '请输入接收方操作！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="接收方销售" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <a-col :span="19">
+            <a-form-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-input
-                placeholder="请输入接收方销售"
-                v-decorator="['receivesale', { rules: [{ required: true, message: '请输入接收方销售！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="8">
-            <a-form-item label="接收方部门" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入接收方部门"
-                v-decorator="['receivedept', { rules: [{ required: true, message: '请输入接收方部门！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="发送人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入发送人电话"
-                v-decorator="['shippertel', { rules: [{ required: true, message: '请输入发送人电话！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="8">
-            <a-form-item label="收货人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入收货人电话"
-                v-decorator="['consigneetel', { rules: [{ required: true, message: '请输入收货人电话！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="8">
-            <a-form-item label="通知人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入通知人电话"
-                v-decorator="['notifypartytel', { rules: [{ required: true, message: '请输入通知人电话！' }] }]"
+                placeholder="请输入备注"
+                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
               />
             </a-form-item>
           </a-col>
@@ -155,10 +53,12 @@
 </template>
 
 <script>
-import { DjyEdiSettingEdit } from '@/api/modular/main/EDIParameterSettingService'
+import { DjyWebsiteAccountConfigEdit } from '@/api/modular/main/WebSiteaccount'
+import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
+      TypeData: [],
       labelCol: {
         xs: { span: 24 },
         sm: { span: 7 }
@@ -167,37 +67,41 @@ export default {
         xs: { span: 24 },
         sm: { span: 15 }
       },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 21 }
+      },
       typeData: [],
       visible: false,
       confirmLoading: false,
-      form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      data: {}
     }
   },
+  mounted() {
+    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '349716496130117' }).then(res => {
+      this.TypeData = res.data.rows
+      console.log(this.TypeData)
+    })
+  },
   methods: {
     // 初始化方法
     edit(record) {
+      this.data = record
       console.log(record)
       this.visible = true
       const typeOption = this.$options
       this.typeData = typeOption.filters['dictData']('edi_type')
       setTimeout(() => {
         this.form.setFieldsValue({
-          ediname: record.ediname,
-          serverip: record.serverip,
-          foldername: record.foldername,
-          username: record.username,
+          typeCode: record.typeCode,
+          account: record.account,
           password: record.password,
-          sendname: record.sendname,
-          sendattn: record.sendattn,
-          sendtel: record.sendtel,
-          sendemail: record.sendemail,
-          receiveemail: record.receiveemail,
-          receiveop: record.receiveop,
-          receivesale: record.receivesale,
-          receivedept: record.receivedept,
-          shippertel: record.shippertel,
-          consigneetel: record.consigneetel,
-          notifypartytel: record.notifypartytel
+          remark: record.remark
         })
         console.log(this.form.getFieldsValue())
       }, 100)
@@ -217,7 +121,9 @@ export default {
             }
           }
           console.log(this.form, values.id)
-          DjyEdiSettingEdit(values)
+          values.id = this.data.id
+          console.log(values)
+          DjyWebsiteAccountConfigEdit(values)
             .then(res => {
               if (res.success) {
                 this.$message.success('编辑成功')
diff --git a/src/views/main/WebSiteaccount/index.vue b/src/views/main/WebSiteaccount/index.vue
index e720b3f..943e745 100644
--- a/src/views/main/WebSiteaccount/index.vue
+++ b/src/views/main/WebSiteaccount/index.vue
@@ -35,7 +35,7 @@
       <vxe-toolbar>
         <template #buttons>
           <a-button type="primary" icon="plus" @click="$refs.addForm.add()">
-            新增EDI参数
+            新增账号
           </a-button>
         </template>
       </vxe-toolbar>
@@ -48,7 +48,11 @@
           :min-width="item.width"
           :title="item.title"
           :align="item.align"
-        ></vxe-column>
+        >
+          <template #default="{ row }" v-if="item.title == '类型'">
+            <span>{{ FnTurnD(row.typeCode) }}</span>
+          </template>
+        </vxe-column>
         <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
             <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
@@ -82,7 +86,8 @@
   </div>
 </template>
 <script>
-import { DjyEdiSettingPage, DjyEdiSettingDelete } from '@/api/modular/main/EDIParameterSettingService'
+import { DjyWebsiteAccountConfigPage, DjyWebsiteAccountConfigDelete } from '@/api/modular/main/WebSiteaccount'
+import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 import columnSetting from '@/components/tableColumnSetting'
@@ -94,6 +99,7 @@ export default {
   },
   data() {
     return {
+      TypeData: [],
       // 高级搜索 展开/关闭
       advanced: false,
       loading: false,
@@ -107,100 +113,28 @@ export default {
       ColumnsQuery: [],
       columns: [
         {
-          title: 'EDI类型名称',
+          title: '类型',
           align: 'center',
           width: '100',
-          dataIndex: 'ediname'
-        },
-        {
-          title: '服务器IP',
-          align: 'center',
-          width: '80',
-          dataIndex: 'serverip'
-        },
-        {
-          title: '文件夹',
-          align: 'center',
-          width: '80',
-          dataIndex: 'foldername'
+          dataIndex: 'typeCode'
         },
         {
-          title: '用户名',
+          title: '账号',
           align: 'center',
           width: '80',
-          dataIndex: 'username'
+          dataIndex: 'account'
         },
         {
           title: '密码',
           align: 'center',
-          width: '100',
+          width: '80',
           dataIndex: 'password'
         },
         {
-          title: '发送方名称',
-          align: 'center',
-          width: '100',
-          dataIndex: 'sendname'
-        },
-        {
-          title: '发送方联系人',
-          align: 'center',
-          width: '120',
-          dataIndex: 'sendattn'
-        },
-        {
-          title: '发送方电话',
-          align: 'center',
-          width: '100',
-          dataIndex: 'sendtel'
-        },
-        {
-          title: '发送方邮箱',
-          align: 'center',
-          width: '100',
-          dataIndex: 'sendemail'
-        },
-        {
-          title: '接收方邮箱',
-          align: 'center',
-          width: '100',
-          dataIndex: 'receiveemail'
-        },
-        {
-          title: '接收方操作',
-          align: 'center',
-          width: '100',
-          dataIndex: 'receiveop'
-        },
-        {
-          title: '接收方销售',
-          align: 'center',
-          width: '100',
-          dataIndex: 'receivesale'
-        },
-        {
-          title: '接收方部门',
-          align: 'center',
-          width: '100',
-          dataIndex: 'receivedept'
-        },
-        {
-          title: '发送人电话',
-          align: 'center',
-          width: '100',
-          dataIndex: 'shippertel'
-        },
-        {
-          title: '收货人电话',
-          align: 'center',
-          width: '100',
-          dataIndex: 'consigneetel'
-        },
-        {
-          title: '通知人电话',
+          title: '备注',
           align: 'center',
-          width: '100',
-          dataIndex: 'notifypartytel'
+          width: '80',
+          dataIndex: 'remark'
         }
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
@@ -211,8 +145,21 @@ export default {
   created() {},
   mounted() {
     this.init()
+    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '349716496130117' }).then(res => {
+      this.TypeData = res.data.rows
+      console.log(this.TypeData)
+    })
   },
   methods: {
+    FnTurnD(data) {
+      let Rdata = ''
+      this.TypeData.forEach(item => {
+        if (item.code == data) {
+          Rdata = item.value
+        }
+      })
+      return Rdata
+    },
     toggleAdvanced() {
       this.advanced = !this.advanced
     },
@@ -228,7 +175,7 @@ export default {
     },
     FnGetData() {
       this.loading = true
-      DjyEdiSettingPage(this.queryParam).then(res => {
+      DjyWebsiteAccountConfigPage(this.queryParam).then(res => {
         this.loadData = res.data.rows
         this.loading = false
         this.queryParam.currentPage = res.data.pageNo
@@ -244,10 +191,10 @@ export default {
       return obj
     },
     confirm(e, data) {
-      this.DjyEdiSettingDelete(data)
+      this.DjyWebsiteAccountConfigDelete(data)
     },
-    DjyEdiSettingDelete(record) {
-      DjyEdiSettingDelete(record).then(res => {
+    DjyWebsiteAccountConfigDelete(record) {
+      DjyWebsiteAccountConfigDelete(record).then(res => {
         if (res.success) {
           this.$message.success('删除成功')
           this.FnGetData()

From f0553715066229a3eeebb478abc3f54f1c413d9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Wed, 9 Nov 2022 17:45:31 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4=20=E5=A4=87=E6=B3=A8=20?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/WebSiteaccount/addForm.vue  | 5 +----
 src/views/main/WebSiteaccount/editForm.vue | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/views/main/WebSiteaccount/addForm.vue b/src/views/main/WebSiteaccount/addForm.vue
index 7a96b90..78c424e 100644
--- a/src/views/main/WebSiteaccount/addForm.vue
+++ b/src/views/main/WebSiteaccount/addForm.vue
@@ -44,10 +44,7 @@
           </a-col>
           <a-col :span="19">
             <a-form-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-input
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
         </a-row>
diff --git a/src/views/main/WebSiteaccount/editForm.vue b/src/views/main/WebSiteaccount/editForm.vue
index 460f794..da9685a 100644
--- a/src/views/main/WebSiteaccount/editForm.vue
+++ b/src/views/main/WebSiteaccount/editForm.vue
@@ -40,10 +40,7 @@
           </a-col>
           <a-col :span="19">
             <a-form-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-input
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
         </a-row>

From e793b89975b0b1df16216c6afc5a01bbda70dfc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Wed, 9 Nov 2022 17:56:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/Customer/addForm.vue        | 2 +-
 src/views/main/Customer/editForm.vue       | 4 ++--
 src/views/main/Customer/index.vue          | 2 +-
 src/views/main/EDI/addForm.vue             | 2 +-
 src/views/main/EDI/editForm.vue            | 2 +-
 src/views/main/EDI/index.vue               | 2 +-
 src/views/main/Printing/addForm.vue        | 2 +-
 src/views/main/Printing/editForm.vue       | 2 +-
 src/views/main/Printing/index.vue          | 2 +-
 src/views/main/WebSiteaccount/addForm.vue  | 2 +-
 src/views/main/WebSiteaccount/editForm.vue | 2 +-
 src/views/main/WebSiteaccount/index.vue    | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/main/Customer/addForm.vue b/src/views/main/Customer/addForm.vue
index c8bbbcb..caf670c 100644
--- a/src/views/main/Customer/addForm.vue
+++ b/src/views/main/Customer/addForm.vue
@@ -389,7 +389,7 @@ export default {
                 this.confirmLoading = false
                 this.$emit('ok', values)
               } else {
-                this.$message.error('新增失败') // + res.message
+                this.$message.error(`新增失败,${res.message}`)
               }
             })
             .finally(res => {
diff --git a/src/views/main/Customer/editForm.vue b/src/views/main/Customer/editForm.vue
index a4f40ed..1b4c9e5 100644
--- a/src/views/main/Customer/editForm.vue
+++ b/src/views/main/Customer/editForm.vue
@@ -378,11 +378,11 @@ export default {
           DjyCustomerEdit({ ...this.Data, ...values, contacts: this.ContactsData })
             .then(res => {
               if (res.success) {
-                this.$message.success('新增成功')
+                this.$message.success('编辑成功')
                 this.confirmLoading = false
                 this.$emit('ok', values)
               } else {
-                this.$message.error('新增失败') // + res.message
+                this.$message.error(`编辑失败,${res.message}`)
               }
             })
             .finally(res => {
diff --git a/src/views/main/Customer/index.vue b/src/views/main/Customer/index.vue
index 5a99c5b..d33e3ba 100644
--- a/src/views/main/Customer/index.vue
+++ b/src/views/main/Customer/index.vue
@@ -486,7 +486,7 @@ export default {
           this.$message.success('删除成功')
           this.FnGetData()
         } else {
-          this.$message.error('删除失败') // + res.message
+          this.$message.error(`删除失败,${res.message}`)
         }
       })
     },
diff --git a/src/views/main/EDI/addForm.vue b/src/views/main/EDI/addForm.vue
index 792966a..671f3f9 100644
--- a/src/views/main/EDI/addForm.vue
+++ b/src/views/main/EDI/addForm.vue
@@ -220,7 +220,7 @@ export default {
                 this.$emit('ok', values)
                 this.handleCancel()
               } else {
-                this.$message.error('新增失败') // + res.message
+                this.$message.error(`新增失败,${res.message}`)
               }
             })
             .finally(res => {
diff --git a/src/views/main/EDI/editForm.vue b/src/views/main/EDI/editForm.vue
index ec44252..deee52c 100644
--- a/src/views/main/EDI/editForm.vue
+++ b/src/views/main/EDI/editForm.vue
@@ -225,7 +225,7 @@ export default {
                 this.$emit('ok', values)
                 this.handleCancel()
               } else {
-                this.$message.error('编辑失败') //  + res.message
+                this.$message.error(`编辑失败,${res.message}`)
               }
             })
             .finally(res => {
diff --git a/src/views/main/EDI/index.vue b/src/views/main/EDI/index.vue
index e720b3f..b3aa32d 100644
--- a/src/views/main/EDI/index.vue
+++ b/src/views/main/EDI/index.vue
@@ -252,7 +252,7 @@ export default {
           this.$message.success('删除成功')
           this.FnGetData()
         } else {
-          this.$message.error('删除失败') // + res.message
+          this.$message.error(`删除失败,${res.message}`)
         }
       })
     },
diff --git a/src/views/main/Printing/addForm.vue b/src/views/main/Printing/addForm.vue
index 55c96c6..8fc72b4 100644
--- a/src/views/main/Printing/addForm.vue
+++ b/src/views/main/Printing/addForm.vue
@@ -134,7 +134,7 @@ export default {
                 this.$emit('ok', values)
                 this.handleCancel()
               } else {
-                this.$message.error('新增失败') // + res.message
+                this.$message.error(`新增失败,${res.message}`) // + res.message
               }
               this.file = {}
               this.fileList = []
diff --git a/src/views/main/Printing/editForm.vue b/src/views/main/Printing/editForm.vue
index 5a8a062..b2096d7 100644
--- a/src/views/main/Printing/editForm.vue
+++ b/src/views/main/Printing/editForm.vue
@@ -151,7 +151,7 @@ export default {
                 this.$emit('ok', values)
                 this.handleCancel()
               } else {
-                this.$message.error('编辑失败') //  + res.message
+                this.$message.error(`编辑失败,${res.message}`)
               }
               this.file = {}
               this.fileList = []
diff --git a/src/views/main/Printing/index.vue b/src/views/main/Printing/index.vue
index 3f72075..944d8cd 100644
--- a/src/views/main/Printing/index.vue
+++ b/src/views/main/Printing/index.vue
@@ -312,7 +312,7 @@ export default {
           this.$message.success('删除成功')
           this.FnGetData()
         } else {
-          this.$message.error('删除失败') // + res.message
+          this.$message.error(`删除失败,${res.message}`)
         }
       })
     },
diff --git a/src/views/main/WebSiteaccount/addForm.vue b/src/views/main/WebSiteaccount/addForm.vue
index 78c424e..001988c 100644
--- a/src/views/main/WebSiteaccount/addForm.vue
+++ b/src/views/main/WebSiteaccount/addForm.vue
@@ -134,7 +134,7 @@ export default {
                 this.$emit('ok', values)
                 this.handleCancel()
               } else {
-                this.$message.error('新增失败') // + res.message
+                this.$message.error(`新增失败,${res.message}`)
               }
             })
             .finally(res => {
diff --git a/src/views/main/WebSiteaccount/editForm.vue b/src/views/main/WebSiteaccount/editForm.vue
index da9685a..fd86afa 100644
--- a/src/views/main/WebSiteaccount/editForm.vue
+++ b/src/views/main/WebSiteaccount/editForm.vue
@@ -128,7 +128,7 @@ export default {
                 this.$emit('ok', values)
                 this.handleCancel()
               } else {
-                this.$message.error('编辑失败') //  + res.message
+                this.$message.error(`编辑失败,${res.message}`)
               }
             })
             .finally(res => {
diff --git a/src/views/main/WebSiteaccount/index.vue b/src/views/main/WebSiteaccount/index.vue
index 943e745..9b0c8d1 100644
--- a/src/views/main/WebSiteaccount/index.vue
+++ b/src/views/main/WebSiteaccount/index.vue
@@ -199,7 +199,7 @@ export default {
           this.$message.success('删除成功')
           this.FnGetData()
         } else {
-          this.$message.error('删除失败') // + res.message
+          this.$message.error(`删除失败,${res.message}`)
         }
       })
     },