feat: 需求开发

zhanbo.xu
Commit e2cfc3cf03ed6c9d4748214afc2fa63fdc3bb1bb e2cfc3cf 1 parent 06a93630
Showing 3 changed files with 77 additions and 21 deletions
src/views/customerConfig/dialog.vue
src/views/exportListQuery/index.vue
src/views/receipt-management/dialog.vue
--- a/src/views/customerConfig/dialog.vue
View file @e2cfc3c
+++ b/src/views/customerConfig/dialog.vue
View file @e2cfc3c
@@ -72,7 +72,7 @@
         <!-- 1.0.9 -->
         <!-- 电商平台代码:、电商平台名称:、收发货人代码:、收发货人名称:、生产销售企业代码:、生产销售企业名称: -->
         <!-- 证书到期时间: -->
-        <el-row :gutter="5" v-if="0">
+        <el-row :gutter="5">
           <el-col :span="8">
             <Formitem label="电商平台代码" prop="ebpcode" type="edit">
               <el-input
@@ -99,7 +99,7 @@
               ></el-input>
             </Formitem>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="0">
             <Formitem
               label="收发货人代码"
               prop="consigneeShipperCode"
@@ -116,9 +116,8 @@
               ></el-input>
             </Formitem>
           </el-col>
-        </el-row>
+
-        <el-row :gutter="5" v-if="0">
+          <el-col :span="8" v-if="0">
-          <el-col :span="8">
             <Formitem
               label="收发货人名称"
               prop="consigneeShipperName"
@@ -169,8 +168,7 @@
               ></el-input>
             </Formitem>
           </el-col>
-        </el-row>
+
-        <el-row :gutter="5">
           <!-- 订单申报方 -->
           <el-col :span="8">
             <Formitem label="订单申报方" prop="orderRequester" type="edit">
@@ -559,7 +557,7 @@
             </el-col>
             <!-- 加签方式 -->
-            <el-col :span="8">
+            <el-col :span="8" v-if="0">
               <Formitem label="加密方式" prop="guangzhouSignature" type="edit">
                 <el-select
                   type="text"
--- a/src/views/exportListQuery/index.vue
View file @e2cfc3c
+++ b/src/views/exportListQuery/index.vue
View file @e2cfc3c
@@ -26,8 +26,6 @@
               dataKey="logisticsNo"
               @formChange="formChange"
             />
-
-
           </Formitem>
         </el-col>
         <!-- 提运单号 -->
@@ -107,7 +105,7 @@
       <el-row>
         <!-- 电商企业代码 -->
         <el-col :span="5">
-          <Formitem label="电商企业代码" prop="ebpcode">
+          <Formitem label="电商平台代码" prop="ebpcode">
             <el-input
               type="text"
               class="inputShadow"
@@ -130,7 +128,11 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS.filter(fItem => fItem.itemChineseName !== '已提交')"
+                v-for="(
+                  item, index
+                ) in $store.getters.dict.RECEIPT_STATUS.filter(
+                  (fItem) => fItem.itemChineseName !== '已提交'
+                )"
                 :key="index"
                 :label="item.itemChineseName"
                 :value="item.itemValue"
@@ -149,7 +151,11 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS.filter(fItem => fItem.itemChineseName !== '已提交')"
+                v-for="(
+                  item, index
+                ) in $store.getters.dict.RECEIPT_STATUS.filter(
+                  (fItem) => fItem.itemChineseName !== '已提交'
+                )"
                 :key="index"
                 :label="item.itemChineseName"
                 :value="item.itemValue"
@@ -300,7 +306,7 @@ export default {
           name: "清单编号",
           value: "invtNo",
           width: "",
-          align: "left"
+          align: "left",
         },
         {
           name: "电商企业代码",
@@ -309,13 +315,13 @@ export default {
           align: "left",
         },
         {
-          name: "电商企业名称",
+          name: "电商平台名称",
           value: "ebpname",
           width: "",
           align: "left",
         },
         {
-          name: "申报企业代码",
+          name: "申报平台代码",
           value: "agentCode",
           width: "",
           align: "left",
@@ -330,8 +336,8 @@ export default {
           name: "创建时间",
           value: "createTime",
           width: "",
-          align: "left"
+          align: "left",
-        }
+        },
       ],
       selected: [],
       receiptDataHead: [
@@ -386,7 +392,7 @@ export default {
       if (val == 0) {
         this.page.pageIndex = 1;
       }
-      let obj = {...this.sreachFormData};
+      let obj = { ...this.sreachFormData };
       obj.pageIndex = this.page.pageIndex;
       obj.pageSize = this.page.pageSize;
       obj.createTimeStart = "";
@@ -395,7 +401,7 @@ export default {
         obj.createTimeStart = obj.createTime[0];
         obj.createTimeEnd = obj.createTime[1];
       }
-      delete obj.createTime
+      delete obj.createTime;
       if (obj.logisticsNo != null && obj.logisticsNo != "") {
         obj.logisticsNo = obj.logisticsNo.split("\n");
       } else {
@@ -453,7 +459,7 @@ export default {
         })
         .finally(() => {
           this.$nextTick(() => {
-            this.$store.dispatch('setLoadingState', false)
+            this.$store.dispatch("setLoadingState", false);
             this.$refs.returnStatusPopover.tableLoading = false;
           });
         });
--- a/src/views/receipt-management/dialog.vue
View file @e2cfc3c
+++ b/src/views/receipt-management/dialog.vue
View file @e2cfc3c
@@ -86,6 +86,36 @@
             </Formitem>
           </el-col>
         </el-row>
+        <el-row :gutter="5" v-if="formData.receiptType == 'list'">
+          <el-col :span="8">
+            <Formitem label="电子口岸编号" prop="preNo" type="edit">
+              <el-input
+                type="text"
+                class="inputShadow"
+                id="inputInner-edit-preNo"
+                resize="none"
+                v-model="formData.preNo"
+                clearable
+                placeholder=""
+                @blur="receiptXml"
+              ></el-input>
+            </Formitem>
+          </el-col>
+          <el-col :span="8">
+            <Formitem label="清单编号" prop="invtNo" type="edit">
+              <el-input
+                type="text"
+                class="inputShadow"
+                id="inputInner-edit-invtNo"
+                resize="none"
+                v-model="formData.invtNo"
+                clearable
+                placeholder=""
+                @blur="receiptXml"
+              ></el-input>
+            </Formitem>
+          </el-col>
+        </el-row>
         <el-row :gutter="5">
           <el-col :span="24">
             <!-- <Formitem label="回执文本" prop="receiptInfo" type="edit">
@@ -159,6 +189,8 @@ export default {
         receiptType: "",
         orderNo: [],
         receiptStatus: "",
+        preNo: "",
+        invtNo: "",
       },
       receiptInfo: "",
       rules: {
@@ -183,6 +215,20 @@ export default {
             message: "请选择回执状态！",
           },
         ],
+        preNo: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "电子口岸编号不能为空！",
+          },
+        ],
+        invtNo: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "清单编号不能为空！",
+          },
+        ],
       },
       orderNoList: [],
       loadings: {
@@ -205,6 +251,12 @@ export default {
       if (!this.formData.receiptStatus) {
         return;
       }
+      if (!this.formData.preNo) {
+        return;
+      }
+      if (!this.formData.invtNo) {
+        return;
+      }
       generateReceiptXml({
         ...this.formData,
         orderNo: this.formData.orderNo[0],