状态小于0时可继续提交

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

@@ -22,9 +22,9 @@
             <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="itemsshow">查看变更项</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0"> 提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
+          <!--<el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0"> 提交审核</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(Status) === 6">交费</el-button>
           <router-link :to="'/oilsupplier/annualaudit/basicindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>

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

@@ -22,9 +22,9 @@
             <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="itemsshow">查看变更项</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
+          <!--<el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0">提交审核</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(Status) === 6">交费</el-button>
           <router-link :to="'/oilsupplier/annualaudit/goodsindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>

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

@@ -22,9 +22,9 @@
             <!-- <el-button slot="reference" plain size="mini" style="margin-left: 8px">查看进度</el-button> -->
           </el-popover>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="itemsshow">查看变更项</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Status <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
-          <el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0"> 提交审核</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 1">提交分办</el-button>
+          <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick()" v-if="Number(Status) <= 0 && authUser.Profile.IsCompanyUser == 0">提交审核</el-button>
+          <!--<el-button type="primary" style="margin-left: 8px;" size="mini" @click="separateUnitSubmitClick()" v-if="Status == 10 &&  authUser.Profile.IsCompanyUser == 0"> 提交审核</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(Status) === 6">交费</el-button>
           <router-link :to="'/oilsupplier/annualaudit/techindex'">
             <el-button type="primary" size="mini" style="margin-left: 8px;">返回</el-button>

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 || InfoStatus == -5 ) && !butnab" @click="saveinfochange">保存
+            v-if="(InfoStatus == '' || Number(InfoStatus) <= 0) && !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="companySubmitApplyBtn"
-            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2 || InfoStatus == -10 || InfoStatus == -5) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
+            v-if="(InfoStatus == '' || Number(InfoStatus) <= 0) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
           </el-button>
           <el-button type="primary" size="mini" @click="separateUnitSubmitApplyBtn"
-                     v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2 || InfoStatus == -5) && authUser.Profile.IsCompanyUser == 0 ">提交1申请
+                     v-if="(InfoStatus == '' || Number(InfoStatus) <= 0) && 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/supplier/_opera/basisedit.vue

@@ -53,10 +53,10 @@
           <el-button type="primary"
                      size="mini"
                      @click="commitAudit()"
-                     v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3">
+                     v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3 || Number(this.formData.Status) < 0">
             提交
           </el-button>
-          <el-button v-if="parseInt(IsCompanyUser) !== 1 && (this.formData.Status == '' || parseInt(this.formData.Status) === 0) " type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
+          <el-button v-if="parseInt(IsCompanyUser) !== 1 && (this.formData.Status == '' || parseInt(this.formData.Status) === 0 || Number(this.formData.Status) < 0) " type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
         </span>

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

@@ -52,10 +52,10 @@
           <el-button type="primary"
                      size="mini"
                      @click="commitAudit()"
-                     v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(totalTab) >= 3">
+                     v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(totalTab) >= 3 || Number(this.formData.Status) < 0">
             提交
           </el-button>
-          <el-button v-if="add_flat && parseInt(IsCompanyUser) !== 1 && parseInt(totalTab) >= 3" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
+          <el-button v-if="add_flat && parseInt(IsCompanyUser) !== 1 && parseInt(totalTab) >= 3 || Number(this.formData.Status) < 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
           <!--<el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>-->

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

@@ -42,10 +42,10 @@
           <el-button type="primary"
                      size="mini"
                      @click="commitAudit()"
-                     v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3">
+                     v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3 || Number(this.formData.Status) < 0">
             提交
           </el-button>
-          <el-button v-if="parseInt(IsCompanyUser) !== 1 && (this.formData.Status == '' || parseInt(this.formData.Status) === 0) " type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
+          <el-button v-if="parseInt(IsCompanyUser) !== 1 && (this.formData.Status == '' || parseInt(this.formData.Status) === 0) || Number(this.formData.Status) <= 0" type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
             提交审批
           </el-button>
         </span>
@@ -72,7 +72,7 @@
                 <el-button type="primary"
                            size="mini"
                            @click="saveEntity"
-                           v-if="formDataCert.Status <= 0">保存基本信息
+                           v-if="Number(formDataCert.Status) <= 0">保存基本信息
                 </el-button>
               </span>
             </div>

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

@@ -25,13 +25,13 @@
           <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="formData.Id !='' && formData.Status <= 0 && formData.Status != -5" @click="saveinfochange">保存
+                     v-if="formData.Id !='' && Number(formData.Status) <= 0" @click="saveinfochange">保存
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审核
+            v-if="formData.Id !='' && Number(formData.Status) <= 0 && IsCompanyUser == 0">提交审核
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
+            v-if="formData.Id !='' && Number(formData.Status) <= 0 && 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

@@ -24,13 +24,13 @@
           </el-popover>
           <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="formData.Id !='' && formData.Status <= 0 && formData.Status != -5" @click="saveinfochange">保存
+          <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id !='' && Number(formData.Status) <= 0" @click="saveinfochange">保存
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-            v-if="formData.Id !='' && formData.Status <= 0 && IsCompanyUser == 0">提交审核
+            v-if="formData.Id !='' && Number(formData.Status) <= 0 && IsCompanyUser == 0">提交审核
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
-            v-if="formData.Id !='' && formData.Status <= 0 && IsCompanyUser == 1">提交
+            v-if="formData.Id !='' && Number(formData.Status) <= 0 && IsCompanyUser == 1">提交
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>

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

@@ -25,13 +25,13 @@
           <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="formData.Id !='' && formData.Status <= 0 && formData.Status != -5" @click="saveinfochange">保存
+                     v-if="formData.Id !='' && Number(formData.Status) <= 0" @click="saveinfochange">保存
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审核
+            v-if="formData.Id !='' && Number(formData.Status) <= 0 && IsCompanyUser == 0">提交审核
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
+            v-if="formData.Id !='' && Number(formData.Status) <= 0 && IsCompanyUser == 1">提交
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>