NR: 2019.05.16-20 注册资本

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

@@ -1413,6 +1413,7 @@ func (this *OilSupplierController) GetDictListByStatus() {
 	dictList["CompanyType"] = dictSvc.GetKeyValueItems("CompanyType")
 	dictList["InOptions"] = dictSvc.GetKeyValueItems("InOptions")
 	dictList["OperType"] = dictSvc.GetKeyValueItems("OperType")
+	dictList["CurrencyType"] = dictSvc.GetKeyValueItems("CurrencyType")
 	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

@@ -222,11 +222,15 @@
           </el-form-item>
         </el-col>
 
-        <!--<el-col :span="8">
+        <el-col :span="8">
           <el-form-item label="币种">
-            <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
+            <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
+                       style="width: 100%;">
+              <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
+              </el-option>
+            </el-select>
           </el-form-item>
-        </el-col>-->
+        </el-col>
 
         <el-col :span="8">
           <el-form-item label="成立时间">
@@ -515,6 +519,7 @@
         UnitRelationOptions: [],
         InOptions: [],
         CompanyTypeOptions: [],
+        CurrencyOptions: [],
         UnitRelationAry: [],
         countryoptions: [],
         countryprops: {
@@ -728,6 +733,7 @@
           this.InOptions = this.dictData['InOptions']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
           this.CompanyTypeOptions = this.dictData['CompanyType']
+          this.CurrencyOptions = this.dictData['CurrencyType']
           let suppliers = this.dictData['CompanyNames']
           for (let idx in suppliers) {
             suppliers[idx]['value'] = suppliers[idx].SupplierName

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

@@ -257,11 +257,15 @@
           </el-form-item>
         </el-col>
 
-        <!--<el-col :span="8">
+        <el-col :span="8">
           <el-form-item label="币种">
-            <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
+            <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
+                       style="width: 100%;">
+              <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
+              </el-option>
+            </el-select>
           </el-form-item>
-        </el-col>-->
+        </el-col>
 
         <el-col :span="8">
           <el-form-item label="成立时间">
@@ -574,6 +578,7 @@
         OperTypeOptions: [],
         InOptions: [],
         CompanyTypeOptions: [],
+        CurrencyOptions: [],
         UnitRelationAry: [],
         countryoptions: [],
         countryListOptions: [],
@@ -816,9 +821,10 @@
         if (this.dictData) {
           this.ManagementUnitOptions=this.dictData['ManagementUnit']
           this.UnitRelationOptions = this.dictData['UnitRelation']
-          this.OperTypeOptions  = this.dictData['OperType']
+          this.OperTypeOptions = this.dictData['OperType']
           this.InOptions = this.dictData['InOptions']
           this.CompanyTypeOptions = this.dictData['CompanyType']
+          this.CurrencyOptions = this.dictData['CurrencyType']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
           this.getCountryList(this.dictData['CountryList'])
           let suppliers = this.dictData['CompanyNames']

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

@@ -218,11 +218,15 @@
           </el-form-item>
         </el-col>
 
-        <!--<el-col :span="8">
+        <el-col :span="8">
           <el-form-item label="币种">
-            <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
+            <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
+                       style="width: 100%;">
+              <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
+              </el-option>
+            </el-select>
           </el-form-item>
-        </el-col>-->
+        </el-col>
 
         <el-col :span="8">
           <el-form-item label="成立时间">
@@ -497,6 +501,7 @@
         UnitRelationOptions: [],
         InOptions: [],
         CompanyTypeOptions: [],
+        CurrencyOptions: [],
         UnitRelationAry: [],
         countryoptions: [],
         countryprops: {
@@ -713,6 +718,7 @@
           this.InOptions = this.dictData['InOptions']
           this.getCityList(this.dictData['GaodeMapChinaAreas'])
           this.CompanyTypeOptions = this.dictData['CompanyType']
+          this.CurrencyOptions = this.dictData['CurrencyType']
           let suppliers = this.dictData['CompanyNames']
           for (let idx in suppliers) {
             suppliers[idx]['value'] = suppliers[idx].SupplierName

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

@@ -459,7 +459,7 @@
           CategoryCode: '',
           CategoryName: '',
           RegCapital: '',
-          Currency: '',
+          Currency: 'CNY',
           ContactName: '',
           CompanyType: '',
           SetupTime: null,

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

@@ -463,7 +463,7 @@
           CategoryCode: "",
           CategoryName: "",
           RegCapital: "",
-          Currency: "",
+          Currency: "CNY",
           ContactName: "",
           CompanyType: "",
           SetupTime: null,
@@ -928,14 +928,14 @@
         })
 
         if (this.formData.OperType === '制造商') {
-            if (this.formData.MaunLicense === '' && this.formData.SafetyLicense === '') {
-              valid1 = false
-              this.$message({
-                type: 'warning',
-                message: '【生产制造许可证获证情况及编号】或【安全生产许可证】 为必填项'
-              })
-              return
-            }
+          if (this.formData.MaunLicense === '' && this.formData.SafetyLicense === '') {
+            valid1 = false
+            this.$message({
+              type: 'warning',
+              message: '【生产制造许可证获证情况及编号】或【安全生产许可证】 为必填项'
+            })
+            return
+          }
         } else if (this.formData.OperType === '代理商') {
           if (this.formData.AgentManufacturer === '') {
             valid1 = false
@@ -947,6 +947,16 @@
           }
         }
 
+        /** 2019.05.16 - 16 准入申请中，若选择了“管理单位”，“中石油准入证编号”应自动改为必填项 */
+        if (this.formData.MgrUnit.length > 0 && this.formData.PACNumber.length <= 0) {
+          valid1 = false
+          this.$message({
+            type: 'warning',
+            message: '【中石油准入证编号】不能为空'
+          })
+          return
+        }
+
         if (valid1 && valid2) {
           if (!this.formData.SetupTime) {
             this.formData.SetupTime = null

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

@@ -457,7 +457,7 @@
           CategoryCode: '',
           CategoryName: '',
           RegCapital: '',
-          Currency: '',
+          Currency: 'CNY',
           ContactName: '',
           CompanyType: '',
           SetupTime: null,