信息变更分办退回 增项选审批人bug

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

@@ -1173,14 +1173,16 @@ func (this *InfoChangeController) InfoAudit() {
 		userIds = utils.ToStr(dataother.FirstAudit)
 		status = suppliercert.FIRST_TRIAL_STATUS
 		step = 2
-		backstatus = suppliercert.NOPASS_STATUS
-		infomodel.FirstAudit = dataother.FirstAudit
-		infomodel.SecondAudit = dataother.SecondAudit
-		cols := []string{
-			"FirstAudit",
-			"SecondAudit",
+		backstatus = suppliercert.NO_FEN_TRIAL_STATUS
+		if dataother.SuccessStatus == 1 {
+			infomodel.FirstAudit = dataother.FirstAudit
+			infomodel.SecondAudit = dataother.SecondAudit
+			cols := []string{
+				"FirstAudit",
+				"SecondAudit",
+			}
+			svc.UpdateEntityByIdCols(infoid, infomodel, cols)
 		}
-		svc.UpdateEntityByIdCols(infoid, infomodel, cols)
 	}
 	if infomodel.Status == suppliercert.FIRST_TRIAL_STATUS {
 		userIds = utils.ToStr(infomodel.SecondAudit)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -290,6 +290,9 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         secorgtreelist: [],
         majorDept: [100000000, 100000128, 100000151],
         auditbusList: [], // 待审核业务
+        allorgunitOptions: [],
+        userOptions: [],
+        selectDept: 100000151,
         dialogMakeSure: false,
         dialogAllocation: false,
         dialogMakeSure2: false,
@@ -400,6 +403,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
       this.getSupplierList() // 获取供应方公司列表
+      this.changeOrgUnit(this.selectDept)
     },
     methods: {
       // 获取需要修改的增项信息
@@ -557,6 +561,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         suppapi.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
           this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+          this.allorgunitOptions = res.data.items['Allunitorglist']
           // this.auditerOptions = res.data.items['Auditer']
           // this.organizeOption = res.data.items['Organizes']
         }).catch(err => {
@@ -637,19 +642,52 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
           console.error(err)
         })
       },
+      changeOrgUnit (val) {
+        let auditstepcode = 'PROF_RECE'
+        suppapi.getAuditerByDept(val, auditstepcode, this.$axios).then(res => {
+          this.userOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 审核通过
       makeSure () {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
-            this.formData.Status !== '4' &&
-            this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if ((!this.auditer || this.auditer === 0) && (this.formData.Status == '0' || this.formData.Status == '10' || this.formData.Status == '3')) {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
             })
             return
           }
+          if (this.formData.Status == '10') {
+            if (!this.fushenauditer || this.fushenauditer === 0) {
+              this.$message({
+                type: 'warning',
+                message: '请选择复审人！'
+              })
+              return
+            }
+            if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
+              if (this.selectDept === 0 || this.selectDept == '') {
+                this.$message({
+                  type: 'warning',
+                  message: '请选择专业处室！'
+                })
+                return
+              }
+            }
+            if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
+            }
+          }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
             .Status !== '5' && this.formData.Status !== '10') {
             this.$message({

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -640,19 +640,27 @@
       },
       // 审核通过
       makeSure () {
-        console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
           if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
             this.formData.Status !== '4' &&
-            this.formData.Status !== '5' && this.formData.Status !== '10') {
+            this.formData.Status !== '5') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
             })
             return
           }
+          if ((!this.fushenauditer || this.fushenauditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
+            this.formData.Status !== '4' &&
+            this.formData.Status !== '5') {
+            this.$message({
+              type: 'warning',
+              message: '请选择复审人！'
+            })
+            return
+          }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
-            .Status !== '5' && this.formData.Status !== '10') {
+            .Status !== '5' && this.formData.Status !== '10' ) {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -660,8 +668,11 @@
             return
           }
         } else {
+          if (this.formData.Status === '10') {
+            this.shenheForm.AuditorRemark = this.backRemark
+          }
           if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
-            .Status !== '5' && this.formData.Status !== '10') {
+            .Status !== '5') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -662,13 +662,22 @@
         if (this.shenheForm.SuccessStatus === 1) {
           if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
             this.formData.Status !== '4' &&
-            this.formData.Status !== '5' && this.formData.Status !== '10') {
+            this.formData.Status !== '5') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
             })
             return
           }
