交费及不良记录，及查询历史变更按钮

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

@@ -82,7 +82,7 @@ const (
 	THIRD_TRIAL_STATUS  string = "3"  //专业处接收
 	PROF_AUDIT_STATUS   string = "4"  //专业科室审核
 	CENT_AUDIT_STATUS   string = "5"  // 集中审批
-	PAYING_AUDIT_STATUS string = "6"  //待缴费
+	PAYING_AUDIT_STATUS string = "6"  //待交费
 	STOREING_STATUS     string = "7"  //待入库
 	STORE_STATUS        string = "8"  //已入库
 	FEN_TRIAL_STATUS    string = "10" //二级单位分办

src/dashoo.cn/backend/api/business/paymentinfo/paymentinfoService.go

@@ -65,7 +65,7 @@ func (s *PaymentService) GetPaymentinfoById(Id string, entitiesPtr interface{})
 
 }
 
-// Amount 缴费金额   PayType 缴费类型 1 准入缴费  2 年审缴费
+// Amount 交费金额   PayType 缴费类型 1 准入缴费  2 年审缴费
 func (s *PaymentService) AddPaymentinfo(SupplierId int, SupplierCertId int, Amount float64, PayType string)(err error){
 	//var err error
 	sql := "INSERT INTO OilPaymentInfo (SupplierId, SupplierCertId, Amount, PayType) VALUES" +

src/dashoo.cn/backend/api/controllers/base.go

@@ -257,7 +257,7 @@ var (
 	OilSupplierCert2FileName                 string = "OilSupplierCert2File"        // 准入与资质对应关系表
 	OilCorporateInfoName                     string = "OilCorporateInfo"            //企业用户注册临时表
 	OilSupplierPauseReasonName				 string = "OilSupplierPauseReason"
-	OilPaymentInfoName                       string = "OilPaymentInfo"              //缴费信息
+	OilPaymentInfoName                       string = "OilPaymentInfo"              //交费信息
 	OilActivityName                          string = "OilActivity" //
 )
 

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

@@ -994,7 +994,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 				}else{
 					bFlag="技术服务类"
 				}
-				msg:= "您的"+ bFlag + "年审审核通过，请及时确认缴费信息！"
+				msg:= "您的"+ bFlag + "年审审核通过，请及时确认交费信息！"
 				msgService := msg2.GetMsgService(utils.DBE)
 				msgService.HandleMsg(toMobile,msg,"4-1",list.CreateBy,supplierEntity.ContactName,strconv.Itoa(list.CreateUserId))
 			} else {

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

@@ -692,7 +692,7 @@ func (this *PaymentInfoController) AddPayInfo() {
 	var model1 paymentinfo.OilPaymentInfo
 	has = svc.GetEntity(&model1, where)
     if has {
-		errinfo.Message = "已经存在相关缴费记录，不能重复添加！"
+		errinfo.Message = "已经存在相关交费记录，不能重复添加！"
 		errinfo.Code = -2
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

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

@@ -1177,7 +1177,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 						paysvc.InsertEntity(&payinfo)
 						//发短信
 						toMobile := supplierEntity.Mobile
-						msg:= "您的"+supplierCertEntity.SupplierTypeName + "准入审核通过，请及时确认缴费信息！"
+						msg:= "您的"+supplierCertEntity.SupplierTypeName + "准入审核通过，请及时确认交费信息！"
 						msgService := msg2.GetMsgService(utils.DBE)
 						msgService.HandleMsg(toMobile,msg,"3-1",supplierCertEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertEntity.CreateUserId))
 					}

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

@@ -847,7 +847,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 						}else{
 							bFlag="技术服务类"
 						}
-						msg:= "您的"+ bFlag + "增项审核通过，请及时确认缴费信息！"
+						msg:= "您的"+ bFlag + "增项审核通过，请及时确认交费信息！"
 						msgService := msg2.GetMsgService(utils.DBE)
 						msgService.HandleMsg(toMobile,msg,"4-1",supplierCertAppendEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertAppendEntity.CreateUserId))
 					}

src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpzcgf.go

