字典增加，字段修改

@@ -7,7 +7,7 @@ import request from '@/utils/request'
  * @param ecomEntEmail 电商企业邮箱
  * @param ecomEntName 电商企业名称
  * @param endCreationTime 结束创建时间
- * @param startCreationTime开始创建时间
+ * @param startCreationTime 开始创建时间
  * @param pageIndex *
  * @param pageSize *
  */
@@ -18,3 +18,71 @@ export function getCustomerList(data) {
         data: data
     })
 }
+
+// 新增客户数据
+/**
+ * @param beijingDxpid 北京DXPID
+ * @param certificare 证书
+ * @param clientId 客户ID
+ * @param ecomEntCode * 电商企业代码
+ * @param ecomEntEmail 电商企业邮箱
+ * @param ecomEntName * 电商企业名称
+ * @param orderRequester 订单申报方
+ * @param qingdaoDanyiUserDxpid 青岛单一用户DXPID
+ * @param qingdaoKey 青岛密钥
+ * @param qingdaoUserDxpid 青岛用户DXPID
+ * @param qingdaoUserId 青岛用户ID
+ */
+export function addCustomerData(data) {
+    let formData = new FormData
+    formData.append("beijingDxpid", data.beijingDxpid);
+    formData.append("certificare", data.certificare);
+    formData.append("clientId", data.clientId);
+    formData.append("ecomEntCode", data.ecomEntCode);
+    formData.append("ecomEntEmail", data.ecomEntEmail);
+    formData.append("orderRequester", data.orderRequester);
+    formData.append("qingdaoDanyiUserDxpid", data.qingdaoDanyiUserDxpid);
+    formData.append("qingdaoKey", data.qingdaoKey);
+    formData.append("qingdaoUserDxpid", data.qingdaoUserDxpid);
+    formData.append("qingdaoUserId", data.qingdaoUserId);
+    return request({
+        url: '/bus-customer/customers/add',
+        method: 'post',
+        data: formData
+    })
+}
+
+// 修改客户数据
+/**
+ * @param id *
+ * @param beijingDxpid 北京DXPID
+ * @param certificare 证书
+ * @param clientId * 客户ID
+ * @param ecomEntCode * 电商企业代码
+ * @param ecomEntEmail 电商企业邮箱
+ * @param ecomEntName * 电商企业名称
+ * @param orderRequester 订单申报方
+ * @param qingdaoDanyiUserDxpid 青岛单一用户DXPID
+ * @param qingdaoKey 青岛密钥
+ * @param qingdaoUserDxpid 青岛用户DXPID
+ * @param qingdaoUserId 青岛用户ID
+ */
+export function updateCustomerData(data) {
+    let formData = new FormData
+    formData.append("id", data.id);
+    formData.append("beijingDxpid", data.beijingDxpid);
+    formData.append("certificare", data.certificare);
+    formData.append("clientId", data.clientId);
+    formData.append("ecomEntCode", data.ecomEntCode);
+    formData.append("ecomEntEmail", data.ecomEntEmail);
+    formData.append("orderRequester", data.orderRequester);
+    formData.append("qingdaoDanyiUserDxpid", data.qingdaoDanyiUserDxpid);
+    formData.append("qingdaoKey", data.qingdaoKey);
+    formData.append("qingdaoUserDxpid", data.qingdaoUserDxpid);
+    formData.append("qingdaoUserId", data.qingdaoUserId);
+    return request({
+        url: '/bus-customer/customers/update',
+        method: 'put',
+        data: formData
+    })
+}
\ No newline at end of file

@@ -2,6 +2,18 @@ import request from '@/utils/request'
 
 //获取物流企业代码
 /**
+ * @param doctCode 
+ */
+export function getDictData(data) {
+    return request({
+        url: '/bus-customer/SysDictItem/getDictItemByDictCode',
+        method: 'get',
+        params: data
+    })
+}
+
+//获取物流企业代码
+/**
  * @param
  */
 export function getLogisticsCodeList(data) {

@@ -203,6 +203,10 @@
 
             span {
                 color: $fedexButton!important ;
+
+                svg {
+                    color: $fedexButton!important ;
+                }
             }
         }
 

