黑名单加法定代表人, 改备注文案

src/dashoo.cn/backend/api/business/oilsupplier/blacklist/blacklist.go

@@ -8,6 +8,7 @@ type BlackList struct {
 	Id             int       `xorm:"not null pk autoincr INT(11)"`
 	SupplierName   string    `xorm:"comment('企业名称') VARCHAR(50)"`
 	CommercialNo   string    `xorm:"comment('工商注册号') VARCHAR(50)"`
+	LegalPerson    string    `xorm:"comment('法定代表人') VARCHAR(50)"`
 	Remark   	   string    `xorm:"comment('备注') VARCHAR(50)"`
 	CreateOn       time.Time `xorm:"comment('创建时间') DATETIME"`
 	CreateUserId   int       `xorm:"comment('创建者编号') INT(11)"`

src/dashoo.cn/frontend_web/src/pages/oilsupplier/blacklist/index.vue

@@ -72,7 +72,7 @@
                        plain
                        title="编辑"
                        size="mini"
-                       @click="updateRow(scope.row.Id,scope.row.SupplierName,scope.row.CommercialNo,scope.row.Remark)">编辑</el-button>
+                       @click="updateRow(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
         <el-table-column align="center" width="70" label="序号">
@@ -96,7 +96,11 @@
                          prop="CommercialNo"
                          align="center"
                          min-width="260px"></el-table-column>
-        <el-table-column label="备注"
+        <el-table-column label="法定代表人"
+                         prop="LegalPerson"
+                         align="center"
+                         min-width="100px"></el-table-column>
+        <el-table-column label="问题描述"
                          prop="Remark"
                          align="center"
                          min-width="260px"></el-table-column>
@@ -104,6 +108,7 @@
 
       <!-- 分页 -->
       <el-pagination @size-change="handleSizeChange"
+                     style="float: right; margin-top: 10px; margin-bottom: 10px"
                      @current-change="handleCurrentChange"
                      :current-page="currentPage"
                      :page-sizes="[10, 15, 20, 25]"
@@ -130,8 +135,15 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="saveForm.Remark" type="textarea" placeholder="请输入备注内容"></el-input>
+            <el-form-item label="法定代表人" prop="LegalPerson">
+              <el-input v-model="saveForm.LegalPerson" placeholder="请输入法定代表人"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="问题描述">
+              <el-input v-model="saveForm.Remark" type="textarea" placeholder="请输入问题描述"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -157,7 +169,7 @@ export default {
   data () {
     var checkCommercialNo = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请填写工商注册号'))
+        callback()
       } else {
         let re4 = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
         if (!re4.test(this.saveForm.CommercialNo)) {
@@ -171,7 +183,6 @@ export default {
       tableLoading: false,
       addLoading: false,
       addShow: false,
-      status: false,
       // 定义列表数据
       entityList: [],
       // 分页参数
@@ -188,14 +199,19 @@ export default {
         Id:0,
         SupplierName: '',
         CommercialNo: '',
+        LegalPerson: '',
         Remark: ''
       },
       rules: {
         SupplierName: [
           {required: true, message: '请填写企业名称', trigger: 'blur'}
         ],
+        LegalPerson: [
+          {required: true, message: '请填写法定代表人', trigger: 'blur'}
+        ],
         CommercialNo: [
-          {required: true, validator: checkCommercialNo, trigger: 'change'}
+          {required: true, validator: checkCommercialNo, trigger: 'change'},
+          {required: true, message: '请填写工商注册号', trigger: 'blur'}
         ]
       }
 
@@ -207,16 +223,17 @@ export default {
       this.saveForm.SupplierName = ""
       this.saveForm.CommercialNo = ""
       this.saveForm.Remark = ""
+      this.saveForm.LegalPerson = ""
       this.saveForm.Id = 0
       this.addShow = true
     },
-    updateRow (id, name, no, remark) {
-      this.saveForm.SupplierName = name
-      this.saveForm.CommercialNo = no
-      this.saveForm.Remark = remark
-      this.saveForm.Id = id
+    updateRow (row) {
+      this.saveForm.SupplierName = row.SupplierName
+      this.saveForm.CommercialNo = row.CommercialNo
+      this.saveForm.Remark = row.Remark
+      this.saveForm.LegalPerson = row.LegalPerson
+      this.saveForm.Id = row.Id
       this.addShow = true
-      this.status = true
     },
     deleterow (id) {
       this.$confirm('确定删除?', '提示', {
@@ -253,7 +270,7 @@ export default {
       this.$refs['EntityForm'].validate((valid) => {
         if (valid) {
           this.addLoading = true
-          if (this.status) {
+          if (this.saveForm.Id > 0) {
             api.updateEntity(this.saveForm.Id, this.saveForm, this.$axios)
               .then(res => {
                 if (res.data.code === 0) {