Merge remote-tracking branch 'origin/dev_v2' into dev_v2

RuoYi-Vue-fast-master/src/main/resources/i18n/messages_en_US.properties

@@ -366,7 +366,7 @@ train.question.correctAnswer.required=题目正确答案不能为空_US
 train.question.answer.required=选项答案至少有一个_US
 train.question.questionContext.tolong=题目名称不能超过500个字符_US
 common.data.noPermession=没有权限访问数据！_US
-project.origin.equipment=设备信息_US
+project.origin.equipment=Manual input
 project.origin.quotation=报价信息_US
 train.question.answer.tolong=选项答案不能超过500个字符_US
 lift.contractNo=合同编号_US

RuoYi-Vue-fast-master/src/main/resources/i18n/messages_es_ES.properties

@@ -366,7 +366,7 @@ train.question.correctAnswer.required=题目正确答案不能为空_ES
 train.question.answer.required=选项答案至少有一个_ES
 train.question.questionContext.tolong=题目名称不能超过500个字符_ES
 common.data.noPermession=没有权限访问数据！_ES
-project.origin.equipment=设备信息_ES
+project.origin.equipment=Entrada manual
 project.origin.quotation=报价信息_ES
 train.question.answer.tolong=选项答案不能超过500个字符_ES
 lift.contractNo=合同编号_ES

RuoYi-Vue-fast-master/src/main/resources/i18n/messages_ru_RU.properties

@@ -366,7 +366,7 @@ train.question.correctAnswer.required=题目正确答案不能为空_RU
 train.question.answer.required=选项答案至少有一个_RU
 train.question.questionContext.tolong=题目名称不能超过500个字符_RU
 common.data.noPermession=没有权限访问数据！_RU
-project.origin.equipment=设备信息_RU
+project.origin.equipment=Ввод вручную
 project.origin.quotation=报价信息_RU
 train.question.answer.tolong=选项答案不能超过500个字符_RU
 lift.contractNo=合同编号_RU

RuoYi-Vue-fast-master/src/main/resources/i18n/messages_zh_CN.properties

@@ -366,7 +366,7 @@ train.question.correctAnswer.required=题目正确答案不能为空
 train.question.answer.required=选项答案至少有一个
 train.question.questionContext.tolong=题目名称不能超过500个字符
 common.data.noPermession=没有权限访问数据！
-project.origin.equipment=设备信息
+project.origin.equipment=手工录入
 project.origin.quotation=报价信息
 train.question.answer.tolong=选项答案不能超过500个字符
 lift.contractNo=合同编号

ruoyi-ui-vue2/src/utils/lang/en-us.js

@@ -126,6 +126,7 @@
     countryNameUS:"Country name (English)",
     countryNameRU:"Country name (Russian)",
     countryNameES:"Country name (Spanish)",
