技术服务类录入页面整理part1

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

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/workflow"
+	"dashoo.cn/business2/items"
 	"encoding/json"
 	"strconv"
 	"strings"
@@ -963,10 +964,10 @@ func (this *OilSupplierController) GetMyTaskEntityList() {
 // @router /dictlist [get]
 func (this *OilSupplierController) GetDictList() {
 	dictList := make(map[string]interface{})
-	//dictSvc := items.GetItemsService(utils.DBE)
+	dictSvc := items.GetItemsService(utils.DBE)
 	userSvc := baseUser.GetBaseUserService(utils.DBE)
 	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
-	//dictList["WellNo"] = dictSvc.GetKeyValueItems("WellNo", this.User.AccCode)
+	dictList["UnitRelation"] = dictSvc.GetKeyValueItems("UnitRelation")
 	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/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -20,7 +20,7 @@
       </div>
 
       <el-steps :active="formData.Step" simple align-center finish-status="success">
-        <el-step title="企业基本信息"></el-step>
+        <el-step title="供方基本信息"></el-step>
         <el-step title="企业情况"></el-step>
         <el-step title="选择准入范围"></el-step>
         <el-step title="提交审批"></el-step>
@@ -29,14 +29,15 @@
 
       <el-tabs tab-position="right" style="margin-top: 20px">
         <el-tab-pane label="企业基本信息">
+
           <el-card class="box-card">
             <div slot="header" class="clearfix">
-              <span>企业人基本信息</span>
+              <span>供方基本信息表</span>
               <span style="float: right;">
-                <el-button type="primary" size="mini" @click="saveEntity">保存企业信息</el-button>
+                <el-button type="primary" size="mini" @click="saveEntity">保存基本信息</el-button>
               </span>
             </div>
-            <el-form label-width="120px" ref="EntityForm" :model="formData">
+            <el-form label-width="140px" ref="EntityForm" :model="formData">
               <el-row>
                 <!--<el-col :span="8">
                   <el-form-item label="DEMO">
@@ -51,79 +52,87 @@
                   </el-form-item>
                 </el-col>-->
 
-                <el-col :span="8">
-                  <el-form-item label="供方名称">
+                <el-col :span="16">
+                  <el-form-item label="供方名称" required>
                     <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
-                <!--<el-col :span="8">
-                  <el-form-item label="中石油供应商证书号">
-                    <el-input v-model="formData.OilCertificateNo" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
                 <el-col :span="8">
-                  <el-form-item label="级别">
-                    <el-input v-model="formData.Grade" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-                <!--<el-col :span="8">
-                  <el-form-item label="管理单位">
-                    <el-input v-model="formData.MgrUnit" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="单位关系">
+                    <el-select ref="SpecType" multiple v-model="UnitRelationAry" filterable placeholder="请选择" style="width: 100%">
+                      <el-option
+                        v-for="item in UnitRelationOptions"
+                        :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="经营方式">
-                    <el-input v-model="formData.OperType" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="统一社会信用代码" required>
+                    <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="国家">
-                    <el-input v-model="formData.Country" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="税务登记证编号" required>
+                    <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="所代理制造商名称">
-                    <el-input v-model="formData.MaunAgent" placeholder="请输入"  style="width: 100%"></el-input>
+                  <el-form-item label="组织机构代码" required>
+                    <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
-                  <el-form-item label="施工队伍名称">
-                    <el-input v-model="formData.ConstructTeam" placeholder="请输入"  style="width: 100%"></el-input>
+                <!--<el-col :span="8">
+                  <el-form-item label="税务登记证地税编号">
+                    <el-input v-model="formData.LocalTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>-->
-
-                <el-col :span="8">
-                  <el-form-item label="工商注册号">
-                    <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%"></el-input>
+                <el-col :span="16">
+                  <el-form-item label="注册地址" required>
+                    <el-row>
+                      <el-col :span="8">
+                        <el-cascader :options="countryoptions" placeholder="省市区" v-model="CityAry" style="width: 100%">
+                        </el-cascader>
+                      </el-col>
+                      <el-col :span="16">
+                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
+                      </el-col>
+                    </el-row>
                   </el-form-item>
                 </el-col>
-
                 <el-col :span="8">
-                  <el-form-item label="组织机构代码">
-                    <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="邮编" required>
+                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="16">
+                  <el-form-item label="通信地址" required>
+                    <el-row>
+                      <el-col :span="8">
+                        <el-cascader :options="countryoptions" placeholder="省市区" v-model="CityAry" style="width: 100%">
+                        </el-cascader>
+                      </el-col>
+                      <el-col :span="16">
+                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
+                      </el-col>
+                    </el-row>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="8">
-                  <el-form-item label="税务登记证编号">
-                    <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="邮编" required>
+                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <!--<el-col :span="8">
-                  <el-form-item label="税务登记证地税编号">
-                    <el-input v-model="formData.LocalTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="8">
                   <el-form-item label="省直辖市">
                     <el-input v-model="formData.Province" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
@@ -145,23 +154,14 @@
                   <el-form-item label="门牌号">
                     <el-input v-model="formData.HouseNo" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
-                </el-col>
+                </el-col>-->
+
 
-                <el-col :span="8">
-                  <el-form-item label="邮编">
-                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
 
-                <el-col :span="16">
-                  <el-form-item label="单位地址">
-                    <el-input v-model="formData.Address" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
               </el-row>
             </el-form>
 
-            <el-form label-width="120px" ref="EntityFormLic" :model="formData">
+            <el-form label-width="140px" ref="EntityFormLic" :model="formData">
               <el-row>
                 <!--<el-col :span="8">
                   <el-form-item label="产品质量认证情况及认证机构">
@@ -295,15 +295,15 @@
             </el-form>
 
             <el-form label-position="top" ref="EntityFormCert" :model="formData">
-              <el-row :gutter="20">
+              <el-row :gutter="60">
                 <el-col :span="8">
-                  <el-form-item label="质量管理体系认证情况及认证机构">
+                  <el-form-item label="质量管理体系认证情况">
                     <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea"
-                      style="width: 100%"></el-input>
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <el-form-item label="企业资质证书">
+                  <el-form-item label="企业资质证书(编号  级别)">
                     <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%">
                     </el-input>
                   </el-form-item>
@@ -319,23 +319,17 @@
                     </el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="中石油勘探与生产工程技术服务市场准入许可证或监督服务市场准入证">
-                    <!--技术服务类准入许可证-->
-                    <el-input v-model="formData.TechServiceLic" placeholder="请输入" type="textarea" style="width: 100%">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
+
                 <el-col :span="8">
                   <el-form-item label="行业特殊要求的认证证书">
                     <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%">
                     </el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="企业简介（成立时间、人数、经营规模、信誉、主要生产设备及保障能力等情况）">
+                <el-col :span="16">
+                  <el-form-item label="营业范围">
                     <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea"
-                      style="width: 100%"></el-input>
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -347,6 +341,7 @@
               </el-row>
 
             </el-form>
+
           </el-card>
 
         </el-tab-pane>
@@ -513,6 +508,7 @@
   import BusinessList from '@/components/oilsupplier/businesslist'
 
   export default {
+
     components: {
       SupplierFileTable,
       WfHistory,
@@ -539,7 +535,10 @@
         patentList: [], //拥有专利、专有技术及工法
         winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
         businessList: [], //准入业务
-
+        UnitRelationOptions: [],
+        UnitRelationAry: [],
+        countryoptions: [],
+        CityAry: [],
         serviceId: '',
         certId: '',
         classId: '03',
@@ -639,7 +638,7 @@
         }
       }
     },
-    created() {
+    created () {
       this.serviceId = this.$route.params.opera
       this.certId = this.$route.query.certid
       this.getDictOptions()
@@ -693,14 +692,25 @@
         }
       },
 
-      getDictOptions() {
-        /*api.getDictList(this.$axios).then(res => {}).catch(err => {
+      getDictOptions () {
+        this.getCityList()
+        api.getDictList(this.$axios).then(res => {
+          this.UnitRelationOptions = res.data.items['UnitRelation']
+        }).catch(err => {
           console.error(err)
-        })*/
+        })
+      },
+      getCityList () {
+        this.$axios.get('http://restapi.amap.com/v3/config/district?key=13f54664eb5a883195604db09d3fba5c&subdistrict=3')
+          .then((res) => {
+            let countstr = JSON.stringify(res.data.districts[0].districts)
+            countstr = countstr.replace(/\,\"districts\"\:\[\]/g,'')
+            this.countryoptions = JSON.parse(countstr)
+          })
       },
 
       //保存信息
-      saveEntity() {
+      saveEntity () {
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';