信息资质变更

src/dashoo.cn/backend/api/controllers/oilsupplier/oilcatalog.go

@@ -206,7 +206,7 @@ func (this *OilCatalogController) ExportExcelAll() {
 
 	for idx, item := range list {
 		datastring := strconv.Itoa(idx + 1) + "," + item.CompanyName + "," + item.Business + "," + utils.ToStr(item.ValidityFrom.Format("2006-01-02")) + "," +
-			utils.ToStr(item.ValidityFrom.Format("2006-01-02")) + item.Remark
+			utils.ToStr(item.ValidityTo.Format("2006-01-02"))+ "," + item.Remark
 		cellname := strings.Split(datastring, ",")
 		row := sheet.AddRow()
 		row.WriteSlice(&cellname, -1)

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

@@ -12,22 +12,25 @@
           </span>
 
           <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-            <el-form-item label="年审日期">
+            <el-form-item label="申请日期">
               <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                 start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
-            <el-form-item label="准入类别">
+            <el-form-item label="企业名称">
+              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+            <!-- <el-form-item label="准入类别">
               <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
                 <el-option label="物资类" value="01"></el-option>
                 <el-option label="技术服务类" value="03"></el-option>
                 <el-option label="基建类" value="02"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
                 查询
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                  <!-- <el-dropdown-item command="search">高级查询</el-dropdown-item> -->
                   <el-dropdown-item command="clear">查询重置</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -77,10 +80,10 @@
           :total="currentItemCount">
         </el-pagination>
       </el-card>
-
+<!-- 
       <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
         <el-form ref="searchForm" label-width="110px">
-          <el-row>
+          <el-row> -->
 
             <!-- <el-col :span="12">
             <el-form-item label="生成时间">
@@ -94,7 +97,7 @@
               <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col> -->
-
+<!-- 
             <el-col :span="12">
               <el-form-item label="推荐单位编码">
                 <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
@@ -127,7 +130,7 @@
           <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
           <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
         </span>
-      </el-dialog>
+      </el-dialog> -->
       <el-dialog title="信息变更添加" :visible.sync="addshow" width="360px">
         <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
           <el-row>