Merge branch 'branch_ccpg_220107' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG into branch_ccpg_220107

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

@@ -308,15 +308,15 @@ export default {
           vwoutorder: "准时化出库单",
           sparepartoutorder: "大众备件出库单",
           kanbanoutorder: "大众看板出库单",
-          HQ_H_OUTORDER:"红旗H平台出库单",
+          HQ_H_OUTORDER: "红旗H平台出库单",
-          HQ_M_OUTORDER:"红旗M平台出库单",
+          HQ_M_OUTORDER: "红旗M平台出库单",
-          HQ_Y_OUTORDER:"一汽轿车平台出库单",
+          HQ_Y_OUTORDER: "一汽轿车平台出库单",
-		      HQ_F_OUTORDER:"红旗F平台出库单",
+          HQ_F_OUTORDER: "红旗F平台出库单",
-          HQ_F_OUTORDER_CHICKOUT:"红旗F平台备件出库单",
+          HQ_F_OUTORDER_CHICKOUT: "红旗F平台备件出库单",
           bomdatabase: "产品结构BOM",
-          HQ_H_CHECKOUT:"红旗H平台备件出库单",
+          HQ_H_CHECKOUT: "红旗H平台备件出库单",
-          HQ_M_CHECKOUT:"红旗M平台备件出库单",
+          HQ_M_CHECKOUT: "红旗M平台备件出库单",
-          //HQ_Y_CHECKOUT:"一汽轿车平台备件出库单",
+          HQ_Y_CHECKOUT: "一汽轿车平台备件出库单",
           prebatch: "预批量",
           secondaryPriceRatio: "二配结算价格比例",
           factory: "工厂设置",
@@ -331,7 +331,6 @@ export default {
           customerStorageLocation: "客户存储地点",
           secondaryAdjustment: "二配数量调整输入",
           secondaryDiscount: "二配折扣调整输入",
-
         }[this.crmType] || ""
       );
     },
@@ -349,15 +348,16 @@ export default {
           vwoutorder: "/api/settleaccount/wmsjitoutput/ExcelImport", //准时化出库单导入
           kanbanoutorder: "/api/settleaccount/wmskanbanoutput/ExcelImport", //大众看板出库单导入
           HQ_H_OUTORDER: "/api/settleaccount/WmsHQHKanbanoutput/ExcelImport", //红旗H平台出库单导入
-		      HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //红旗F平台出库单导入
+          HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //红旗F平台出库单导入
-          HQ_F_OUTORDER_CHICKOUT:"/api/settleaccount/wmsHQFSharePartoutput/ExcelImport",//红旗F平台备件出库单
+          HQ_F_OUTORDER_CHICKOUT:
-
+            "/api/settleaccount/wmsHQFSharePartoutput/ExcelImport", //红旗F平台备件出库单
 
           HQ_F_OUTORDER: "/api/settleaccount/WMSHQFKanbanoutput/ExcelImport", //红旗F平台出库单导入
-          HQ_F_OUTORDER_CHICKOUT:"/api/settleaccount/wmsHQFSharePartoutput/ExcelImport",//红旗F平台备件出库单导入
+          HQ_F_OUTORDER_CHICKOUT:
+            "/api/settleaccount/wmsHQFSharePartoutput/ExcelImport", //红旗F平台备件出库单导入
 
           HQ_M_OUTORDER: "/api/settleaccount/WMSHQMKanbanoutput/ExcelImport", //红旗M平台出库单导入
-          HQ_Y_OUTORDER: "/api/settleaccount/WmsHQCaroutput/ExcelImport", //一汽轿车平台出库单导入
+          HQ_Y_OUTORDER: "/api/settleaccount//ExcelImport", //一汽轿车平台出库单导入
 
           sparepartoutorder:
             "/api/settleaccount/wmsSharePartoutput/ExcelImport", //大众备件出库单导入
@@ -383,9 +383,9 @@ export default {
             "/api/settleaccount/SecondaryAdjustment/ExcelImport",
           secondaryDiscount: "/api/settleaccount/SecondaryDiscount/ExcelImport",
 
-          HQ_H_CHECKOUT:"/api/settleaccount/WmsHQHSharePartoutput/ExcelImport", //H平台备件出库单导入
+          HQ_H_CHECKOUT: "/api/settleaccount/WmsHQHSharePartoutput/ExcelImport", //H平台备件出库单导入
-          HQ_M_CHECKOUT:"/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //M平台备件出库单导入
+          HQ_M_CHECKOUT: "/api/settleaccount/WmsHQMSharePartoutput/ExcelImport", //M平台备件出库单导入
-          //HQ_Y_CHECKOUT:"/api/settleaccount//ExcelImport" //一汽轿车平台备件出库单导入
+          HQ_Y_CHECKOUT: "/api/settleaccount//ExcelImport", //一汽轿车平台备件出库单导入
         }[this.crmType] || ""
       );
     },

vue/src/views/ux/vw/dataInput/hq_f_outorder_chickout/detail.vue

@@ -274,12 +274,12 @@ export default {
         prop: "version",
         width: 110,
       });
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "订货看板编号",
+      //   label: "订货看板编号",
-        prop: "kanban",
+      //   prop: "kanban",
-        width: 150,
+      //   width: 150,
-      });
+      // });
-      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
+      // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
       tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
       tempsTabs.push({
         label: "物料组(车型)",
@@ -287,7 +287,8 @@ export default {
         width: 220,
       });
       tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
-      tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
 
       return tempsTabs;

vue/src/views/ux/vw/dataInput/hq_h_checkout/detail.vue

@@ -274,20 +274,21 @@ export default {
         prop: "version",
         width: 110,
       });
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "订货看板编号",
+      //   label: "订货看板编号",
-        prop: "kanban",
+      //   prop: "kanban",
-        width: 150,
+      //   width: 150,
-      });
+      // });
-      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
+      // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
       tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
       tempsTabs.push({
         label: "物料组(车型)",
         prop: "materialGroup",
         width: 220,
       });
-      tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
+      tempsTabs.push({ label: "结算零件号", prop: "extend1", width: 220 });
-      tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
 
       return tempsTabs;

vue/src/views/ux/vw/dataInput/hq_h_outorder/detail.vue

@@ -36,7 +36,7 @@
         v-model="searchContent"
         clearable
         size="small"
-        placeholder="按照零件号搜索..."
+        placeholder="按照看板号搜索..."
         style="width: 230px"
         class="search-container"
         @keyup.enter.native="handleFilter"
@@ -275,6 +275,11 @@ export default {
         prop: "version",
         width: 110,
       });
+      tempsTabs.push({
+        label: "订单号",
+        prop: "billNum",
+        width: 170,
+      });
       tempsTabs.push({
         label: "订货看板编号",
         prop: "kanban",
@@ -504,7 +509,7 @@ export default {
       this.getList();
       this.listQuery.Filters = [];
       if (this.searchContent != "") {
-        var column = "materialCode";
+        var column = "billNum";
         let filter = {
           logic: 0,
           column: column,

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

@@ -715,6 +715,14 @@ export default {
         });
         return;
       } else {
+        if(this.stateNameCateMap == Failed){
+         this.$message({
+          message:
+            "已经生成出库单的不能再确认！单号：" ,
+            
+          type: "warning",
+        });
+        }else{
         var params = [];
         let myalert = ""; //声明变量，其变量必须在此声明后使用
         if (row) {
@@ -757,6 +765,7 @@ export default {
               message: "已取消操作",
             });
           });
+          }
       }
     },
     //出库单

vue/src/views/ux/vw/dataInput/hq_m_checkout/detail.vue

@@ -274,12 +274,12 @@ export default {
         prop: "version",
         width: 110,
       });
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "订货看板编号",
+      //   label: "订货看板编号",
-        prop: "kanban",
+      //   prop: "kanban",
-        width: 150,
+      //   width: 150,
-      });
+      // });
-      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
+      // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
       tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
       tempsTabs.push({
         label: "物料组(车型)",
@@ -287,7 +287,8 @@ export default {
         width: 220,
       });
       tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
-      tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
 
       return tempsTabs;

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

@@ -570,6 +570,7 @@ export default {
       multipleSelection: [],
       tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
+      isEdit1: false,
       menuCateMap: [
         { label: "导出", value: "导出", cssName: "warning" },
         { label: "消息", value: "消息", cssName: "info" },
@@ -715,6 +716,7 @@ export default {
         });
         return;
       } else {
+        
         var params = [];
         let myalert = ""; //声明变量，其变量必须在此声明后使用
         if (row) {
@@ -757,6 +759,7 @@ export default {
               message: "已取消操作",
             });
           });
+        
       }
     },
     //出库单

vue/src/views/ux/vw/dataInput/hq_y_checkout/detail.vue

@@ -231,12 +231,12 @@ export default {
         prop: "version",
         width: 110,
       });
-      tempsTabs.push({
+      // tempsTabs.push({
-        label: "订货看板编号",
+      //   label: "订货看板编号",
-        prop: "kanban",
+      //   prop: "kanban",
-        width: 150,
+      //   width: 150,
-      });
+      // });
-      tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
+      // tempsTabs.push({ label: "交货单号", prop: "wmsBillNum", width: 110 });
       tempsTabs.push({ label: "Sap编码", prop: "materialCode", width: 150 });
       tempsTabs.push({
         label: "物料组(车型)",
@@ -244,7 +244,8 @@ export default {
         width: 220,
       });
       tempsTabs.push({ label: "发货零件号", prop: "extend1", width: 220 });
-      tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      //tempsTabs.push({ label: "收货仓库", prop: "extend2", width: 120 });
+      tempsTabs.push({ label: "寄售库存", prop: "StockQty", width: 100 });
       tempsTabs.push({ label: "结算数量", prop: "qty", width: 100 });
 
       return tempsTabs;