后:曾用名审批通过才算

src/dashoo.cn/backend/api/business/oilsupplier/infochange/infochangeService.go

@@ -211,13 +211,15 @@ func (s *InfoChangeService) GetUsedNameWithOrderBytbl(SupplierName, infoChangeNa
 	//获取总记录数
 	sqlCount := `select count(*) from ` + SupplierName + ` a `
 	sqlCount += ` left join ` + infoChangeName + ` b  on b.SupplierId = a.Id `
-	sqlCount += ` where b.SelectItem = 'SupplierName'` + where
+	sqlCount += ` left join OilInfoChange c on c.SupplierId = a.Id `
+	sqlCount += ` where b.SelectItem = 'SupplierName' and c.Status = '8' and` + where
 
 	var sql string
 	sql = `select a.SupplierName, b.ChangeInfo as OldSupplierName`
 	sql += ` from ` + SupplierName + ` a `
 	sql += ` left join ` + infoChangeName + ` b on b.SupplierId = a.Id `
-	sql += ` where b.SelectItem = 'SupplierName' and` + where
+	sql += ` left join OilInfoChange c on c.SupplierId = a.Id `
+	sql += ` where b.SelectItem = 'SupplierName' and c.Status = '8' and` + where
 	if asc {
 		sql += ` order by ` + orderby + ` ASC `
 	} else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -2705,12 +2705,6 @@
           }
         }
       },
-      getCityList (val) {
-        let resultData = JSON.parse(val)
-        let countstr = JSON.stringify(resultData.districts[0].districts)
-        countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
-        this.countryoptions = JSON.parse(countstr)
-      },
       jstimehandle (val) {
         if (val === '') {
           return ''