bug 修改

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

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

@@ -1,8 +1,10 @@
 package oilsupplier
 
 import (
+	msg2 "dashoo.cn/backend/api/business/msg"
 	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/auditsetting"
+	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/backend/api/business/register"
@@ -641,6 +643,9 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
 	svc.GetEntityById(appendId, &supplierCertAppendEntity)
 
+	var supplierEntity supplier.OilSupplier
+	wheresup := "Id=" + strconv.Itoa(supplierCertAppendEntity.SupplierId)
+	svc.GetEntity(&supplierEntity, wheresup)
 	var jsonblob = this.Ctx.Input.RequestBody
 	var dataother AppShenHeModel
 	json.Unmarshal(jsonblob, &dataother)
@@ -810,6 +815,19 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 					payinfo.CreateBy = supplierCertAppendEntity.CreateBy
 					payinfo.CreateOn = time.Now()
 					paysvc.InsertEntity(&payinfo)
+					//发短信
+					toMobile := supplierEntity.Mobile
+					bFlag:=""
+					if supplierCertAppendEntity.AppendType == "01"{
+						bFlag="物资类"
+					}else if supplierCertAppendEntity.AppendType == "02"{
+						bFlag="基建类"
+					}else{
+						bFlag="技术服务类"
+					}
+					msg:= "您的"+ bFlag + "增项审核通过，请及时确认缴费信息！"
+					msgService := msg2.GetMsgService(utils.DBE)
+					msgService.HandleMsg(toMobile,msg,"4-1",supplierCertAppendEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertAppendEntity.CreateUserId))
 					//paysvc.AddPaymentinfo(supplierCertAppendEntity.SupplierId, supplierCertAppendEntity.Id, Amount, "3")
 				}
 			}

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -396,7 +396,7 @@
             this.auditTitle = '专业审批'
             this.auditstepcode = 'PROF_AUDIT'
           } else if (this.formData.Status === '5') {
-            this.auditTitle = '集中审批'
+            this.auditTitle = '集中评审'
             this.auditstepcode = 'PROF_REGULATION'
           }
           this.getFileList()

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

@@ -35,13 +35,13 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status != 8"
+          <el-button type="primary" plain size="mini" style="margin-right:3px" v-if="formDataCert.Status == 8"
             @click="annaudit">
             年审申请</el-button>
-          <el-button type="primary" plain size="mini" :disabled="formDataCert.Status != 8" @click="qppend">增项申请
+          <el-button type="primary" plain size="mini" v-if="formDataCert.Status == 8" @click="qppend">增项申请
           </el-button>
           <el-button type="primary" @click="toWord" size="mini" :disabled="formData.Status == 0">表单下载</el-button>
-          <el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">资质下载</el-button>
+          <el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>
           <!--<router-link :to="'/oilsupplier/supplier/basislist'">-->
             <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回-->
             <!--</el-button>-->

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

@@ -41,13 +41,13 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status != 8"
+          <el-button type="primary" plain size="mini" style="margin-right:3px" v-if="formDataCert.Status == 8"
             @click="annaudit">
             年审申请</el-button>
-          <el-button type="primary" plain size="mini" :disabled="formDataCert.Status != 8" @click="qppend">增项申请
+          <el-button type="primary" plain size="mini" v-if="formDataCert.Status == 8" @click="qppend">增项申请
           </el-button>
           <el-button type="primary" @click="toWord" size="mini" :disabled="formData.Status == 0">表单下载</el-button>
-          <el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">资质下载</el-button>
+          <el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>
           <!--<router-link :to="'/oilsupplier/supplier/goodslist'">-->
             <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回</el-button>-->
           <!--</router-link>-->

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

@@ -36,13 +36,13 @@
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
 
-          <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status != 8"
+          <el-button type="primary" plain size="mini" style="margin-right:3px" v-if="formDataCert.Status == 8"
             @click="annaudit">
             年审申请</el-button>
-          <el-button type="primary" plain size="mini" :disabled="formDataCert.Status != 8" @click="qppend">增项申请
+          <el-button type="primary" plain size="mini" v-if="formDataCert.Status == 8" @click="qppend">增项申请
           </el-button>
           <el-button type="primary" @click="toWord" size="mini" :disabled="formData.Status == 0">表单下载</el-button>
-          <el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">资质下载</el-button>
+          <el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>
           <!--<router-link :to="'/oilsupplier/supplier/techlist'">-->
             <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回-->
             <!--</el-button>-->

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

@@ -74,7 +74,7 @@
         <el-table-column label="操作" min-width="200px" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="toWord(scope.row)" title="下载" size="mini" icon="el-icon-download" width="120px">表单下载</el-button>
-            <el-button type="text" @click="toPdf(scope.row)" title="导出" size="mini" icon="el-icon-document" width="120px">资质下载</el-button>
+            <el-button type="text" @click="toPdf(scope.row)" title="导出" size="mini" icon="el-icon-document" width="120px">准入范围</el-button>
 
           </template>
         </el-table-column>

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

@@ -70,7 +70,7 @@
         <el-table-column label="操作" min-width="200px" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="toWord(scope.row)" title="下载" size="mini" icon="el-icon-download" width="120px">表单下载</el-button>
-            <el-button type="text" @click="toPdf(scope.row)" title="导出" size="mini" icon="el-icon-document" width="120px">资质下载</el-button>
+            <el-button type="text" @click="toPdf(scope.row)" title="导出" size="mini" icon="el-icon-document" width="120px">准入范围</el-button>
 
           </template>
         </el-table-column>