+    countryAbbr:"National abbreviation",
   },
   area: {
     areaName:"Name of the region",

ruoyi-ui-vue2/src/utils/lang/es-es.js

@@ -126,6 +126,7 @@
     countryNameUS:"Nombre de país (inglés)",
     countryNameRU:"Nombre de país (ruso)",
     countryNameES:"Nombre de país (español)",
+    countryAbbr:"Siglas nacionales",
   },
   area: {
     areaName:"Nombre de área",

ruoyi-ui-vue2/src/utils/lang/ru-ru.js

@@ -126,6 +126,7 @@
     countryNameUS:"Название страны (на английском)",
     countryNameRU:"Название страны (на русском)",
     countryNameES:"Название страны (на испанском)",
+    countryAbbr:"Сокращения",
   },
   area: {
     areaName:"Название региона",

ruoyi-ui-vue2/src/utils/lang/zh-cn.js

@@ -126,6 +126,7 @@
     countryNameUS:"国家名称（英）",
     countryNameRU:"国家名称（俄）",
     countryNameES:"国家名称（西）",
+    countryAbbr:"国家缩写",
   },
   area: {
     areaName:"区域名称",

ruoyi-ui-vue2/src/views/crmManagement/account/edit.vue

@@ -128,7 +128,7 @@
               <!--    :styleObj="disableFlag ? { width: '16vw' } : { width: '80%' }"></Select>-->
 
               <!--城市-->
-              <Input :disabled="disableFlag" prop="city" :label="$t('project.city')" 
+              <Input :disabled="disableFlag" prop="city" :label="$t('project.city')" :required="!disableFlag"
                      :width="disableFlag ? '16vw' : '80%'" :maxlength="30"></Input>
 
             </el-col>
@@ -158,7 +158,7 @@
             <el-col :span="8">
               <!-- 公司类型 -->
               <Select :disabled="disableFlag" prop="companyType" :data="dict.type.company_type"
-                      :label="$t('account.companyType')" 
+                      :label="$t('account.companyType')" :required="!disableFlag"
                       :styleObj="disableFlag ? { width: '16vw' } : { width: '80%' }"></Select>
             </el-col>
             <el-col :span="8">
@@ -368,7 +368,7 @@
               <!--    :styleObj="disableFlag ? { width: '16vw' } : { width: '80%' }"></Select>-->
 
               <!--城市-->
-              <Input :disabled="disableFlag" prop="city" :label="$t('project.city')"
+              <Input :disabled="disableFlag" prop="city" :label="$t('project.city')" :required="!disableFlag"
                      :width="disableFlag ? '16vw' : '80%'" :maxlength="30"></Input>
 
             </el-col>

ruoyi-ui-vue2/src/views/crmManagement/project/dialog.vue

@@ -44,16 +44,15 @@
           </el-col>
           <!-- 项目进度 dict.type.project_progress -->
           <el-col :span="12">
-            <Input :label="$t('project.progress')" disabled prop="progress" width="100%" />
+            <Input :label="$t('project.progress')" disabled prop="progress" width="100%" required />
           </el-col>
         </el-row>
 
-
         <el-row :gutter="20">
           <!--项目状态-->
           <el-col :span="12">
             <Select :data="projectProgress" :label="$t('project.status')" prop="progress"
-                     width="100%" @change="progressChange"
+                    width="100%" @change="progressChange" required
             />
           </el-col>
           <!-- 标杆项目 -->
@@ -561,9 +560,12 @@ export default {
         projectName: [
           {required: true, message: this.$t('common.pleaseInput') + this.$t('project.name'), trigger: 'blur'},
         ],
-        // modelFlag: [
-        //   {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.isModel'), trigger: 'change'},
-        // ],
+        progress: [
+          {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.progress'), trigger: 'blur'},
+        ],
+        modelFlag: [
+          {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.isModel'), trigger: 'change'},
+        ],
         countryId: [
           {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.countryId'), trigger: 'change'},
         ],
@@ -573,27 +575,30 @@ export default {
         city: [
           {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.city'), trigger: 'change'},
         ],
-        // type: [
-        //   {required: true, message: this.$t('common.pleaseSelect') + this.$t('lead.segment'), trigger: 'change'},
-        // ],
-        // segmentedMarket: [
-        //   {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.projectSegments'), trigger: 'change'},
-        // ],
-        // city: [
-        //     { required: true, message: this.$t('common.pleaseInput') + this.$t('project.city'), trigger: 'blur' },
-        // ],
+        type: [
+          {required: true, message: this.$t('common.pleaseSelect') + this.$t('lead.segment'), trigger: 'change'},
+        ],
+        segmentedMarket: [
+          {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.projectSegments'), trigger: 'change'},
+        ],
+        currencyId: [
+          {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.countryId'), trigger: 'change'},
+        ],
         // planDealMonth: [
         //     { required: true, message: this.$t('common.pleaseSelect') + this.$t('account.planDealMonth'), trigger: 'change' },
         // ],
-        // contactPerson: [
-        //   {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.contactPerson'), trigger: 'change'},
-        // ],
-        // contact: [
-        //   {required: true, message: this.$t('common.pleaseInput') + this.$t('project.contact'), trigger: 'blur'},
-        // ],
-        // email: [
-        //   {required: true, message: this.$t('common.pleaseInput') + this.$t('user.email'), trigger: 'blur'},
-        // ],
+        contactPerson: [
+          {required: true, message: this.$t('common.pleaseSelect') + this.$t('project.contactPerson'), trigger: 'change'},
+        ],
+        contact: [
+          {required: true, message: this.$t('common.pleaseInput') + this.$t('project.contact'), trigger: 'blur'},
+        ],
+        email: [
+          {required: true, message: this.$t('common.pleaseInput') + this.$t('user.email'), trigger: 'blur'},
+        ],
+        owner: [
+          {required: true, message: this.$t('common.pleaseSelect') + this.$t('agent.head'), trigger: 'change'},
+        ],
         // keyContactPerson: [
         //     { required: true, message: this.$t('common.pleaseInput') + this.$t('project.keyContactPerson'), trigger: 'blur' },
         // ],

ruoyi-ui-vue2/src/views/quotation/quotation.vue

@@ -287,7 +287,7 @@
           <el-col :span="12">
             <el-form-item :label="$t('quotation.targetPort')" label-width="120px">
 <!--              <el-input v-model="quotationExportForm.targetPort" :maxlength="100" style="width: 200px;" @change="handleImageChange"/>-->
-              <el-select v-model="quotationExportForm.targetPort" :placeholder="$t('common.pleaseSelect') + $t('quotation.targetPort')" @change="handleImageChange" style="width: 200px;">
+              <el-select filterable v-model="quotationExportForm.targetPort" :placeholder="$t('common.pleaseSelect') + $t('quotation.targetPort')" @change="handleImageChange" style="width: 200px;">
                 <el-option v-for="dict in dict.type.target_port" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>