注释-自动取消

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

@@ -1248,7 +1248,7 @@ func (this *OilSupplierCertController) UpdataInFlag() {
 		session.Close()
 	}()
 	err := session.Begin()
-	svc.GetEntities(&certentitys, "InFlag!='3' and CreateBy != '导入' ")
+	svc.GetEntities(&certentitys, "InFlag!='3'")
 	currenttime := time.Now()
 	//.Format("2006-01-02")
 	for i := 0; i < len(certentitys); i++ {

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

@@ -13,21 +13,21 @@ import (
 func TimingTask(){
 	c := new(oilsupplier.OilSupplierCertController)
 	//c.UpdataInFlag52456564546
-	tkInFlag := toolbox.NewTask("myTaskInFlag", "0 0 1 * * *", func() error {
-		c.UpdataInFlag()
-		return nil
-		})
-	err := tkInFlag.Run()
-	if err != nil {
-		fmt.Println(err)
-	}
-	toolbox.AddTask("myTaskInFlag", tkInFlag)
+	//tkInFlag := toolbox.NewTask("myTaskInFlag", "0 0 1 * * *", func() error {
+	//	c.UpdataInFlag()
+	//	return nil
+	//	})
+	//err := tkInFlag.Run()
+	//if err != nil {
+	//	fmt.Println(err)
+	//}
+	//toolbox.AddTask("myTaskInFlag", tkInFlag)
 
 	tkSMSnotice := toolbox.NewTask("myTaskSMSnotice", "0 0 10 * * *", func() error {
 		c.SendingSMS()
 		return nil
 	})
-	err = tkSMSnotice.Run()
+	err := tkSMSnotice.Run()
 	if err != nil {
 		fmt.Println(err)
 	}

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

@@ -118,15 +118,15 @@
         </el-tab-pane>
         <el-tab-pane label="信息变更" name="fourth">
           <el-table :data="entityList" id="rebateSetTable3" size="mini" border style="width: 100%" @sort-change="orderby">
-            <el-table-column align="center" label="公司名称" prop="OldSupplierName"></el-table-column>
+            <el-table-column align="center" label="公司名称" prop="SupplierName"></el-table-column>
             <el-table-column align="center" label="当前状态" prop="Status">
               <template slot-scope="scope">
-                <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
-                <span v-if="scope.row.Status=='1'" style="color:#E6A23C">已申请</span>
-                <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">初审未通过</span>
-                <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待法规处审核</span>
-                <span v-if="scope.row.Status=='-3'" style="color:#F56C6C">审核未通过</span>
-                <span v-if="scope.row.Status=='3'" style="color:#67C23A">审核通过</span>
+                <span v-if="scope.row.Status=='0'">待提交</span>
+                <span v-if="scope.row.Status=='1'">已申请</span>
+                <span v-if="scope.row.Status=='-2'">初审未通过</span>
+                <span v-if="scope.row.Status=='2'" >待法规处审核</span>
+                <span v-if="scope.row.Status=='-3'">审核未通过</span>
+                <span v-if="scope.row.Status=='3'" >审核通过</span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="操作">