前后:年审列表单位关系;supplier主表导入加入管理单位

src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -193,6 +193,12 @@ func (s *TmpzcgtSession) UpdateSupplierTypeCodeAndInFlag() error {
 
 }
 
+func (s *TmpzcgtSession) UpdateSupplierMgrUnit() error {
+	sql := " update OilSupplier a set a.MgrUnit = (select MgrUnit from OilSupplierCert b where b.SupplierId = a.Id and b.SupplierTypeCode = '01') where a.MgrUnit is null or a.MgrUnit = ''"
+	_, err := s.DBE.Query(sql)
+	return err
+}
+
 func (s *TmpzcgtSession) InsterAnnual() error {
 
 	sql := "INSERT INTO OilAnnualAudit (Status,SupplierTypeName, SupplierName, CreateOn, CreateBy, RecUnitId, ApplyTime, AccessCardNo, OldId) " +

src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpzcgf.go

@@ -89,6 +89,11 @@ func (this *TmpzcgfController) UpdateCertTypeAndInflag() {
 		// session.Rollback()
 		fmt.Println(err)
 	}
+	err = svc.UpdateSupplierMgrUnit()
+	if err != nil {
+		// session.Rollback()
+		fmt.Println(err)
+	}
 	// err = session.Commit()
 	elapsed := time.Since(t)
 	fmt.Println(elapsed)

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

@@ -41,7 +41,7 @@
         <el-step title="完成"></el-step>
       </el-steps> -->
 
-      <el-tabs tab-position="top" style="margin-top: 20px" v-model="activeName" size="mini">
+      <el-tabs tab-position="top" v-model="activeName" size="mini">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -714,7 +714,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" v-if="Status != '0'">
-          <el-card class="box-card" style="height: 800px">
+          <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
               <!-- <span style="float: right;">
@@ -856,7 +856,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogComSubmitToSeparateUnitVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="companySubmitToSecUnitSeparate" :loading="loading">确定</el-button>
+        <el-button size="mini" type="primary" @click="companySubmitToSecUnitSeparate" :loading="loading">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">
@@ -2758,6 +2758,9 @@ import apiCert from '@/api/oilsupplier/suppliercert'
           this.UnitOrgOptions = res.data.items['UnitOrgList']
           this.OperTypeOptions = res.data.items['OperType']
           this.UnitRelationOptions = res.data.items['UnitRelation']
+          if (this.formData.SpecTypeCode == '') {
+            this.formData.SpecTypeCode = "1"
+          }
           this.CompanyTypeOptions = res.data.items['CompanyType']
           this.CurrencyOptions = res.data.items['CurrencyType']
           this.getCountryList(res.data.items['CountryList'])

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

@@ -7,7 +7,8 @@
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>年审基本信息表</span>
+        <span v-if="formData.SupplierName !== ''">{{formData.SupplierName}}</span>
+        <span v-else>年审基本信息表</span>
         <span style="float: right;">
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <!-- <el-button plain icon="el-icon-right" size="mini" style="margin-right: 5px" @click="nextTab">下一步</el-button> -->
@@ -41,7 +42,7 @@
         <el-step title="完成"></el-step>
       </el-steps> -->
 
-      <el-tabs tab-position="top" style="margin-top: 20px" v-model="activeName" size="mini">
+      <el-tabs tab-position="top" v-model="activeName" size="mini">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -80,7 +81,8 @@
                       </el-input>
                     </el-form-item>
                   </el-col>
-
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="单位关系">
                       <el-select ref="SpecType" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
@@ -97,23 +99,28 @@
                   </el-col>
 
                   <el-col :span="8">
-                    <el-form-item label="国家"
-                                  prop="Country">
-                      <el-select v-model="formData.Country" :class="changedForm['Country'] ? 'modified-form-input' : ''"
-                                 filterable
-                                 placeholder="请选择"
-                                 style="width: 100%">
-                        <el-option v-for="item in countryListOptions"
-                                   :key="item.key"
-                                   :label="item.value"
-                                   :value="item.value">
-                          <span style="float: left">{{ item.value }}</span>
-                          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                    <el-form-item label="准入方式">
+                      <el-select ref="SpecType" v-model="InStyle" :disabled="true"
+                                 placeholder="请选择" style="width: 100%">
+                        <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" v-if="item.Value != '2' && item.Value != '3'"
+                                   :value="item.Value">
                         </el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
 
+                  <el-col :span="8">
+                    <el-form-item label="统一社会信用代码" prop="CommercialNo">
+                      <el-input v-model="formData.CommercialNo"
+                                maxlength="50" :readonly="true"
+                                placeholder="请输入"
+                                style="width: 100%">
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+
                   <el-col :span="8">
                     <el-form-item label="中石油准入证编号">
                       <el-input :class="changedForm['PACNumber'] ? 'modified-form-input' : ''" v-model="formData.PACNumber"
@@ -125,7 +132,7 @@
                   </el-col>
 
                   <el-col :span="8">
-                    <el-form-item label="级别">
+                    <el-form-item label="级别" prop="Grade">
                       <el-select v-model="formData.Grade" :class="changedForm['Grade'] ? 'modified-form-input' : ''"
                                  placeholder="请选择级别"
                                  style="width: 100%"
@@ -145,7 +152,7 @@
                       <el-select filterable :class="changedForm['MgrUnit'] ? 'modified-form-input' : ''"
                                  v-model="formData.MgrUnit"
                                  maxlength="255"
-                                 clearable
+                                 :disabled="(this.formData.Status > '0') || (this.formData.Grade == '1') "
                                  placeholder="请输入"
                                  style="width: 100%">
                         <el-option v-for="item in ManagementUnitOptions"
@@ -172,27 +179,6 @@
                     </el-form-item>
                   </el-col>
 
-                  <el-col :span="8">
-                    <el-form-item label="准入方式">
-                      <el-select ref="SpecType" v-model="InStyle" :disabled="true"
-                                 placeholder="请选择" style="width: 100%">
-                        <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" v-if="item.Value != '2' && item.Value != '3'"
-                                   :value="item.Value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="8">
-                    <el-form-item label="统一社会信用代码" prop="CommercialNo">
-                      <el-input v-model="formData.CommercialNo"
-                                maxlength="50" :readonly="true"
-                                placeholder="请输入"
-                                style="width: 100%">
-                      </el-input>
-                    </el-form-item>
-                  </el-col>
-
                   <el-col :span="8">
                     <el-form-item label="税务登记证编号"
                                   prop="CountryTaxNo"
@@ -205,6 +191,24 @@
                     </el-form-item>
                   </el-col>
 
+                  <el-col :span="8">
+                    <el-form-item label="国家"
+                                  prop="Country">
+                      <el-select v-model="formData.Country" :class="changedForm['Country'] ? 'modified-form-input' : ''"
+                                 filterable
+                                 placeholder="请选择"
+                                 style="width: 100%">
+                        <el-option v-for="item in countryListOptions"
+                                   :key="item.key"
+                                   :label="item.value"
+                                   :value="item.value">
+                          <span style="float: left">{{ item.value }}</span>
+                          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+
                   <el-col :span="8">
                     <el-form-item label="组织机构代码"
                                   prop="OrganCode"
@@ -820,7 +824,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" v-if="Status != '0'">
-          <el-card class="box-card" style="height: 800px">
+          <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
               <!-- <span style="float: right;">
@@ -948,7 +952,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogComSubmitToSeparateUnitVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="companySubmitToSecUnitSeparate" :loading="loading">确定</el-button>
+        <el-button size="mini" type="primary" @click="companySubmitToSecUnitSeparate" :loading="loading">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog title="变更项查看" :visible.sync="myitemsshow" width="780px">
@@ -1163,6 +1167,14 @@
           callback()
         }
       }
