baichengfei 5 年之前
父節點
當前提交
1c956dd1c8

+ 1 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/paymentinfo.go

@@ -605,8 +605,7 @@ func (this *PaymentInfoController) ReceiveMoneyBillList() {
 	for _, payItem := range paymentInfos {
 		supplierId = payItem.SupplierId
 		srcIds = srcIds + "," + strconv.Itoa(payItem.Id)
-		if payItem.PayType == "1" {
-			//准入申请
+		if payItem.PayType == "1" { //准入申请
 			//取出准入表信息
 			certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 			var supplierCertEntity suppliercert.OilSupplierCert

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -23,7 +23,7 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提1交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
           <el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0"> 提交审核</el-button>
           <router-link :to="'/oilsupplier/annualaudit/techindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -8,7 +8,7 @@
       <el-card class="box-card" style="height: calc(100vh - 115px);">
         <div slot="header">
           <span>
-            <i class="icon icon-table2"></i> 年审1申请表
+            <i class="icon icon-table2"></i> 年审申请表
           </span>
           <span style="float: right;">
             <el-button v-if="IsCompanyUser == 0" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"

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

@@ -43,7 +43,7 @@
                      size="mini"
                      @click="commitAudit()"
                      v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3">
-            提1
+            提交
           </el-button>
           <el-button v-if="parseInt(IsCompanyUser) !== 1 && (this.formData.Status == '' || parseInt(this.formData.Status) === 0) " type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批

+ 3 - 0
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -967,6 +967,7 @@
       },
       auditOrgChange (val) {
         let auditstepcode = ''
+        console.log('基建类申请状态', this.formData.Status)
         if (this.formData.Status === '1') {
           auditstepcode = 'SECOND_TRIAL'
         } else if (this.formData.Status === '3') {
@@ -980,7 +981,9 @@
         // console.log(deptid)
         // this.auditerOptions = []
         // this.auditer = ''
+        console.log('请求复审人员')
         api.getAuditerByDept(this.authUser.Profile.DepartmentId, auditstepcode, this.$axios).then(res => {
+          console.log('复审人员返回结果', res.data)
           this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)