Browse Source

前:基建和服务准入添加国家

dubch 5 years ago
parent
commit
40c8ba1312

+ 39 - 2
src/dashoo.cn/frontend_web/src/components/oilsupplier/basisinfo.vue

@@ -46,7 +46,23 @@
             </el-select>
           </el-form-item>
         </el-col>
-
+        <el-col :span="8">
+        <el-form-item label="国家" prop="Country">
+          <el-select v-model="formData.Country"
+                     :disabled="!canUpdateSupplier"
+                     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="准入方式">
             <el-select ref="SpecType" v-model="formData.InStyle" :disabled="this.formData.Status > '0'&&!appendStatus"
@@ -587,13 +603,18 @@
           value: '0',
           label: '否'
         }],
-
+        countryListOptions: [],
         rulesform: {
           BusinessScope: [{
             required: true,
             message: '请输入营业范围',
             trigger: 'change'
           }],
+          Country: [{
+            required: true,
+            message: '请输入国家',
+            trigger: 'change'
+          }],
           SupplierName: [{
             required: true,
             validator: checkSupplierName,
@@ -728,6 +749,21 @@
       }
     },
     methods: {
+      getCountryList (val) {
+        if (this.formData.Country == "") {
+          this.formData.Country = "中国"
+        }
+        let tmpJson = JSON.parse(val)
+        this.countryListOptions = []
+        for (let idx in tmpJson) {
+          this.countryListOptions.push({
+            label: tmpJson[idx].split('-')[0],
+            value: tmpJson[idx].split('-')[1],
+            code: tmpJson[idx].split('-')[2],
+            key: tmpJson[idx]
+          })
+        }
+      },
       showorhid (val) {
         if (val == '1' || val == '2') {
           this.showorhidflag = 'hid'
@@ -822,6 +858,7 @@
           this.CompanyTypeOptions = this.dictData['CompanyType']
           this.CurrencyOptions = this.dictData['CurrencyType']
           let suppliers = this.dictData['CompanyNames']
+          this.getCountryList(this.dictData['CountryList'])
           // for (let idx in suppliers) {
           //   suppliers[idx]['value'] = suppliers[idx].SupplierName
           //   this.companynames.push(suppliers[idx])

+ 40 - 0
src/dashoo.cn/frontend_web/src/components/oilsupplier/techinfo.vue

@@ -46,6 +46,24 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="8">
+          <el-form-item label="国家" prop="Country">
+            <el-select v-model="formData.Country"
+                       :disabled="!canUpdateSupplier"
+                       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="准入方式">
             <el-select ref="SpecType" v-model="formData.InStyle" :disabled="this.formData.Status > '0'&&!appendStatus"
@@ -582,6 +600,7 @@
           value: '0',
           label: '否'
         }],
+        countryListOptions: [],
 
         rulesform: {
           BusinessScope: [{
@@ -589,6 +608,11 @@
             message: '请输入营业范围',
             trigger: 'change'
           }],
+          Country: [{
+            required: true,
+            message: '请输入国家',
+            trigger: 'change'
+          }],
           SupplierName: [{
             required: true,
             validator: checkSupplierName,
@@ -729,6 +753,21 @@
       }
     },
     methods: {
+      getCountryList (val) {
+        if (this.formData.Country == "") {
+          this.formData.Country = "中国"
+        }
+        let tmpJson = JSON.parse(val)
+        this.countryListOptions = []
+        for (let idx in tmpJson) {
+          this.countryListOptions.push({
+            label: tmpJson[idx].split('-')[0],
+            value: tmpJson[idx].split('-')[1],
+            code: tmpJson[idx].split('-')[2],
+            key: tmpJson[idx]
+          })
+        }
+      },
       showorhid (val) {
         if (val == '1' || val == '2') {
           this.showorhidflag = 'hid'
@@ -824,6 +863,7 @@
           this.CompanyTypeOptions = this.dictData['CompanyType']
           this.CurrencyOptions = this.dictData['CurrencyType']
           let suppliers = this.dictData['CompanyNames']
+          this.getCountryList(this.dictData['CountryList'])
           // for (let idx in suppliers) {
           //   suppliers[idx]['value'] = suppliers[idx].SupplierName
           //   this.companynames.push(suppliers[idx])

+ 12 - 10
src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -597,16 +597,16 @@
           </el-col>
         </el-row>
         <el-row>
-<!--        <el-col :span="12">-->
-<!--          <el-form-item label="推荐单位">-->
-<!--            <el-select size="mini" v-model="auditorg"  filterable placeholder="请选择推荐单位"-->
-<!--                        ref="auditorgselect" style="width: 100%;">-->
-<!--              <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"-->
-<!--                          style="width: 100%">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
+        <el-col :span="12">
+          <el-form-item label="推荐单位">
+            <el-select size="mini" v-model="auditorg"  filterable placeholder="请选择推荐单位"
+                        ref="auditorgselect" style="width: 100%;">
+              <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                          style="width: 100%">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item label="专业处室">
             <el-select size="mini"  v-model="selectDept" filterable
@@ -617,6 +617,8 @@
             </el-select>
           </el-form-item>
         </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="申请时间">
               <el-date-picker size="mini"