信息变更提交审批

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

@@ -279,11 +279,13 @@ func (this *AnnualAuditController) AddEntity() {
 		return
 	}
 	supwhere := "a.Id = " + utils.ToStr(model.SupplierId) + " and b.SupplierTypeCode = " + model.SupplierTypeName
+	// + " and b.Status > 5"
 	supsvc := supplier.GetOilSupplierService(utils.DBE)
 	var list []supplier.OilSupplierView
 	total := supsvc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, 1, 1, "a.Id", true, &list, supwhere)
 	if total == 0 {
 		errinfo.Message = "请先提交准入申请再提交年审！"
+		//errinfo.Message = "请先提交准入，准入申请通过后，才可申请年审！"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

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

@@ -532,7 +532,7 @@
             <el-form-item label="审批人" prop="auditer" required>
               <el-select ref="selectAuditer" v-model="entityForm.auditer" placeholder="请选择" style="width: 100%"
                 filterable allow-create default-first-option>
-                <el-option v-for="item in auditerOption" :key="item.Id" :label="item.Realname" :value="item.Id">
+               <el-option v-for="item in auditerOption" :key="item.userid" :label="item.username" :value="item.userid">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -724,18 +724,16 @@
       },
       getorgtreelist() {
         let _this = this
-        // request
         let params = {
           IsInnerOrganize: 1
         }
-        _this.$axios.get('organizes/list', {
+        _this.$axios.get('organizes/orgalllist', {
             params
           })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
           .catch(err => {
-            // handle error
             console.error(err)
           })
       },
@@ -743,7 +741,8 @@
         console.log("------val----", val)
         this.auditerOption = []
         this.entityForm.auditer = ''
-        api.getAuditerByDept(val[val.length - 2], this.$axios).then(res => {
+        let auditstepcode = 'FIRST_TRIAL'
+        supplierapi.getAuditerByDept(val[val.length - 1], auditstepcode, this.$axios).then(res => {
           // if (res.data.item.length === 0) {
           //   this.$message({
           //     type: 'warning',