@@ -23,7 +23,7 @@ router.beforeEach((to, from, next) => {
           store.dispatch('GetInfo').then((res) => {
             // if (res.success) {
             store.dispatch('GenerateRoutes').then(accessRoutes => {
-              store.dispatch("GetDict");
+              store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY']);
               // 根据roles权限生成可访问的路由表
               router.addRoutes(accessRoutes) // 动态添加可访问路由表
               next({ ...to, replace: true }) // hack方法 确保addRoutes已完成

 import { login, logout } from '@/api/login'
-import { getLogisticsCodeList } from '@/api/system/dict-api.js'
+import { getLogisticsCodeLis, getDictData } from '@/api/system/dict-api.js'
 import { getToken, setToken, removeToken, removeUserId, removeTime } from '@/utils/auth'
 import { alertWarningMsg } from '@/utils/index.js'
 
@@ -19,7 +19,9 @@ const user = {
       id: null,
       status: 0,
     },
-    dict: {},
+    dict: {
+      DECLARE_TRAFMODE: [{ itemCode: 'DECLARE_TRAFMODE_AVIATION', itemChineseName: '航空运输', itemValue: '5' }]
+    },
     dictWit: ['H2000Account'],
     loading: {
       type: false,
@@ -126,16 +128,29 @@ const user = {
     },
 
     //获取字典数据
-    async GetDict({ commit, state }) {
+    async GetDict({ commit, state }, codeList) {
       let obj = state.dict
-      new Promise((resolve, reject) => {
-        getLogisticsCode().then(res => {
-          obj.LogisticsCode = res
+      codeList.forEach((item, idx) => {
+        if (obj[item] == undefined || obj[item].length == 0) {
+          obj[item] = []
+          getDictData({ doctCode: item }).then(res => {
+            if (res.code === '200') {
+              obj[item] = res.data
+            }
+          }).catch(err => {
+            console.log(err);
           }).finally(() => {
-          resolve()
+            if (idx == codeList.length - 1) {
+              console.log(obj);
+              commit('SET_DICT', obj)
+            }
           })
-      }).then(() => {
+        } else {
+          if (idx == codeList.length - 1) {
+            console.log(obj);
             commit('SET_DICT', obj)
+          }
+        }
       })
     },
 

@@ -19,11 +19,13 @@
     :expandRowKeys="expandRowKeys"
   >
     <template v-slot:unit="scope">
-      <span>{{ selectDictLabel(scope.row.unit, "unit", "code") }}</span>
+      <span>{{
+        selectDictLabel(scope.row.unit, "MEASUREMENT_UNIT", "itemCode")
+      }}</span>
     </template>
     <template v-slot:currency="scope">
       <span>{{
-        selectDictLabel(scope.row.currency, "currency", "value")
+        selectDictLabel(scope.row.currency, "CURRENCY", "itemValue")
       }}</span>
     </template>
     <!-- <template slot="optionColumn">
@@ -87,7 +89,7 @@ export default {
     },
     selectDictLabel(value, dictkey, key) {
       let str = value;
-      this.dictData[dictkey].forEach((item) => {
+      this.$store.getters.dict[dictkey].forEach((item) => {
         if (value == item[key]) {
           str = item.name;
         }

@@ -68,18 +68,18 @@
         <el-row :gutter="5">
           <!-- 订单申报方 -->
           <el-col :span="8">
-            <Formitem label="订单申报方" prop="declarationUnit10" type="edit">
+            <Formitem label="订单申报方" prop="orderRequester" type="edit">
               <el-select
                 type="text"
-                id="inputInner--portCode"
-                v-model="sreachFormData.portCode"
+                id="inputInner--orderRequester"
+                v-model="formData.orderRequester"
                 clearable
                 placeholder=""
               >
                 <el-option
-                  v-for="(item, index) in dict.port"
+                  v-for="(item, index) in dict.orderRequester"
                   :key="index"
-                  :label="item"
+                  :label="item.name"
                   :value="item"
                 ></el-option>
               </el-select>
@@ -87,11 +87,7 @@
           </el-col>
           <!-- DXPID -->
           <el-col :span="8">
-            <Formitem
-              label="DXPID"
-              prop="qingdaoDanyiUserDxpid"
-              type="edit"
-            >
+            <Formitem label="DXPID" prop="qingdaoDanyiUserDxpid" type="edit">
               <el-input
                 type="text"
                 class="inputShadow"
@@ -104,7 +100,9 @@
             </Formitem>
           </el-col>
         </el-row>
-        <div>青岛</div>
+        <div class="checkTitle">
+          <el-checkbox v-model="formData.qdCheck"></el-checkbox>青岛
+        </div>
         <el-row :gutter="5">
           <!-- User ID -->
           <el-col :span="8">
@@ -149,7 +147,9 @@
             </Formitem>
           </el-col>
         </el-row>
-        <div>北京</div>
+        <div class="checkTitle">
+          <el-checkbox v-model="formData.bjCheck"></el-checkbox>北京
+        </div>
         <el-row :gutter="5">
           <!-- DXPID -->
           <el-col :span="8">
@@ -183,7 +183,6 @@
               :auto-upload="true"
               :show-file-list="false"
               :data="{}"
-              accept=".xlsx"
               :before-upload="beforeUpload"
               :on-remove="handleRemove"
               :on-success="handleSuccess"
@@ -239,7 +238,10 @@
 </template>
 
 <script>
-import { addPortData, updatePortData } from "@/api/system/port-api.js";
+import {
+  addCustomerData,
+  updateCustomerData,
+} from "@/api/system/customer-ai.js";
 export default {
   props: {
     outerVisible: {
@@ -248,7 +250,7 @@ export default {
     },
     title: {
       type: String,
-      default: "新增口岸",
+      default: "新增客户",
     },
     type: {
       type: String,
@@ -258,17 +260,33 @@ export default {
       type: Object,
       default: null,
     },
+    dict: {
+      type: Array,
+      default() {
+        return {
+          orderRequester:[]
+        };
+      },
+    },
   },
   data() {
     return {
       formData: {
-        declarationPortCode: "",
-        declarationUnit10: "",
-        declarationUnit10Inspection: "",
-        declarationUnit18: "",
-        declarationUnitCompanyName: "",
-        dxpid: "",
-        portCode: "",
+        id: null,
+        beijingDxpid: "",
+        certificare: "",
+        clientId: "",
+        ecomEntCode: "",
+        ecomEntEmail: "",
+        ecomEntName: "",
+        orderRequester: "",
+        qingdaoDanyiUserDxpid: "",
+        qingdaoKey: "",
+        qingdaoUserDxpid: "",
+        qingdaoUserId: "",
+        qdCheck: false,
+        bjCheck: false,
+        file: null,
       },
       rules: {
         portCode: [
@@ -343,6 +361,7 @@ export default {
         submitLoading: false,
       },
       loadingText: "",
+      fileList: [],
     };
   },
   watch: {
@@ -356,6 +375,42 @@ export default {
     },
   },
   methods: {
+    uploadFile() {
+      this.$refs.uploadFile.$refs["upload-inner"].handleClick();
+    },
+    //文件校验
+    beforeUpload(val) {
+      // if (
+      //   val.type !=
+      //   "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+      // ) {
+      //   this.alertWarningMsg("请上传Excel文件！");
+      //   return false;
+      // } else {
+      return true;
+      // }
+    },
+    fileUpload(val) {
+      const reader = new FileReader();
+      reader.readAsDataURL(val.file);
+      reader.onload = (e) => {
+        let obj = {
+          file: e.target.result,
+          name: val.file.name,
+        };
+        this.formData.file = obj;
+      };
+    },
+    fileChange(val) {},
+    handleSuccess() {},
+    clearFile() {},
+    handleRemove() {
+      this.fileList = [];
+    },
+    //删除文件
+    delTypeDFile() {
+      this.formData.file = null;
+    },
     //查询用户信息详情
     searchUserData(id) {
       this.loadings.dialogLoading = true;
@@ -433,14 +488,23 @@ export default {
     },
     close() {
       this.formData = {
-        declarationPortCode: "",
-        declarationUnit10: "",
-        declarationUnit10Inspection: "",
-        declarationUnit18: "",
-        declarationUnitCompanyName: "",
-        dxpid: "",
-        portCode: "",
+        id: null,
+        beijingDxpid: "",
+        certificare: "",
+        clientId: "",
+        ecomEntCode: "",
+        ecomEntEmail: "",
+        ecomEntName: "",
+        orderRequester: "",
+        qingdaoDanyiUserDxpid: "",
+        qingdaoKey: "",
+        qingdaoUserDxpid: "",
+        qingdaoUserId: "",
+        qdCheck: false,
+        bjCheck: false,
+        file: null,
       };
+      this.handleRemove();
       this.$emit("close");
     },
   },
@@ -449,4 +513,76 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/styles/variables.scss";
+.uploadItem {
+  margin-bottom: 5px;
+
+  .uploadbox {
+    width: 100%;
+    height: 40px;
+    line-height: 20px;
+    background-color: $formItemBackgroundColor;
+    padding: 4px 8px;
+    margin-top: 5px;
+    display: flex;
+    justify-content: space-between;
+
+    .el-button {
+      font-weight: 400 !important;
+    }
+  }
+}
+
+.fileList {
+  width: 100%;
+
+  .fileList-item {
+    display: flex;
+    justify-content: space-between;
+    padding: 5px 15px 5px 5px;
+    background-color: $formItemBackgroundColor;
+    font-size: 14px;
+
+    .uploadbox-fileName {
+      display: flex;
+      align-items: center;
+    }
+
+    .uploadbox-option {
+      .fileSize {
+        display: inline-block;
+        color: #8e8e8e;
+        font-size: 12px;
+      }
+    }
+
+    .svg-icon {
+      display: inline-block;
+      color: $fedexError;
+    }
+
+    .text-tooltip {
+      max-width: 500px;
+      display: inline-block;
+      margin-left: 10px;
+    }
+
+    .fileList-item-empty {
+      display: inline-block;
+      margin: 5px;
+      height: max-content;
+      color: #8e8e8e;
+    }
+  }
+}
+
+.checkTitle {
+  font-weight: 600;
+  font-size: 14px;
+  color: #333 !important;
+  margin: 5px;
+  .el-checkbox {
+    display: inline-block;
+    margin-right: 10px;
+  }
+}
 </style>

@@ -157,6 +157,7 @@
       :title="dialogTitle"
       :type="editType"
       :active="activeData"
+      :dict="dict"
       @close="dialogClose"
     />
   </div>
@@ -244,7 +245,10 @@ export default {
         },
       ],
       dict: {
-        port: [],
+        orderRequester: [
+          { name: "企业", code: "ENTERPRISE_DECLARATION", value: "1" },
+          { name: "FEDEX", code: "FEDEX_DECLARATION", value: "2" },
+        ],
       },
       loadings: {
         searchLoading: false,
@@ -319,12 +323,12 @@ export default {
     addCustomer() {
       this.dialogTitle = "新增客户";
       this.editType = "add";
-      // this.outerVisible = true;
+      this.outerVisible = true;
     },
     update(val) {
       this.dialogTitle = "修改客户";
       this.editType = "update";
-      // this.outerVisible = true;
+      this.outerVisible = true;
       this.activeData = val;
     },
     dialogClose() {

@@ -15,6 +15,7 @@
       size="small"
     >
       <el-row :gutter="5">
+        <!-- 订单编号 -->
         <el-col :span="3">
           <Formitem label="订单编号" prop="orderNo">
             <el-input
@@ -28,6 +29,7 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 订单类型 -->
         <el-col :span="3">
           <Formitem label="订单类型" prop="orderType">
             <el-input
@@ -41,6 +43,7 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 电商平台代码 -->
         <el-col :span="3">
           <Formitem label="电商平台代码" prop="ebpcode">
             <el-input
@@ -54,6 +57,7 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 电商平台名称 -->
         <el-col :span="6">
           <Formitem label="电商平台名称" prop="ebpname">
             <el-input
@@ -67,6 +71,7 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 电商企业代码 -->
         <el-col :span="3">
           <Formitem label="电商企业代码" prop="ebccode">
             <el-input
@@ -80,6 +85,7 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 电商企业 -->
         <el-col :span="3">
           <Formitem label="电商企业" prop="ebcname">
             <el-input
@@ -93,6 +99,7 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 货款金额 -->
         <el-col :span="3">
           <Formitem label="货款金额" prop="goodsValue">
             <el-input
@@ -108,6 +115,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="5">
+        <!-- 运杂费 -->
         <el-col :span="3">
           <Formitem label="运杂费" prop="freight">
             <el-input
@@ -121,6 +129,7 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 币制 -->
         <el-col :span="3">
           <Formitem label="币制" prop="currency">
             <el-select
@@ -131,27 +140,15 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.currency"
+                v-for="(item, index) in $store.getters.dict.CURRENCY"
                 :key="index"
-                :label="item.name"
-                :value="item.value"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
               ></el-option>
             </el-select>
           </Formitem>
         </el-col>
-        <!-- <el-col :span="3">
-          <Formitem label="回执状态" prop="returnStatus">
-            <el-input
-              type="text"
-              class="inputShadow"
-              id="inputInner--returnStatus"
-              resize="none"
-              v-model="formData.returnStatus"
-              clearable
-              placeholder=""
-            ></el-input>
-          </Formitem>
-        </el-col> -->
+        <!-- 申报类型 -->
         <el-col :span="3">
           <Formitem label="申报类型" prop="appType">
             <el-select
@@ -162,14 +159,16 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.appType"
+                v-for="(item, index) in $store.getters.dict
+                  .DECLARE_STATISTICS_FLAG"
                 :key="index"
-                :label="item.name"
-                :value="item.value"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
               ></el-option>
             </el-select>
           </Formitem>
         </el-col>
+        <!-- 申报日期 -->
         <el-col :span="3">
           <Formitem label="申报日期" prop="appTime">
             <el-input
@@ -183,6 +182,7 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 备注 -->
         <el-col :span="12">
           <Formitem label="备注" prop="note">
             <el-input

@@ -43,10 +43,10 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.returnStatus"
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
                 :key="index"
-                :label="item.name"
-                :value="item.code"
+                :label="item.itemChineseName"
+                :value="item.itemCode"
               ></el-option>
             </el-select>
           </Formitem>
@@ -234,19 +234,19 @@ export default {
       receiptDataHead: [
         {
           name: "回执状态",
-          value: "receiptStatus",
-          width: "",
+          value: "returnStatus",
+          width: "120",
           align: "left",
         },
         {
           name: "状态时间",
-          value: "statusTime",
+          value: "returnTime",
           width: "",
           align: "left",
         },
         {
           name: "回执描述",
-          value: "receiptDescription",
+          value: "returnInfo",
           width: "",
           align: "left",
         },
@@ -333,7 +333,7 @@ export default {
     popoverChange(val) {
       console.log(val);
       this.tableData = val.tableData;
-      this.receiptApi(val.data.declareId, val.status)
+      this.receiptApi(val.data.id, val.status)
         .then((res) => {
           val.tableData.forEach((item) => {
             if (item.declareId == val.data.declareId) {

@@ -167,12 +167,13 @@
               clearable
               placeholder=""
             >
-              <!-- <el-option
-                v-for="(item, index) in dictData.currency"
+              <el-option
+                v-for="(item, index) in $store.getters.dict
+                  .DECLARE_STATISTICS_FLAG"
                 :key="index"
-                :label="item.name"
-                :value="item.value"
-              ></el-option> -->
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
             </el-select>
           </Formitem>
         </el-col>
@@ -333,12 +334,12 @@
               clearable
               placeholder=""
             >
-              <!-- <el-option
-                v-for="(item, index) in dictData.currency"
+              <el-option
+                v-for="(item, index) in $store.getters.dict.DECLARE_TRAFMODE"
                 :key="index"
-                :label="item.name"
-                :value="item.value"
-              ></el-option> -->
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
             </el-select>
           </Formitem>
         </el-col>
@@ -455,15 +456,20 @@
         <!-- 运费币制 -->
         <el-col :span="3">
           <Formitem label="运费币制" prop="fcurrency">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--fcurrency"
-              resize="none"
               v-model="formData.fcurrency"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.CURRENCY"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
       </el-row>
@@ -471,15 +477,20 @@
         <!-- 运费标志 -->
         <el-col :span="3">
           <Formitem label="运费标志" prop="fflag">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--fflag"
-              resize="none"
               v-model="formData.fflag"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.DECLARE_F_FLAG"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
         <!-- 保费 -->
@@ -499,29 +510,39 @@
         <!-- 保费币制 -->
         <el-col :span="3">
           <Formitem label="保费币制" prop="icurrency">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--icurrency"
-              resize="none"
               v-model="formData.icurrency"
-              clearable
+              clearableF
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.CURRENCY"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
         <!-- 保费标志 -->
         <el-col :span="3">
           <Formitem label="保费标志" prop="iflag">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--iflag"
-              resize="none"
               v-model="formData.iflag"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.DECLARE_F_FLAG"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
         <!-- 件数/包裹件数 -->
@@ -585,29 +606,39 @@
         <!-- 业务状态 -->
         <el-col :span="3">
           <Formitem label="回执状态" prop="returnStatus">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--returnStatus"
-              resize="none"
               v-model="formData.returnStatus"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
         <!-- 申报类型 -->
         <el-col :span="3">
           <Formitem label="申报类型" prop="appType">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--appType"
-              resize="none"
               v-model="formData.appType"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.DECLARE_STATISTICS_FLAGF"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
         <!-- 申报时间 -->
@@ -714,13 +745,13 @@ export default {
         },
         {
           name: "商品编码",
-          value: "itemNo",
+          value: "gcode",
           width: "",
           align: "left",
         },
         {
           name: "商品规格型号",
-          value: "",
+          value: "gmodel",
           width: "",
           align: "left",
         },

@@ -122,10 +122,10 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.returnStatus"
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
                 :key="index"
-                :label="item.name"
-                :value="item.code"
+                :label="item.itemChineseName"
+                :value="item.itemCode"
               ></el-option>
             </el-select>
           </Formitem>
@@ -291,19 +291,19 @@ export default {
       receiptDataHead: [
         {
           name: "回执状态",
-          value: "receiptStatus",
-          width: "",
+          value: "returnStatus",
+          width: "120",
           align: "left",
         },
         {
           name: "状态时间",
-          value: "statusTime",
+          value: "returnTime",
           width: "",
           align: "left",
         },
         {
           name: "回执描述",
-          value: "receiptDescription",
+          value: "returnInfo",
           width: "",
           align: "left",
         },
@@ -390,7 +390,7 @@ export default {
     popoverChange(val) {
       console.log(val);
       this.tableData = val.tableData;
-      this.receiptApi(val.data.copNo, val.status)
+      this.receiptApi(val.data.id, val.status)
         .then((res) => {
           val.tableData.forEach((item) => {
             if (item.declareId == val.data.declareId) {

@@ -38,10 +38,10 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.returnStatus"
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
                 :key="index"
-                :label="item.name"
-                :value="item.code"
+                :label="item.itemChineseName"
+                :value="item.itemCode"
               ></el-option>
             </el-select>
           </Formitem>

@@ -48,10 +48,10 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.returnStatus"
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
                 :key="index"
-                :label="item.name"
-                :value="item.code"
+                :label="item.itemChineseName"
+                :value="item.itemCode"
               ></el-option>
             </el-select>
           </Formitem>
@@ -232,19 +232,19 @@ export default {
       receiptDataHead: [
         {
           name: "回执状态",
-          value: "receiptStatus",
-          width: "",
+          value: "returnStatus",
+          width: "120",
           align: "left",
         },
         {
           name: "状态时间",
-          value: "statusTime",
+          value: "returnTime",
           width: "",
           align: "left",
         },
         {
           name: "回执描述",
-          value: "receiptDescription",
+          value: "returnInfo",
           width: "",
           align: "left",
         },
@@ -331,7 +331,7 @@ export default {
     popoverChange(val) {
       console.log(val);
       this.tableData = val.tableData;
-      this.receiptApi(val.data.declareId, val.status)
+      this.receiptApi(val.data.id, val.status)
         .then((res) => {
           val.tableData.forEach((item) => {
             if (item.declareId == val.data.declareId) {

@@ -140,10 +140,10 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.currency"
+                v-for="(item, index) in $store.getters.dict.CURRENCY"
                 :key="index"
-                :label="item.name"
-                :value="item.value"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
               ></el-option>
             </el-select>
           </Formitem>
@@ -201,10 +201,10 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.returnStatus"
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
                 :key="index"
-                :label="item.name"
-                :value="item.code"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
               ></el-option>
             </el-select>
           </Formitem>

@@ -102,15 +102,20 @@
         <!-- 运输方式 -->
         <el-col :span="3">
           <Formitem label="运输方式" prop="trafMode">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--trafMode"
-              resize="none"
               v-model="formData.trafMode"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.DECLARE_TRAFMODE"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
       </el-row>
@@ -232,15 +237,20 @@
         <!-- 业务状态 -->
         <el-col :span="3">
           <Formitem label="业务状态" prop="returnStatus">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--returnStatus"
-              resize="none"
               v-model="formData.returnStatus"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
         <!-- 申报类型 -->

@@ -38,10 +38,10 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.returnStatus"
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
                 :key="index"
-                :label="item.name"
-                :value="item.code"
+                :label="item.itemChineseName"
+                :value="item.itemCode"
               ></el-option>
             </el-select>
           </Formitem>
@@ -221,19 +221,19 @@ export default {
       receiptDataHead: [
         {
           name: "回执状态",
-          value: "receiptStatus",
-          width: "",
+          value: "returnStatus",
+          width: "120",
           align: "left",
         },
         {
           name: "状态时间",
-          value: "statusTime",
+          value: "returnTime",
           width: "",
           align: "left",
         },
         {
           name: "回执描述",
-          value: "receiptDescription",
+          value: "returnInfo",
           width: "",
           align: "left",
         },

@@ -46,15 +46,20 @@
         <!-- 业务状态 -->
         <el-col :span="3">
           <Formitem label="业务状态" prop="returnStatus">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--returnStatus"
-              resize="none"
               v-model="formData.returnStatus"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
         <!-- 报送时间 -->
@@ -116,15 +121,20 @@
         <!-- 运输方式 -->
         <el-col :span="3">
           <Formitem label="运输方式" prop="trafMode">
-            <el-input
+            <el-select
               type="text"
-              class="inputShadow"
               id="inputInner--trafMode"
-              resize="none"
               v-model="formData.trafMode"
               clearable
               placeholder=""
-            ></el-input>
+            >
+              <el-option
+                v-for="(item, index) in $store.getters.dict.DECLARE_TRAFMODE"
+                :key="index"
+                :label="item.itemChineseName"
+                :value="item.itemValue"
+              ></el-option>
+            </el-select>
           </Formitem>
         </el-col>
       </el-row>

@@ -38,10 +38,10 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in dictData.returnStatus"
+                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
                 :key="index"
-                :label="item.name"
-                :value="item.code"
+                :label="item.itemChineseName"
+                :value="item.itemCode"
               ></el-option>
             </el-select>
           </Formitem>
@@ -253,19 +253,19 @@ export default {
       receiptDataHead: [
         {
           name: "回执状态",
-          value: "receiptStatus",
-          width: "",
+          value: "returnStatus",
+          width: "120",
           align: "left",
         },
         {
           name: "状态时间",
-          value: "statusTime",
+          value: "returnTime",
           width: "",
           align: "left",
         },
         {
           name: "回执描述",
-          value: "receiptDescription",
+          value: "returnInfo",
           width: "",
           align: "left",
         },

@@ -41,7 +41,6 @@ export default {
       //     })
       //   );
       // }
-      this.$store.dispatch("GetDict");
       location.replace(process.env.VUE_APP_BASE_ROUTE);
     } else {
       this.$router.push({ path: "/login" });

@@ -9,8 +9,8 @@
         size="small"
       >
         <el-row class="row-border">
-          <el-col :span="5">
           <!-- 提运单号 -->
+          <el-col :span="5">
             <Formitem label="提运单号" prop="billNo">
               <el-input
                 type="text"
@@ -23,8 +23,8 @@
               ></el-input>
             </Formitem>
           </el-col>
-          <el-col :span="5">
           <!-- 订单编号 -->
+          <el-col :span="5">
             <Formitem label="订单编号" prop="orderNo">
               <el-input
                 type="text"
@@ -37,8 +37,8 @@
               ></el-input>
             </Formitem>
           </el-col>
-          <el-col :span="5">
           <!-- 运单编号 -->
+          <el-col :span="5">
             <Formitem label="运单编号" prop="logisticsNo">
               <FormTextareaInput
                 :formData="sreachFormData"
@@ -47,8 +47,8 @@
               />
             </Formitem>
           </el-col>
-          <el-col :span="5">
           <!-- 创建时间 -->
+          <el-col :span="5">
             <Formitem label="创建时间" prop="createTime" :activeType="true">
               <el-date-picker
                 class="inputInner--createTime"
@@ -75,7 +75,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="2">
-            <!--  清空查询条件-->
             <el-form-item class="textLeft textCenter">
               <el-button
                 type="text"
@@ -89,27 +88,8 @@
           </el-col>
         </el-row>
         <el-row class="backgroundRow">
-          <!-- <el-col :span="5"> -->
-          <!-- 回执类型 -->
-          <!-- <Formitem label="回执类型" prop="receiptType">
-              <el-select
-                type="text"
-                id="inputInner--receiptType"
-                v-model="sreachFormData.receiptType"
-                clearable
-                placeholder=""
-              >
-                <el-option
-                  v-for="(item, index) in dictData.returnStatus"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.code"
-                ></el-option>
-              </el-select>
-            </Formitem> -->
-          <!-- </el-col> -->
-          <el-col :span="5">
           <!-- 回执状态 -->
+          <el-col :span="5">
             <Formitem label="回执状态" prop="receiptStatus">
               <el-select
                 type="text"
@@ -119,10 +99,10 @@
                 placeholder=""
               >
                 <el-option
-                  v-for="(item, index) in dictData.returnStatus"
+                  v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
                   :key="index"
-                  :label="item.name"
-                  :value="item.code"
+                  :label="item.itemChineseName"
+                  :value="item.itemCode"
                 ></el-option>
               </el-select>
             </Formitem>

+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  name: "",
+  data() {
+    return {};
+  },
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>