2
3
yuedefeng 5 лет назад
Родитель
Сommit
b560dfde01

+ 3 - 8
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(activeName) === 3">
+                     v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(totalTab) >= 3">
             提交
           </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="add_flat && parseInt(IsCompanyUser) !== 1 && parseInt(totalTab) >= 3" 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>-->
@@ -1264,13 +1264,8 @@ export default {
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
             this.formDataCert.InStyle = this.formData.InStyle
-            if (this.formData.Status > 0 || this.formData.Status == -5) {
+            if (this.formData.Status > 0) {
               this.add_flat = false
-            }
-            if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
-              this.delete_flat = false
-            }
-            if ((this.formData.Status > 0) && (this.authUser.Profile.IsCompanyUser == 1)) {
               this.delete_flat = false
             }
 

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -109,7 +109,7 @@
 
                 <el-col :span="24">
                   <el-form-item label="审核单位" label-width="150px" style="width: 100%;" :required="true">
-                    <el-select v-model="auditorg" placeholder="请选择审核单位"
+                    <el-select filterable v-model="auditorg" placeholder="请选择审核单位"
                                ref="auditorgselect" style="width: 100%;" @change="orgChange">
                       <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                                  style="width: 100%">