Merge branch 'release-v1.0.10' into release-pdd-v1.0.10

zhanbo.xu
Commit 281f1a07dc5ed400c8a60f6993fecbd4efc73ad1 281f1a07 2 parents a1f666bb 1e6a91f9
Showing 2 changed files with 45 additions and 5 deletions
src/views/editReportingData/index.vue
src/views/exportListQuery/index.vue
--- a/src/views/editReportingData/index.vue
View file @281f1a0
+++ b/src/views/editReportingData/index.vue
View file @281f1a0
@@ -313,8 +313,6 @@
               ></el-input>
             </Formitem>
           </el-col>
-        </el-row>
-        <el-row :gutter="5">
           <el-col :span="3">
             <Formitem label="监管场所代码" prop="regulatoryVenueCode">
               <el-input
@@ -341,6 +339,8 @@
               ></el-input>
             </Formitem>
           </el-col>
+        </el-row>
+        <el-row :gutter="5">
           <el-col :span="3">
             <Formitem label="运抵国(地区)" prop="destinationCountryRegion">
               <el-select
@@ -445,8 +445,6 @@
               ></el-input>
             </Formitem>
           </el-col>
-        </el-row>
-        <el-row :gutter="5">
           <el-col :span="3">
             <Formitem label="保费币制" prop="insuredfeeCurrency">
               <el-select
@@ -484,6 +482,8 @@
               </el-select>
             </Formitem>
           </el-col>
+        </el-row>
+        <el-row :gutter="5">
           <el-col :span="3">
             <Formitem label="包装种类代码" prop="packageTypeCode">
               <el-select
@@ -801,6 +801,29 @@ export default {
         remark: [
           { max: 1000, message: "长度不能超过1000个字符", trigger: "blur" },
         ],
+        ebpCode: [
+          { required: true, message: "请输入电商平台代码", trigger: "blur" },
+        ],
+        ebpName: [
+          { required: true, message: "请输入电商平台名称", trigger: "blur" },
+        ],
+        productionSaleEnterpriseCode: [
+          {
+            required: true,
+            message: "请输入生产销售企业代码",
+            trigger: "blur",
+          },
+        ],
+        ebcName: [
+          {
+            required: true,
+            message: "请输入生产销售企业名称",
+            trigger: "blur",
+          },
+        ],
+        declareBusinessType: [
+          { required: true, message: "请选择申报业务类型", trigger: "change" },
+        ],
       },
       detailData: [],
       detialHeaderData: [
@@ -1278,6 +1301,7 @@ export default {
   display: flex;
   justify-content: center;
   padding-top: 8px;
+  cursor: pointer;
   img {
     width: 22px;
   }
--- a/src/views/exportListQuery/index.vue
View file @281f1a0
+++ b/src/views/exportListQuery/index.vue
View file @281f1a0
@@ -165,7 +165,7 @@
       </el-row>
       <el-row>
         <el-col :span="5">
-          <Formitem label="申报类型" prop="statisticsFlag">
+          <Formitem label="申报业务类型" prop="statisticsFlag">
             <el-select
               type="text"
               id="inputInner--statisticsFlag"
@@ -254,6 +254,15 @@
           {{ scope.row.logisticsNo }}
         </el-button>
       </template>
+      <template v-slot:statisticsFlag="scope">
+        <span>
+          {{
+            ($store.getters.dict.DECLARE_STATISTICS_FLAG || []).find(
+              (v) => v.itemValue == scope.row.statisticsFlag
+            ).itemChineseName || ""
+          }}
+        </span>
+      </template>
     </Table>
     <CustomDialog :showDialog="customDialogShow" @cancelModify="cancelModify" />
   </div>
@@ -341,6 +350,13 @@ export default {
           align: "left",
         },
         {
+          name: "申报业务类型",
+          value: "statisticsFlag",
+          width: "",
+          align: "left",
+          slot: true,
+        },
+        {
           name: "汇总申报状态",
           value: "summaryApplicationStatus",
           width: "",