feat: 开发运抵

@@ -8,7 +8,8 @@
     :close-on-click-modal="false"
   >
     <div>
-     <el-form class="fedexFormStyle"
+      <el-form
+        class="fedexFormStyle"
         ref="batchModifyForm"
         :model="batchModifyFormData"
         :rules="batchModifyFormRules"
@@ -23,10 +24,10 @@
             placeholder=""
           >
             <el-option
-            v-for="(item, index) in modifyDataList"
-            :key="index"
-            :label="item.name"
-            :value="item.value"
+              v-for="item in modifyDataList"
+              :key="item.itemValue"
+              :label="item.itemChineseName"
+              :value="item.itemValue"
             ></el-option>
           </el-select>
         </Formitem>
@@ -47,58 +48,73 @@
         class="entrySaveButton entrySaveButton-background revokeSubmitBtn"
         type="primary"
         @click="formSubmit"
-           >确定</el-button>
-           <el-button
-           class="entrySaveButton"
-           @click="cancelModify"
-           >关闭</el-button>
+        >确定</el-button
+      >
+      <el-button class="entrySaveButton" @click="cancelModify">关闭</el-button>
     </div>
   </el-dialog>
-   </template>
+</template>
 
-     <script>
-     import { bathDeclareDate } from "@/api/declareData-api.js";
-     export default {
+<script>
+import { bathDeclareDate } from "@/api/declareData-api.js";
+import { getDictData } from "@/api/system/dict-api.js";
+export default {
   props: {
     showDialog: {
       type: Boolean,
       default: false,
     },
-         selectedDatas:{
-            type:Array,
-            default:() => []
+    selectedDatas: {
+      type: Array,
+      default: () => [],
     },
   },
   data() {
     return {
-            batchModifyVisible:false,
-            batchModifyFormData:{
-              modifyData:'',
-              modifyContent:''
+      batchModifyVisible: false,
+      batchModifyFormData: {
+        modifyData: "",
+        modifyContent: "",
       },
       batchModifyFormRules: {
-                modifyData: [{ required: true, message: '请选择修改数据', trigger: 'change' }],
-                modifyContent: [{ required: true, message: '请输入修改内容', trigger: 'blur' }],
+        modifyData: [
+          { required: true, message: "请选择修改数据", trigger: "change" },
+        ],
+        modifyContent: [
+          { required: true, message: "请输入修改内容", trigger: "blur" },
+        ],
       },
-            modifyDataList:[
-                {name:'提运单号',value:'BILLNO'},
-                {name:'航班航次号',value:'FLIGHT_NUMBER'},
-            ]
+      modifyDataList: [
+        { name: "提运单号", value: "BILLNO" },
+        { name: "航班航次号", value: "FLIGHT_NUMBER" },
+      ],
     };
   },
   watch: {
     showDialog(val) {
       if (val) {
-                   this.batchModifyVisible = val
-                   this.batchModifyFormData.modifyData=""
-                   this.batchModifyFormData.modifyContent=""
+        this.batchModifyVisible = val;
+        this.batchModifyFormData.modifyData = "";
+        this.batchModifyFormData.modifyContent = "";
       }
     },
   },
   created() {
+    this.getModifyDataList();
   },
   methods: {
-        formSubmit(){
+    getModifyDataList() {
+      getDictData({ doctCode: "DATABASE_FIELD" })
+        .then((res) => {
+          if (res.code == "200") {
+            this.modifyDataList = res.data;
+          }
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    formSubmit() {
       this.$refs.batchModifyForm.validate((valid) => {
         if (valid) {
           let obj = {
@@ -109,20 +125,20 @@
           this.selectedDatas.forEach((item) => {
             obj.declareIds.push(item.declareId);
           });
-            console.log('datas==', obj)
-            bathDeclareDate(obj).then((res) => {
+          console.log("datas==", obj);
+          bathDeclareDate(obj)
+            .then((res) => {
               if (res.code === "200") {
-                   this.msgSuccess('批量修改成功')
-                   this.cancelModify(1)
+                this.msgSuccess("批量修改成功");
+                this.cancelModify(1);
               } else {
                 this.alertWarningMsg(res.message);
               }
-
             })
             .catch((err) => {
               console.log(err);
               this.alertWarningMsg(err.message);
-                this.cancelModify(1)
+              this.cancelModify(1);
             });
         } else {
           return false;
@@ -130,17 +146,17 @@
       });
     },
 
-       cancelModify(val){
-          this.batchModifyVisible = false
-          this.$emit('cancelBatchModify',val)
-       }
+    cancelModify(val) {
+      this.batchModifyVisible = false;
+      this.$emit("cancelBatchModify", val);
     },
-     };
-     </script>
+  },
+};
+</script>
 
-     <style lang="scss" scoped>
-     @import "@/assets/styles/variables.scss";
-     .modelItem {
+<style lang="scss" scoped>
+@import "@/assets/styles/variables.scss";
+.modelItem {
   width: 100%;
   .modelItem-title {
     display: flex;
@@ -150,11 +166,11 @@
     font-weight: 600;
     color: #333;
   }
-     }
-     .revokeOperation{
-     margin-bottom:25px;
-     .revokeSubmitBtn{
+}
+.revokeOperation {
+  margin-bottom: 25px;
+  .revokeSubmitBtn {
     margin-right: 30px;
   }
-   }
-     </style>
+}
+</style>

@@ -187,9 +187,7 @@
           type="primary"
           class="dropdown-style-button"
           :loading="loadings.departureLoading"
-          @click="
-            declareData('departureLoading', '运抵单申报', 'logisticsDeparture')
-          "
+          @click="declareData('arrivalInLoading', '运抵单申报', 'arrivalIn')"
         >
           <svg-icon
             class="el-icon-user-solid"
@@ -632,6 +630,7 @@ export default {
         exportDeclareLoading: false,
         revokeLoading: false, // 撤销单申报加载状态
         departureLoading: false, // 离境单申报加载状态
+        arrivalInLoading: false, // 运抵单申报加载状态
       },
       textareaVisible: {},
       tableMaxheight: 500,

@@ -8,7 +8,8 @@
     :close-on-click-modal="false"
   >
     <div>
-  <el-form class="fedexFormStyle"
+      <el-form
+        class="fedexFormStyle"
         ref="cancelForm"
         :model="cancelFormData"
         :rules="cancelFormRules"
@@ -24,7 +25,7 @@
             placeholder=""
           >
             <el-option
-                  v-for="(item) in cancellationReasons"
+              v-for="item in cancellationReasons"
               :key="item.itemValue"
               :label="item.itemValue"
               :value="item.itemValue"
@@ -48,95 +49,96 @@
         class="entrySaveButton entrySaveButton-background revokeSubmitBtn"
         type="primary"
         @click="submitRevoke"
-        >提交</el-button>
-        <el-button
-        class="entrySaveButton"
-        @click="cancelRevoke"
-        >取消</el-button>
+        >提交</el-button
+      >
+      <el-button class="entrySaveButton" @click="cancelRevoke">取消</el-button>
     </div>
-</el-dialog>
+  </el-dialog>
 </template>
 
-  <script>
-  import { declareDataUpload } from "@/api/declareData-api.js";
-  import { getDictData } from '@/api/system/dict-api.js'
-  export default {
+<script>
+import { declareDataUpload } from "@/api/declareData-api.js";
+import { getDictData } from "@/api/system/dict-api.js";
+export default {
   props: {
     showDialog: {
       type: Boolean,
       default: false,
     },
-      selectedDatas:{
-        type:Array,
-        default:() => []
+    selectedDatas: {
+      type: Array,
+      default: () => [],
     },
     dropdownCode: {
       type: String,
-        default: 'full',
+      default: "full",
     },
   },
   data() {
     return {
-      cancelVisible:false,
-      showOtherReason:false,
-      cancellationReasons:[],
-      cancelFormData:{
-        cancellationReason:'',
-        otherReason:'',
+      cancelVisible: false,
+      showOtherReason: false,
+      cancellationReasons: [],
+      cancelFormData: {
+        cancellationReason: "",
+        otherReason: "",
       },
       cancelFormRules: {
         cancellationReason: [
-            { required: true, message: '请选择撤销原因', trigger: 'change' }
+          { required: true, message: "请选择撤销原因", trigger: "change" },
         ],
-          otherReason:[
-            { required: true, message: '请输入撤销原因', trigger: 'blur' }
-          ]
-      }
+        otherReason: [
+          { required: true, message: "请输入撤销原因", trigger: "blur" },
+        ],
+      },
     };
   },
   watch: {
     showDialog(val) {
       if (val) {
-                this.cancelVisible = val
+        this.cancelVisible = val;
       }
     },
   },
   created() {
-    this.getCancellationReasons()
+    this.getCancellationReasons();
   },
   methods: {
-    getCancellationReasons(){
-      getDictData({doctCode:'CANCELLATION_REASON'}).then(res =>{
-         if (res.code == '200') {
-           this.cancellationReasons = res.data
+    getCancellationReasons() {
+      getDictData({ doctCode: "CANCELLATION_REASON" })
+        .then((res) => {
+          if (res.code == "200") {
+            this.cancellationReasons = res.data;
           }
-      }).catch(err =>{
-         console.error(err)
         })
+        .catch((err) => {
+          console.error(err);
+        });
     },
-    changeCancellationReason(ev){
-      if (ev == '手工输入') {
-        this.showOtherReason = true
+    changeCancellationReason(ev) {
+      if (ev == "手工输入") {
+        this.showOtherReason = true;
       } else {
-        this.showOtherReason = false
-
+        this.showOtherReason = false;
       }
     },
-    submitRevoke(){
+    submitRevoke() {
       if (!this.showOtherReason) {
-        this.cancelFormData.otherReason = ''
+        this.cancelFormData.otherReason = "";
       }
       this.$refs.cancelForm.validate((valid) => {
         if (valid) {
           let obj = {
-              cancellationReason: this.cancelFormData.otherReason || this.cancelFormData.cancellationReason,
+            cancellationReason:
+              this.cancelFormData.otherReason ||
+              this.cancelFormData.cancellationReason,
             declareIds: [],
             type: this.dropdownCode,
           };
           this.selectedDatas.forEach((item) => {
             obj.declareIds.push(item.declareId);
           });
-            console.log('datas==', obj)
+          console.log("datas==", obj);
           declareDataUpload(obj)
             .then((res) => {
               if (res.code === "200") {
@@ -145,11 +147,11 @@
               } else {
                 this.alertWarningMsg(res.message);
               }
-                this.cancelRevoke()
+              this.cancelRevoke();
             })
             .catch((err) => {
               console.log(err);
-                this.cancelRevoke()
+              this.cancelRevoke();
             });
         } else {
           return false;
@@ -157,20 +159,20 @@
       });
     },
 
-    cancelRevoke(){
-       this.cancelVisible = false
-       this.showOtherReason = false
-       this.cancelFormData.cancellationReason = ''
-       this.cancelFormData.otherReason = ''
-       this.$emit('cancelRevoke')
-    }
+    cancelRevoke() {
+      this.cancelVisible = false;
+      this.showOtherReason = false;
+      this.cancelFormData.cancellationReason = "";
+      this.cancelFormData.otherReason = "";
+      this.$emit("cancelRevoke");
     },
-  };
-  </script>
+  },
+};
+</script>
 
-  <style lang="scss" scoped>
-  @import "@/assets/styles/variables.scss";
-  .modelItem {
+<style lang="scss" scoped>
+@import "@/assets/styles/variables.scss";
+.modelItem {
   width: 100%;
   .modelItem-title {
     display: flex;
@@ -180,11 +182,11 @@
     font-weight: 600;
     color: #333;
   }
-  }
-  .revokeOperation{
-  margin-bottom:25px;
-  .revokeSubmitBtn{
+}
+.revokeOperation {
+  margin-bottom: 25px;
+  .revokeSubmitBtn {
     margin-right: 30px;
   }
 }
-  </style>
+</style>