红旗未结核对等前端代码

vue/src/components/ImportExcel-base/index.vue

@@ -338,7 +338,7 @@ export default {
           Wms_HqKB_Output: "红旗数据调整",
           Wms_onetimesale_Output: "一次性寄售销售",
           wmsOutputSum: "WMS未结出库单",
-          
+          unHQSettle: "红旗未结明细",
         }[this.crmType] || ""
       );
     },
@@ -400,6 +400,7 @@ export default {
           Wms_onetimesale_Output:
             "/api/settleaccount/WmsOneTimeSaleOutput/ExcelImport", //红旗数据调整导入
           wmsOutputSum: "/api/settleaccount/WmsOneTimeSaleOutput/ExcelImport", //WMS未结出库单
+          unHQSettle: "/api/settleaccount/UnHQSettle/ExcelImport", //红旗未结明细
         
           //HQ_Y_CHECKOUT: "/api/settleaccount//ExcelImport", //一汽轿车平台备件出库单导入
         }[this.crmType] || ""

vue/src/router/index.js

@@ -22,6 +22,7 @@ import btcarDataRouter from './modules/bt_menu'
 import vwOutOrderDataRouter from './modules/vw_out_order'
 import hqOutOrderDataRouter from './modules/hq_out_order'
 import vwsOutOrderDataRouter from './modules/wms_out_order'
+import onetimesaleDataRouter from './modules/onetimesale'
 import pgfis from './modules/fis'
 import pgfisPrint from './modules/fisprint'
 
@@ -181,6 +182,7 @@ export const asyncRoutes = [
   hqMenudataRouter,//红旗
   vwOutOrderDataRouter,
   hqOutOrderDataRouter,
+  onetimesaleDataRouter,//一次性寄售销售
   vwsOutOrderDataRouter,//wms相关操作
   //btcarDataRouter,//一汽轿车
   //vwFisDataRouter,//结算与开票数据导入

vue/src/router/modules/hq_menu.js

@@ -18,7 +18,7 @@ const hqMenudataRouter = {
             component: () => import('@/views/ux/vw/dataInput/hq_open'),
             name: 'ERPEI',//命名路由
             meta: {
-                title: '红旗工厂未结明细',
+                title: '红旗未结导入',
                 roles: ['SettleAccount.HQ_HPlatform'],//控制页面角色（可以设置多个角色）
                 icon: '单据导入'
             }
@@ -28,7 +28,7 @@ const hqMenudataRouter = {
             component: () => import('@/views/ux/vw/dataInput/hq_h'),
             name: 'ERPEI',//命名路由
             meta: {
-                title: '红旗工厂平台导入',
+                title: '红旗结算导入',
                 roles: ['SettleAccount.HQ_HPlatform'],//控制页面角色（可以设置多个角色）
                 icon: '单据导入'
             }
@@ -58,9 +58,19 @@ const hqMenudataRouter = {
             component: () => import('@/views/ux/vw/dataInput/hq_unsettle_report'),
             name: 'HQUnSettle',
             meta: {
-                title: '红旗看板未结明细',
+                title: '红旗未结明细',
                 roles: ['SettleAccount.Reports'],
-                icon: '文件'
+                icon: '期间'
+            }
+        },
+        {
+            path: 'hq_unsettle_factory',
+            component: () => import('@/views/ux/vw/dataInput/hq_unsettle_factory'),
+            name: 'HQUnSettle',
+            meta: {
+                title: '红旗未结核对',
+                roles: ['SettleAccount.Reports'],
+                icon: '未结算'
             }
         },
         {

vue/src/router/modules/hq_out_order.js

@@ -98,16 +98,16 @@ const hqOutOrderDataRouter = {
       }
     },
 
-    {
+    // {
-      path: 'onetime-sale-outorder',
+    //   path: 'onetime-sale-outorder',
-      component: () => import('@/views/ux/vw/dataInput/OnetimeSale'),
+    //   component: () => import('@/views/ux/vw/dataInput/OnetimeSale'),
-      name: 'WmsHQKBOutput',//命名路由
+    //   name: 'WmsHQKBOutput',//命名路由
-      meta: {
+    //   meta: {
-        title: '一次性寄售销售结算',
+    //     title: '一次性寄售销售结算',
-        roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+    //     roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
-        icon: '客户'
+    //     icon: '客户'
-      }
+    //   }
-    },
+    // },
 
 
 

vue/src/router/modules/onetimesale.js

@@ -0,0 +1,34 @@
+//大众-FIS结算-路由
+import Layout from '@/layout'
+
+const onetimesaleDataRouter = {
+  path: '/cpat-order-onetimesale',
+  component: Layout,
+  redirect: 'pg',
+  name: '业务数据',
+  //hidden: true,
+  meta: {
+    //requiresAuth: true,
+    title: '一次性寄售销售',
+    index: 0,
+    type: 'crm',
+    icon: '红旗',
+    roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+    keepAlive: false,
+  },
+  children: [
+    {
+      path: 'onetime-sale-outorder',
+      component: () => import('@/views/ux/vw/dataInput/OnetimeSale'),
+      name: 'WmsOneTimeSaleOutput',//命名路由
+      meta: {
+        title: '一次性寄售销售结算',
+        roles: ['SettleAccount.WMSHQ'],//控制页面角色（可以设置多个角色）
+        icon: '客户'
+      }
+    }
+
+  ]
+}
+
+export default onetimesaleDataRouter

vue/src/router/modules/wms_out_order.js

@@ -37,16 +37,16 @@ const vwsOutOrderDataRouter = {
         icon: '零件'
       }
     },
-    {
+    // {
-      path: '/nonDeliveryList',
+    //   path: '/nonDeliveryList',
-      component: () => import('@/views/ux/billManage/NonDeliveryList'),
+    //   component: () => import('@/views/ux/billManage/NonDeliveryList'),
-      name: 'NonDeliveryList',//命名路由
+    //   name: 'NonDeliveryList',//命名路由
-      meta: {
+    //   meta: {
-        title: 'WMS未出库清单',
+    //     title: 'WMS未出库清单',
-        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+    //     roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
-        icon: '零件'
+    //     icon: '零件'
-      }
+    //   }
-    },
+    // },
 
 
 

vue/src/views/ux/billManage/FisUpdateExport/index.vue

@@ -854,7 +854,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "准时化未结差异比对输出";
+      this.listQuery.name = "Fis发货数据更新状态";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)

vue/src/views/ux/vw/dataInput/hq_open/index.vue

@@ -294,8 +294,8 @@ export default {
         width: 170,
       });
       tempsTabs.push({ label: "数量", prop: "qty", width: 100 });
