前端: 增项申请业务处室审批后用户交费前，新增企管法规处审批环节(侯处讲该担责的要担责)

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

@@ -30,6 +30,7 @@
           <!--<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="secUnitSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 10">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '9'" :loading="btnLoading">企管法规处审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="confirm" v-if="auditBtn && this.formData.Status === '7'" :loading="btnLoading">审批入库</el-button>
           <el-button type="warning" size="mini" style="margin-right: 8px" @click="backStatus" v-if="auditBtn && formData.Status == '7'" :loading="btnLoading">退回</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
@@ -1150,6 +1151,8 @@
             this.auditstepcode = 'PAYING_FEE'
           } else if (_this.formData.Status === '7') {
             this.auditstepcode = 'PROF_REGULATION_STORAGE'
+          } else if (_this.formData.Status === '9') {
+            this.auditstepcode = 'PROF_REGULATION' // PROF_REGULATION 按照集中审批的权限取人
           } else if (_this.formData.Status === '10') {
             this.auditstepcode = 'SUB_OFFICE_JS'
           }
@@ -1181,6 +1184,8 @@
           this.auditstepcode = 'PAYING_FEE'
         } else if (this.Status === '7') {
           this.auditstepcode = 'PROF_REGULATION_STORAGE'
+        } else if (this.Status === '9') {
+          this.auditstepcode = 'PROF_REGULATION'
         } else if (this.Status === '10') {
           this.auditstepcode = 'SUB_OFFICE_JS'
         }
@@ -1359,7 +1364,7 @@
           this.btnLoading = false
         })
       },
-      // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核
+      // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核、企管法规处审核
       commonAuditClick () {
         console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true

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

@@ -31,6 +31,7 @@
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-if="auditBtn && this.formData.Status != '6'">1{{auditTitle}}</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 10">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '9'" :loading="btnLoading">企管法规处审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="confirm" v-if="auditBtn && this.formData.Status === '7'" :loading="btnLoading">审批入库</el-button>
           <el-button type="warning" size="mini" style="margin-right: 5px" @click="backStatus" v-if="auditBtn && formData.Status == '7'" :loading="btnLoading">退回</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
@@ -52,9 +53,9 @@
                     <el-input :class="changedForm['SupplierName'] ? 'modified-form-input' : ''" :readonly="formData.Status > 0"
                               v-model="supplierData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%">
                     </el-input>
-<!--                    <el-input v-model="supplierData.SupplierName" :maxlength="255" :readonly="formData.Status > 0"-->
-<!--                              placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">-->
-<!--                    </el-input>-->
+                    <!--<el-input v-model="supplierData.SupplierName" :maxlength="255" :readonly="formData.Status > 0"-->
+                    <!--          placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">-->
+                    <!--</el-input>-->
                   </el-form-item>
                 </el-col>
 
@@ -1235,6 +1236,8 @@
             this.auditstepcode = 'PAYING_FEE'
           } else if (_this.formData.Status === '7') {
             this.auditstepcode = 'PROF_REGULATION_STORAGE'
+          } else if (_this.formData.Status === '9') {
+            this.auditstepcode = 'PROF_REGULATION' // PROF_REGULATION 按照集中审批的权限取人
           } else if (_this.formData.Status === '10') {
             this.auditstepcode = 'SUB_OFFICE_WZ'
           }
@@ -1266,6 +1269,8 @@
           this.auditstepcode = 'PAYING_FEE'
         } else if (this.Status === '7') {
           this.auditstepcode = 'PROF_REGULATION_STORAGE'
+        } else if (this.Status === '9') {
+          this.auditstepcode = 'PROF_REGULATION'
         } else if (this.Status === '10') {
           this.auditstepcode = 'SUB_OFFICE_WZ'
         }
@@ -1585,7 +1590,7 @@
           this.btnLoading = false
         })
       },
-      // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核
+      // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核、企管法规处审核
       commonAuditClick () {
         console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true

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

@@ -30,6 +30,7 @@
           <!--<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="secUnitSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 10">分办</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick" v-if="auditBtn && this.formData.Status === '9'" :loading="btnLoading">企管法规处审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="confirm" v-if="auditBtn && this.formData.Status === '7'" :loading="btnLoading">审批入库</el-button>
           <el-button type="warning" size="mini" style="margin-right: 5px" @click="backStatus" v-if="auditBtn && formData.Status == '7'" :loading="btnLoading">退回</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
@@ -1153,6 +1154,8 @@
             this.auditstepcode = 'PAYING_FEE'
           } else if (_this.formData.Status === '7') {
             this.auditstepcode = 'PROF_REGULATION_STORAGE'
+          } else if (_this.formData.Status === '9') {
+            this.auditstepcode = 'PROF_REGULATION' // PROF_REGULATION 按照集中审批的权限取人
           } else if (_this.formData.Status === '10') {
             this.auditstepcode = 'SUB_OFFICE_JF'
           }
@@ -1184,6 +1187,8 @@
           this.auditstepcode = 'PAYING_FEE'
         } else if (this.Status === '7') {
           this.auditstepcode = 'PROF_REGULATION_STORAGE'
+        } else if (this.Status === '9') {
+          this.auditstepcode = 'PROF_REGULATION'
         } else if (this.Status === '10') {
           this.auditstepcode = 'SUB_OFFICE_JF'
         }
@@ -1389,7 +1394,7 @@
           this.btnLoading = false
         })
       },
-      // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核
+      // 分办之后的各级审批  --审批 包含：二级单位初审、复审, 业务处室专业审核、企管法规处审核
       commonAuditClick () {
         console.log('审批公共会话框')
         this.dialogCommonAuditMakeSureVisible = true

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

@@ -74,6 +74,8 @@
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+              <span v-if="scope.row.Status=='9'" style="color:#E6A23C">待企管法规处审批</span>
+              <span v-if="scope.row.Status=='-9'" 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>

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

@@ -73,6 +73,8 @@
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+              <span v-if="scope.row.Status=='9'" style="color:#E6A23C">待企管法规处审批</span>
+              <span v-if="scope.row.Status=='-9'" 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>

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

@@ -76,6 +76,8 @@
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+              <span v-if="scope.row.Status=='9'" style="color:#E6A23C">待企管法规处审批</span>
+              <span v-if="scope.row.Status=='-9'" 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>

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

@@ -74,6 +74,8 @@
               <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
               <span v-if="scope.row.Status=='-7'" style="color:#F56C6C">待入库退回</span>
               <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+              <span v-if="scope.row.Status=='9'" style="color:#E6A23C">待企管法规处审批</span>
+              <span v-if="scope.row.Status=='-9'" 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>