feat: 🚀 是否作废

package-lock.json

@@ -26,7 +26,7 @@
                 "lodash-es": "^4.17.21",
                 "mitt": "^3.0.0",
                 "nprogress": "^0.2.0",
-                "pinia": "^2.1.3",
+                "pinia": "^2.2.4",
                 "pinia-plugin-persistedstate": "^3.1.0",
                 "print-js": "^1.6.0",
                 "qs": "^6.11.2",
@@ -3526,9 +3526,9 @@
             }
         },
         "node_modules/@vue/devtools-api": {
-            "version": "6.5.0",
+            "version": "6.6.4",
-            "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
+            "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
-            "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
+            "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g=="
         },
         "node_modules/@vue/reactivity": {
             "version": "3.3.4",
@@ -9873,12 +9873,15 @@
             }
         },
         "node_modules/pinia": {
-            "version": "2.1.3",
+            "version": "2.2.4",
-            "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.3.tgz",
+            "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.2.4.tgz",
-            "integrity": "sha512-XNA/z/ye4P5rU1pieVmh0g/hSuDO98/a5UC8oSP0DNdvt6YtetJNHTrXwpwsQuflkGT34qKxAEcp7lSxXNjf/A==",
+            "integrity": "sha512-K7ZhpMY9iJ9ShTC0cR2+PnxdQRuwVIsXDO/WIEV/RnMC/vmSoKDTKW/exNQYPI+4ij10UjXqdNiEHwn47McANQ==",
             "dependencies": {
-                "@vue/devtools-api": "^6.5.0",
+                "@vue/devtools-api": "^6.6.3",
-                "vue-demi": ">=0.14.5"
+                "vue-demi": "^0.14.10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/posva"
             },
             "peerDependencies": {
                 "@vue/composition-api": "^1.4.0",
@@ -9903,9 +9906,9 @@
             }
         },
         "node_modules/pinia/node_modules/vue-demi": {
-            "version": "0.14.5",
+            "version": "0.14.10",
-            "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.5.tgz",
+            "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
-            "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==",
+            "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
             "hasInstallScript": true,
             "bin": {
                 "vue-demi-fix": "bin/vue-demi-fix.js",
@@ -9914,6 +9917,9 @@
             "engines": {
                 "node": ">=12"
             },
+            "funding": {
+                "url": "https://github.com/sponsors/antfu"
+            },
             "peerDependencies": {
                 "@vue/composition-api": "^1.0.0-rc.1",
                 "vue": "^3.0.0-0 || ^2.6.0"
@@ -17213,9 +17219,9 @@
             }
         },
         "@vue/devtools-api": {
-            "version": "6.5.0",
+            "version": "6.6.4",
-            "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
+            "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
-            "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
+            "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g=="
         },
         "@vue/reactivity": {
             "version": "3.3.4",
@@ -22253,18 +22259,18 @@
             "dev": true
         },
         "pinia": {
-            "version": "2.1.3",
+            "version": "2.2.4",
-            "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.3.tgz",
+            "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.2.4.tgz",
-            "integrity": "sha512-XNA/z/ye4P5rU1pieVmh0g/hSuDO98/a5UC8oSP0DNdvt6YtetJNHTrXwpwsQuflkGT34qKxAEcp7lSxXNjf/A==",
+            "integrity": "sha512-K7ZhpMY9iJ9ShTC0cR2+PnxdQRuwVIsXDO/WIEV/RnMC/vmSoKDTKW/exNQYPI+4ij10UjXqdNiEHwn47McANQ==",
             "requires": {
-                "@vue/devtools-api": "^6.5.0",
+                "@vue/devtools-api": "^6.6.3",
-                "vue-demi": ">=0.14.5"
+                "vue-demi": "^0.14.10"
             },
             "dependencies": {
                 "vue-demi": {
-                    "version": "0.14.5",
+                    "version": "0.14.10",
-                    "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.5.tgz",
+                    "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz",
-                    "integrity": "sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==",
+                    "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
                     "requires": {}
                 }
             }

package.json

@@ -38,7 +38,7 @@
         "lodash-es": "^4.17.21",
         "mitt": "^3.0.0",
         "nprogress": "^0.2.0",
-        "pinia": "^2.1.3",
+        "pinia": "^2.2.4",
         "pinia-plugin-persistedstate": "^3.1.0",
         "print-js": "^1.6.0",
         "qs": "^6.11.2",

src/api/modules/deliveryAndOutbound.ts

@@ -19,7 +19,6 @@ export const getDetailsApi = (id: any) => {
 export const getTaskDetailsApi = (params: any) => {
     return http.post<any>(`OutStockTask/GetInfoByNo`, params);
 };
-
 //修改出库箱信息
 export const getEditBoxInfoApi = (params: Record<string, any>) => {
     return http.post<any>(`OutStock/EditBoxInfo`, params);

src/api/modules/receiptAndWarehousing.ts

@@ -18,3 +18,7 @@ export const getDetailsApi = (id: any) => {
 export const getTaskDetailsApi = (id: any) => {
     return http.get<any>(`InStockTask/GetInfo/${id}`);
 };
+//同步成功
+export const getInStockSyncSuccessApi = (params: Record<string, any>) => {
+    return http.post<ResPage<any>>(`InStock/SyncSuccess`, params);
+};

src/api/modules/warehouseSaleNotice.ts

@@ -0,0 +1,18 @@
+import http from "@/api";
+//发货通知单详情 SalOutStockOrder/GetInfo
+export const getNoticerDetailsApi = (id: any) => {
+    return http.get<any>(`DeliveryNoticeOrder/GetInfo/${id}`);
+};
+//发货通知单列表
+export const getNoticeListApi = (params: Record<string, any>) => {
+    return http.post<any>(`DeliveryNoticeOrder/GetList`, params);
+};
+//发货通知单自定义条件
+export const getNoticeDictionaryApi = () => {
+    return http.get<any>(`Dictionary/deliverynotice`);
+};
+//getNoticeStatusApi
+//发货通知单据类型
+export const getNoticeStatusApi = () => {
+    return http.get<any>(`DeliveryNoticeOrder/GetStatus`);
+};

src/components.d.ts

@@ -49,6 +49,5 @@ declare module 'vue' {
     IEpSwitchButton: typeof import('~icons/ep/switch-button')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    Synchronous: typeof import('./components/ListBtns/components/Synchronous.vue')['default']
   }
 }

src/styles/element.scss

@@ -90,6 +90,7 @@
     flex: 1;
     flex-direction: column;
     width: 100%;
+    min-width: 1280px;
     height: 100%;
 
     // table-search 表格搜索样式

src/views/deliveryAndOutbound/outboundOrderList/index.vue

@@ -43,7 +43,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getOutStockListApi } from "@/api/modules/deliveryAndOutbound";

src/views/deliveryAndOutbound/outboundTaskList/constant/list/search.ts

@@ -68,6 +68,13 @@ export const FORMDATA: any[] = [
         type: "input",
         disabled: false,
         label: "序列号："
+    },
+    {
+        prop: "inStock",
+        placeholder: "请输入调用仓库",
+        type: "input",
+        disabled: false,
+        label: "调入仓库："
     }
 ];
 
@@ -87,5 +94,6 @@ export const RULEFORM: any = {
     ids: [],
     serialNumbers: "",
     boxBillNos: "",
-    orgId: null // 组织ID
+    orgId: null, // 组织ID
+    inStock: "" //调入仓库
 };

src/views/deliveryAndOutbound/outboundTaskList/constant/list/table.ts

@@ -1,4 +1,4 @@
-// import { STATUS } from "@/constant";
+// // import { STATUS } from "@/constant";
 // import { RenderScope } from "@/components/ProTable/interface";
 
 // 销售订单  表格配置项
@@ -89,6 +89,12 @@ export const COLUMNS = [
         prop: "realityQty",
         width: "120"
     },
+    {
+        align: "left",
+        label: "调入仓库",
+        prop: "inStock",
+        width: "120"
+    },
     {
         align: "left",
         label: "出库开始时间",

src/views/deliveryAndOutbound/outboundTaskList/details.vue

@@ -100,7 +100,6 @@ import { useMsg } from "@/hooks/useMsg";
 import { numberDecimalSeparatorRexg5 } from "@/utils/rexg/index";
 import { useAuthStore } from "@/stores/modules/auth";
 const authStore = useAuthStore();
-console.log(authStore, "============authStore=============");
 let labelWidth = "107px";
 
 const tableRef = ref<any>(null);
@@ -125,7 +124,6 @@ const getDetails = async (billNo: any) => {
     if (!billNo) {
         return false;
     }
-    console.log("12323");
     const result = await getTaskDetailsApi({
         billNo,
         pageSize: datas.pageSize,

src/views/deliveryAndOutbound/outboundTaskList/index.vue

@@ -33,7 +33,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getOutStockTaskListApi } from "@/api/modules/deliveryAndOutbound";
@@ -59,7 +58,7 @@ initSearch(datas);
  * @param type {string} 按钮类型
  * @param result {Object} 操作结果
  */
-//result?: Record<string, any>
+
 const handleParentCallback = () => {
     datas.ruleForm = cloneDeep(RULEFORM);
     proTable!.value.getTableList(datas.initParam);

src/views/export/list/index.vue

@@ -44,7 +44,6 @@
 <script setup lang="ts">
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { ref, reactive } from "vue";
 
 import { getListApi, getStatusApi } from "@/api/modules/exportList";

src/views/inOtherLibraries/boxModificationsList/index.vue

@@ -26,7 +26,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getChangeBoxRecordListApi } from "@/api/modules/inOtherLibraries";

src/views/inOtherLibraries/inboundOutboundRollbackList/constant/list/search.ts

@@ -49,5 +49,6 @@ export const RULEFORM: any = {
     subStockCode: "",
     type: "",
     createBeginDate: "",
-    createEndDate: ""
+    createEndDate: "",
+    materialNumber: ""
 };

src/views/inOtherLibraries/inboundOutboundRollbackList/index.vue

@@ -27,7 +27,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { useSetSearchData, useSearchStockCodeInfoArray } from "@/hooks/useSearch";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";

src/views/inOtherLibraries/movingBoxesList/index.vue

@@ -21,7 +21,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getmovingBoxesListApi } from "@/api/modules/inOtherLibraries";

src/views/inventory/inventoryList/index.vue

@@ -26,7 +26,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getTakeStockListApi } from "@/api/modules/inventory";

src/views/receiptAndWarehousing/ofInboundInstructionsList/details.vue

@@ -70,7 +70,6 @@ const getDetails = async (id: any) => {
         datas.ruleForm = data;
     }
 };
-getDetails($route.query.id);
 
 //动态计算表格高度
 const handleResize = () => {

src/views/receiptAndWarehousing/warehouseReceiptList/index.vue

@@ -25,13 +25,47 @@
                     {{ scope.row.billNo }}
                 </a>
             </template>
-            <!-- successSync -->
+            <!-- 只有采购入库单才显示同步状态 -->
             <template #successSync="scope">
-                <a @click="handleSuccessSync(scope.row)" :class="scope.row.successSync == '失败' ? 'break-word to-detail1' : ''">
+                <a
-                    {{ scope.row.successSync }}
+                    @click="handleSuccessSync(scope.row)"
+                    :class="
+                        scope.row.successSync == '失败' && (scope.row.type == '采购入库' || scope.row.type == '生产入库')
+                            ? 'break-word to-detail1'
+                            : ''
+                    "
+                >
+                    {{ scope.row.type == "采购入库" || scope.row.type == "生产入库" ? scope.row.successSync : "--" }}
                 </a>
             </template>
         </ProTable>
+        <!-- 同步成功操作弹窗 -->
+        <el-dialog v-model="datas.isSynchronous" title="修改同步状态" width="500" align-center @close="handleDiaLog">
+            <span style="font-size: 16px; color: red">确定入库数据已同步金蝶系统, 请输入金蝶入库单号</span>
+            <div>
+                <div style="display: flex; padding: 10px">
+                    <div style="flex: 1; text-align: left">入库单号</div>
+                    <div style="flex: 1; padding-left: 20px">来源单号</div>
+                    <div style="flex: 1; padding-left: 20px; text-align: left">
+                        <span style="padding-right: 3px; color: red">*</span>金蝶入库单号
+                    </div>
+                </div>
+                <div style="max-height: 200px; overflow: auto">
+                    <div v-for="item in datas.successSyncList" :key="item.id" style="display: flex; padding: 0 10px 10px">
+                        <el-input v-model="item.billNo" disabled style="flex: 1; padding-right: 20px" />
+                        <el-input v-model="item.sourceBillNo" disabled style="flex: 1; padding-right: 20px" />
+                        <el-input v-model="item.erpBillNo" style="flex: 1" :maxlength="20" />
+                    </div>
+                </div>
+            </div>
+
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="datas.isSynchronous = false">取消</el-button>
+                    <el-button type="primary" @click="handleSynchronousCommit"> 确认 </el-button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 
@@ -39,22 +73,24 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
-import { getInStockListApi } from "@/api/modules/receiptAndWarehousing";
+import { getInStockListApi, getInStockSyncSuccessApi } from "@/api/modules/receiptAndWarehousing";
 import { useRouter } from "vue-router";
 import { initSearch } from "./init/index";
 import { useSearchInfoArray, useSetSearchData } from "@/hooks/useSearch";
 import { ElMessageBox } from "element-plus";
+import { useMsg } from "@/hooks/useMsg";
 const proTable = ref<any>(null);
 // 数据源
-const datas = reactive({
+const datas: any = reactive<any>({
     exportList: cloneDeep(RULEFORM),
     columns: COLUMNS, //列表配置项
     initParam: cloneDeep(RULEFORM), // 初始化搜索条件|重置搜索条件
     ruleForm: cloneDeep(RULEFORM), // 搜索条件
-    formData: FORMDATA //搜索配置项
+    formData: FORMDATA, //搜索配置项
+    isSynchronous: false, //用于控制同步成功弹窗
+    successSyncList: [] //同步成功弹窗表格数据
 });
 //选中表格的行
 let selectionList = ref([]);
@@ -67,11 +103,24 @@ const $router = useRouter();
  * @param type {string} 按钮类型
  * @param result {Object} 操作结果
  */
-//result?: Record<string, any>
 //按钮回调
-const handleParentCallback = () => {
+const handleParentCallback = (params: Record<string, any>) => {
-    datas.ruleForm = cloneDeep(RULEFORM);
+    const { type } = params;
-    proTable!.value.getTableList(datas.initParam);
+    if (type === "Synchronous") {
+        selectionList.value.forEach((item: any) => {
+            datas.successSyncList.push({
+                id: item.id,
+                billNo: item.billNo,
+                sourceBillNo: item.sourceBillNo,
+                materialNumber: item.materialNumber,
+                erpBillNo: ""
+            });
+        });
+        datas.isSynchronous = true;
+    } else {
+        datas.ruleForm = cloneDeep(RULEFORM);
+        proTable!.value.getTableList(datas.initParam);
+    }
 };
 //搜索
 const handleSearch = () => {
@@ -100,7 +149,44 @@ const handleSuccessSync = (row: any) => {
         });
     }
 };
-
+//同步成功按钮弹窗确认事件
+const handleSynchronousCommit = async () => {
+    let isErpBillNo = datas.successSyncList.some((item: any) => {
+        return !item.erpBillNo;
+    });
+    if (isErpBillNo) {
+        useMsg("warning", "金蝶入库单号不能为空 ! ");
+        return;
+    }
+    let params: any = [];
+    datas.successSyncList.forEach((item: any) => {
+        params.push({
+            id: item.id,
+            sourceBillNo: item.sourceBillNo,
+            materialNumber: item.materialNumber,
+            erpBillNo: item.erpBillNo
+        });
+    });
+    const result = await getInStockSyncSuccessApi(params);
+    const { isSuccess, message } = result;
+    if (result.status === 200) {
+        // const { isSuccess, message } = result;
+        if (isSuccess) {
+            useMsg("success", "数据同步成功 !");
+            datas.isSynchronous = false;
+            datas.successSyncList = [];
+            proTable!.value.getTableList(datas.initParam);
+        } else {
+            useMsg("error", message);
+        }
+    } else {
+        useMsg("error", message);
+    }
+};
+//同步成功弹窗关闭(清空数据)
+const handleDiaLog = () => {
+    datas.successSyncList = [];
+};
 //跳转到详情
 const handleToDetail = (row: any) => {
     $router.push({
@@ -134,4 +220,14 @@ const handleRemoteMehod = (params: any) => {
     color: red;
     cursor: pointer;
 }
+:deep(.el-dialog__body) {
+    padding: 10px;
+    font-size: 14px;
+
+    /* color: red; */
+    text-align: center;
+}
+:deep(.el-dialog__title) {
+    font-weight: bold;
+}
 </style>

src/views/reportForm/finishedProduct/constant/list/table.ts

@@ -57,31 +57,34 @@ export const COLUMNS = [
     {
         align: "left",
         label: "库存量",
-        prop: "beforeQty",
+        prop: "beforeQty"
-        width: "240"
     },
     {
         align: "left",
         label: "1级分类",
         prop: "fProductLines1FName",
-        width: "180"
+        width: "160"
+        // fixed: true
     },
     {
         align: "left",
         label: "2级分类",
         prop: "fProductCATs1FName",
-        width: "180"
+        width: "160"
+        // fixed: true
     },
     {
         align: "left",
         label: "3级分类",
         prop: "fMaterialGroupFName",
-        width: "180"
+        width: "160"
+        // fixed: true
     },
     {
         align: "left",
         label: "SPU",
         prop: "f_Product",
         width: "240"
+        // fixed: true
     }
 ];

src/views/reportForm/finishedProduct/index.vue

@@ -21,7 +21,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getProductInventoryListApi } from "@/api/modules/finishedProduct";

src/views/reportForm/material/index.vue

@@ -21,7 +21,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getInOutistApi } from "@/api/modules/reportForm";

src/views/setUp/boxMark/index.vue

@@ -33,7 +33,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getBoxMarkListApi } from "@/api/modules/boxMark";

src/views/setUp/subscription/index.vue

@@ -27,7 +27,6 @@
 import ListBtns from "@/components/ListBtns/index.vue";
 import Search from "@/components/Search/index.vue";
 import ProTable from "@/components/ProTable/index.vue";
-
 import { cloneDeep } from "lodash-es";
 import { RULEFORM, FORMDATA, COLUMNS } from "./constant/list/index";
 import { getSubscriptionListApi } from "@/api/modules/subscription";