不合格原因

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

@@ -77,7 +77,7 @@ func (s *SelectService) GetUp( supplierCertTableName string, pageIndex, itemsPer
 
 	var sql string
 	sql = `  select (select FullName from Base_Organize where Id = a.CommitComId) FullName,max(a.CommitComId) CommitComId,a.SupplierTypeName,`
-	sql +=`  count(a.Status>=6 or null ) HeGe,count(a.Status=-5 or null ) BuHeGe,count(a.Status=-5 or null ) + count(a.Status>=6 or null ) ZongShu `
+	sql +=`  count(a.Status>=6 or null ) HeGe,count(a.Status=-5 or null ) BuHeGe,count(a.Status=-5 or null ) + count(a.Status>=6 or null ) ZongShu,GROUP_CONCAT(a.BackReason SEPARATOR ';') Reason  `
 	sql += ` from ` + supplierCertTableName + ` a `
 	sql += ` where a.CommitComId is not null and  a.CommitComId!="" and  a.CommitComId!=0 ` + where
 	sql += ` group by FullName,SupplierTypeName `

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -16,7 +16,7 @@ type OilSupplierCert struct {
 	RecUnitId         string    `xorm:"comment('推荐单位编码') VARCHAR(10)"`
 	RecUnitName       string    `xorm:"comment('推荐单位名称') VARCHAR(50)"`
 	Status            string    `xorm:"not null default '0' comment('状态标识(0未申请，1办理完毕)') VARCHAR(10)"`
-	BackReason        string    `xorm:"comment('退回原因') VARCHAR(50)"`
+	BackReason        string    `xorm:"comment('退回原因') VARCHAR(500)"`
 	InFlag            string    `xorm:"default '0' comment('准入标识') VARCHAR(10)"`
 	InStyle           string    `xorm:"default '1' comment('准入方式') VARCHAR(10)"`
 	EffectStartTime   time.Time `xorm:"comment('有效期起') DATETIME"`

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

@@ -488,31 +488,38 @@ func (this *OilSupplierCertController) UpdateStorage() {
 
 	//var jsonBlob = this.Ctx.Input.RequestBody
 	//json.Unmarshal(jsonBlob, &model)
-	if status == suppliercert.NOPASS_STATUS {
+	var err error
+	if status == suppliercert.NO_CENT_AUDIT_STATUS {
 		model.Status = suppliercert.DRAFT_STATUS
+		cols := []string{
+			"Status",
+		}
+		err = svc.UpdateEntityBytbl(OilSupplierCertName, id, &model, cols)
 	} else {
 		model.Status = suppliercert.STORE_STATUS
+		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()
+
+		cols := []string{
+			"Step",
+			"Status",
+			"ApplyTime",
+			"InFlag",
+			"StorageOn",
+			"ModifiedOn",
+			"ModifiedUserId",
+			"ModifiedBy",
+		}
+		err = svc.UpdateEntityBytbl(OilSupplierCertName, id, &model, cols)
 	}
 
-	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()
 
-	cols := []string{
-		"Step",
-		"Status",
-		"ApplyTime",
-		"InFlag",
-		"StorageOn",
-		"ModifiedOn",
-		"ModifiedUserId",
-		"ModifiedBy",
-	}
-	err := svc.UpdateEntityBytbl(OilSupplierCertName, id, &model, cols)
+
 	if err == nil {
 		errinfo.Message = "提交成功！"
 		errinfo.Code = 0
@@ -1080,7 +1087,12 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 			audithistoryentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			certSrv.InsertEntity(audithistoryentity)
 			if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
-				supplierCertEntity.Status = suppliercert.NOPASS_STATUS
+				supplierCertEntity.Status = suppliercert.NO_CENT_AUDIT_STATUS
+				supplierCertEntity.BackReason = dataother.AuditorRemark
+				cols := []string{
+					"BackReason",
+				}
+				certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 			} else {
 				supplierCertEntity.Status = backstatus
 			}

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -962,7 +962,7 @@
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
             this.formDataCert.InStyle = this.formData.InStyle
-            if (this.formData.Status > 0) {
+            if (this.formData.Status > 0 || this.formData.Status == -5 ) {
               this.add_flat = false
             }
             if ((this.formData.Status > 0) && (this.formData.Status != 4)) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -984,7 +984,7 @@
               this.formDataCert.Status = this.formData.Status;
               this.formDataCert.WorkflowId = this.formData.WorkflowId;
               this.formDataCert.InStyle = this.formData.InStyle;
-              if (this.formData.Status > 0) {
+              if (this.formData.Status > 0 || this.formData.Status == -5) {
                 this.add_flat = false;
               }
               if ((this.formData.Status > 0) && (this.formData.Status != 4)) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -957,7 +957,7 @@
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
             this.formDataCert.InStyle = this.formData.InStyle
-            if (this.formData.Status > 0) {
+            if (this.formData.Status > 0 || this.formData.Status == -5 ) {
               this.add_flat = false
             }
             if ((this.formData.Status > 0) && (this.formData.Status != 4)) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/_opera/basisedit.vue

@@ -23,7 +23,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '-1'" @click="confirm">解锁</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '-5'" @click="confirm">解锁</el-button>
           <router-link :to="'/oilsupplier/supplierstore/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/_opera/goodsedit.vue

@@ -23,7 +23,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '-1'" @click="confirm">解锁</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this.formData.Status == '-5'" @click="confirm">解锁</el-button>
           <router-link :to="'/oilsupplier/supplierstore/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/_opera/techedit.vue

@@ -23,7 +23,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '7'" @click="confirm">确认入库</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 5px" v-if="this,formData.Status == '-5'" @click="confirm">解锁</el-button>
           <router-link :to="'/oilsupplier/supplierstore/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>

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

@@ -79,7 +79,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
          <!-- <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
@@ -140,8 +140,8 @@
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
- 
- 
+
+
         <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
@@ -260,7 +260,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>
@@ -729,7 +729,7 @@
           Order: this.Column.Order,
           Prop: this.Column.Prop,
           SupplierTypeCode: '02',
-          Status: '-1'
+          Status: '-5'
         }
         let myCreateOn = []
         // 解析时间

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

@@ -64,7 +64,7 @@
     </el-card>
 
     <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-     
+
        <el-form ref="advancedsearchForm" label-width="130px">
         <el-row>
 
@@ -80,7 +80,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
          <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
@@ -141,8 +141,8 @@
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
- 
- 
+
+
         <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
@@ -261,7 +261,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>
@@ -522,7 +522,7 @@
           Order: this.Column.Order,
           Prop: this.Column.Prop,
           SupplierTypeCode: '01',
-          Status: '-1'
+          Status: '-5'
         }
         let myCreateOn = []
         // 解析时间

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

@@ -859,7 +859,7 @@
           Order: this.Column.Order,
           Prop: this.Column.Prop,
           SupplierTypeName: '',
-          Status: '-1'
+          Status: '-5'
         }
         let myCreateOn = []
         // 解析时间

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

@@ -79,7 +79,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-        
+
          <!-- <el-col :span="12">
           <el-form-item label="供应商类型">
             <el-select  size="mini" v-model="searchForm.OperType" placeholder="请选择" style="width: 100%">
@@ -140,8 +140,8 @@
             <el-input size="mini" v-model="searchForm.PACNumber" maxlength="255" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
- 
- 
+
+
         <el-col :span="12">
           <el-form-item label="统一社会信用代码">
             <el-input size="mini" v-model="searchForm.CommercialNo" maxlength="50" placeholder="请输入" style="width: 100%"></el-input>
@@ -260,7 +260,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>
@@ -736,7 +736,7 @@
           Order: this.Column.Order,
           Prop: this.Column.Prop,
           SupplierTypeCode: '03',
-          Status: '-1'
+          Status: '-5'
         }
         let myCreateOn = []
         // 解析时间