准入标识-准入

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

@@ -62,15 +62,17 @@ type OilSupplier struct {
 	SpecSupplier       string    `xorm:"default '0' comment('是否特殊业务供应商(可不招标)') VARCHAR(2)"`
 	SpecTypeCode       string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(2)"`
 	SpecTypeName       string    `xorm:"comment('业务类型（1战略合作，2内部多经，3区域关键，4专业化实施）') VARCHAR(20)"`
-
-	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
-	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
-	CreateOn       time.Time `xorm:"DATETIME"`
-	CreateUserId   int       `xorm:"INT(10)"`
-	CreateBy       string    `xorm:"VARCHAR(50)"`
-	ModifiedOn     time.Time `xorm:"DATETIME"`
-	ModifiedUserId int       `xorm:"INT(10)"`
-	ModifiedBy     string    `xorm:"VARCHAR(50)"`
+	WZAccessCardNo     string    `xorm:"comment('准入证编码--物质') VARCHAR(20)"`
+	JSAccessCardNo     string    `xorm:"comment('准入证编码--基建') VARCHAR(20)"`
+	JFAccessCardNo     string    `xorm:"comment('准入证编码--技术服务类') VARCHAR(20)"`
+	Remark             string    `xorm:"comment('备注') VARCHAR(500)"`
+	IsDelete           int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn           time.Time `xorm:"DATETIME"`
+	CreateUserId       int       `xorm:"INT(10)"`
+	CreateBy           string    `xorm:"VARCHAR(50)"`
+	ModifiedOn         time.Time `xorm:"DATETIME"`
+	ModifiedUserId     int       `xorm:"INT(10)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
 }
 
 type OilSupplierView struct {

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

@@ -27,7 +27,7 @@ func (s *OilSupplierService) GetMyPagingEntitiesWithOrderBytbl(supplierTableName
 	sqlCount += ` where ` + where
 
 	var sql string
-	sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, `
+	sql = `select a.*, b.Id as CertId, b.AccessCardNo, b.SupplierTypeCode, b.SupplierTypeName, b.InFlag, `
 	sql += ` b.WorkerTotal, `
 	sql += ` b.ContractNum, `
 	sql += ` b.UniversityNum, `

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

@@ -492,6 +492,7 @@ func (this *OilSupplierCertController) UpdateStorage() {
 	model.Step = 7
 	model.StorageOn = time.Now()
 	model.ApplyTime = time.Now().AddDate(1, 0 ,0)
+	model.InFlag = "1"
 	model.ModifiedOn = time.Now()
 	model.ModifiedBy = this.User.Realname
 	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -500,6 +501,7 @@ func (this *OilSupplierCertController) UpdateStorage() {
 		"Step",
 		"Status",
 		"ApplyTime",
+		"InFlag",
 		"StorageOn",
 		"ModifiedOn",
 		"ModifiedUserId",

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

@@ -19,6 +19,7 @@
           </el-form-item>
           <el-form-item label="项目类别">
             <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
+              <el-option label="全部" value=""></el-option>
               <el-option label="物资类" value="01"></el-option>
               <el-option label="基建类" value="02"></el-option>
               <el-option label="技术服务类" value="03"></el-option>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/paymented.vue

@@ -19,6 +19,7 @@
           </el-form-item>
           <el-form-item label="项目类别">
             <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeCode" placeholder="准入类别">
+              <el-option label="全部" value=""></el-option>
               <el-option label="物资类" value="01"></el-option>
               <el-option label="基建类" value="02"></el-option>
               <el-option label="技术服务类" value="03"></el-option>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/basislist.vue

@@ -535,10 +535,15 @@
           {
             prop: "SupplierTypeName",
             label: '准入类别',
-            width: 260,
+            width: 130,
+            sort: true
+          },
+          {
+            prop: "InFlag",
+            label: '准入标识',
+            width: 110,
             sort: true
           },
-
           {
             prop: "SupplierName",
             label: '企业名称',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -48,7 +48,19 @@
             </el-popover>
           </template>
         </el-table-column>
-
+        <el-table-column min-width="110" align="center" prop="InFlag" label="准入标识" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.InFlag=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="准入" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.InFlag=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="暂停" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.InFlag=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+                      title="取消" type="error">
+            </el-alert>
+          </template>
+        </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
                          v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip></el-table-column>