生成费用

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

@@ -1448,3 +1448,19 @@ func (this *OilSupplierController) CanUpdateSupplier() {
 		this.ServeJSON()
 	}
 }
+// @Title 获取二级初审人员
+// @Description 获取二级初审人员
+// @router /getauditerbydept/:deptId [get]
+func (this *OilSupplierController) GetAuditerByDept() {
+	Id := this.Ctx.Input.Param(":deptId")
+
+	var auditWorkflow auditsetting.Base_OilAuditSetting
+	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, Id, workflow.FIRST_TRIAL, &auditWorkflow)
+	users := rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode)
+
+	var datainfo ErrorDataInfo
+	datainfo.Item = users
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}

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

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/paymentinfo"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -772,6 +773,18 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 				"Step",
 			}
 			certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+			if supplierCertEntity.Status == "5" {
+				paysvc := paymentinfo.GetPaymentService(utils.DBE)
+				var Amount float64
+				if supplierCertEntity.SupplierTypeCode == "01" {
+					Amount =  6000
+				}else if supplierCertEntity.SupplierTypeCode == "02"{
+					Amount = 7000
+				}else if supplierCertEntity.SupplierTypeCode == "03" {
+					Amount = 8000
+				}
+				paysvc.AddPaymentinfo(supplierCertEntity.SupplierId, supplierCertEntity.Id, Amount,"2")
+			}
 			errinfo.Message = "提交成功！"
 			errinfo.Code = 0
 			this.Data["json"] = &errinfo

src/dashoo.cn/frontend_web/src/api/oilsupplier/supplier.js

@@ -89,4 +89,10 @@ export default {
       method: 'get'
     })
   },
+  getAuditerByDept (deptId, myAxios) {
+    return myAxios({
+      url: '/supplier/getauditerbydept/' + deptId,
+      method: 'GET'
+    })
+  }
 }

src/dashoo.cn/frontend_web/src/components/oilsupplier/businesslist.vue

@@ -438,15 +438,15 @@
       nextStep() {
         this.subfileList = this.$refs["subfileList"].subfileList
         if (this.subfileList && this.subfileList.length > 0) {
-          for (var i = 0; i < this.subfileList.length; i++) {
-            if (this.subfileList[i].FileType == '1' && this.subfileList[i].FileUrl == '') {
-              this.$message({
-                type: 'warning',
-                message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-              })
-              return
-            }
-          }
+          // for (var i = 0; i < this.subfileList.length; i++) {
+          //   if (this.subfileList[i].FileType == '1' && this.subfileList[i].FileUrl == '') {
+          //     this.$message({
+          //       type: 'warning',
+          //       message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+          //     })
+          //     return
+          //   }
+          // }
           this.$emit('close')
         } else {
           this.$emit('close')

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

@@ -207,7 +207,7 @@
       <el-form ref="searchForm" label-width="110px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="单位名称">
+            <el-form-item label="二级单位">
               <el-select ref="selectauditOrg" v-model="firstAudit" placeholder="请选择"
                          style="width: 90%" filterable allow-create default-first-option>
                 <el-option
@@ -219,6 +219,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="审批人">
+              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
+                         style="width: 90%" filterable allow-create default-first-option>
+                <el-option
+                  v-for="item in auditerOption"
+                  :key="item.id"
+                  :label="item.realname"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -279,6 +292,8 @@
         winningList: [], // 近三年获得省部级及以上主要技术、管理成果、获奖项目
         businessList: [], // 准入业务
         organizeOption: [], // 审批部门
+        auditerOption: [], // 审批人
+        auditer: '',
         firstAudit: '',
         serviceId: '',
         certId: '',
@@ -562,6 +577,22 @@
           console.error(err)
         })
       },
