准入审批按钮调整

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

@@ -75,5 +75,6 @@ const (
 	PROF_AUDIT_STATUS string = "4" //专业科室审核
 	CENT_AUDIT_STATUS string = "5" // 集中审批
 	PAYING_AUDIT_STATUS string = "6" //待缴费
+	STOREING_STATUS string = "7" //待入库
 )
 

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -224,6 +224,7 @@ func (this *UserController) AddUser() {
 	//var orginizeentity organize.Base_Organize
 	//svcorg.GetEntityById(model.DepartmentId, &orginizeentity)
 	var userentity userRole.Base_User
+	userentity.Companyid = "0"
 	userentity.Superior = model.Superior
 	userentity.Roleid, _ = utils.StrTo(model.Role).Int()
 	if userentity.Roleid == 0 {

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

@@ -1,10 +1,12 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/paymentinfo"
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 	"encoding/json"
+	"strconv"
 	"time"
 )
 
@@ -105,6 +107,16 @@ func (this *PaymentInfoController) UpdateEntity() {
 		"ModifiedBy",
 	}
 	_,err := svc.UpdateEntityByIdCols(id, &model, cols)
+
+	if (model.IsPay == "2") {
+		var certentity suppliercert.OilSupplierCert
+		certentity.Status = suppliercert.STOREING_STATUS
+		cols = []string{
+			"Status",
+		}
+		_,err = svc.UpdateEntityByIdCols(strconv.Itoa(model.SupplierCertId), &certentity, cols)
+	}
+
 	if err == nil {
 		errinfo.Message = "修改成功！"
 		errinfo.Code = 0

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

@@ -542,6 +542,8 @@ func (this *OilSupplierCertController) AuditEntity() {
 	if supplierCertEntity.WorkflowId == "0" || len(supplierCertEntity.WorkflowId) <= 0 {
 		//启动工作流
 		processInstanceId = svcActiviti.StartProcess(workflow.OIL_SUPPLIER_APPLY, certId, this.User.Id)
+	} else {
+		processInstanceId = supplierCertEntity.WorkflowId
 	}
 
 	//processInstanceId,_ := certSrv.SubmitOrgAudit(certId, workflow.OIL_SUPPLIER_APPLY, workflow.FIRST_TRIAL, this.User.Id, result, "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName, "", "")
@@ -828,7 +830,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 
 		if receiveVal == "true" {
 			supplierCertEntity.Status = "0"
-			supplierCertEntity.Step = step
+			supplierCertEntity.Step = 1
 			cols := []string{
 				"Status",
 				"Step",

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

@@ -43,7 +43,12 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="缴费方式">
-              <el-input v-model="formData.PayMode" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay == '2'"></el-input>
+              <!--<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'">
+                <el-option v-for="item in PayModeOption" :key="item.value" :label="item.value" :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -118,7 +123,18 @@
           ModifiedOn: '',
           ModifiedUserId: '',
           ModifiedBy: ''
-        }
+        },
+        PayModeOption: [
+          {
+            value: '现金'
+          },
+          {
+            value: '电汇'
+          },
+          {
+            value: '支票'
+          }
+        ]
       }
     },
     created () {

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

@@ -13,8 +13,13 @@
         <span style="float: right;">
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">提交专业审批</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>-->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
-            v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
+          <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"-->
+            <!--v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '3'">提交专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '4'">专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '5'">集中审批</el-button>
           <router-link :to="'/oilsupplier/supplieraudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>

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

@@ -12,7 +12,12 @@
         </span>
         <span style="float: right;">
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">提交专业审批</el-button>-->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
+          <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '3'">提交专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '4'">专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '5'">集中审批</el-button>
           <router-link :to="'/oilsupplier/supplieraudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>

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

@@ -12,7 +12,12 @@
         </span>
         <span style="float: right;">
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="allocationBtn" v-if="this.formData.Status == '3'">提交专业审批</el-button>-->
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
+          <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '3'">提交专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '4'">专业审批</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status == '5'">集中审批</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>-->
           <router-link :to="'/oilsupplier/supplieraudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>