12/15

src/views/gen/database/addColumnForm.vue

@@ -1,45 +1,78 @@
 <template>
-  <a-modal title="编辑数据列" :width="900" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit"
-    @cancel="handleCancel">
+  <a-modal
+    title="编辑数据列"
+    :width="900"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
     <a-spin :spinning="confirmLoading">
       <a-divider orientation="left">数据列信息</a-divider>
       <a-form :form="form">
         <a-form-item label="列名" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="请输入列名" v-decorator="['dbColumnName', { rules: [{ required: true, message: '请输入列名！' }] }]" />
+          <a-input
+            placeholder="请输入列名"
+            v-decorator="['dbColumnName', { rules: [{ required: true, message: '请输入列名！' }] }]"
+          />
         </a-form-item>
         <a-form-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="请输入描述" style="width: 100%"
-            v-decorator="['columnDescription', { rules: [{ required: true, message: '请输入描述！' }] }]" />
+          <a-input placeholder="请输入描述" style="width: 100%" v-decorator="['columnDescription']" />
         </a-form-item>
         <a-form-item label="主键" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-select v-decorator="['isPrimarykey', { rules: [{ required: true, message: '请选择是否为主键' }] }]"
-            key="isPrimarykey" style="width: 100%" placeholder="请选择" has-feedback
-            @change="e => primarykeyHandleChange(e)">
-            <a-select-option v-for="(item, index) in selectData" :key="index" :value="item.value">{{ item.text }}
+          <a-select
+            v-decorator="['isPrimarykey', { rules: [{ required: true, message: '请选择是否为主键' }] }]"
+            key="isPrimarykey"
+            style="width: 100%"
+            placeholder="请选择"
+            has-feedback
+            @change="e => primarykeyHandleChange(e)"
+          >
+            <a-select-option v-for="(item, index) in selectData" :key="index" :value="item.value"
+              >{{ item.text }}
             </a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item label="自增" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-select :disabled="enabledIsIdentity"
-            v-decorator="['isIdentity', { rules: [{ required: true, message: '请选择是否自增' }] }]" key="isIdentity"
-            style="width: 100%" placeholder="请选择" has-feedback>
-            <a-select-option v-for="(item, index) in selectData" :key="index" :value="item.value">{{ item.text }}
+          <a-select
+            :disabled="enabledIsIdentity"
+            v-decorator="['isIdentity', { rules: [{ required: true, message: '请选择是否自增' }] }]"
+            key="isIdentity"
+            style="width: 100%"
+            placeholder="请选择"
+            has-feedback
+          >
+            <a-select-option v-for="(item, index) in selectData" :key="index" :value="item.value"
+              >{{ item.text }}
             </a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item label="可空" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-select :disabled="enabledIsNullabled"
-            v-decorator="['isNullable', { rules: [{ required: true, message: '请选择是否可空' }] }]" key="isNullable"
-            style="width: 100%" placeholder="请选择" has-feedback>
-            <a-select-option v-for="(item, index) in selectData" :key="index" :value="item.value">{{ item.text }}
+          <a-select
+            :disabled="enabledIsNullabled"
+            v-decorator="['isNullable', { rules: [{ required: true, message: '请选择是否可空' }] }]"
+            key="isNullable"
+            style="width: 100%"
+            placeholder="请选择"
+            has-feedback
+          >
+            <a-select-option v-for="(item, index) in selectData" :key="index" :value="item.value"
+              >{{ item.text }}
             </a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-select v-decorator="['dataType', { rules: [{ required: true, message: '请选择类型' }] }]" key="dataType"
-            style="width: 100%" placeholder="请选择" has-feedback @change="e => dataTypeHandleChange(e)">
+          <a-select
+            v-decorator="['dataType', { rules: [{ required: true, message: '请选择类型' }] }]"
+            key="dataType"
+            style="width: 100%"
+            placeholder="请选择"
+            has-feedback
+            @change="e => dataTypeHandleChange(e)"
+          >
             <a-select-option v-for="(item, index) in dataTypeSelectData" :key="index" :value="item.value">
-              {{ item.value }}</a-select-option>
+              {{ item.value }}</a-select-option
+            >
           </a-select>
         </a-form-item>
         <a-form-item label="长度" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