+          if ((!this.fushenauditer || this.fushenauditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
+            this.formData.Status !== '4' &&
+            this.formData.Status !== '5') {
+            this.$message({
+              type: 'warning',
+              message: '请选择复审人！'
+            })
+            return
+          }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
             .Status !== '5' && this.formData.Status !== '10') {
             this.$message({

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

@@ -92,6 +92,7 @@
               <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>
+              <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             </template>
           </el-table-column>
           <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"

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

@@ -92,6 +92,7 @@
               <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>
+              <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             </template>
           </el-table-column>
           <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"

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

@@ -92,6 +92,7 @@
               <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>
+              <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             </template>
           </el-table-column>
           <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"

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

@@ -92,6 +92,7 @@
               <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>
+              <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             </template>
           </el-table-column>
           <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -14,7 +14,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="fenbanbtn"
-                     v-if="auditBtn && InfoStatus == '10'">分办</el-button>
+                     v-if="auditBtn && InfoStatusBool()">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="submitInfoChange"
             v-if="auditBtn && InfoStatus == '1'">初审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="submitInfoChange"
@@ -503,10 +503,18 @@
     <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
       <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
-    <el-dialog title="提交申请" :visible.sync="commitshowfen" width="360px">
+    <el-dialog title="提交申请" :visible.sync="commitshowfen" width="520px">
       <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
         <el-row>
           <el-col :span="24">
+            <el-form-item label="审批状态">
+              <el-radio-group v-model="shenheForm.SuccessStatus">
+                <el-radio :label="1">通过</el-radio>
+                <el-radio :label="0">退回</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
                 <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
@@ -520,11 +528,17 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="备注">
               <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入备注内容"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="shenheForm.SuccessStatus == 0">
+            <el-form-item label="退回原因">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="请输入备注内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span style="float: right;margin-top:-10px;">
@@ -877,23 +891,42 @@
       this.getAccessCardNo()
     },
     methods: {
+      InfoStatusBool () {
+        console.log(this.InfoStatus, 'this.InfoStatus')
+        if (this.InfoStatus === '10' || this.InfoStatus === '-10' || this.InfoStatus === '-1' ||
+          this.InfoStatus === '-2' || this.InfoStatus === '-5') {
+          return true
+        } else {
+          return false
+        }
+      },
       fenbanbtn () {
         this.commitshowfen = true
       },
       addInfoChangeAudit () {
-        if (this.auditer === '') {
-          this.$message({
-            type: 'warning',
-            message: '请选择初审人！'
-          })
-          return
-        }
-        if (this.fushenauditer === '') {
-          this.$message({
-            type: 'warning',
-            message: '请选择复审人！'
-          })
-          return
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.auditer === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择初审人！'
+            })
+            return
+          }
+          if (this.fushenauditer === '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择复审人！'
+            })
+            return
+          }
+        } else {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
         }
         this.shenheForm.SecondAudit = this.fushenauditer
         this.shenheForm.FirstAudit = parseInt(this.auditer)

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

@@ -14,14 +14,14 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px"
-            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1|| InfoStatus == -2) && !butnab" @click="saveinfochange">保存
+            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1|| InfoStatus == -2 || InfoStatus == -10) && !butnab" @click="saveinfochange">保存
           </el-button>
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <el-button type="primary" size="mini" @click="submitInfoChange"
-            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
+            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2 || InfoStatus == -10) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
           </el-button>
           <el-button type="primary" size="mini" @click="submitApplyBtn"
-                     v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2) && authUser.Profile.IsCompanyUser == 0 ">提交申请
+                     v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2 || InfoStatus == -10) && authUser.Profile.IsCompanyUser == 0 ">提交申请
           </el-button>
           <router-link :to="'/oilsupplier/infochangech'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

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

@@ -65,6 +65,8 @@
               <span v-if="scope.row.Status=='-2'" 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=='10'" style="color:#E6A23C">待二级单位分办</span>
+              <span v-if="scope.row.Status=='-10'" style="color:#F56C6C">分办未通过</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
             </template>
           </el-table-column>
@@ -80,7 +82,7 @@
           :total="currentItemCount">
         </el-pagination>
       </el-card>
-<!-- 
+<!--
       <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
         <el-form ref="searchForm" label-width="110px">
           <el-row> -->
@@ -97,7 +99,7 @@
               <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col> -->
-<!-- 
+<!--
             <el-col :span="12">
               <el-form-item label="推荐单位编码">
                 <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -27,7 +27,7 @@
             v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审批
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
-            v-if="formData.Id !='' && formData.Status == 0 && IsCompanyUser == 1">提交分办
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交分办
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -27,7 +27,7 @@
             v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审批
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
-            v-if="formData.Id !='' && formData.Status == 0 && IsCompanyUser == 1">提交分办
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交分办
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -1607,6 +1607,7 @@
       },
       // 提交审批
       AuditEntity () {
+
         if (this.auditer === '') {
           this.$message({
             type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -27,7 +27,7 @@
             v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审批
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
-            v-if="formData.Id !='' && formData.Status == 0 && IsCompanyUser == 1">提交分办
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交分办
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

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

@@ -378,7 +378,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
       editData (row) {
         let _this = this
         _this.$router.push({
-          path: `/oilsupplier/supplierappend/1/goodsdataopera`,
+          path: `/oilsupplier/supplierappend/` + (row.AppendType === '01' ? '1' : (row.AppendType === '02' ? '2' : '3')) + `/` + (row.AppendType === '01' ? 'goodsoperation' : (row.AppendType === '02' ? 'bassicoperation' : 'techdataopera')),
           query: {
             Id: row.Id,
             editFlag: 1 // 编辑标记： 1 修改，0 不修改