-      tempsTabs.push({ label: "单价", prop: "price", width: 100 });
+      // tempsTabs.push({ label: "单价", prop: "price", width: 100 });
-      tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
+      // tempsTabs.push({ label: "金额", prop: "amt", width: 100 });
       tempsTabs.push({ label: "供应商", prop: "supplier", width: 120 });
       tempsTabs.push({
         label: "存储地点",
@@ -429,7 +429,8 @@ export default {
         if (date == undefined) {
           return "";
         }
-        return moment(date).format("YYYY-MM-DD HH:mm:ss");
+        return moment(date).format("YYYY-MM-DD");
+        //return moment(date).format("YYYY-MM-DD HH:mm:ss");
       }
       return row[column.property] || "--";
     },

vue/static/tableFieldForSearch.json

@@ -2926,6 +2926,51 @@
       }
     ]
   },
+  "unHQSettle": {
+    "id": "36",
+    "data": [
+      {
+        "fieldId": 3,
+        "formType": "text",
+        "name": "工厂",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "factory",
+        "setting": []
+      },
+      {
+        "fieldId": 3,
+        "formType": "text",
+        "name": "看板号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "hqhKanBan",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "物料号",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "materialCode",
+        "setting": []
+      },
+      {
+        "fieldId": 5,
+        "formType": "text",
+        "name": "存储地点描述",
+        "type": 1,
+        "value": "",
+        "fieldType": 1,
+        "fieldName": "storageLocationDesc",
+        "setting": []
+      }
+    ]
+  },
   "hqMPlatform": {
     "id": "36",
     "data": [