@@ -54,9 +87,7 @@
 </template>
 
 <script>
-import {
-  columnAdd
-} from '@/api/modular/gen/databaseManage'
+import { columnAdd } from '@/api/modular/gen/databaseManage'
 export default {
   data() {
     return {
@@ -79,69 +110,83 @@ export default {
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
-      dataTypeSelectData: [{
-        value: 'text',
-        hasLength: false,
-        hasDecimalDigits: false
-      },
-      {
-        value: 'varchar',
-        hasLength: true,
-        hasDecimalDigits: false
-      }, {
-        value: 'nvarchar',
-        hasLength: true,
-        hasDecimalDigits: false
-      },
-      {
-        value: 'char',
-        hasLength: true,
-        hasDecimalDigits: false
-      }, {
-        value: 'nchar',
-        hasLength: true,
-        hasDecimalDigits: false
-      }, {
-        value: 'timestamp',
-        hasLength: false,
-        hasDecimalDigits: false
-      }, {
-        value: 'int',
-        hasLength: false,
-        hasDecimalDigits: false
-      }, {
-        value: 'smallint',
-        hasLength: false,
-        hasDecimalDigits: false
-      }, {
-        value: 'tinyint',
-        hasLength: false,
-        hasDecimalDigits: false
-      }, {
-        value: 'bigint',
-        hasLength: false,
-        hasDecimalDigits: false
-      }, {
-        value: 'bit',
-        hasLength: false,
-        hasDecimalDigits: false
-      }, {
-        value: 'decimal',
-        hasLength: true,
-        hasDecimalDigits: true
-      }, {
-        value: 'datetime',
-        hasLength: false,
-        hasDecimalDigits: false
-      },
+      dataTypeSelectData: [
+        {
+          value: 'text',
+          hasLength: false,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'varchar',
+          hasLength: true,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'nvarchar',
+          hasLength: true,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'char',
+          hasLength: true,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'nchar',
+          hasLength: true,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'timestamp',
+          hasLength: false,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'int',
+          hasLength: false,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'smallint',
+          hasLength: false,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'tinyint',
+          hasLength: false,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'bigint',
+          hasLength: false,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'bit',
+          hasLength: false,
+          hasDecimalDigits: false
+        },
+        {
+          value: 'decimal',
+          hasLength: true,
+          hasDecimalDigits: true
+        },
+        {
+          value: 'datetime',
+          hasLength: false,
+          hasDecimalDigits: false
+        }
+      ],
+      selectData: [
+        {
+          text: '是',
+          value: 1
+        },
+        {
+          text: '否',
+          value: 0
+        }
       ],
-      selectData: [{
-        text: '是',
-        value: 1
-      }, {
-        text: '否',
-        value: 0
-      }],
       hasLength: true,
       hasDecimalDigits: true,
       enabledIsNullabled: false,
@@ -149,85 +194,85 @@ export default {
       tableName: '',
       validateLengthRule: {
         rules: [
-          {required: this.lengthIsRequire, message: '请输入字段长度'},
+          { required: this.lengthIsRequire, message: '请输入字段长度' },
           {
             validator: (rule, value, cbfn) => {
-              const form = this.form;
-              let dataType = form.getFieldValue('dataType');
-              if((dataType=='varchar' || dataType =='nvarchar') && !value){
-                cbfn('请输入长度');
-                return false;
+              const form = this.form
+              let dataType = form.getFieldValue('dataType')
+              if ((dataType == 'varchar' || dataType == 'nvarchar') && !value) {
+                cbfn('请输入长度')
+                return false
               }
-              if ((dataType=="varchar" || dataType=="nvarchar") && value<=0) {
+              if ((dataType == 'varchar' || dataType == 'nvarchar') && value <= 0) {
                 cbfn('长度不能小于0')
               }
               cbfn()
-            },
-          },
+            }
+          }
         ]
       }
     }
   },
   methods: {
     dataTypeHandleChange(value) {
-      let type = this.dataTypeSelectData.find(item => item.value == value);
+      let type = this.dataTypeSelectData.find(item => item.value == value)
       if (type) {
         this.hasLength = type.hasLength
         this.hasDecimalDigits = type.hasDecimalDigits
         if (!this.hasLength) {
           this.form.setFieldsValue({
             length: 0
-          });
+          })
         }
         if (!this.hasDecimalDigits) {
           this.form.setFieldsValue({
             decimalDigits: 0
-          });
+          })
         }
       }
     },
     primarykeyHandleChange(value) {
       if (value == 1) {
-        this.enabledIsNullabled = true;
-        this.enabledIsIdentity = false;
+        this.enabledIsNullabled = true
+        this.enabledIsIdentity = false
         this.form.setFieldsValue({
           isNullable: 0
-        });
+        })
       } else {
-        this.enabledIsNullabled = false;
-        this.enabledIsIdentity = true;
+        this.enabledIsNullabled = false
+        this.enabledIsIdentity = true
         this.form.setFieldsValue({
           isIdentity: 0
-        });
+        })
       }
     },
     // 初始化方法
     add(tableName) {
-      this.tableName = tableName;
+      this.tableName = tableName
       this.visible = true
     },
     handleSubmit() {
       const {
-        form: {
-          validateFields
-        }
+        form: { validateFields }
       } = this
       this.confirmLoading = true
       validateFields((errors, values) => {
         if (!errors) {
-          values["tableName"] = this.tableName;
-          columnAdd(values).then((res) => {
-            if (res.success) {
-              this.$message.success('新增成功')
+          values['tableName'] = this.tableName
+          columnAdd(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
-              this.$emit('ok', values)
-              this.handleCancel()
-            } else {
-              this.$message.error('新增失败') //  + res.message
-            }
-          }).finally((res) => {
-            this.confirmLoading = false
-          })
+            })
         } else {
           this.confirmLoading = false
         }

src/views/main/CommondbCarrierList/index.vue

@@ -104,12 +104,12 @@ export default {
           width: '80',
           dataIndex: 'cnName'
         },
-        {
-          title: 'EDI代码',
-          align: 'center',
-          width: '80',
-          dataIndex: 'ediCode'
-        },
+        // {
+        //   title: 'EDI代码',
+        //   align: 'center',
+        //   width: '80',
+        //   dataIndex: 'ediCode'
+        // },
         {
           title: '描述',
           align: 'center',

src/views/main/CommondbCodeCountry/addForm.vue

@@ -52,10 +52,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-input placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
           <a-col :span="12">

src/views/main/CommondbCodeCountry/editForm.vue

@@ -58,11 +58,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbCodeLane/addForm.vue

@@ -44,11 +44,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbCodeLane/editForm.vue

@@ -45,11 +45,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbCtn/index.vue

@@ -118,7 +118,7 @@ export default {
           dataIndex: 'remark'
         },
         {
-          title: 'EDI代码',
+          // title: 'EDI代码',
           align: 'center',
           width: '80',
           dataIndex: 'ediCode'

src/views/main/CommondbForwarder/addForm.vue

@@ -28,20 +28,13 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
 
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbForwarder/editForm.vue

@@ -29,20 +29,13 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
 
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -87,8 +80,8 @@ export default {
       this.visible = true
       setTimeout(() => {
         this.form.setFieldsValue({
+          code: record.code,
           name: record.name,
-          ediCode: record.ediCode,
           description: record.description,
           remark: record.remark
         })

src/views/main/CommondbForwarder/index.vue

@@ -51,11 +51,11 @@
           :show-overflow="true"
         >
         </vxe-column>
-        <!-- <vxe-column title="操作" fixed="right" width="200" align="center">
+        <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
             <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
           </template>
-        </vxe-column> -->
+        </vxe-column>
       </vxe-table>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />

src/views/main/CommondbPackageList/index.vue

@@ -105,7 +105,7 @@ export default {
           dataIndex: 'remark'
         },
         {
-          title: 'EDI代码',
+          // title: 'EDI代码',
           align: 'center',
           width: '80',
           dataIndex: 'ediCode'

src/views/main/CommondbPort/editForm.vue

@@ -29,20 +29,13 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
 
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbPort/index.vue

@@ -135,7 +135,7 @@ export default {
           dataIndex: 'remark'
         },
         {
-          title: 'EDI代码',
+          // title: 'EDI代码',
           align: 'center',
           width: '80',
           dataIndex: 'ediCode'

src/views/main/CommondbPortload/editForm.vue

@@ -13,36 +13,45 @@
           <a-col :span="12">
             <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
-                placeholder="请输入代码"
                 :disabled="true"
+                placeholder="请输入代码"
                 v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
               />
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <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="['name', { rules: [{ required: true, message: '请输入名称！' }] }]"
+                placeholder="请输入英文名称"
+                v-decorator="['enName', { rules: [{ required: true, message: '请输入英文名称！' }] }]"
               />
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <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="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
+                placeholder="请输入中文名称"
+                v-decorator="['cnName', { rules: [{ required: true, message: '请输入中文名称！' }] }]"
               />
             </a-form-item>
           </a-col>
+          <!-- <a-col :span="12">
+            <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入EDI代码"
+                v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="12">
+            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+            </a-form-item>
+          </a-col>
 
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -87,8 +96,10 @@ export default {
       this.visible = true
       setTimeout(() => {
         this.form.setFieldsValue({
-          name: record.name,
-          ediCode: record.ediCode,
+          code: record.code,
+          enName: record.enName,
+          cnName: record.cnName,
+          // ediCode: record.ediCode,
           description: record.description,
           remark: record.remark
         })

src/views/main/CommondbPortload/index.vue

@@ -51,11 +51,11 @@
           :show-overflow="true"
         >
         </vxe-column>
-        <!-- <vxe-column title="操作" fixed="right" width="200" align="center">
+        <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
             <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
           </template>
-        </vxe-column> -->
+        </vxe-column>
       </vxe-table>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
@@ -110,12 +110,12 @@ export default {
           width: '80',
           dataIndex: 'remark'
         },
-        {
-          title: 'EDI代码',
-          align: 'center',
-          width: '80',
-          dataIndex: 'ediCode'
-        },
+        // {
+        //   title: 'EDI代码',
+        //   align: 'center',
+        //   width: '80',
+        //   dataIndex: 'ediCode'
+        // },
         {
           title: '描述',
           align: 'center',

src/views/main/CommondbServiceList/index.vue

@@ -105,7 +105,7 @@ export default {
           dataIndex: 'remark'
         },
         {
-          title: 'EDI代码',
+          // title: 'EDI代码',
           align: 'center',
           width: '80',
           dataIndex: 'ediCode'

src/views/main/CommondbVessel/addForm.vue

@@ -20,10 +20,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
           <!-- <a-col :span="12">
@@ -36,11 +33,7 @@
           </a-col> -->
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbVessel/editForm.vue

@@ -20,10 +20,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
           <!-- <a-col :span="12">
@@ -36,11 +33,7 @@
           </a-col> -->
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbVessel/index.vue

@@ -51,11 +51,11 @@
           :show-overflow="true"
         >
         </vxe-column>
-        <!-- <vxe-column title="操作" fixed="right" width="200" align="center">
+        <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
             <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
           </template>
-        </vxe-column> -->
+        </vxe-column>
       </vxe-table>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />
@@ -93,7 +93,7 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: 'EDI代码',
+          // title: 'EDI代码',
           align: 'center',
           width: '80',
           dataIndex: 'ediCode'

src/views/main/CommondbYard/addForm.vue

@@ -28,20 +28,13 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
 
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbYard/editForm.vue

@@ -29,20 +29,13 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
             </a-form-item>
           </a-col>
 
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -87,8 +80,8 @@ export default {
       this.visible = true
       setTimeout(() => {
         this.form.setFieldsValue({
+          code: record.code,
           name: record.name,
-          ediCode: record.ediCode,
           description: record.description,
           remark: record.remark
         })

src/views/main/CommondbYard/index.vue

@@ -51,11 +51,11 @@
           :show-overflow="true"
         >
         </vxe-column>
-        <!-- <vxe-column title="操作" fixed="right" width="200" align="center">
+        <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
             <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
           </template>
-        </vxe-column> -->
+        </vxe-column>
       </vxe-table>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />