准入方式

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

@@ -418,6 +418,12 @@ type SupplierInfoInte struct {
 	WZAccessCardNo      string    `xorm:"comment('准入证编码--物质') VARCHAR(20)"`
 	JSAccessCardNo      string    `xorm:"comment('准入证编码--基建') VARCHAR(20)"`
 	JFAccessCardNo      string    `xorm:"comment('准入证编码--技术服务类') VARCHAR(20)"`
+	WZStatus            string    `xorm:"comment('准入状态--物质') VARCHAR(20)"`
+	JSStatus            string    `xorm:"comment('准入状态--基建') VARCHAR(20)"`
+	JFStatus            string    `xorm:"comment('准入状态--技术服务类') VARCHAR(20)"`
+	WZDate              string    `xorm:"comment('有效期--物质') VARCHAR(20)"`
+	JSDate              string    `xorm:"comment('有效期--基建') VARCHAR(20)"`
+	JFDate              string    `xorm:"comment('有效期--技术服务类') VARCHAR(20)"`
 	Remark              string    `xorm:"comment('备注') VARCHAR(500)"`
 	PACNumber           string    `xorm:"comment('中石油准入证编号') VARCHAR(50)"`
 	SupplierCertificate string    `xorm:"comment('中石油物资供应商证书') VARCHAR(200)"`

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

@@ -267,6 +267,23 @@ func (this *SelectController) GetBaseInfo() {
 		var infoInte supplier.OilSupplierInte
 		where := " where 1 = 1 AND a.SupplierName = '" + item + "'"
 		svc.GetInfoByCompId(where,&infoInte.SupplierInfo)
+
+		var cert1 suppliercert.OilSupplierCert
+		where = "SupplierId=" + strconv.Itoa(infoInte.SupplierInfo.Id) + " and SupplierTypeCode= '01'"
+		svc.GetEntityByWhere(OilSupplierCertName, where, &cert1)
+		infoInte.SupplierInfo.WZStatus = cert1.InFlag
+		infoInte.SupplierInfo.WZDate = cert1.ApplyTime.Format("2006-01-02")
+		var cert2 suppliercert.OilSupplierCert
+		where = "SupplierId=" + strconv.Itoa(infoInte.SupplierInfo.Id) + " and SupplierTypeCode= '02'"
+		svc.GetEntityByWhere(OilSupplierCertName, where, &cert2)
+		infoInte.SupplierInfo.JSStatus = cert2.InFlag
+		infoInte.SupplierInfo.JSDate = cert2.ApplyTime.Format("2006-01-02")
+		var cert3 suppliercert.OilSupplierCert
+		where = "SupplierId=" + strconv.Itoa(infoInte.SupplierInfo.Id) + " and SupplierTypeCode= '03'"
+		svc.GetEntityByWhere(OilSupplierCertName, where, &cert3)
+		infoInte.SupplierInfo.JFStatus = cert3.InFlag
+		infoInte.SupplierInfo.JFDate = cert3.ApplyTime.Format("2006-01-02")
+
 		if infoInte.SupplierInfo.SupplierName != "" {
 
 			//var suplliersup []supplier.OilSupplierCertSubInte

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -763,7 +763,7 @@
           instance: "",
           Status: '',
         },
-        textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
+        textplaceholder: '请填写审核意见',
         secauditerOptions: [],
         infochangedata: [],
         infochangedatalist: [],
@@ -1618,7 +1618,7 @@
           if(this.InfoStatus == '5'){
             this.textplaceholder = ''
           }else{
-            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+            this.textplaceholder = '请填写审核意见'
           }
         } else {
           this.textplaceholder = '退回意见不能少于5个字'
@@ -1644,10 +1644,10 @@
       //审核通过
       makeSure() {
         if (this.shenheForm.SuccessStatus === 1) {
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.InfoStatus && this.InfoStatus !== '3' && this.InfoStatus !== '5') {
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.InfoStatus && this.InfoStatus !== '3' && this.InfoStatus !== '5') {
             this.$message({
               type: 'warning',
-              message: '审批意见不能低于20个字符！'
+              message: '请填写审批意见！'
             })
             return
           }

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

@@ -84,6 +84,11 @@
               {{ checkAppendType(scope.row.AppendType) }}
             </template>
           </el-table-column>
+          <el-table-column prop="AppendType" label="准入方式" sortable width="150" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkInStyle(scope.row.InStyle) }}
+            </template>
+          </el-table-column>
           <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
           <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -539,7 +544,21 @@
           return '技术服务类'
         }
       },
