lining 5 years ago
parent
commit
78cbc832c5

+ 4 - 0
src/dashoo.cn/backend/api/controllers/oilsupplier/badrecord.go

@@ -483,11 +483,15 @@ func (this *BadRecordController) SerachGoodsCertByCompany() {
 	currentPage := this.GetString("_currentPage")
 	size := this.GetString("_size")
 	certName := this.GetString("_certName")
+	certSubStatus := this.GetString("_certSubStatus")
 
 	sqlAdd:=""
 	if certName!=""{
 		sqlAdd="and (Name like '%"+certName+"%' or Code like '%"+certName+"%')"
 	}
+	if certSubStatus!=""{
+		sqlAdd=" and (CertSubStatus = '"+certSubStatus+"')"
+	}
 	sizeIntPage,_:=strconv.Atoi(size)
 	currentIntPage,_:=strconv.Atoi(currentPage)
 	ye:=strconv.Itoa((currentIntPage-1)*sizeIntPage)

+ 4 - 4
src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -162,14 +162,14 @@ module.exports = {
   ignore: [
     'pages/oilsupplier/addtionaudit/*.*',
     // 'pages/oilsupplier/annualaudit/*.*',
-    'pages/oilsupplier/badrecord/*.*',
+    // 'pages/oilsupplier/badrecord/*.*',
     'pages/oilsupplier/basisbuild/*.*',
     'pages/oilsupplier/compayaudit/*.*',
     'pages/oilsupplier/goodsaptitude/*.*',
     'pages/oilsupplier/infochange/*.*',
-    // 'pages/oilsupplier/infochangech/*.*',
-    // 'pages/oilsupplier/supplier/*.*',
-    // 'pages/oilsupplier/supplierappend/*.*',
+    'pages/oilsupplier/infochangech/*.*',
+    'pages/oilsupplier/supplier/*.*',
+    'pages/oilsupplier/supplierappend/*.*',
     'pages/oilsupplier/supplieraudit/*.*',
     'pages/oilsupplier/suppliercert/*.*',
     'pages/oilsupplier/supplierfile/*.*',

+ 12 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/badrecord/index.vue

@@ -451,13 +451,21 @@
                        @click="initCert($event)">查询</el-button>
             <el-form :inline="true"
                      style="float:right">
-              <el-form-item label="">
+              <el-form-item label="编码或名称">
                 <el-input size="mini"
                           style="width: 225px;"
                           v-model="certChooseName"
                           clearable
                           placeholder="请输入准入范围编码或名称"></el-input>
               </el-form-item>
+              <el-form-item label="状态">
+                <el-select size="mini" style="width:100px"
+                  v-model="CertSubStatus"
+                  placeholder="请选择" clearable >
+                  <el-option label="准入" value="1"></el-option>
+                  <el-option label="暂停" value="2"></el-option>
+                </el-select>
+              </el-form-item>
             </el-form>
           </div>
           <el-tabs type="border-card"
@@ -757,6 +765,7 @@ export default {
       }],
       companyChooseName: '',
       certChooseName: '',
+      CertSubStatus: '',
       companyDialog: false,
       certDialog: false,
       dataList: [],
@@ -1059,7 +1068,8 @@ export default {
         _size: this.goodsSize,
         _currentPage: this.currentGoodsPage,
         _companyId: this.companyId,
-        _certName: this.certChooseName
+        _certName: this.certChooseName,
+        _certSubStatus: this.CertSubStatus
       }
       setapi
         .serachGoodsCertByCompany(params, this.$axios)