待测试功能代码增加

jinhui.wang
Commit 6a82cec2de8f0ce502bc93c9412a4287f6dbaf96 6a82cec2 1 parent 5f942ddb
Showing 8 changed files with 44 additions and 74 deletions
src/api/system/logConfig.js
src/assets/icons/svg/processing.svg
src/assets/languages/dictLabels.js
src/router/index.js
src/views/allocationConfig/cargoAllocation/index.vue
src/views/basicInformation/queryCargo/index.vue
src/views/systemLog/dmLog/index.vue
vue.config.js
--- a/src/api/system/logConfig.js 0 → 100644
View file @6a82cec
+++ b/src/api/system/logConfig.js 0 → 100644
View file @6a82cec
+import request from '@/utils/request'
+
+// DM数据查询
+/**
+ * @param createTime 创建时间 *
+ * @param fltNo 航班号
+ * @param fltDate 航班日期
+ * @param status 状态
+ * @param portName 口岸名称
+ * @param page 页数 *
+ * @param size 数据长度 
+ */
+export function getDmDataList(data) {
+  return request({
+    url: '/dmDataLog/getDmDataList',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
--- a/src/assets/icons/svg/processing.svg 0 → 100644
View file @6a82cec
+++ b/src/assets/icons/svg/processing.svg 0 → 100644
View file @6a82cec
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1650528704724" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2035" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M396.00128 892.68224c-130.6624-16.62976-247.6032-63.52896-247.6032-122.38336V692.8384c51.48672 38.62528 131.8912 66.23232 225.64864 79.33952 0.4096-20.84864 2.8672-41.21088 7.24992-60.87168-124.60032-18.14528-232.89856-63.7696-232.89856-120.34048v-77.45536c61.80864 46.36672 165.0688 77.08672 283.4432 85.44256a310.12864 310.12864 0 0 1 54.84544-58.61376c-161.792-2.176-338.28864-56.44288-338.28864-128.77824V354.05824C221.30688 408.69888 351.55968 442.04032 496.64 442.04032c145.03936 0 275.328-33.30048 348.24192-87.98208v57.50784c0 28.22144-27.02848 53.69856-69.4272 74.42432a307.38944 307.38944 0 0 1 65.29024 30.22848c1.26976-0.94208 2.8672-1.76128 4.1728-2.70336v5.24288a307.26144 307.26144 0 0 1 60.87168 50.5856V252.1088c0-108.25728-175.88224-189.89056-409.10848-189.89056s-409.1904 81.63328-409.1904 189.89056v518.18496c0 98.01728 144.26112 173.95712 344.55552 187.51488a306.62144 306.62144 0 0 1-36.0448-65.1264zM496.64 123.12576c164.40832 0 348.24192 55.17312 348.24192 128.98304S661.04832 381.09184 496.64 381.09184c-164.37248 0-348.20096-55.17312-348.20096-128.98304S332.26752 123.12576 496.64 123.12576z" p-id="2036"></path><path d="M731.4176 907.264l-95.0272-72.25344h-11.1872c-5.57056 0-5.57056 5.61152-5.57056 11.10016v38.87104c-39.15264-22.20032-67.09248-61.07136-72.65792-105.50784 0-11.10016-16.7936-22.24128-27.97568-22.24128-11.18208 0-22.36416 16.74752-22.36416 27.84768 5.61152 44.4416 27.97568 83.30752 55.9104 111.08352 22.36416 16.62976 44.72832 33.30048 67.09248 44.4416v44.44672c0 5.5296 0 5.5296 5.57056 5.5296 5.61664 5.61152 5.61664 5.61152 11.1872 5.61152l95.0272-72.25344s5.61664-5.5296 5.61664-11.10016c-0.00512-0.04608-0.00512-5.57568-5.62176-5.57568z m162.16064-183.25504l39.12192-22.24128c5.61152 0 5.61152-5.57056 5.61152-11.10016s0-5.5296-5.61152-11.10016l-111.8208-44.40064h-11.14112c-5.57056 0-5.57056 5.52448-5.57056 5.52448l-5.61664 122.22464c0 5.5296 0 5.5296 5.61664 5.5296h11.14112l33.54624-22.20032c0 44.4416-16.7936 88.84224-55.9104 116.65408-11.1872 11.10016-11.1872 22.20032-5.61664 33.30048 11.1872 11.10016 22.36928 11.10016 33.5104 0 55.95136-33.37728 83.97312-105.5488 72.73984-172.19072z m-234.7776-72.25344c0-5.5296 0-5.5296-5.61152-11.10016l-33.55136-16.62976c39.15776-22.20032 83.8912-27.77088 128.61952-11.10016 11.14112 5.61664 27.9296 0 33.50016-16.62976 5.61664-11.10016 0-27.77088-16.74752-33.30048-61.48096-22.20032-139.8016-5.57056-190.09536 33.30048l-44.72832-22.24128h-11.18208c0 5.61152-5.57056 5.61152 0 11.10016l11.18208 116.65408s0 5.57056 5.61664 5.57056h11.18208l111.8208-50.01216v-5.61152h-0.00512z" p-id="2037"></path></svg>
\ No newline at end of file
--- a/src/assets/languages/dictLabels.js
View file @6a82cec
+++ b/src/assets/languages/dictLabels.js
View file @6a82cec
@@ -21,13 +21,13 @@ let ductLabels = {
     },
     "role": {//角色设置
         "valid": {
-            "1": "开启",
+            "1": "启用",
             "2": "关闭",
         },
     },
     "user": {//用户设置
         "isValid": {
-            "1": "开启",
+            "1": "启用",
             "2": "关闭",
         },
     },
@@ -55,6 +55,9 @@ let ductLabels = {
             "1": "已处理",
             "2": "处理失败",
             "3": "无需处理",
+            "4": "校验不通过",
+            "5": "数据不能被多次处理",
+            "9": "处理中",
         },
     }
 }
--- a/src/router/index.js
View file @6a82cec
+++ b/src/router/index.js
View file @6a82cec
@@ -89,8 +89,8 @@ export const constantRoutes = [
 ]
 export default new Router({
-  mode: 'history', // 去掉url中的#
+  mode: 'hash', // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes,
-  base: '/iMac'
+  base: '/test'
 })
\ No newline at end of file
--- a/src/views/allocationConfig/cargoAllocation/index.vue
View file @6a82cec
+++ b/src/views/allocationConfig/cargoAllocation/index.vue
View file @6a82cec
@@ -72,7 +72,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="6">
+        <el-col :span="6">
           <el-form-item label="ACCSpool">
             <el-select
               placeholder="不限"
@@ -97,7 +97,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-        </el-col> -->
+        </el-col>
         <el-col :span="6">
           <el-form-item label="运单号">
             <el-input
@@ -181,6 +181,7 @@
                   :controls="false"
                   :min="0"
                   :precision="2"
+                  clearable
                 ></el-input-number
               ></el-col>
               <el-col class="line" :span="2">-</el-col>
@@ -192,6 +193,7 @@
                   :controls="false"
                   :min="formData.minWeight"
                   :precision="2"
+                  clearable
                 ></el-input-number
               ></el-col>
             </el-row>
@@ -207,6 +209,7 @@
                 v-model="formData.minNumber"
                 :controls="false"
                 :min="0"
+                clearable
               ></el-input-number
             ></el-col>
             <el-col class="line" :span="2">-</el-col>
@@ -217,6 +220,7 @@
                 v-model="formData.maxNumber"
                 :controls="false"
                 :min="formData.minNumber"
+                clearable
               ></el-input-number
             ></el-col>
             </el-row>
@@ -308,7 +312,7 @@
           size="mini"
           v-hasPermi="['allocation:cargo:allocation']"
           @click="addFit"
-          :disabled="tableSelection.length <= 0 || formData.accsPool!='OSPR'"
+          :disabled="tableSelection.length <= 0"
           >添加到航班</el-button
         >
         <div class="tips">
@@ -319,16 +323,20 @@
     </el-form>
     <Tables
       ref="newTables"
+      ductName="cargo"
       :data="tableData"
       :headerData="tableHeader"
       :totalCount="totalCount"
       :loading="loading"
+      :selection="true"
       :limitSize="size"
       :limitStart="formData.limitStart"
       :page="page"
       :shiftKey="shiftKey"
       :infoShow="false"
       :height="tableHeight"
+      :pageSizes="[100]"
+      @sizeChange="sizeChange"
       @tableSelect="tableSelect"
       @tableSelectAll="tableSelectAll"
       @currentChange="currentChange"
@@ -376,31 +384,10 @@ export default {
         handingCodes: null,
         subCategorys: null,
         customsReceiptStatusId: null,
-        // accsPool:"OSPR"
+        accsPool:"OSPR"
       }, //查询数据
       tableHeader: [
         {
-          type: "selection",
-          name: "",
-          value: "",
-          width: "50",
-          align: "center",
-          sorTable: false,
-          fixed: true,
-          disabled:true
-        },
-        {
-          type: "index",
-          name: "",
-          value: "",
-          width: "50",
-          align: "center",
-          sorTable: false,
-          fixed: false,
-          disabled:true
-        },
-        {
-          type: "",
           name: "口岸代码",
           value: "portName",
           width: "100",
@@ -410,7 +397,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "取件日期",
           value: "pickUpDate",
           width: "120",
@@ -420,7 +406,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "取件扫描号",
           value: "pickUpScanNo",
           width: "120",
@@ -430,7 +415,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "站点",
           value: "siteName",
           width: "80",
@@ -440,7 +424,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "运单号",
           value: "waybillNo",
           width: "120",
@@ -450,7 +433,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "总单号",
           value: "totalWaybillNo",
           width: "120",
@@ -460,7 +442,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "服务类型",
           value: "serviceTypeName",
           width: "100",
@@ -470,7 +451,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "服务代码",
           value: "serviceCode",
           width: "100",
@@ -480,7 +460,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "URSA",
           value: "ursa",
           width: "100",
@@ -490,7 +469,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "申报类型",
           value: "typeName",
           width: "100",
@@ -500,7 +478,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "HandlingCode",
           value: "handingCode",
           width: "150",
@@ -510,7 +487,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "subcategory",
           value: "subCategory",
           width: "140",
@@ -520,7 +496,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "件数",
           value: "qty",
           width: "80",
@@ -530,7 +505,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "实际重量",
           value: "actualWeight",
           width: "100",
@@ -540,7 +514,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "收件人国家代码",
           value: "consigneeCountry",
           width: "150",
@@ -550,7 +523,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "品名描述",
           value: "nameDescription",
           width: "100",
@@ -560,7 +532,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "海关回执状态",
           value: "customsReceiptStatusName",
           width: "140",
@@ -570,7 +541,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "预审状态",
           value: "preQualificationStatus",
           width: "100",
@@ -580,7 +550,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "航班预审意见",
           value: "caPretrialOpinion",
           width: "120",
@@ -590,7 +559,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "货物状态",
           value: "statusName",
           width: "100",
@@ -600,7 +568,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "终配航班号",
           value: "finalFlightNo",
           width: "120",
@@ -610,7 +577,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "终配航班日期",
           value: "finalFlightTime",
           width: "140",
@@ -620,7 +586,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "二配航班号",
           value: "twoMatchFlightNo",
           width: "120",
@@ -630,7 +595,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "二配航班日期",
           value: "twoMatchFlightTime",
           width: "150",
@@ -640,7 +604,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "预配航班号",
           value: "preplanFlightNo",
           width: "120",
@@ -650,7 +613,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "预配航班日期",
           value: "preplanFlightTime",
           width: "150",
@@ -660,7 +622,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "ACCS原航班号",
           value: "fltNoAccs",
           width: "150",
@@ -670,7 +631,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "ACCS原航班日期",
           value: "fltDateAccs",
           width: "150",
@@ -680,7 +640,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "ACCS原航线",
           value: "accsFlightRoute",
           width: "140",
@@ -690,7 +649,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "是否RDE手工录入",
           value: "manualRde",
           width: "170",
@@ -700,7 +658,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "是否自动",
           value: "cargoRulesStatus",
           width: "100",
@@ -710,7 +667,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "发件人账号",
           value: "shipperAccount",
           width: "120",
@@ -720,7 +676,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "发件公司中文名称",
           value: "shipperCompany",
           width: "150",
@@ -730,7 +685,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "始发地城市名称",
           value: "originCity",
           width: "130",
@@ -740,7 +694,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "收件地",
           value: "destinationSiteName",
           width: "90",
@@ -750,7 +703,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "尺寸",
           value: "sizeStr",
           width: "80",
@@ -760,7 +712,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "大货预审意见（是否可以配置航班）",
           value: "bigPretrialOpinion",
           width: "250",
@@ -770,7 +721,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "大货预审时间",
           value: "bigPretrialTime",
           width: "120",
@@ -780,7 +730,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "海关回执时间",
           value: "customsReceiptTime",
           width: "150",
@@ -790,7 +739,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "航班预审时间",
           value: "caPretrialTime",
           width: "150",
@@ -800,7 +748,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "创建人",
           value: "createUserName",
           width: "90",
@@ -810,7 +757,6 @@ export default {
           disabled:true
         },
         {
-          type: "",
           name: "创建时间",
           value: "createTime",
           width: "100",
@@ -859,6 +805,9 @@ export default {
   activated(){
     this.select();
   },
+  deactivated(){
+    this.tableData = []
+  },
   mounted() {
     window.addEventListener("keydown", (code) => {
       if (code.keyCode === 16 && code.shiftKey) {
@@ -1118,9 +1067,6 @@ export default {
       },
     },
   },
-  deactivated(){
-    this.tableData = []
-  },
 };
 </script>
--- a/src/views/basicInformation/queryCargo/index.vue
View file @6a82cec
+++ b/src/views/basicInformation/queryCargo/index.vue
View file @6a82cec
--- a/src/views/systemLog/dmLog/index.vue 0 → 100644
View file @6a82cec
+++ b/src/views/systemLog/dmLog/index.vue 0 → 100644
View file @6a82cec
--- a/vue.config.js
View file @6a82cec
+++ b/vue.config.js
View file @6a82cec
@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.FedEx.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.FedEx.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/iMac/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/test/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）