From 86d627eecb14597a338ee402eab5a0c05ce1bdeb Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 27 十一月 2025 08:26:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/sell/XsSeOutStockBackBillList.vue |   49 +++++++++++++++++++++++++++++++++++--------------
 1 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index f73c289..7e8ac2f 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -15,6 +15,8 @@
             type="date"
             placeholder="寮�濮嬫棩鏈�"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -24,6 +26,8 @@
             type="date"
             placeholder="缁撴潫鏃ユ湡"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -624,7 +628,7 @@
 import dayjs from "dayjs";
 
 export default {
-  name: "GySource",
+  name: "XsSeOutStockBackBillList",
   components: { RowSettings },
   props: {
     openPage: { type: String },
@@ -632,7 +636,7 @@
   data() {
     return {
       activeSeach: "",
-      HModName: "Cg_POOrderBillList",
+      HModName: "XsSeOutStockBackBillList",
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -641,7 +645,7 @@
       openPrintList: false,
       printListShow: false,
       HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "1202",
+      HBillType: "1105",
       openBtnHide: false,
       btnHideShow: false,
       rowHideShow: false,
@@ -673,6 +677,7 @@
         { label: "杩�30澶�", value: 29 },
         { label: "杩戝崐骞�", value: 180 },
         { label: "杩戜竴骞�", value: 365 },
+        { label: "浠绘剰鏃堕棿", value: -1 },
       ],
       hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
       addBtnShow: false,
@@ -691,7 +696,6 @@
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
-      user: "admin",
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -878,6 +882,10 @@
       this.getList();
     },
     riqiChange() {
+      if (this.queryParams.HInitTimeCycle == -1) {
+        // 浠绘剰鏃堕棿
+        return;
+      }
       const end = dayjs(new Date()).format("YYYY-MM-DD");
       const start = dayjs(new Date())
         .subtract(this.queryParams.HInitTimeCycle, "d")
@@ -953,7 +961,7 @@
         let res = await axios.get(this.baseURL + "/Xs_SeOutStockBackBill/list_byPage", {
           params: {
             sWhere: this.sWhere,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             Organization: HOrgName,
             page: this.page,
             size: this.pageSize,
@@ -1042,7 +1050,12 @@
             }
           }
           option.data = result;
-          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+          this.DisPlay_HideColumn(
+            this.HModName,
+            sessionStorage["HUserName"],
+            option,
+            this.dataList
+          );
         }
       } catch (err) {
         this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1335,7 +1348,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1424,7 +1437,7 @@
                   HQty: this.rowForm.HQty,
                   HSourceInterID: this.rowForm.HSourceInterID,
                   HSourceEntryID: this.rowForm.HSourceEntryID,
-                  user: this.user,
+                  user: sessionStorage["HUserName"],
                 },
               })
               .then((res) => {
@@ -1450,7 +1463,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
-          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            TypeError: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1475,7 +1492,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1503,7 +1520,7 @@
               HInterID: HInterID,
               HEntryID: HEntryID,
               ISAudit: num,
-              CurUserName: this.user,
+              CurUserName: sessionStorage["HUserName"],
             },
           }
         );
@@ -1529,7 +1546,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1551,7 +1568,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1617,7 +1638,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",

--
Gitblit v1.9.1