准入方式

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -18,6 +18,7 @@ type OilSupplierCert struct {
 	Status            string    `xorm:"not null default '0' comment('状态标识(0未申请，1办理完毕)') VARCHAR(10)"`
 	BackReason        string    `xorm:"comment('退回原因') VARCHAR(50)"`
 	InFlag            string    `xorm:"default '0' comment('准入标识') VARCHAR(10)"`
+	InStyle           string    `xorm:"default '1' comment('准入方式') VARCHAR(10)"`
 	EffectStartTime   time.Time `xorm:"comment('有效期起') DATETIME"`
 	EffectEndTime     time.Time `xorm:"comment('有效期止') DATETIME"`
 	AuditProcessNote  string    `xorm:"comment('办理过程备注') VARCHAR(100)"`

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

@@ -1326,6 +1326,8 @@ func (this *OilSupplierController) GetDictList() {
 	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
 	dictList["UnitRelation"] = dictSvc.GetKeyValueItems("UnitRelation")
 	dictList["CompanyType"] = dictSvc.GetKeyValueItems("CompanyType")
+	dictList["InOptions"] = dictSvc.GetKeyValueItems("InOptions")
+
 	var userEntity userRole.Base_User
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)

src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -15,7 +15,7 @@
           </el-form-item>
         </el-col>-->
 
-        <el-col :span="16">
+        <el-col :span="8">
           <el-form-item label="供方名称" prop="SupplierName">
             <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly"
               :fetch-suggestions="querySearch" :maxlength="255" placeholder="请输入内容" style="width: 100%"
@@ -38,6 +38,17 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8">
+          <el-form-item label="准入方式">
+            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="!canUpdateSupplier"
+                       placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                         :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="!canUpdateSupplier" placeholder="请输入"
@@ -71,7 +82,7 @@
           <el-form-item label="注册地址" prop="Province">
             <el-row>
               <el-col :span="10">
-                <el-cascader :options="countryoptions" :props="countryprops" maxlength="20"
+                <el-cascader :options="countryoptions" :props="countryprops" :disabled="!canUpdateSupplier"
                   :readonly="!canUpdateSupplier" placeholder="省市区" v-model="CityAry" style="width: 100%"
                   @change="handleAreaChange"></el-cascader>
               </el-col>
@@ -96,7 +107,7 @@
             <el-row>
               <el-col :span="10">
                 <el-cascader :options="countryoptions" :props="countryprops" :disabled="!canUpdateSupplier"
-                  placeholder="省市区" v-model="LinkCityAry" maxlength="20" style="width: 100%"
+                  placeholder="省市区" v-model="LinkCityAry" style="width: 100%"
                   @change="handleLinkAreaChange">
                 </el-cascader>
               </el-col>
@@ -402,6 +413,7 @@
         companyReadonly: false,
         companynames: [],
         UnitRelationOptions: [],
+        InOptions: [],
         CompanyTypeOptions: [],
         UnitRelationAry: [],
         countryoptions: [],
@@ -620,6 +632,7 @@
       getDictOptions() {
         if (this.dictData) {
           this.UnitRelationOptions = this.dictData['UnitRelation']
+          this.InOptions = this.dictData['InOptions']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
           this.CompanyTypeOptions = this.dictData['CompanyType']
           let suppliers = this.dictData['CompanyNames']

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -37,7 +37,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="国家" prop="Country" >
             <!--<el-input v-model="formData.Country" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
             </el-input>-->
@@ -54,8 +54,18 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8">
+          <el-form-item label="准入方式">
+            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="!canUpdateSupplier"
+                       placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
-         <el-col :span="12">
+         <el-col :span="8">
           <el-form-item label="管理单位" >
             <el-input v-model="formData.ManagementUnit" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
             </el-input>
@@ -528,6 +538,7 @@
         companyReadonly: false,
         companynames: [],
         UnitRelationOptions: [],
+        InOptions: [],
         CompanyTypeOptions: [],
         UnitRelationAry: [],
         countryoptions: [],
@@ -751,6 +762,7 @@
       getDictOptions () {
         if (this.dictData) {
           this.UnitRelationOptions = this.dictData['UnitRelation']
+          this.InOptions = this.dictData['InOptions']
           this.CompanyTypeOptions = this.dictData['CompanyType']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
           this.getCountryList(this.dictData['CountryList'])

src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -16,7 +16,7 @@
           </el-form-item>
         </el-col>-->
 
-        <el-col :span="16">
+        <el-col :span="8">
           <el-form-item label="供方名称" prop="SupplierName" >
             <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly" :fetch-suggestions="querySearch"
                              :maxlength="255" placeholder="请输入内容" style="width: 100%"  @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
@@ -36,6 +36,18 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="准入方式">
+            <el-select ref="SpecType" v-model="formData.InStyle" :disabled="!canUpdateSupplier"
+                       placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                         :value="item.Value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
       </el-row>
       <el-row>
         <el-col :span="8">
@@ -382,6 +394,7 @@
         companyReadonly: false,
         companynames: [],
         UnitRelationOptions: [],
+        InOptions: [],
         CompanyTypeOptions: [],
         UnitRelationAry: [],
         countryoptions: [],
@@ -597,9 +610,12 @@
           .catch(err => {
             console.error(err)
           })
-      },      getDictOptions () {
+      },
+
+      getDictOptions () {
         if (this.dictData) {
           this.UnitRelationOptions = this.dictData['UnitRelation']
+          this.InOptions = this.dictData['InOptions']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
           this.CompanyTypeOptions = this.dictData['CompanyType']
           let suppliers = this.dictData['CompanyNames']

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

@@ -406,6 +406,7 @@
           SpecSupplier: '',
           SpecTypeCode: '1',
           SpecTypeName: '',
+          InStyle: '1',
           WorkerTotal: 0,
           ContractNum: 0,
           UniversityNum: 0,

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

@@ -505,6 +505,7 @@ export default {
         SpecSupplier: "",
         SpecTypeCode: "1",
         SpecTypeName: "",
+        InStyle: '1',
         WorkerTotal: 0,
         ContractNum: 0,
         UniversityNum: 0,
@@ -881,7 +882,7 @@ export default {
           return false;
         }
         })
-        
+
       });
     },
 

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

@@ -406,6 +406,7 @@
           SpecSupplier: '',
           SpecTypeCode: '1',
           SpecTypeName: '',
+          InStyle: '1',
           WorkerTotal: 0,
           ContractNum: 0,
           UniversityNum: 0,