前后:信息变更没有准入不能创建

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

@@ -355,9 +355,9 @@ func (this *AnnualAuditController) GetSupplierForChange() {
 	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	where := "1=1 "
 	if SuppTypeCode != "" {
-		where = " WHERE b.Id is NOT NULL AND a.SupplierTypeCode = '" + SuppTypeCode + "' and (a.InFlag='1' or a.InFlag='2' or a.Status='6' or a.Status='7')"
+		where = " WHERE b.Id is NOT NULL AND a.SupplierTypeCode = '" + SuppTypeCode + "' and (a.InFlag='1' or a.InFlag='2' or a.Status='8')"
 	} else {
-		where = " WHERE b.Id is NOT NULL AND (a.InFlag='1' or a.InFlag='2' or a.Status='6' or a.Status='7')"
+		where = " WHERE b.Id is NOT NULL AND (a.InFlag='1' or a.InFlag='2' or a.Status='8')"
 	}
 	var registerUser register.OilCorporateInfo
 	sql := " UserName='" + this.User.Username + "' and CheckStatus = 11 "

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

@@ -49,7 +49,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" v-if="accessedType.includes('01')">
+              <el-col :span="8" v-if="accessedType && accessedType.includes('01')">
                 <el-form-item label="供应商类型" prop="OperType">
                   <el-select ref="OperType"
                              :class="changedForm['OperType'] ? 'modified-form-input' : ''"
@@ -69,7 +69,7 @@
             </el-row>
             <el-row>
 
-              <el-col :span="8" v-if="accessedType.includes('01')">
+              <el-col :span="8" v-if="accessedType && accessedType.includes('01')">
                 <el-form-item label="中石油准入证编号">
                   <el-input v-model="formData.PACNumber" maxlength="255" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                             :class="changedForm['PACNumber'] ? 'modified-form-input' : ''" style="width: 100%">
@@ -77,7 +77,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" v-if="accessedType.includes('01')">
+              <el-col :span="8" v-if="accessedType && accessedType.includes('01')">
                 <el-form-item label="级别" prop="Gradechange">
                   <el-select v-model="formData.Grade"
                              placeholder="请选择级别"
@@ -94,7 +94,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" v-if="accessedType.includes('01')">
+              <el-col :span="8" v-if="accessedType && accessedType.includes('01')">
                 <el-form-item label="管理单位">
                   <el-select filterable clearable v-model="formData.MgrUnit" maxlength="255" :disabled="InfoStatus > 0 || butnab"
                     :class="changedForm['MgrUnit'] ? 'modified-form-input' : ''" placeholder="请输入" style="width: 100%">
@@ -328,7 +328,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" v-if="(accessedType.length === 1 && !accessedType.includes('01')) || accessedType.length > 1">
+              <el-col :span="8" v-if="(accessedType && accessedType.length === 1 && !accessedType.includes('01')) || (accessedType && accessedType.length > 1)">
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
                   <el-select v-model="formData.HseTraining" placeholder="请选择" :disabled="InfoStatus > 0 || butnab"
@@ -342,7 +342,7 @@
               </el-col>
 
             </el-row>
-            <el-row v-if="accessedType.includes('02')">
+            <el-row v-if="accessedType && accessedType.includes('02')">
               <el-col :span="8">
                 <el-form-item label="进津备案通知书">
                   <el-input v-model="formData.TjinNotify"  :readonly="InfoStatus > '0'" placeholder="请输入" style="width: 100%"></el-input>
@@ -360,27 +360,27 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" v-if="accessedType.includes('01')">
+              <el-col :span="8" v-if="accessedType && accessedType.includes('01')">
                 <el-form-item label="产品质量认证情况及认证机构">
                   <el-input v-model="formData.ProductQualityCert" placeholder="请输入" maxlength="200" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['ProductQualityCert'] ? 'modified-form-input' : ''">
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" v-if="!accessedType.includes('01')">
+              <el-col :span="8" v-if="accessedType && !accessedType.includes('01')">
                 <el-form-item label="企业资质证书(编号  级别)">
                   <el-input v-model="formData.QualifCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"
                             style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" v-if="accessedType.includes('01')">
+              <el-col :span="8" v-if="accessedType && accessedType.includes('01')">
                 <el-form-item label="生产/制造许可证获证情况及编号">
                   <el-input v-model="formData.MaunLicense" placeholder="请输入" maxlength="200" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['MaunLicense'] ? 'modified-form-input' : ''"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" v-if="accessedType.includes('01')">
+              <el-col :span="8" v-if="accessedType && accessedType.includes('01')">
                 <el-form-item label="所代理制造商名称">
                   <el-input v-model="formData.MaunAgent" maxlength="255" placeholder="请输入" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['MaunAgent'] ? 'modified-form-input' : ''">
@@ -428,7 +428,7 @@
             </el-row>
 
           </el-form>
-          <el-card class="box-card" v-if="accessedType.includes('01')" style="margin-top: 10px;">
+          <el-card class="box-card" v-if="accessedType && accessedType.includes('01')" style="margin-top: 10px;">
             <div slot="header" class="clearfix" style="padding: 8px">
               <span style="margin-left: 10px;">所代理制造商名称</span>
               <span style="float: right;margin-right: 10px;">
@@ -443,7 +443,7 @@
                                style="margin-top: 20px"></manufacturer-list>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="物资类企业情况" v-if="accessedType.includes('01')">
+        <el-tab-pane label="物资类企业情况" v-if="accessedType && accessedType.includes('01')">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
@@ -566,7 +566,7 @@
             </winning-list>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="服务类企业情况" v-if="accessedType.includes('03')">
+        <el-tab-pane label="服务类企业情况" v-if="accessedType && accessedType.includes('03')">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
@@ -689,7 +689,7 @@
             </winning-list>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="基建类企业情况" v-if="accessedType.includes('02')">
+        <el-tab-pane label="基建类企业情况" v-if="accessedType && accessedType.includes('02')">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
@@ -812,7 +812,7 @@
             </winning-list>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="物资类" v-if="accessedType.includes('01')">
+        <el-tab-pane label="物资类" v-if="accessedType && accessedType.includes('01')">
           <!-- <el-card class="box-card">
             <el-form :model="formData">
               <el-col :span="8">
@@ -943,7 +943,7 @@
               </el-pagination>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="服务类" v-if="accessedType.includes('03')">
+        <el-tab-pane label="服务类" v-if="accessedType && accessedType.includes('03')">
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>
@@ -1059,7 +1059,7 @@
             </el-pagination>
           </el-card>
         </el-tab-pane>
-        <el-tab-pane label="基建类" v-if="accessedType.includes('02')">
+        <el-tab-pane label="基建类" v-if="accessedType && accessedType.includes('02')">
           <el-card class="box-card" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span style="font-weight: bold">企业资质</span>