-
+      checkInStyle (val) {
+        if (val === '1') {
+          return '评审准入'
+        } else if (val === '2') {
+          return '一级物资备案准入'
+        } else if (val === '3') {
+          return '二级物资备案准入'
+        } else if (val === '4') {
+          return '战略合作准入'
+        } else if (val === '5') {
+          return '内部多元准入'
+        } else if (val === '6') {
+          return '外部市场准入'
+        }
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -84,6 +84,11 @@
               {{ checkAppendType(scope.row.AppendType) }}
             </template>
           </el-table-column>
+          <el-table-column prop="AppendType" label="准入方式" sortable width="150" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkInStyle(scope.row.InStyle) }}
+            </template>
+          </el-table-column>
           <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
           </el-table-column> -->
           <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -541,7 +546,21 @@
           return '技术服务类'
         }
       },
-
+      checkInStyle (val) {
+        if (val === '1') {
+          return '评审准入'
+        } else if (val === '2') {
+          return '一级物资备案准入'
+        } else if (val === '3') {
+          return '二级物资备案准入'
+        } else if (val === '4') {
+          return '战略合作准入'
+        } else if (val === '5') {
+          return '内部多元准入'
+        } else if (val === '6') {
+          return '外部市场准入'
+        }
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -87,6 +87,11 @@
               {{ checkAppendType(scope.row.AppendType) }}
             </template>
           </el-table-column>
+          <el-table-column prop="AppendType" label="准入方式" sortable width="150" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkInStyle(scope.row.InStyle) }}
+            </template>
+          </el-table-column>
           <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
           </el-table-column> -->
           <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -487,7 +492,22 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
           return '技术服务类'
         }
       },
-
+      // 准入方式： [1 评审准入、2 一级物资备案准入、3 二级物资备案准入、4 战略合作准入（需在资质中提交战略合作协议扫描件上传）、5 内部多元准入]
+      checkInStyle (val) {
+        if (val === '1') {
+          return '评审准入'
+        } else if (val === '2') {
+          return '一级物资备案准入'
+        } else if (val === '3') {
+          return '二级物资备案准入'
+        } else if (val === '4') {
+          return '战略合作准入'
+        } else if (val === '5') {
+          return '内部多元准入'
+        } else if (val === '6') {
+          return '外部市场准入'
+        }
+      },
       jstimehandle (val) {
         if (val === '') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -85,6 +85,11 @@
               {{ checkAppendType(scope.row.AppendType) }}
             </template>
           </el-table-column>
+          <el-table-column prop="AppendType" label="准入方式" sortable width="150" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkInStyle(scope.row.InStyle) }}
+            </template>
+          </el-table-column>
           <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
           <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -543,7 +548,21 @@
           return '技术服务类'
         }
       },
-
+      checkInStyle (val) {
+        if (val === '1') {
+          return '评审准入'
+        } else if (val === '2') {
+          return '一级物资备案准入'
+        } else if (val === '3') {
+          return '二级物资备案准入'
+        } else if (val === '4') {
+          return '战略合作准入'
+        } else if (val === '5') {
+          return '内部多元准入'
+        } else if (val === '6') {
+          return '外部市场准入'
+        }
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -465,15 +465,32 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="12">
+            <el-form-item label="准入方式">
+              <el-select
+                size="mini"
+                style="width:100%"
+                clearable
+                v-model="searchForm.InStyle"
+                placeholder="请选择">
+                <el-option v-for="item in InOptions"
+                           :key="item.Id"
+                           :label="item.Key"
+                           :value="item.Value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="12">
             <el-form-item label="准入类别">
               <el-select
                 size="mini"
                 style="width:100%"
+                clearable
                 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>
@@ -485,10 +502,10 @@
               <el-select
                 size="mini"
                 style="width:100%"
+                clearable
                 v-model="searchForm.InFlag"
                 placeholder="请选择"
               >
-                <el-option label="全部" value></el-option>
                 <el-option label="准入" value="1"></el-option>
                 <el-option label="暂停" value="2"></el-option>
                 <el-option label="取消" value="3"></el-option>
@@ -871,6 +888,7 @@ export default {
       auditorg: '',
       selectDept: '',
       allorgunitOptions: [],
+      InOptions: [],
       HSEOptions: [
         {
           value: '',
@@ -956,6 +974,7 @@ export default {
         SupplierName: '',
         SupplierTypeCode: '',
         InFlag: '',
+        InStyle: '',
         LegalPerson: '',
         ContactName: '',
         CommercialNo: '',
@@ -1099,6 +1118,7 @@ export default {
       }
       oapi.getDictListByStatus(params, this.$axios).then(res => {
         this.allorgunitOptions = res.data.items['Allunitorglist']
+        this.InOptions = res.data.items['InOptions']
       }).catch(err => {
         console.error(err)
       })