[update] 市场法规清单

src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue

@@ -17,7 +17,8 @@
                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
                              style="width: 100%"
                              :tree-data="countryOptions"
-                             :label-in-value="false"
+                             tree-checkable
+                             treeCheckStrictly
                              :placeholder="$t('pleaseSelect')+$t('standardRegulationLibrary.marketRegulationsList.countryRegion')" />
             </a-form-item>
           </a-col>
@@ -47,7 +48,10 @@
             <a-form-item :labelCol="labelCol"
                          :wrapperCol="wrapperCol"
                          :label="$t('standardRegulationLibrary.marketRegulationsList.drivingPosition')">
-              <j-dict-select-tag v-decorator="['drivePosition', validatorRules.drivePosition]"
+<!--              <j-dict-select-tag v-decorator="['drivePosition', validatorRules.drivePosition]"-->
+<!--                                 dict-code="driving_position"-->
+<!--                                 :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.drivingPosition')" />-->
+              <j-multi-select-tag v-decorator="['drivePosition', validatorRules.drivePosition]"
                                   dict-code="driving_position"
                                   :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.drivingPosition')" />
             </a-form-item>
@@ -838,6 +842,18 @@ export default {
     // 提交
     handleSubmit () {
       if (this.loading) return
+      this.form.validateFields((err, values) => {
+        if (err) {
+          return
+        }
+        let tableErr = false
+        // 校验表格是否至少有一条数据
+        if (this.dataList.length <= 0) {
+          this.$message.warning(this.$t('addAtLeastOneRowOfData'))
+          tableErr = true
+          return
+        }
+        // 校验表格必填项是否都填写了
         const requiredField = [
           'standardNumber', // 标准编号
           'standardName', // 标准名称
@@ -855,15 +871,17 @@ export default {
           for (const filed of requiredField) {
             if (!item[filed]) {
               this.$message.warning(this.$t('pleaseCompleteTableInfo'))
+              tableErr = true
               return
             }
           }
         }
-      this.form.validateFields((err, values) => {
+        if (!err && !tableErr) {
-        if (!err) {
           this.loading = true
           const param = {}
           param.manifest = Object.assign({}, values)
+          // 国家/地区是树选择，需要处理格式
+          param.manifest.country = param.manifest.country.map(item => item.value).join(',')
           let func
           if (this.model.manifest.id) {
             param.manifest.id = this.model.manifest.id