+      auditOrgChang (val) {
+        this.auditerOption = []
+        this.auditer = ''
+        api.getAuditerByDept(val, this.$axios).then(res => {
+          if (res.data.item.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该单位未设置审批人员！'
+            })
+            return
+          }
+          this.auditerOption = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       /* getCityList(val) {
        let resultData = JSON.parse(val)
        let countstr = JSON.stringify(resultData.districts[0].districts)

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

@@ -208,9 +208,9 @@
       <el-form ref="searchForm" label-width="110px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="单位名称">
+            <el-form-item label="二级单位">
               <el-select ref="selectauditOrg" v-model="FirstAudit" placeholder="请选择"
-                         style="width: 90%" filterable allow-create default-first-option>
+                         style="width: 90%" filterable allow-create default-first-option @change="auditOrgChang">
                 <el-option
                   v-for="item in organizeOption"
                   :key="item.Id"
@@ -220,6 +220,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="审批人">
+              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
+                         style="width: 90%" filterable allow-create default-first-option>
+                <el-option
+                  v-for="item in auditerOption"
+                  :key="item.id"
+                  :label="item.realname"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -280,6 +293,8 @@
         winningList: [], // 近三年获得省部级及以上主要技术、管理成果、获奖项目
         businessList: [], // 准入业务
         organizeOption: [], // 审批部门
+        auditerOption: [], // 审批人
+        auditer: '',
         serviceId: '',
         certId: '',
         classId: '01',
@@ -479,10 +494,10 @@
         this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkProvince)
         this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkCity)
         this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkStreet)
-        /*this.$refs['GoodsInfo'].UnitRelationAry = []
+        /* this.$refs['GoodsInfo'].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
           this.$refs['GoodsInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-        }*/
+        } */
       },
 
       isCanUpdateSupplier (supplierId) {
@@ -530,10 +545,10 @@
             this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkProvince)
             this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkCity)
             this.$refs['GoodsInfo'].LinkCityAry.push(this.formData.LinkStreet)
-            /*this.$refs['GoodsInfo'].UnitRelationAry = []
+            /* this.$refs['GoodsInfo'].UnitRelationAry = []
             if (this.formData.SpecTypeCode.length > 0) {
               this.$refs['GoodsInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-            }*/
+            } */
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
@@ -562,6 +577,22 @@
           console.error(err)
         })
       },
+      auditOrgChang (val) {
+        this.auditerOption = []
+        this.auditer = ''
+        api.getAuditerByDept(val, this.$axios).then(res => {
+          if (res.data.item.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该单位未设置审批人员！'
+            })
+            return
+          }
+          this.auditerOption = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       /* getCityList(val) {
        let resultData = JSON.parse(val)
        let countstr = JSON.stringify(resultData.districts[0].districts)

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

@@ -204,7 +204,7 @@
       <el-form ref="searchForm" label-width="110px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="单位名称">
+            <el-form-item label="二级单位">
               <el-select ref="selectauditOrg" v-model="firstAudit" placeholder="请选择"
                          style="width: 90%" filterable allow-create default-first-option>
                 <el-option
@@ -216,6 +216,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="审批人">
+              <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择"
+                         style="width: 90%" filterable allow-create default-first-option>
+                <el-option
+                  v-for="item in auditerOption"
+                  :key="item.id"
+                  :label="item.realname"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -276,6 +289,8 @@
         winningList: [], // 近三年获得省部级及以上主要技术、管理成果、获奖项目
         businessList: [], // 准入业务
         organizeOption: [], // 审批部门
+        auditerOption: [], // 审批人
+        auditer: '',
         firstAudit: '',
         serviceId: '',
         certId: '',
@@ -563,6 +578,22 @@
           console.error(err)
         })
       },
+      auditOrgChang (val) {
+        this.auditerOption = []
+        this.auditer = ''
+        api.getAuditerByDept(val, this.$axios).then(res => {
+          if (res.data.item.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该单位未设置审批人员！'
+            })
+            return
+          }
+          this.auditerOption = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       /* getCityList(val) {
         let resultData = JSON.parse(val)
         let countstr = JSON.stringify(resultData.districts[0].districts)

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

@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 审批
         </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="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>
           <router-link :to="'/oilsupplier/supplieraudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

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

@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 审批
         </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="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>
           <router-link :to="'/oilsupplier/supplieraudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

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

@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 审批
         </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="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>
           <router-link :to="'/oilsupplier/supplieraudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>