增项上传资质有效期

src/dashoo.cn/backend/api/business/oilsupplier/badrecord/badrecordservice.go

@@ -58,8 +58,8 @@ func (s *BadRecordService) GetMyPagingEntitiesWithOrderBytbl1(TableName, supTabl
 	var resultsSlice []map[string][]byte
 
 	//获取总记录数
-	sqlCount := `select count(*) from ` + TableName + ` a `
-	sqlCount += ` left join ` + supTableName + " b on (b.SupplierId = a.Id)"
+	sqlCount := `select count(*) from ` + TableName
+	//sqlCount += ` left join ` + supTableName + " b on (b.SupplierId = a.Id)"
 	sqlCount += ` where ` + where
 
 	var sql string

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -536,12 +536,12 @@
       <el-form :model="SubfileForm" ref="subfileForm" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="资质名称" required>
+            <el-form-item label="资质名称" prop="NeedFileType">
               <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="有效日期" required>
+            <el-form-item label="有效日期" prop="EffectDate">
               <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期">
               </el-date-picker>
             </el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -667,12 +667,12 @@
       <el-form ref="subfileForm" :model="SubfileForm" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="资质名称" required>
+            <el-form-item label="资质名称" prop="NeedFileType">
               <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="有效日期" required>
+            <el-form-item label="有效日期" prop="EffectDate">
               <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期">
               </el-date-picker>
             </el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -527,12 +527,12 @@
       <el-form ref="subfileForm" :model="SubfileForm" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="资质名称" required>
+            <el-form-item label="资质名称" prop="NeedFileType">
               <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="有效日期" required>
+            <el-form-item label="有效日期" prop="EffectDate">
               <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期">
               </el-date-picker>
             </el-form-item>