+      //级别
+      var checkGrade = (rule, value, callback) => {
+        if (!value) {
+          callback(new Error('请选择级别'))
+        } else {
+          callback()
+        }
+      }
       // 检查邮编格式
       var checkZipCode = (rule, value, callback) => {
         if (!value) {
@@ -1591,6 +1603,11 @@
             validator: checkSupplierName,
             trigger: 'change'
           }],
+          Grade: [{
+            required: true,
+            validator: checkGrade,
+            trigger: 'change'
+          }],
           Country: [{
             required: true,
             message: '请输入国家',
@@ -2673,6 +2690,10 @@
           this.UnitOrgOptions = res.data.items['UnitOrgList']
           this.OperTypeOptions = res.data.items['OperType']
           this.UnitRelationOptions = res.data.items['UnitRelation']
+          // 在前面加默认值会导致取不到UnitRelationOptions数据
+          if (this.formData.SpecTypeCode == '') {
+            this.formData.SpecTypeCode = "1"
+          }
           this.CompanyTypeOptions = res.data.items['CompanyType']
           this.CurrencyOptions = res.data.items['CurrencyType']
           this.getCountryList(res.data.items['CountryList'])
@@ -2866,6 +2887,20 @@
         this.$refs['EntityFormCert'].validate((valid) => {
           valid2 = valid
         })
+        if (this.formData.Grade == 1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined' || this.formData.PACNumber.trim() == '')) {
+          this.$message({
+            type: 'warning',
+            message: '中石油准入证编号不能为空！'
+          })
+          return
+        }
+        if (this.formData.InStyle === '3' && this.formData.MgrUnit === '大港油田分公司') {
+          this.$message({
+            type: 'warning',
+            message: '二级物资准入不能选择大港油田分公司！'
+          })
+          return
+        }
         if (valid1 && valid2) {
           api.checkBack(this.formData.BankAccount, this.formData.Id, this.$axios).then(res => {
             if (res.data.item) {

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

@@ -41,7 +41,7 @@
         <el-step title="完成"></el-step>
       </el-steps> -->
 
-      <el-tabs tab-position="top" style="margin-top: 20px" v-model="activeName" size="mini">
+      <el-tabs tab-position="top" v-model="activeName" size="mini">
         <el-tab-pane label="企业信息">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
@@ -391,7 +391,7 @@
               </span>
             </div>
 
-            <el-form label-width="220px" ref="EntityFormNumber" :model="formDataCert" :rules="rulesnum">
+            <el-form label-width="220px" ref="EntityFormNumber" size="mini" :model="formDataCert" :rules="rulesnum">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="企业员工总数" prop="WorkerTotal">
@@ -631,7 +631,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" v-if="Status != '0'">
-          <el-card class="box-card" style="height: 800px">
+          <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
               <!-- <span style="float: right;">
@@ -757,7 +757,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogComSubmitToSeparateUnitVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="companySubmitToSecUnitSeparate" :loading="loading">确定</el-button>
+        <el-button size="mini" type="primary" @click="companySubmitToSecUnitSeparate" :loading="loading">确 定</el-button>
       </span>
     </el-dialog>
     <el-dialog title="变更项查看" :visible.sync="myitemsshow" width="780px">
@@ -2707,6 +2707,9 @@ import Viewer from 'v-viewer'
           this.orgunitChange(this.UnitOrg)
           this.OperTypeOptions = res.data.items['OperType']
           this.UnitRelationOptions = res.data.items['UnitRelation']
+          if (this.formData.SpecTypeCode == '') {
+            this.formData.SpecTypeCode = "1"
+          }
           this.CompanyTypeOptions = res.data.items['CompanyType']
           this.CurrencyOptions = res.data.items['CurrencyType']
           this.getCountryList(res.data.items['CountryList'])