备注

src/dashoo.cn/backend/api/business/oilsupplier/selectbusiness/selectservice.go

@@ -42,7 +42,7 @@ func (s *SelectService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName, sup
 	sql += `a.LegalPerson,a.RegCapital,a.Mobile,b.AuditDate,b.ApplyTime,b.InFlag,a.ContactName,a.CommercialNo, `
 	sql += `a.DepositBank,a.HseTraining,a.CompanyType,a.SetupTime,a.Address,a.Province,a.City,a.Street, `
 	sql += `a.LinkAddress,a.LinkProvince,a.LinkCity,a.LinkStreet,a.BusinessScope, `
-	sql += `b.InStyle, b.Id CertId, f.FullName, g.CheckUnitName, `
+	sql += `b.InStyle, b.Id CertId, f.FullName, g.CheckUnitName, b.Remark, `
 	sql += `group_concat(distinct e.NeedFileType) NeedFileType `
 	if liftjoon != "" {
 		sql += `,group_concat(distinct d.Name) CerSubName `

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -243,6 +243,7 @@ type OilSupplierSelect struct {
 	InStyle          string    //准入方式
 	FullName         string    //专业科室审批
 	CheckUnitName    string    //推荐单位
+	Remark           string
 }
 
 //type NeedFileTypeStruct struct {

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

@@ -1577,7 +1577,8 @@ func (this *OilSupplierCertController) UpdataInFlag() {
 		if currenttime.After(certentitys[i].ApplyTime) && !currenttime.After(certentitys[i].ApplyTime.AddDate(1, 0, 0)) && certentitys[i].InFlag != "2" {
 			var certentity suppliercert.OilSupplierCert
 			certentity.InFlag = "2"
-			cols := []string{"InFlag"}
+			certentity.Remark = "未年审"
+			cols := []string{"InFlag", "Remark"}
 			_, err = svc.UpdateEntityByIdCols(certentitys[i].Id, &certentity, cols)
 			if err != nil {
 				session.Rollback()
@@ -1587,7 +1588,8 @@ func (this *OilSupplierCertController) UpdataInFlag() {
 			fmt.Println(time.Now().Format("2006-01-02"), certentitys[i].ApplyTime.AddDate(1, 0, 0).Format("2006-01-02"))
 			var certentity suppliercert.OilSupplierCert
 			certentity.InFlag = "3"
-			cols := []string{"InFlag"}
+			certentity.Remark = "超1年未年审"
+			cols := []string{"InFlag", "Remark"}
 			_, err = svc.UpdateEntityByIdCols(certentitys[i].Id, &certentity, cols)
 			if err != nil {
 				session.Rollback()
@@ -1781,8 +1783,10 @@ func (this *OilSupplierCertController) ChangeSupplierStatus() {
 		var sert suppliercert.OilSupplierCert
 		cols := []string{
 			"InFlag",
+			"Remark",
 		}
 		sert.InFlag = "2"
+		sert.Remark = "资质已到期"
 		where := "SupplierId=" + strconv.Itoa(item.Id) + " AND InFlag = '1'"
 		if item.SupplierTypeCode != "000" {
 			where = where + " and SupplierTypeCode='" + item.SupplierTypeCode + "'"

src/dashoo.cn/backend/api/controllers/toolbox/toolbox.go

@@ -12,7 +12,7 @@ import (
 
 func TimingTask(){
 	c := new(oilsupplier.OilSupplierCertController)
-	//c.UpdataInFlag52456564546
+
 	//tkInFlag := toolbox.NewTask("myTaskInFlag", "0 0 1 * * *", func() error {
 	//	c.UpdataInFlag()
 	//	return nil

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -145,6 +145,7 @@
         <el-table-column label="企业曾用名" width="280px" prop="OldSupplierName" align="center"></el-table-column>
         <el-table-column label="推荐单位" width="280px" prop="CheckUnitName" align="center"></el-table-column>
         <el-table-column label="专业处室审核" width="280px" prop="FullName" align="center"></el-table-column>
+        <el-table-column label="备注" width="100px" prop="Remark" align="center"></el-table-column>
       </el-table>
 
       <!-- 分页 -->

src/dashoo.cn/frontend_web/src/pages/select/processselect/index.vue

@@ -50,7 +50,12 @@
       <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="全部" name="all">
           <el-table :data="entityListAll" id="rebateSetTableAll" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
-            <el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>
+            <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column label="准入编码" prop="AccessCardNo" align="center">
+              <template slot-scope="scope" >
+                <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName" width="300px"></el-table-column>
             <el-table-column align="center" label="申请时间" prop="CreateOn">
               <template slot-scope="scope">
@@ -92,7 +97,12 @@
         </el-tab-pane>
         <el-tab-pane label="准入" name="first">
           <el-table :data="entityList" id="rebateSetTable0" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
-            <el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>
+            <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column label="准入编码" prop="AccessCardNo" align="center">
+              <template slot-scope="scope" >
+                <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName" width="300px"></el-table-column>
             <el-table-column align="center" label="申请时间" prop="CreateOn">
               <template slot-scope="scope">
@@ -129,7 +139,12 @@
         </el-tab-pane>
         <el-tab-pane label="增项" name="second">
           <el-table :data="entityList1" id="rebateSetTable1" size="mini"  border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
-            <el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>
+            <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column label="准入编码" prop="AccessCardNo" align="center">
+              <template slot-scope="scope" >
+                <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName" width="300px"></el-table-column>
             <el-table-column align="center" label="申请时间" prop="CreateOn">
               <template slot-scope="scope">
@@ -166,7 +181,12 @@
         </el-tab-pane>
         <el-tab-pane label="年审" name="third">
           <el-table :data="entityList2" id="rebateSetTable2" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
-            <el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>
+            <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column label="准入编码" prop="AccessCardNo" align="center">
+              <template slot-scope="scope" >
+                <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName" width="300px"></el-table-column>
             <el-table-column align="center" label="申请时间" prop="CreateOn">
               <template slot-scope="scope">
@@ -211,7 +231,12 @@
         </el-tab-pane>
         <el-tab-pane label="变更申请" name="fourth">
           <el-table :data="entityList3" id="rebateSetTable3" size="mini" border style="width: 100%" @sort-change="orderby" height="calc(100vh - 330px)">
-            <el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>
+            <!--<el-table-column align="center" label="准入编码" prop="AccessCardNo"></el-table-column>-->
+            <el-table-column label="准入编码" prop="AccessCardNo" align="center">
+              <template slot-scope="scope" >
+                <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="公司名称" prop="SupplierName" width="300px"></el-table-column>
             <el-table-column align="center" label="申请时间" prop="CreateOn">
               <template slot-scope="scope">

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -447,18 +447,18 @@
           ContactId: [
             { required: true, validator: checkContactId, trigger: 'change' }
           ],
-          // LegalPersonImg: [
-          //   { required: !this.legalHaspic,
-          //     message: '请上传法定代表人身份证照片',
-          //     trigger: 'change'
-          //   }
-          // ],
-          // ContactImg: [
-          //   { required: !this.ContactImg,
-          //     message: '请上传联系人身份证照片',
-          //     trigger: 'change'
-          //   }
-          // ],
+          LegalPersonImg: [
+            { required: !this.legalHaspic,
+              message: '请上传法定代表人身份证照片',
+              trigger: 'change'
+            }
+          ],
+          ContactImg: [
+            { required: !this.ContactImg,
+              message: '请上传联系人身份证照片',
+              trigger: 'change'
+            }
+          ],
           UserName: [
             { required: true,
               validator: userNameIsExist,