分办退回

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

@@ -151,6 +151,7 @@ const (
 	STOREING_STATUS     string = "7"  //待入库
 	STORE_STATUS        string = "8"  //已入库
 	FEN_TRIAL_STATUS    string = "10" //二级单位分办
+	NO_FEN_TRIAL_STATUS    string = "-10" //二级单位分办未通过
 	NOPASS_STATUS       string = "-1" // 初审未通过
 	NO_SECOND_TRIAL_STATUS   string = "-2" // 复审未通过
 	NO_THIRD_TRIAL_STATUS    string = "-3" // 专业处接收未通过

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

@@ -888,16 +888,18 @@ func (this *AnnualAuditController) AnnualAudit() {
 		userIds = firstAudit
 		status = suppliercert.FIRST_TRIAL_STATUS
 		step = 2
-		backstatus = suppliercert.NOPASS_STATUS
-		list.FirstAudit,_ = strconv.Atoi(firstAudit)
-		list.SecondAudit,_ = strconv.Atoi(secondAudit)
-		list.ThirdAudit,_ = strconv.Atoi(thirdAudit)
-		cols := []string{
-			"FirstAudit",
-			"SecondAudit",
-			"ThirdAudit",
+		backstatus = suppliercert.NO_FEN_TRIAL_STATUS
+		if dataother.SuccessStatus == 1 {
+			list.FirstAudit,_ = strconv.Atoi(firstAudit)
+			list.SecondAudit,_ = strconv.Atoi(secondAudit)
+			list.ThirdAudit,_ = strconv.Atoi(thirdAudit)
+			cols := []string{
+				"FirstAudit",
+				"SecondAudit",
+				"ThirdAudit",
+			}
+			svc.UpdateEntityByIdCols(dataother.AnnualId, list, cols)
 		}
-		svc.UpdateEntityByIdCols(dataother.AnnualId, list, cols)
 	}
 	if list.Status == suppliercert.FIRST_TRIAL_STATUS {
 		userIds = utils.ToStr(list.SecondAudit)

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

@@ -904,19 +904,22 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	if supplierCertEntity.Status == suppliercert.FEN_TRIAL_STATUS {
 		userIds = firstAudit
 		status = suppliercert.FIRST_TRIAL_STATUS
+		backstatus = suppliercert.NO_FEN_TRIAL_STATUS
 		step = 2
-		supplierCertEntity.Step = 2
-		supplierCertEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
-		supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
-		supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit)
-		cols := []string{
-			"Id",
-			"Step",
-			"FirstAudit",
-			"SecondAudit",
-			"ThirdAudit",
+		if dataother.SuccessStatus == 1 {
+			supplierCertEntity.Step = 2
+			supplierCertEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
+			supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
+			supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit)
+			cols := []string{
+				"Id",
+				"Step",
+				"FirstAudit",
+				"SecondAudit",
+				"ThirdAudit",
+			}
+			certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 		}
-		certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 	}
 	if supplierCertEntity.Status == suppliercert.FIRST_TRIAL_STATUS {
 		userIds = utils.ToStr(supplierCertEntity.SecondAudit)

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

@@ -690,17 +690,20 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	if supplierCertAppendEntity.Status == suppliercert.FEN_TRIAL_STATUS {
 		userIds = firstAudit
 		status = suppliercert.FIRST_TRIAL_STATUS
+		backstatus = suppliercert.NO_FEN_TRIAL_STATUS
 		step = 2
-		supplierCertAppendEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
-		supplierCertAppendEntity.SecondAudit,_ = strconv.Atoi(secondAudit)
-		supplierCertAppendEntity.ThirdAudit,_ = strconv.Atoi(thirdAudit)
-		cols := []string{
-			"Id",
-			"FirstAudit",
-			"SecondAudit",
-			"ThirdAudit",
+		if dataother.SuccessStatus == 1 {
+			supplierCertAppendEntity.FirstAudit, _ = strconv.Atoi(firstAudit)
+			supplierCertAppendEntity.SecondAudit,_ = strconv.Atoi(secondAudit)
+			supplierCertAppendEntity.ThirdAudit,_ = strconv.Atoi(thirdAudit)
+			cols := []string{
+				"Id",
+				"FirstAudit",
+				"SecondAudit",
+				"ThirdAudit",
+			}
+			svc.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
 		}
-		svc.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
 	}
 	if supplierCertAppendEntity.Status == suppliercert.FIRST_TRIAL_STATUS {
 		userIds = utils.ToStr(supplierCertAppendEntity.SecondAudit)
@@ -917,8 +920,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 				supplierCertAppendEntity.Step = step
 				supplierCertAppendEntity.AuditIndex = supplierCertAppendEntity.AuditIndex + 1
 			}else {
-				supplierCertAppendEntity.Status = "-1"
-				supplierCertAppendEntity.Status = "0"
+				supplierCertAppendEntity.Status = backstatus
 				supplierCertAppendEntity.Step = 1
 				supplierCertAppendEntity.AuditIndex = supplierCertAppendEntity.AuditIndex + 1
 			}

src/dashoo.cn/frontend_web/src/components/workflow/wfmultihistory.vue

@@ -32,7 +32,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <div style="margin-top:4px; text-align: center;">
+    <div style="margin-top:-1px; text-align: center;">
       <img :src="baseurl + 'workflow/historyimg/' + entryinfo.instance +'?t='+(new Date()).getTime() " v-if="entryinfo.instance">
     </div>
   </div>

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

@@ -694,6 +694,8 @@
             return '未通过'
           case '10':
             return '分办'
+          case '-10':
+            return '分办未通过'
           case '11':
             return '审核完成'
           default:

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

@@ -171,6 +171,14 @@
       <el-form ref="searchForm" label-width="100px">
         <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>
@@ -178,23 +186,35 @@
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
-                allow-create default-first-option>
+                         allow-create default-first-option>
                 <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
-              <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
-                style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
-              </el-cascader>
+              <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
+              <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
+              <!--</el-cascader>-->
+              <el-select  v-model="selectDept" filterable
+                          placeholder="请选择" style="width: 100%" @change="changeOrgUnit">
+                <el-option  v-for="item in allorgunitOptions" :key="item.Id" :label="item.Fullname"
+                            :value="item.Id">
+                </el-option>
+              </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.AuditRemark" 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="backRemark" type="textarea" placeholder="请输入退回原因，不少于5个字！">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -257,6 +277,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
         }
       }
       return {
+        backRemark: '',
         inStyle: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         chooseAuditorVisible: false,
@@ -638,6 +659,9 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
             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') {
             this.$message({

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

@@ -176,6 +176,14 @@
       <el-form ref="searchForm" label-width="100px">
         <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>
@@ -183,23 +191,35 @@
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
-                allow-create default-first-option>
+                         allow-create default-first-option>
                 <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
-              <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
-                style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
-              </el-cascader>
+              <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
+              <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
+              <!--</el-cascader>-->
+              <el-select  v-model="selectDept" filterable
+                          placeholder="请选择" style="width: 100%" @change="changeOrgUnit">
+                <el-option  v-for="item in allorgunitOptions" :key="item.Id" :label="item.Fullname"
+                            :value="item.Id">
+                </el-option>
+              </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.AuditRemark" 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="backRemark" type="textarea" placeholder="请输入退回原因，不少于5个字！">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -261,6 +281,7 @@
         }
       }
       return {
+        backRemark: '',
         inStyle: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         chooseAuditorVisible: false,

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

@@ -172,6 +172,14 @@
       <el-form ref="searchForm" label-width="100px">
         <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>
@@ -179,23 +187,35 @@
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
-                allow-create default-first-option>
+                         allow-create default-first-option>
                 <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
-              <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
-                style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
-              </el-cascader>
+              <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
+              <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
+              <!--</el-cascader>-->
+              <el-select  v-model="selectDept" filterable
+                          placeholder="请选择" style="width: 100%" @change="changeOrgUnit">
+                <el-option  v-for="item in allorgunitOptions" :key="item.Id" :label="item.Fullname"
+                            :value="item.Id">
+                </el-option>
+              </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.AuditRemark" 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="backRemark" type="textarea" placeholder="请输入退回原因，不少于5个字！">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -255,6 +275,7 @@
         }
       }
       return {
+        backRemark: '',
         inStyle: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         chooseAuditorVisible: false,
@@ -657,6 +678,9 @@
             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') {
             this.$message({

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

@@ -241,6 +241,14 @@
       <el-form label-width="90px" :model="shenheForm" 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>
@@ -259,12 +267,18 @@
               <!--</el-cascader>-->
             <!--</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;">
@@ -795,53 +809,38 @@
       },
       // 审核通过
       makeSure () {
-        if (this.AnnualStatus == '10') {
-          if (this.auditer === '') {
-            this.$message({
-              type: 'warning',
-              message: '请选择审批人！'
-            })
-            return
-          }
-          if (this.fushenauditer === '') {
-            this.$message({
-              type: 'warning',
-              message: '请选择复审人！'
-            })
-            return
-          }
-          // if (this.majorDept.length === 0) {
-          //   this.$message({
-          //     type: 'warning',
-          //     message: '请选择专业处室！'
-          //   })
-          //   return
-          // }
-          // if (this.userOptions.length === 0) {
-          //   this.$message({
-          //     type: 'warning',
-          //     message: '该专业科室未配置接收人！'
-          //   })
-          //   return
-          // }
-        } else {
-          if (this.shenheForm.SuccessStatus === 1) {
-            if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {
+        if (this.shenheForm.SuccessStatus === 1) {
+          if (this.AnnualStatus == '10') {
+            if (this.auditer === '') {
               this.$message({
                 type: 'warning',
-                message: '审批意见不能低于20个字符！'
+                message: '请选择审批人！'
               })
               return
             }
-          } else {
-            if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3') {
+            if (this.fushenauditer === '') {
               this.$message({
                 type: 'warning',
-                message: '退回意见不能低于5个字符！'
+                message: '请选择复审人！'
               })
               return
             }
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return
+          }
+        } else {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },

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

@@ -102,6 +102,7 @@
                   style="color:#E6A23C">待提交</span>
             <span v-if="scope.row.Status=='10'"
                   style="color:#E6A23C">待二级单位分办</span>
+            <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             <span v-if="scope.row.Status=='1'"
                   style="color:#E6A23C">待初审</span>
             <span v-if="scope.row.Status=='-1'"

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

@@ -101,6 +101,7 @@
                   style="color:#E6A23C">待提交</span>
             <span v-if="scope.row.Status=='10'"
                   style="color:#E6A23C">待二级单位分办</span>
+            <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             <span v-if="scope.row.Status=='1'"
                   style="color:#E6A23C">待初审</span>
             <span v-if="scope.row.Status=='-1'"

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

@@ -66,6 +66,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
             <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待二级单位分办</span>
+            <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
             <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
             <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>

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

@@ -102,6 +102,7 @@
                   style="color:#E6A23C">待提交</span>
             <span v-if="scope.row.Status=='10'"
                   style="color:#E6A23C">待二级单位分办</span>
+            <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             <span v-if="scope.row.Status=='1'"
                   style="color:#E6A23C">待初审</span>
             <span v-if="scope.row.Status=='-1'"

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

@@ -92,7 +92,7 @@
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</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="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>

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

@@ -92,6 +92,7 @@
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</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>

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

@@ -97,6 +97,7 @@
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</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="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>

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

@@ -92,6 +92,7 @@
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</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>

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

@@ -288,6 +288,14 @@
       <el-form ref="searchForm" label-width="100px">
         <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>
@@ -312,12 +320,18 @@
               </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="auditform.AuditRemark" 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="backRemark" type="textarea" placeholder="请输入退回原因，不少于5个字！">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -377,6 +391,7 @@
 
     data() {
       return {
+        backRemark: '',
         chooseAuditorVisible: false,
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         equipmentList: [], // 企业主要装备情况
@@ -555,24 +570,32 @@
     },
     methods: {
       radioChange () {
-        if (this.shenheForm.SuccessStatus === 1) {
-          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
-          if (this.inStyle == '1') {
-            this.shenheForm.AuditorRemark = '集中评审通过'
-          } else if (this.inStyle == '2') {
-            this.shenheForm.AuditorRemark = '一级物资备案准入'
-          } else if (this.inStyle == '3') {
-            this.shenheForm.AuditorRemark = '二级物资备案准入'
-          } else if (this.inStyle == '4') {
-            this.shenheForm.AuditorRemark = '战略合作准入'
-          }
-        } else {
-          if (this.formData.Status == '5') {
-            this.textplaceholder = ''
+        if (this.formData.Status == '5') {
+          if (this.shenheForm.SuccessStatus === 1) {
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+            if (this.inStyle == '1') {
+              this.shenheForm.AuditorRemark = '集中评审通过。'
+            } else if (this.inStyle == '2') {
+              this.shenheForm.AuditorRemark = '一级物资备案准入'
+            } else if (this.inStyle == '3') {
+              this.shenheForm.AuditorRemark = '二级物资备案准入'
+            } else if (this.inStyle == '4') {
+              this.shenheForm.AuditorRemark = '战略合作准入'
+            } else if (this.inStyle == '5') {
+              this.shenheForm.AuditorRemark = '集中评审通过。'
+            } else if (this.inStyle == '6') {
+              this.shenheForm.AuditorRemark = '外部市场准入通过。'
+            } else {
+              this.shenheForm.AuditorRemark = '集中评审通过。'
+            }
           } else {
-            this.textplaceholder = '退回意见不能少于5个字'
+            if (this.formData.Status == '5') {
+              this.textplaceholder = ''
+            } else {
+              this.textplaceholder = '退回意见不能少于5个字'
+            }
+            this.shenheForm.AuditorRemark = ''
           }
-          this.shenheForm.AuditorRemark = ''
         }
       },
       changeOrgUnit (val) {
@@ -967,6 +990,9 @@
           //   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') {
             this.$message({
               type: 'warning',

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

@@ -299,6 +299,14 @@
       <el-form ref="searchForm" label-width="100px">
         <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>
@@ -306,14 +314,14 @@
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
-                allow-create default-first-option>
+                         allow-create default-first-option>
                 <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
-                <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
+              <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
               <!--</el-cascader>-->
               <el-select  v-model="selectDept" filterable
                           placeholder="请选择" style="width: 100%" @change="changeOrgUnit">
@@ -323,12 +331,18 @@
               </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="auditform.AuditRemark" 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="backRemark" type="textarea" placeholder="请输入退回原因，不少于5个字！">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -389,6 +403,7 @@
 
     data() {
       return {
+        backRemark: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         auditer: '',
         auditerName: '',
@@ -572,24 +587,32 @@
     },
     methods: {
       radioChange () {
-        if (this.shenheForm.SuccessStatus === 1) {
-          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
-          if (this.inStyle == '1') {
-            this.shenheForm.AuditorRemark = '集中评审通过'
-          } else if (this.inStyle == '2') {
-            this.shenheForm.AuditorRemark = '一级物资备案准入'
-          } else if (this.inStyle == '3') {
-            this.shenheForm.AuditorRemark = '二级物资备案准入'
-          } else if (this.inStyle == '4') {
-            this.shenheForm.AuditorRemark = '战略合作准入'
-          }
-        } else {
-          if (this.formData.Status == '5') {
-            this.textplaceholder = ''
+        if (this.formData.Status == '5') {
+          if (this.shenheForm.SuccessStatus === 1) {
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+            if (this.inStyle == '1') {
+              this.shenheForm.AuditorRemark = '集中评审通过。'
+            } else if (this.inStyle == '2') {
+              this.shenheForm.AuditorRemark = '一级物资备案准入'
+            } else if (this.inStyle == '3') {
+              this.shenheForm.AuditorRemark = '二级物资备案准入'
+            } else if (this.inStyle == '4') {
+              this.shenheForm.AuditorRemark = '战略合作准入'
+            } else if (this.inStyle == '5') {
+              this.shenheForm.AuditorRemark = '集中评审通过。'
+            } else if (this.inStyle == '6') {
+              this.shenheForm.AuditorRemark = '外部市场准入通过。'
+            } else {
+              this.shenheForm.AuditorRemark = '集中评审通过。'
+            }
           } else {
-            this.textplaceholder = '退回意见不能少于5个字'
+            if (this.formData.Status == '5') {
+              this.textplaceholder = ''
+            } else {
+              this.textplaceholder = '退回意见不能少于5个字'
+            }
+            this.shenheForm.AuditorRemark = ''
           }
-          this.shenheForm.AuditorRemark = ''
         }
       },
       changeOrgUnit (val) {
@@ -988,6 +1011,9 @@
           //   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') {
             this.$message({
               type: 'warning',

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

@@ -286,6 +286,14 @@
       <el-form ref="searchForm" label-width="100px">
         <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>
@@ -293,14 +301,14 @@
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
-                allow-create default-first-option>
+                         allow-create default-first-option>
                 <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="业务处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
+            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
-                <!--style="width: 100%" v-model="majorDept" placeholder="请选择业务处室">-->
+              <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
               <!--</el-cascader>-->
               <el-select  v-model="selectDept" filterable
                           placeholder="请选择" style="width: 100%" @change="changeOrgUnit">
@@ -310,12 +318,18 @@
               </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="auditform.AuditRemark" 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="backRemark" type="textarea" placeholder="请输入退回原因，不少于5个字！">
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -375,6 +389,7 @@
 
     data() {
       return {
+        backRemark: '',
         textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         equipmentList: [], // 企业主要装备情况
         performanceList: [], // 近三年主要工程业绩
@@ -556,7 +571,7 @@
           if (this.shenheForm.SuccessStatus === 1) {
             this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
             if (this.inStyle == '1') {
-              this.shenheForm.AuditorRemark = '集中评审通过'
+              this.shenheForm.AuditorRemark = '集中评审通过。'
             } else if (this.inStyle == '2') {
               this.shenheForm.AuditorRemark = '一级物资备案准入'
             } else if (this.inStyle == '3') {
@@ -973,6 +988,9 @@
           //   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') {
             this.$message({
               type: 'warning',