Pārlūkot izejas kodu

准入申请:暂时先不检查统一信用代码的重复性, fix检查该重复性的方法

baichengfei 5 gadi atpakaļ
vecāks
revīzija
ce05e309b3

+ 10 - 10
src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1485,23 +1485,23 @@ func (this *OilSupplierController) GetEntityByName() {
 // @Title 获取实体
 // @Description 判断统一社会码
 // @Success 200 {object} supplier.OilSupplier
-// @router /getbycomminercialno [get]
+// @router /getbycomminercialno/commercialNo [get]
 func (this *OilSupplierController) GetEntityComminercialNo() {
-	comminercialno := this.GetString("comminercialno")
+	commercialNo := this.Ctx.Input.Param(":commercialNo")
 	svc := supplier.GetOilSupplierService(utils.DBE)
-	var datainfo ErrorDataInfo
-	var sqlsus string
-	sqlsus = "select Id from OilSupplier where CommercialNo= '" + comminercialno + "'"
+	var dataInfo ErrorDataInfo
+	var sqlSus string
+	sqlSus = "select Id from OilSupplier where CommercialNo= '" + commercialNo + "'"
 	var tempMap []map[string]string
-	tempMap, _ = svc.DBE.QueryString(sqlsus)
+	tempMap, _ = svc.DBE.QueryString(sqlSus)
 
 	if tempMap != nil && tempMap[0]["Id"] != "" {
-		datainfo.Code = 1
-		this.Data["json"] = &datainfo
+		dataInfo.Code = 1
+		this.Data["json"] = &dataInfo
 		this.ServeJSON()
 	} else {
-		datainfo.Code = 0
-		this.Data["json"] = &datainfo
+		dataInfo.Code = 0
+		this.Data["json"] = &dataInfo
 		this.ServeJSON()
 	}
 }

+ 6 - 0
src/dashoo.cn/frontend_web/src/api/oilsupplier/supplier.js

@@ -181,5 +181,11 @@ export default {
       method: 'get',
       params: params
     })
+  },
+  checkCommercialIsRepeat (commercialNo, myAxios) {
+    return myAxios({
+      url: 'supplier/getbycomminercialno' + commercialNo,
+      method: 'GET'
+    })
   }
 }

+ 1 - 13
src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -452,19 +452,7 @@
             if (!re.test(value)) {
               callback(new Error('请输入正确的统一社会信用代码'))
             } else {
-              if (!this.formData.Id) {
-                this.$axios.get('/supplier/getbycomminercialno?comminercialno=' + value, {})
-                  .then(res => {
-                    if (res.data.code) {
-                      callback(new Error('该统一社会信用代码与其他公司重复'))
-                    } else {
-                      callback()
-                    }
-                  })
-                  .catch(err => {
-                    console.error(err)
-                  })
-              }
+              callback()
             }
           } else {
             callback()

+ 1 - 14
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -838,20 +838,7 @@ export default {
           if (!re.test(value)) {
             callback(new Error('请输入正确的统一社会信用代码'))
           } else {
-            if (!this.formData.Id) {
-              this.$axios.get('/supplier/getbycomminercialno?comminercialno=' + value, {})
-                .then(res => {
-                  console.log(res.data.code)
-                  if (res.data.code) {
-                    callback(new Error('该统一社会信用代码与其他公司重复'))
-                  } else {
-                    callback()
-                  }
-                })
-                .catch(err => {
-                  console.error(err)
-                })
-            }
+            callback()
           }
         } else {
           callback()

+ 1 - 13
src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -442,19 +442,7 @@
             if (!re.test(value)) {
               callback(new Error('请输入正确的统一社会信用代码'))
             } else {
-              if (!this.formData.Id) {
-                this.$axios.get('/supplier/getbycomminercialno?comminercialno=' + value, {})
-                  .then(res => {
-                    if (res.data.code) {
-                      callback(new Error('该统一社会信用代码与其他公司重复'))
-                    } else {
-                      callback()
-                    }
-                  })
-                  .catch(err => {
-                    console.error(err)
-                  })
-              }
+              callback()
             }
           } else {
             callback()