@@ -258,11 +258,11 @@ func (this *TmpzcgfController) UpdateOilSupplierCertAppend(){
 // @Success 200 {object}
 // @router /insterOilPaymentInfo [get]
 func (this *TmpzcgfController) InsterOilPaymentInfo(){
-	fmt.Println("=============导入缴费记录开始==========")
+	fmt.Println("=============导入交费记录开始==========")
 	t := time.Now()
 	session := utils.DBE.NewSession()
 	defer func() {
-		fmt.Println("=============导入缴费记录结束==========")
+		fmt.Println("=============导入交费记录结束==========")
 		session.Close()
 	}()
 	err := session.Begin()

src/dashoo.cn/backend/api/controllers/workflow/workflow.go

@@ -137,7 +137,7 @@ func (this *WorkflowController) GetWorkflowNodeBySrcId() {
 
 	if has {
 		var historicTask workflow.ActiHistoricTask
-		historicTask.TaskName = "缴费"
+		historicTask.TaskName = "交费"
 		historicTask.StartTime = model.CreateOn.Unix() * 1000
 		historicTask.EndTime = model.ModifiedOn.Unix() * 1000
 		historicTask.Assignee = "--"
@@ -146,7 +146,7 @@ func (this *WorkflowController) GetWorkflowNodeBySrcId() {
 		} else if model.IsPay == "1" {
 			historicTask.Remarks = "已确认"
 		} else if model.IsPay == "2" {
-			historicTask.Remarks = "已缴费"
+			historicTask.Remarks = "已交费"
 		}
 		historicTasks = append(historicTasks, historicTask)
 	}

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

@@ -681,7 +681,7 @@
               return '集中评审未通过'
             }
           case '6':
-            return '待缴费'
+            return '待交费'
           case '7':
             return '待入库'
           case '8':

src/dashoo.cn/frontend_web/src/pages/indexgf.vue

@@ -67,9 +67,9 @@
           <el-card>
             <img style="height: 130px" src="../assets/img/zaixianjiaofei.jpg" class="image">
             <div style="padding: 14px;">
-              <span style="font-weight: bold">在线缴费</span>
+              <span style="font-weight: bold">在线交费</span>
               <div class="bottom clearfix">
-                <el-button type="text" class="button">缴费</el-button>
+                <el-button type="text" class="button">交费</el-button>
               </div>
             </div>
           </el-card>

src/dashoo.cn/frontend_web/src/pages/oilbank/icbclist.vue

@@ -29,7 +29,7 @@
         <el-form-item label="组织机构代码">
           <span>XXXXXXXXXXX</span>
         </el-form-item>
-        <el-form-item label="缴费总金额">
+        <el-form-item label="交费总金额">
           <span style="font-weight: bold; color: red;">XXXXX 元</span>
         </el-form-item>
         <el-form-item label="">
@@ -42,12 +42,12 @@
 
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
         <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>-->
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="交费类型">
           <template slot-scope="scope">
             {{ transferStr(scope.row.PayType) }}
           </template>
         </el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="缴费金额">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="交费金额">
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -168,11 +168,11 @@
 
       transferStr (val) {
         if (val === '1') {
-          return '准入缴费'
+          return '准入交费'
         }else if (val === '2') {
-          return '年审缴费'
+          return '年审交费'
         }else if (val === '3') {
-          return '增项缴费'
+          return '增项交费'
         } else {
           return val
         }

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

@@ -64,7 +64,7 @@
             <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
             <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/annualfistaudit.vue

@@ -66,7 +66,7 @@
             <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
             <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
           </template>
         </el-table-column>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -89,7 +89,7 @@
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
             </template>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -89,7 +89,7 @@
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
             </template>

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

@@ -89,7 +89,7 @@
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#F56C6C">待缴费</span>
+              <span v-if="scope.row.Status=='6'" style="color:#F56C6C">待交费</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
             </template>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -89,7 +89,7 @@
               <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
               <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
             </template>

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

@@ -206,7 +206,7 @@
     <!-- 添加框（默认隐藏） -->
     <el-dialog :title="addShowTitle"
                :visible.sync="addshow"
-               width="800px">
+                width="85%">
       <!-- <el-form :model="entityForm"
                :rules="rules"
                ref="EntityFormref"> -->
@@ -475,7 +475,7 @@
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="CertSubStatus"
                                  label="状态"
-                                 width="160px"
+                                 width="100px"
                                  align="center"
                                  show-overflow-tooltip>
                   <template slot-scope="scope">
@@ -483,8 +483,6 @@
                     <el-button type="warning" size="mini" v-else-if="scope.row.CertSubStatus>'1'" @click="changeCertSubStatus(scope.row)">暂停</el-button>
                     <el-button type="plain" size="mini" plain v-else @click="changeCertSubStatus(scope.row)">——</el-button>
 
-                    <el-button type="plain" plain size="mini" icon="el-icon-star-off" circle @click="showBackReasonList(scope.row)"></el-button>
-
                     <!--<span v-if="scope.row.CertSubStatus=='1'"
                           style="color:#67C23A">准入</span>
                     <span v-else-if="scope.row.CertSubStatus>'1'"
@@ -492,6 +490,14 @@
                     <span v-else>——</span>-->
                   </template>
                 </el-table-column>
+                <el-table-column label=""
+                                 align="center"
+                                 width="160px"
+                                 show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <el-button type="plain" plain size="mini" @click="showBackReasonList(scope.row)">查看历史状态</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
               <el-pagination @size-change="handleGoodsSizeChange"
                              @current-change="handleGoodsCurrentChange"
@@ -518,18 +524,27 @@
                                  align="center"></el-table-column>
                 <el-table-column prop="CertSubStatus"
                                  label="状态"
-                                 width="160px"
-                                 align="center">
+                                 width="100px"
+                                 align="center"
+                                 show-overflow-tooltip>
                   <template slot-scope="scope">
                     <el-button type="success" size="mini" v-if="scope.row.CertSubStatus=='1'" @click="changeCertSubStatus(scope.row)">准入</el-button>
                     <el-button type="warning" size="mini" v-else-if="scope.row.CertSubStatus>'1'" @click="changeCertSubStatus(scope.row)">暂停</el-button>
                     <el-button type="plain" size="mini" plain v-else @click="changeCertSubStatus(scope.row)">——</el-button>
+
                     <!--<span v-if="scope.row.CertSubStatus=='1'"
                           style="color:#67C23A">准入</span>
                     <span v-else-if="scope.row.CertSubStatus>'1'"
                           style="color:#E6A23C">暂停</span>
                     <span v-else>——</span>-->
-                    <el-button type="plain" plain size="mini" icon="el-icon-star-off" circle @click="showBackReasonList(scope.row)"></el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label=""
+                                 align="center"
+                                 width="160px"
+                                 show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <el-button type="plain" plain size="mini" @click="showBackReasonList(scope.row)">查看历史状态</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -558,7 +573,7 @@
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="CertSubStatus"
                                  label="状态"
-                                 width="160px"
+                                 width="100px"
                                  align="center"
                                  show-overflow-tooltip>
                   <template slot-scope="scope">
@@ -571,7 +586,14 @@
                     <span v-else-if="scope.row.CertSubStatus>'1'"
                           style="color:#E6A23C">暂停</span>
                     <span v-else>——</span>-->
-                    <el-button type="plain" plain size="mini" icon="el-icon-star-off" circle @click="showBackReasonList(scope.row)"></el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label=""
+                                 align="center"
+                                 width="160px"
+                                 show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <el-button type="plain" plain size="mini" @click="showBackReasonList(scope.row)">查看历史状态</el-button>
                   </template>
                 </el-table-column>
               </el-table>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/_opera/operation.vue

@@ -2,16 +2,16 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/paymentinfo' }">缴费列表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/paymentinfo' }">交费列表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 缴费信息
+          <i class="icon icon-table2"></i> 交费信息
         </span>
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-right: 15px" v-if="formData.IsPay == '1'" @click="printBtn" >打印</el-button>
-          <!--<el-button type="primary" size="mini" style="margin-right: 15px" @click="submitPay" v-if="formData.IsPay == '1'">提交缴费</el-button>-->
+          <!--<el-button type="primary" size="mini" style="margin-right: 15px" @click="submitPay" v-if="formData.IsPay == '1'">提交交费</el-button>-->
           <el-button type="primary" size="mini" style="margin-right: 15px" @click="updateEntity" v-if="formData.IsPay == '0' && authUser.Profile.IsCompanyUser!=1 "><i class="el-icon-circle-check"></i>保存</el-button>
 
           <el-button type="plain" plain size="mini" @click="$router.back()">返回</el-button>
@@ -30,21 +30,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="缴费金额">
+            <el-form-item label="交费金额">
               <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay != '0' || authUser.Profile.IsCompanyUser==1 " ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="缴费类型">
+            <el-form-item label="交费类型">
               <el-select v-model="formData.PayType" disabled >
-                <el-option label="准入缴费" value="1"></el-option>
-                <el-option label="年审缴费" value="2"></el-option>
-                <el-option label="增项缴费" value="3"></el-option>
+                <el-option label="准入交费" value="1"></el-option>
+                <el-option label="年审交费" value="2"></el-option>
+                <el-option label="增项交费" value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="formData.IsPay == '2'">
-            <el-form-item label="缴费方式">
+            <el-form-item label="交费方式">
               <!--<el-input v-model="formData.PayMode" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>-->
               <el-select v-model="formData.PayMode" placeholder="请选择" style="width: 100%"
                          filterable allow-create default-first-option :disabled="formData.IsPay == '2'">
@@ -54,7 +54,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="formData.IsPay == '2'">
-            <el-form-item label="缴费日期" >
+            <el-form-item label="交费日期" >
               <el-date-picker
                 v-model="formData.PayDate"
                 type="date"

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

@@ -34,7 +34,7 @@
             <el-form-item label="组织机构代码">
               <span>{{supplierEntity.CommercialNo}}</span>
             </el-form-item>
-            <el-form-item label="缴费总金额">
+            <el-form-item label="交费总金额">
               <span style="font-weight: bold; color: red;">{{amountSum()}} 元</span>
             </el-form-item>
           </el-form>
@@ -46,12 +46,12 @@
 
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
         <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>-->
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="交费类型">
           <template slot-scope="scope">
             {{ transferStr(scope.row.PayType) }}
           </template>
         </el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="缴费金额">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="交费金额">
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -174,11 +174,11 @@
 
       transferStr (val) {
         if (val === '1') {
-          return '准入缴费'
+          return '准入交费'
         }else if (val === '2') {
-          return '年审缴费'
+          return '年审交费'
         }else if (val === '3') {
-          return '增项缴费'
+          return '增项交费'
         } else {
           return val
         }
@@ -231,7 +231,7 @@
         let params = {
           ids: idlist,
           receiveAmount: sumMoeny,
-          bankName: '现场缴费',
+          bankName: '现场交费',
           bankSerialNum: this.RndNum(11) + '_SD',
           payDate: new Date(),
           payMode: '现金'

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

@@ -2,16 +2,16 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item>缴费信息列表</el-breadcrumb-item>
+      <el-breadcrumb-item>交费信息列表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 缴费信息列表
+          <i class="icon icon-table2"></i> 交费信息列表
         </span>
-        <el-button type="primary" size="mini" style="float: right;margin-top: -3px;margin-left: 15px" v-if="authUser.Profile.IsCompanyUser != '1'" @click="addpayinfo">添加缴费信息</el-button>
+        <el-button type="primary" size="mini" style="float: right;margin-top: -3px;margin-left: 15px" v-if="authUser.Profile.IsCompanyUser != '1'" @click="addpayinfo">添加交费信息</el-button>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px;">
-          <!--<el-form-item label="缴费日期">-->
+          <!--<el-form-item label="交费日期">-->
             <!--<el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"-->
                             <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
           <!--</el-form-item>-->
@@ -61,18 +61,18 @@
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="CommercialNo" label="组织机构代码"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="交费类型">
           <template slot-scope="scope">
           {{ transferStr(scope.row.PayType) }}
           </template>
         </el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="缴费金额">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="交费金额">
         </el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="IsPay" label="状态">
           <template slot-scope="scope">
             <span style="color: yellowgreen" v-if="scope.row.IsPay == 0">待确认</span>
-            <span style="color: #00bcd4"  v-if="scope.row.IsPay == 1">待缴费</span>
-            <span style="color: green"  v-if="scope.row.IsPay == 2">已缴费</span>
+            <span style="color: #00bcd4"  v-if="scope.row.IsPay == 1">待交费</span>
+            <span style="color: green"  v-if="scope.row.IsPay == 2">已交费</span>
           </template>
         </el-table-column>
       </el-table>
@@ -82,7 +82,7 @@
       </el-pagination>
     </el-card>
 
-    <el-dialog title="添加缴费信息" :visible.sync="dialogVisible" width="720px">
+    <el-dialog title="添加交费信息" :visible.sync="dialogVisible" width="720px">
       <el-form ref="searchForm" label-width="110px">
         <el-row>
 
@@ -117,7 +117,7 @@
           <!--</el-col>-->
 
           <el-col :span="12">
-            <el-form-item label="缴费类型">
+            <el-form-item label="交费类型">
               <el-select v-model="addForm.PayType" filterable placeholder="请选择">
                 <el-option
                   v-for="item in payTypeOptions"
@@ -130,7 +130,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="缴费金额">
+            <el-form-item label="交费金额">
               <el-input v-model="addForm.Amount" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -182,15 +182,15 @@
         payTypeOptions: [
           {
             Id: '1',
-            Value: '准入缴费'
+            Value: '准入交费'
           },
           {
             Id: '2',
-            Value: '年审缴费'
+            Value: '年审交费'
           },
           {
             Id: '3',
-            Value: '增项缴费'
+            Value: '增项交费'
           }
         ],
         supplierOptions: [],
@@ -354,11 +354,11 @@
 
       transferStr (val) {
         if (val === '1') {
-          return '准入缴费'
+          return '准入交费'
         } else if (val === '2') {
-          return '年审缴费'
+          return '年审交费'
         } else if (val === '3') {
-          return '增项缴费'
+          return '增项交费'
         } else {
           return val
         }
@@ -387,7 +387,7 @@
         })
       },
       deleteEntity (row) {
-        this.$confirm('此操作将永久删除该数据,删除后将不需要缴费直接到待入库中, 是否继续?', '提示', {
+        this.$confirm('此操作将永久删除该数据,删除后将不需要交费直接到待入库中, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'

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

@@ -2,15 +2,15 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item>已缴费列表</el-breadcrumb-item>
+      <el-breadcrumb-item>已交费列表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 缴费信息列表
+          <i class="icon icon-table2"></i> 交费信息列表
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <!--<el-form-item label="缴费日期">-->
+          <!--<el-form-item label="交费日期">-->
             <!--<el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"-->
                             <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
           <!--</el-form-item>-->
@@ -48,16 +48,16 @@
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="CommercialNo" label="组织机构代码"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="交费类型">
           <template slot-scope="scope">
           {{ transferStr(scope.row.PayType) }}
           </template>
         </el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="缴费金额">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="交费金额">
         </el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayMode" label="缴费方式">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayMode" label="交费方式">
         </el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayDate" label="缴费日期">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayDate" label="交费日期">
           <template slot-scope="scope">
           {{ jstimehandle(scope.row.PayDate+'') }}
           </template>
@@ -247,11 +247,11 @@
 
       transferStr (val) {
         if (val === '1') {
-          return '准入缴费'
+          return '准入交费'
         }else if (val === '2') {
-          return '年审缴费'
+          return '年审交费'
         }else if (val === '3') {
-          return '增项缴费'
+          return '增项交费'
         } else {
           return val
         }

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

@@ -2,12 +2,12 @@
   <div>
     <!--<el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/paymentinfo' }">缴费列表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/paymentinfo' }">交费列表</el-breadcrumb-item>
     </el-breadcrumb>-->
     <el-card class="box-card">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 缴费确认
+          <i class="icon icon-table2"></i> 交费确认
         </span>
         <span style="float: right;">
           <el-form ref="form" :inline="true" style="margin-top: -10px">
@@ -19,7 +19,7 @@
             </el-form-item>
             <el-form-item>
               <el-button type="primary" size="mini" style="margin-right: 15px" @click="printBtn">打印</el-button>
-              <el-button type="primary" plain title="查看详情" size="mini" v-if="entityList && entityList.length > 0" :loading="sureLoading" @click="BillSureClickConfirm">确认缴费单</el-button>
+              <el-button type="primary" plain title="查看详情" size="mini" v-if="entityList && entityList.length > 0" :loading="sureLoading" @click="BillSureClickConfirm">确认交费单</el-button>
             </el-form-item>
           </el-form>
         </span>
@@ -63,12 +63,12 @@
       <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
         <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>-->
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="交费类型">
           <template slot-scope="scope">
             {{ transferStr(scope.row.PayType) }}
           </template>
         </el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="缴费金额">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="交费金额">
         </el-table-column>
         <el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -90,12 +90,12 @@
       <el-table :data="entityList2" size="mini" border style="width: 100%" @sort-change="orderby">
         <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>-->
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="缴费类型">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="交费类型">
           <template slot-scope="scope">
             {{ transferStr(scope.row.PayType) }}
           </template>
         </el-table-column>
-        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="缴费金额">
+        <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Amount" label="交费金额">
         </el-table-column>
         <el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -233,11 +233,11 @@
       },
       transferStr (val) {
         if (val === '1') {
-          return '准入缴费'
+          return '准入交费'
         } else if (val === '2') {
-          return '年审缴费'
+          return '年审交费'
         } else if (val === '3') {
-          return '增项缴费'
+          return '增项交费'
         } else {
           return val
         }

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

@@ -2,12 +2,12 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item>缴费信息列表</el-breadcrumb-item>
+      <el-breadcrumb-item>交费信息列表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="position:relative">
       <div slot="header">
         <span>
-          <i class="icon icon-table2"></i> 缴费查询
+          <i class="icon icon-table2"></i> 交费查询
         </span>
         <el-form :model="searchForm" ref="searchformRef" :inline="true"
                  style="float: right;position:absolute;right:15px;top:10.5px">
@@ -38,7 +38,7 @@
         </el-form>
       </div>
       <el-tabs v-model="activeName" type="border-card">
-        <el-tab-pane label="缴费明细表" name="first">
+        <el-tab-pane label="交费明细表" name="first">
           <el-table :data="entityList" size="mini" height="calc(100vh - 300px)" border style="width: 100%" @sort-change="orderby">
 
             <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="AccessCardNo" label="准入编码"></el-table-column>
@@ -69,7 +69,7 @@
             </el-table-column>
 
             <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="Sums" label="金额合计"></el-table-column>
-            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayDate" label="缴费日期">
+            <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayDate" label="交费日期">
               <template slot-scope="scope">
                 {{ jstimehandle(scope.row.PayDate+'') }}
               </template>
@@ -83,7 +83,7 @@
         </el-tab-pane>
 
 
-        <el-tab-pane label="缴费汇总表" name="second">
+        <el-tab-pane label="交费汇总表" name="second">
           <el-table :data="entitySumList" border show-summary style="width: 100%" @sort-change="orderby">
 
             <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="准入类别">
@@ -240,11 +240,11 @@
 
       transferStr (val) {
         if (val === '1') {
-          return '准入缴费'
+          return '准入交费'
         }else if (val === '2') {
-          return '年审缴费'
+          return '年审交费'
         }else if (val === '3') {
-          return '增项缴费'
+          return '增项交费'
         } else {
           return val
         }

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

@@ -343,7 +343,7 @@
         <!--</el-card>-->
         <!--</el-tab-pane>-->
 
-        <el-tab-pane label="供方缴费"
+        <el-tab-pane label="供方交费"
                      v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>

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

@@ -348,7 +348,7 @@
         <!--</el-card>-->
         <!--</el-tab-pane>-->
 
-        <el-tab-pane label="供方缴费"
+        <el-tab-pane label="供方交费"
                      v-if="formDataCert.Status == 5"></el-tab-pane>
       </el-tabs>
 

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

@@ -340,7 +340,7 @@
         <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
         <!--</el-card>-->
         <!--</el-tab-pane>-->
-        <el-tab-pane label="供方缴费"
+        <el-tab-pane label="供方交费"
                      v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>

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

@@ -121,7 +121,7 @@
             <span v-if="scope.row.Status=='-5'"
                   style="color:#F56C6C">集中评审未通过</span>
             <span v-if="scope.row.Status=='6'"
-                  style="color:#E6A23C">待缴费</span>
+                  style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"

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

@@ -120,7 +120,7 @@
             <span v-if="scope.row.Status=='-5'"
                   style="color:#F56C6C">集中评审未通过</span>
             <span v-if="scope.row.Status=='6'"
-                  style="color:#E6A23C">待缴费</span>
+                  style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"

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

@@ -75,7 +75,7 @@
             <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
             <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"
                   style="color:#67C23A">已入库</span>

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

@@ -121,7 +121,7 @@
             <span v-if="scope.row.Status=='-5'"
                   style="color:#F56C6C">集中评审未通过</span>
             <span v-if="scope.row.Status=='6'"
-                  style="color:#E6A23C">待缴费</span>
+                  style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"

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

@@ -87,7 +87,7 @@
               <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>

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

@@ -87,7 +87,7 @@
               <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>

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

@@ -92,7 +92,7 @@
               <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>

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

@@ -87,7 +87,7 @@
               <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
               <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>

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

@@ -68,7 +68,7 @@
             <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
             <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>

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

@@ -195,7 +195,7 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane label="供方交费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>

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

@@ -186,7 +186,7 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane label="供方交费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>

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

@@ -198,7 +198,7 @@
             <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane name="7" label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane name="7" label="供方交费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>

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

@@ -49,7 +49,7 @@
             <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
             <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>
@@ -90,7 +90,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%">
@@ -151,8 +151,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>
@@ -271,7 +271,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>

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

@@ -48,7 +48,7 @@
             <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
             <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>
@@ -88,7 +88,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%">
@@ -149,8 +149,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>
@@ -269,7 +269,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>

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

@@ -59,7 +59,7 @@
             <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
             <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>

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

@@ -50,7 +50,7 @@
             <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
             <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
             <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>
@@ -91,7 +91,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%">
@@ -152,8 +152,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>
@@ -272,7 +272,7 @@
               <el-input size="mini" v-model="searchForm.BusinessScope" placeholder="请输入内容"></el-input>
             </el-form-item>
         </el-col>
-       
+
        </el-row>
 
       </el-form>

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

@@ -209,7 +209,7 @@
           <!--</el-card>-->
         <!--</el-tab-pane>-->
 
-        <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane label="供方交费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>

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

@@ -210,7 +210,7 @@
           <!--</el-card>-->
         <!--</el-tab-pane>-->
 
-        <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane label="供方交费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>

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

@@ -215,7 +215,7 @@
             <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
           <!--</el-card>-->
         <!--</el-tab-pane>-->
-        <el-tab-pane name="7" label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane name="7" label="供方交费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>

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

@@ -176,7 +176,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat" 
+          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat"
             height="360px" style="margin-top: 20px" :candelete="delete_flat" :newcanadd="newadd_flat"></business-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
@@ -207,7 +207,7 @@
           <!--</el-card>-->
         <!--</el-tab-pane>-->
 
-        <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane label="供方交费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>

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

@@ -208,7 +208,7 @@
           <!--</el-card>-->
         <!--</el-tab-pane>-->
 
-        <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane label="供方交费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>

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

@@ -213,7 +213,7 @@
             <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
           <!--</el-card>-->
         <!--</el-tab-pane>-->
-        <el-tab-pane name="7" label="供方缴费" v-if="formDataCert.Status == 5">
+        <el-tab-pane name="7" label="供方交费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
     </el-card>

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

@@ -206,7 +206,7 @@
     <!-- 添加框（默认隐藏） -->
     <el-dialog :title="addShowTitle"
                :visible.sync="addshow"
-               width="800px">
+               width="85%">
       <!-- <el-form :model="entityForm"
                :rules="rules"
                ref="EntityFormref"> -->
@@ -465,6 +465,7 @@
                 <el-table-column prop="CertSubStatus"
                                  label="状态"
                                  align="center"
+                                 width="100px"
                                  show-overflow-tooltip>
                   <template slot-scope="scope">
                     <span v-if="scope.row.CertSubStatus=='1'"
@@ -472,7 +473,14 @@
                     <span v-else-if="scope.row.CertSubStatus>'1'"
                           style="color:#E6A23C">暂停</span>
                     <span v-else>——</span>
-                    <el-button type="plain" plain size="mini" icon="el-icon-star-off" style="margin-left: 5px" circle @click="showBackReasonList(scope.row)"></el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label=""
+                                 align="center"
+                                 width="160px"
+                                 show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <el-button type="plain" plain size="mini" @click="showBackReasonList(scope.row)">查看历史状态</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -503,6 +511,7 @@
                 <el-table-column prop="CertSubStatus"
                                  label="状态"
                                  align="center"
+                                 width="100px"
                                  show-overflow-tooltip>
                   <template slot-scope="scope">
                     <span v-if="scope.row.CertSubStatus=='1'"
@@ -510,7 +519,14 @@
                     <span v-else-if="scope.row.CertSubStatus>'1'"
                           style="color:#E6A23C">暂停</span>
                     <span v-else>——</span>
-                    <el-button type="plain" plain size="mini" icon="el-icon-star-off" style="margin-left: 5px" circle @click="showBackReasonList(scope.row)"></el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label=""
+                                 align="center"
+                                 width="160px"
+                                 show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <el-button type="plain" plain size="mini" @click="showBackReasonList(scope.row)">查看历史状态</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -541,6 +557,7 @@
                 <el-table-column prop="CertSubStatus"
                                  label="状态"
                                  align="center"
+                                 width="100px"
                                  show-overflow-tooltip>
                   <template slot-scope="scope">
                     <span v-if="scope.row.CertSubStatus=='1'"
@@ -548,7 +565,14 @@
                     <span v-else-if="scope.row.CertSubStatus>'1'"
                           style="color:#E6A23C">暂停</span>
                     <span v-else>——</span>
-                    <el-button type="plain" plain size="mini" icon="el-icon-star-off" style="margin-left: 5px" circle @click="showBackReasonList(scope.row)"></el-button>
+                  </template>
+                </el-table-column>
+                <el-table-column label=""
+                                 align="center"
+                                 width="160px"
+                                 show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <el-button type="plain" plain size="mini" @click="showBackReasonList(scope.row)">查看历史状态</el-button>
                   </template>
                 </el-table-column>
               </el-table>

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

@@ -236,7 +236,7 @@
           case '-5':
             return '集中评审未通过'
           case '6':
-            return '待缴费'
+            return '待交费'
           case '7':
             return '待入库'
           case '8':

src/dashoo.cn/frontend_web/src/pages/select/businessfollowup/index_1.vue

@@ -356,7 +356,7 @@
           case '-5':
             return '集中评审未通过'
           case '6':
-            return '待缴费'
+            return '待交费'
           case '7':
             return '待入库'
           case '8':

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

@@ -475,7 +475,7 @@
           case '-5':
             return '集中评审未通过'
           case '6':
-            return '待缴费'
+            return '待交费'
           case '7':
             return '待入库'
           case '8':

src/dashoo.cn/frontend_web/src/pages/system/tmpzcgf.vue

@@ -50,7 +50,7 @@
 
        <el-row style ="margin-bottom: 20px;">
          <el-col :span="24">
-           <el-button size="mini" type="primary" @click="insterOilPaymentInfo" v-loading.fullscreen.lock="fullscreenLoading">导入缴费记录并更新</el-button>
+           <el-button size="mini" type="primary" @click="insterOilPaymentInfo" v-loading.fullscreen.lock="fullscreenLoading">导入交费记录并更新</el-button>
            <el-button size="mini" type="primary" @click="insterBadRecord" v-loading.fullscreen.lock="fullscreenLoading">导入不良记录并更新</el-button>
            <el-button size="mini" type="primary" @click="insertOilInfoChange" v-loading.fullscreen.lock="fullscreenLoading">导入信息变更</el-button>
            <el-button size="mini" type="primary" @click="updateOilInfoChange" v-loading.fullscreen.lock="fullscreenLoading">更新新信息变更</el-button>