You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

1429 lines
43 KiB

<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search">
<!-- 列表模块 -->
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-table
ref="table"
v-loading="loading"
:data="data"
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
style="width: 100%"
:border="option.border"
>
<!-- <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
<!-- <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
<!-- <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">-->
<!-- </el-table-column>-->
<template v-for="(item, index) in option.columnBasic">
<!-- table字段 -->
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
>
</el-table-column>
</template>
</el-table>
</el-row>
<el-row style="margin-bottom: 1%">
<!-- 列表模块 -->
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-table
ref="table"
v-loading="loading"
@selection-change="selectionChange"
:data="data"
style="width: 100%"
:border="option.border"
>
<!-- <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
<!-- <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
<!-- <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">-->
<!-- </el-table-column>-->
<template v-for="(item, index) in option.columnTakeOver">
<!-- table字段 -->
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
>
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<template #="{ row }">
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
<el-button
type="primary"
text
icon="el-icon-edit"
@click="handleCallDelivery('3', row)"
>编辑</el-button
>
<!-- <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
</template>
</el-table-column>
</el-table>
</el-row>
<el-row style="margin-bottom: 1%">
<!-- 列表模块 -->
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-table
ref="table"
v-loading="loading"
@selection-change="selectionChange"
:data="data"
style="width: 100%"
:border="option.border"
>
<!-- <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>-->
<!-- <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
<!-- <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">-->
<!-- </el-table-column>-->
<template v-for="(item, index) in option.columnTakeClice">
<!-- table字段 -->
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-table-column
v-if="item.hide !== true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index"
>
</el-table-column>
</template>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<!-- &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <template #="{row}">-->
<!--&lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDelivery('3',row)">编辑</el-button>-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-row>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<h3>包件信息</h3>
<div class="plck">
<el-button type="primary" @click="allhandleQRCode">批量查看二维码</el-button>
<el-button type="primary" @click="handleMaterialList()">补充物料信息</el-button>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
</div>
<el-row>
<!-- 列表模块 -->
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<tablecmt
:columnList="columnList"
:tableData="dataPare"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-edit" @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-button>-->
2 years ago
<el-text
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type="primary"
text
icon="el-icon-view"
@click="handleTrajectory(slotProps.scope.row)"
2 years ago
>查看轨迹</el-text
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
>
2 years ago
<el-text
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type="primary"
text
icon="el-icon-view"
@click="handleQRCode(slotProps.scope.row)"
2 years ago
>查看二维码</el-text
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
>
2 years ago
<el-text
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type="primary"
text
icon="el-icon-view"
v-if="!slotProps.scope.row.materialId"
@click="handleMaterial(slotProps.scope.row, '1')"
2 years ago
>补充物料信息</el-text
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
>
<el-text
type="primary"
text
icon="el-icon-view"
v-if="slotProps.scope.row.materialId"
@click="handleMaterial(slotProps.scope.row, '2')"
>修改物料信息</el-text
>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
</template>
</tablecmt>
<!-- 列表模块 -->
<!-- <el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="dataPare"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
</el-table-column>
<template v-for="(item,index) in option.columnParcels">
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
&lt;!&ndash; table字段 &ndash;&gt;
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
&lt;!&ndash; 操作栏模块 &ndash;&gt;
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleTrajectory(row)">查看轨迹</el-button>
<el-button type="primary" text icon="el-icon-view" @click="handleQRCode(row)">查看二维码</el-button>
<el-button type="primary" text icon="el-icon-view" v-if="row.materialId == '' || row.materialId == '-1'" @click="handleMaterial(row)">补充物料信息</el-button>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
&lt;!&ndash; <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;
&lt;!&ndash; <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;
</template>
</el-table-column>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
</el-table>-->
</el-row>
<el-row>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
<!-- 物料选择模块 -->
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-dialog
:title="titleMaterial"
v-model="materialBox"
width="70%"
:before-close="beforeClose"
append-to-body
>
<el-form :disabled="view" ref="form" :model="formMaterial" label-width="80px">
<el-form-item label="物料名称" prop="typeService">
<el-select
v-model="formMaterial.materialId"
filterable
remote
reserve-keyword
placeholder="请输入物料名称"
remote-show-suffix
:remote-method="remoteMethodName"
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
@change="getMethodName($event, '1')"
:loading="loading"
>
<el-option
v-for="item in optionsName"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="物料编码" prop="serviceNumber">
<el-select
v-model="formMaterial.materialCode"
filterable
remote
reserve-keyword
placeholder="请输入物料编码"
remote-show-suffix
:remote-method="remoteMethodCode"
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
@change="getMethodName($event, '2')"
:loading="loading"
>
<el-option
v-for="item in optionsCode"
:key="item.id"
:label="item.productCode"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="物料单位" prop="orderCode">
<!-- <el-input v-model="formMaterial.unit" placeholder="请输入物料单位"/>-->
<el-select v-model="formMaterial.materialUnit" clearable placeholder="请选择单位">
<el-option
v-for="item in logpmUnit"
:key="item.dictKey"
:label="item.dictValue"
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="SKU" prop="mallName">
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-input v-model="formMaterial.sku" placeholder="请输入SKU" />
</el-form-item>
</el-form>
<!-- 表单按钮 -->
<template #footer>
<span v-if="!view" class="dialog-footer">
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitMethod"
> </el-button
>
<el-button icon="el-icon-circle-close" @click="materialBox = false"> </el-button>
</span>
</template>
</el-dialog>
<el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<el-form :model="formCustomer">
<el-form-item label="姓名" :label-width="formLabelWidth">
<el-input v-model="formCustomer.name" autocomplete="off" />
</el-form-item>
<el-form-item label="电话" :label-width="formLabelWidth">
<el-input v-model="formCustomer.phone" autocomplete="off" />
</el-form-item>
<el-form-item label="地址" :label-width="formLabelWidth">
<el-input
v-model="formCustomer.address"
:rows="2"
type="textarea"
placeholder="请填写地址"
/>
</el-form-item>
</el-form>
<template #footer>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<span class="dialog-footer">
<el-button @click="dialogFormCustomer = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
</span>
</template>
</el-dialog>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-dialog title="二维码" :visible.sync="dialogVisible" width="780px" v-model="dialogVisible">
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<div>
<div v-html="html"></div>
</div>
<span slot="footer" class="dialog-footer">
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<el-button type="primary" @click="printTemplate"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</span>
</el-dialog>
</div>
</basic-container>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<edittablehead
@setcolum="setnewcolum"
@closce="showdrawer"
:drawerShow="drawerShow"
:columnList="columnList"
></edittablehead>
</template>
<script>
import { Search } from '@element-plus/icons-vue';
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
import {
getList,
getDetail,
add,
update,
remove,
addStock,
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
showOrderPackgeCode,
} from '@/api/distribution/distributionStockArticle';
import { getListOwn, updateParcelList } from '@/api/distribution/distributionParcelList';
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
import { addClient } from '@/api/distribution/distributionClientMessage';
import { addService } from '@/api/distribution/distributionServiceLog';
import option from '@/option/distribution/distributionStockArticle';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import { getListMaterial } from '@/api/basic/basicMaterial';
import { getLodop } from '@/utils/LodopFuncs';
import { getStockTemplate } from '@/api/distribution/distributionStockArticle';
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
import dayjs from 'dayjs';
import print from '@/utils/print';
export default {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
data() {
return {
height: 0,
// 弹框标题
title: '',
// 是否展示弹框
box: false,
// 是否显示查询
search: true,
// 加载中
loading: true,
// 是否为查看模式
view: false,
// 查询信息
query: {},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
queryPage: {},
// 弹框标题
titleMaterial: '',
optionsName: [],
optionsCode: [],
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
logpmUnit: [],
// 是否展示弹框
materialBox: false,
// 分页信息
page: {
currentPage: 1,
2 years ago
pageSize: 30,
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
total: 40,
},
// 表单数据
form: {},
formMaterial: {},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
formCall: {}, // 通知
formService: {}, // 服务
formCustomer: {}, // 客户
materialQRCode: {}, // 客户
// 选择行
selectionList: [],
// 表单配置
option: option,
// 表单列表
data: [],
dataPare: [],
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
dataMaterial: false,
distributionType: [],
dialogTableVisible: false,
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
dialogVisible: false, //二维码控制
qrCodeObj: [], //二维码图片
dialogFormVisible: false,
dialogFormCustomer: false,
dialogFormService: false,
formLabelWidth: '120px',
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handler: true, //首次
trade: false, // 商
municipal: true, // 市
taker: true, // 自提
columnListedit: [],
drawerShow: false,
columnList: [
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{
Squashed commit of the following: commit 905bffef83461cceb5fc9c2ebac4a3991a1e70d1 Merge: f40f2ec 08b1e3c Author: big-y <804609860@qq.com> Date: Wed Aug 30 15:12:10 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit f40f2ec43ba0999162cfd9e611b3973590dde25a Author: big-y <804609860@qq.com> Date: Wed Aug 30 15:11:51 2023 +0800 产品包配置回显问题已调整完成 commit 08b1e3c3697512f4f56440465a5a450a8dd6074c Merge: bdcb96d 1db8162 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 30 14:35:59 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit bdcb96d90c0b79220f0f7700f49646b10ab2586c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 30 14:35:52 2023 +0800 添加全部订单记录 commit 1db8162b7e6640a4aba841b05f60598403c3050f Author: 0.0 <1092404103.qq.com> Date: Wed Aug 30 11:04:35 2023 +0800 1.仓库权限 commit e20a7de5dbfc234999041a47a2a4539a163c1049 Author: pref_mail@163.com <123456> Date: Tue Aug 29 22:30:16 2023 +0800 修复预约 commit ec972fcd59457fe3377d586607eba86dcc6d1ecb Author: kilo <wan.ren@foxmail.com> Date: Tue Aug 29 21:41:01 2023 +0800 页面调整 commit 357d9cebd7e9ceb84362a66868b372085008618f Author: caoyizhong <1270296080@qq.com> Date: Tue Aug 29 17:31:04 2023 +0800 添加订单可空格查询 commit 7d75a1cf641a411515fc058cc52966782c335bff Author: pref_mail@163.com <123456> Date: Tue Aug 29 17:14:26 2023 +0800 修改运单显示字段 commit 21771e869973256019140c434959d9268bd20f5e Author: 0.0 <1092404103.qq.com> Date: Tue Aug 29 17:08:25 2023 +0800 1.禁用 commit d52dccc92791c7c26a25092fe0f0181a6c456cd8 Merge: 42ee206 ea10e1c Author: caoyizhong <1270296080@qq.com> Date: Tue Aug 29 11:15:07 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 42ee2067e0a24a25d01f404895b7135f9ced5aa2 Author: caoyizhong <1270296080@qq.com> Date: Tue Aug 29 11:14:32 2023 +0800 修改班组人员添加 # Conflicts: # src/views/basicdata/team/basicdataTeamStaff.vue
2 years ago
prop: 'serviceNumber',
label: '服务号',
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
prop: 'waybillNumber',
label: '运单号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: true,
sortable: true,
head: false,
},
{
Squashed commit of the following: commit 905bffef83461cceb5fc9c2ebac4a3991a1e70d1 Merge: f40f2ec 08b1e3c Author: big-y <804609860@qq.com> Date: Wed Aug 30 15:12:10 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit f40f2ec43ba0999162cfd9e611b3973590dde25a Author: big-y <804609860@qq.com> Date: Wed Aug 30 15:11:51 2023 +0800 产品包配置回显问题已调整完成 commit 08b1e3c3697512f4f56440465a5a450a8dd6074c Merge: bdcb96d 1db8162 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 30 14:35:59 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit bdcb96d90c0b79220f0f7700f49646b10ab2586c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 30 14:35:52 2023 +0800 添加全部订单记录 commit 1db8162b7e6640a4aba841b05f60598403c3050f Author: 0.0 <1092404103.qq.com> Date: Wed Aug 30 11:04:35 2023 +0800 1.仓库权限 commit e20a7de5dbfc234999041a47a2a4539a163c1049 Author: pref_mail@163.com <123456> Date: Tue Aug 29 22:30:16 2023 +0800 修复预约 commit ec972fcd59457fe3377d586607eba86dcc6d1ecb Author: kilo <wan.ren@foxmail.com> Date: Tue Aug 29 21:41:01 2023 +0800 页面调整 commit 357d9cebd7e9ceb84362a66868b372085008618f Author: caoyizhong <1270296080@qq.com> Date: Tue Aug 29 17:31:04 2023 +0800 添加订单可空格查询 commit 7d75a1cf641a411515fc058cc52966782c335bff Author: pref_mail@163.com <123456> Date: Tue Aug 29 17:14:26 2023 +0800 修改运单显示字段 commit 21771e869973256019140c434959d9268bd20f5e Author: 0.0 <1092404103.qq.com> Date: Tue Aug 29 17:08:25 2023 +0800 1.禁用 commit d52dccc92791c7c26a25092fe0f0181a6c456cd8 Merge: 42ee206 ea10e1c Author: caoyizhong <1270296080@qq.com> Date: Tue Aug 29 11:15:07 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 42ee2067e0a24a25d01f404895b7135f9ced5aa2 Author: caoyizhong <1270296080@qq.com> Date: Tue Aug 29 11:14:32 2023 +0800 修改班组人员添加 # Conflicts: # src/views/basicdata/team/basicdataTeamStaff.vue
2 years ago
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'warehouse',
label: '仓库',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
},
{
prop: 'orderPackageStatusName',
label: '包件状态',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderPackageFreezeStatusName',
label: '冻结状态',
type: 3,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderPackageGroundingStatusName',
label: '上架状态',
type: 3,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderPackageStockupStatusName',
label: '备货状态',
type: 3,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderPackageReservationStatusName',
label: '预约状态',
type: 3,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'orderPackageCode',
label: '包条码',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'goodsAllocation',
label: '货位信息',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'pallet',
label: '所在托盘',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'firsts',
label: '一级品',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'second',
label: '二级品',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'thirdProduct',
label: '三级品',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'materialName',
label: '物料名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'quantity',
label: '数量',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'createTime',
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
label: '入库时间',
type: 4,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'trainNumber',
label: '客户车次号',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
{
prop: 'sendWarehouseName',
label: '发站仓',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '230',
checkarr: [],
fixed: 'right',
hide: true,
},
],
html: null, // 页面包条码内容
};
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
mounted() {
this.init();
this.onLoad(this.page);
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配不能更改
*/
// let checkList=[]
// this.columnList.map(item => {
// item.head = false;
// });
let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
if (checkListnewarr) {
this.columnList.map(item => {
item.head = false;
});
checkListnewarr.map(ite => {
this.columnList.map(item => {
if (ite == item.label) {
item.head = true;
}
});
});
} else {
let arr = [];
this.columnList.map(item => {
if (item.head) {
arr.push(item.label);
}
});
this.$functions.setStorage(window.location.pathname + 'checkList', arr);
}
if (flexListnewarr) {
this.columnList.map(item => {
item.fixed = false;
});
flexListnewarr.map(ite => {
this.columnList.map(item => {
if (ite == item.label) {
if (item.type == 6) {
item.fixed = 'right';
} else {
item.fixed = true;
}
}
});
});
} else {
let arr = [];
this.columnList.map(item => {
if (item.fixed) {
arr.push(item.label);
}
});
this.$functions.setStorage(window.location.pathname + 'flexList', arr);
}
if (sortlistnewarr) {
this.columnList.map(item => {
item.sortable = false;
});
sortlistnewarr.map(ite => {
this.columnList.map(item => {
if (ite == item.label) {
item.sortable = true;
}
});
});
} else {
let arr = [];
this.columnList.map(item => {
if (item.sortable) {
arr.push(item.label);
}
});
this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
}
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
watch: {
'$route.query.id': {
handler(newVal, oldVal) {
// console.log(newVal, oldVal);
if (!!this.$route.query.id) {
this.onLoad(this.page);
this.onLoadOwn(this.page);
}
},
deep: true,
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
immediate: true,
},
},
computed: {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
...mapGetters(['permission']),
permissionList() {
return {
addBtn: this.validData(this.permission.basicdataBrandCategory_add, false),
viewBtn: this.validData(this.permission.basicdataBrandCategory_view, false),
delBtn: this.validData(this.permission.basicdataBrandCategory_delete, false),
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false),
};
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
return ids.join(',');
},
},
methods: {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleMaterialList() {
if (this.selectionList.length === 0) {
this.$message.warning('请选择需要补充的包件!!!');
return;
} else {
let a = false;
this.selectionList.forEach(i => {
console.log('现在的数据》》》》 ', i);
if (!!i.materialId && i.materialId != '-1') {
a = true;
}
});
if (a) {
this.$message.warning('有包含物料的包件信息,请去除,在勾选!!!');
return;
}
this.titleMaterial = '补充物料';
this.materialBox = true;
}
},
showdrawer(value) {
this.drawerShow = value;
},
/**
* 弹窗的勾选回调用于更改头部数组
* 固定搭配只需要更换 columnList
*/
setnewcolum(newarr, headarr, type) {
// console.log(newarr,'+++++++++++')
if (type == 1) {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
} else if (type == 2) {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
} else if (type == 3) {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
}
},
selectionsc(value) {
console.log('11111', value);
},
delectsolt(scope) {
const { row } = scope;
console.log('2222222', row);
},
editsolt(scope) {
const { row } = scope;
console.log('33333', row);
},
btnsc(index, row) {
console.log('4444444', index, row);
},
selectsc(index, row) {
console.log(index, row);
if (row.prop === 'orderPackageFreezeStatusName') {
this.queryPage['orderPackageFreezeStatus'] = index;
} else if (row.prop === 'orderPackageReservationStatusName') {
this.queryPage['orderPackageReservationStatus'] = index;
} else if (row.prop === 'orderPackageGroundingStatusName') {
this.queryPage['orderPackageGroundingStatus'] = index;
} else if (row.prop === 'orderPackageStockupStatusName') {
this.queryPage['orderPackageStockupStatus'] = index;
} else if (row.prop === 'orderPackageStatusName') {
this.queryPage['orderPackageStatus'] = index;
} else {
this.queryPage[row.prop] = index;
}
this.onLoadOwn(this.page);
},
timesc(index, row) {
console.log(index, row);
if (!!index) {
index = dayjs(index).format('YYYY-MM-DD');
}
this.queryPage[row.prop] = index;
if (!index) {
delete this.queryPage[row.prop];
}
this.onLoadOwn(this.page);
},
inputsc(index, row) {
console.log(index, row);
// console.log(index, row.prop);
this.queryPage[row.prop] = index;
this.onLoadOwn(this.page);
},
printTemplate() {
const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
print(orderNodeList);
},
//提交物品数据
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleSubmitMethod() {
// console.log(">>>",this.formMaterial);
const regex = /^\d+$/;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
let id = [];
let asm = {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
// id: this.formMaterial.id,
// materialId: this.formMaterial.materialId,
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
};
if (regex.test(this.formMaterial.materialId)) {
// console.log("全是数字");
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
asm.materialId = this.formMaterial.materialId;
} else {
// console.log("包含非数字字符");
asm.materialId = this.formMaterial.materialCode;
}
if (!!this.formMaterial.id) {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
id.push(this.formMaterial.id);
} else {
if (this.selectionList.length > 0) {
this.selectionList.forEach(i => {
id.push(i.id);
});
console.log('shuju>>>>', this.selectionList.length);
} else {
id.push(this.formMaterial.id);
}
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
}
asm.ids = id;
console.log('>>>', asm);
updateParcelList(asm).then(() => {
this.materialBox = false;
this.onLoadOwn(this.page);
this.$message({
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type: 'success',
message: '操作成功!',
});
this.formMaterial = {};
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
});
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
getMethodName(row, num) {
// console.log("名称选择事件",row);
switch (num) {
case '1':
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
let a = this.optionsName.find(i => i.id == row);
this.formMaterial.materialCode = a.productCode;
this.formMaterial.materialUnit = a.logpmUnit;
this.formMaterial.sku = a.sku;
break;
case '2':
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
let b = this.optionsCode.find(i => i.id == row);
this.formMaterial.materialId = b.name;
this.formMaterial.materialUnit = b.logpmUnit;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.formMaterial.sku = b.sku;
break;
}
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
async remoteMethodName(query) {
if (query) {
this.loading = true;
//查询物料数据
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
name: query,
}).then();
console.log('物料信息', asd.data.data);
this.optionsName = asd.data.data.records;
this.loading = false;
} else {
this.optionsName = [];
}
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
async remoteMethodCode(query) {
if (query) {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.loading = true;
let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
productCode: query,
}).then();
console.log('物料编号信息', asd.data.data);
this.optionsCode = asd.data.data.records;
this.loading = false;
} else {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.optionsCode = [];
}
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
/*handleMoke(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$router.push({
path: '/distribution/reservation/reservationFrom',
query:{
id: this.ids,
name: '添加预约单'
}
});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
},*/
/* handleStockList(){
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$router.push({
path: '/distribution/inventory/distributionStockArticleFrom',
query: {
id : this.ids,
name : "转库存单"
}
});
//
// this.$confirm("确定将选择的订单转为库存品吗?", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning"
// })
// .then(() => {
// return addStock(this.ids);
// })
// .then(() => {
// this.selectionClear();
// this.onLoad(this.page);
// this.$message({
// type: "success",
// message: "操作成功!"
// });
// });
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
},*/
//确定通知提货按钮
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
callFordelivery(inde) {
switch (inde) {
case '1':
console.log(this.formCall);
this.formCall.waybillNumber = this.ids;
addCallDelivery(this.formCall).then(() => {
this.$message({
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type: 'success',
message: '操作成功!',
});
this.dialogFormVisible = false;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.formCall = {};
});
break;
case '2':
// console.log("服务类型",this.formService);
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
addService(this.formService).then(() => {
this.$message({
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type: 'success',
message: '操作成功!',
});
this.dialogFormService = false;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.formService = {};
});
break;
case '3':
// console.log("客户信息!!!",this.formCustomer);
this.formCustomer.stockArticleId = this.$route.query.id;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
console.log('客户信息!!!', this.formCustomer);
addClient(this.formCustomer).then(() => {
this.$message({
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type: 'success',
message: '操作成功!',
});
this.dialogFormCustomer = false;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.formCustomer = {};
this.onLoad(this.page);
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
});
break;
}
},
//提货跳转
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handlebill(row) {
console.log('>>>>', this.ids);
if (this.selectionList.length === 0) {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.$message.warning('请选择至少一条数据');
return;
}
this.$router.push({
path: '/distribution/inventory/distrilbutionBillLading',
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
query: {
id: this.ids,
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
},
});
},
//通知提货
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleCallDelivery(ind, row) {
switch (ind) {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
case '1':
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.orderCode);
});
this.formCall.waybill = ids;
this.dialogFormVisible = true;
break;
case '2':
this.dialogFormService = true;
break;
case '3':
this.dialogFormCustomer = true;
console.log('<><>', row);
this.formCustomer.name = row.customerName;
this.formCustomer.phone = row.customerTelephone;
this.formCustomer.address = row.customerAddress;
break;
}
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
init() {
this.height = this.setPx(document.body.clientHeight - 580);
getDictionaryBiz('distribution_type').then(res => {
this.distributionType = res.data.data;
});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
getDictionaryBiz('logpm_unit').then(res => {
//单位
this.logpmUnit = res.data.data;
});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
getDictionaryBiz('order_package_status').then(res => {
this.deliveryOrderStatus = res.data.data;
this.$functions.checkcColumnList('orderPackageStatusName', this.columnList).checkarr =
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
res.data.data.map(item => {
item.value = item.dictKey;
item.label = item.dictValue;
return item;
});
});
getDictionaryBiz('order_package_grounding_status').then(res => {
this.$functions.checkcColumnList(
'orderPackageGroundingStatusName',
this.columnList
).checkarr = res.data.data.map(item => {
item.value = item.dictKey;
item.label = item.dictValue;
return item;
});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
});
getDictionaryBiz('order_package_freeze_status').then(res => {
this.$functions.checkcColumnList('orderPackageFreezeStatusName', this.columnList).checkarr =
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
res.data.data.map(item => {
item.value = item.dictKey;
item.label = item.dictValue;
return item;
});
});
getDictionaryBiz('order_package_stockup_status').then(res => {
this.$functions.checkcColumnList(
'orderPackageStockupStatusName',
this.columnList
).checkarr = res.data.data.map(item => {
item.value = item.dictKey;
item.label = item.dictValue;
return item;
});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
});
getDictionaryBiz('order_package_reservation_status').then(res => {
this.$functions.checkcColumnList(
'orderPackageReservationStatusName',
this.columnList
).checkarr = res.data.data.map(item => {
item.value = item.dictKey;
item.label = item.dictValue;
return item;
});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
});
},
searchHide() {
this.search = !this.search;
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
searchChange() {
this.onLoad(this.page);
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
searchReset() {
this.query = {};
this.page.currentPage = 1;
this.onLoad(this.page);
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleSubmit() {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type: 'success',
message: '操作成功!',
});
});
} else {
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type: 'success',
message: '操作成功!',
});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
});
}
},
//全部
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleEntire() {
this.handler = true;
this.taker = true;
this.trade = false;
},
//商配
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleTrade() {
// this.handler = true;
this.trade = true;
},
//商配
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleMunicipal() {
// this.handler = true;
// this.taker = true;
},
//自提
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handlePickUpStore() {
this.loading = true;
// console.log("this.query",this.query);
let params = {};
this.query.typeService = '1';
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(
res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
this.handler = false;
this.taker = false;
}
);
}, //自提的通知
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleInform(index) {
this.loading = true;
// console.log("this.query",this.query);
let params = {};
this.query.typeService = '1';
switch (index) {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
case '1':
this.query.notification = index;
break;
case '2':
this.query.notification = index;
break;
}
this.query.typeService = '1';
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(
res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
this.handler = false;
this.taker = false;
}
);
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleAdd() {
this.title = '新增';
this.form = {};
this.box = true;
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleEdit(row) {
this.title = '编辑';
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleView(row) {
this.title = '查看';
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
async handleMaterial(row, index) {
// console.log('row>>>', row);
if (index === '2') {
this.titleMaterial = '修改物料';
this.formMaterial = row;
this.loading = true;
getListMaterial(this.page.currentPage, this.page.pageSize, {
productCode: row.materialCode,
}).then(res => {
// console.log('物料编号信息', res.data.data.records[0].sku);
this.formMaterial.sku = res.data.data.records[0].sku;
});
this.loading = false;
this.optionsName = [{ id: row.materialId, name: row.materialName }];
this.optionsCode = [{ id: row.materialId, productCode: row.materialCode }];
// console.log("333333",this.optionsCode[0]);
} else {
this.titleMaterial = '补充物料';
this.formMaterial.id = row.id;
}
this.materialBox = true;
console.log('_+_+_+_+_+_+_', index);
},
allhandleQRCode() {
console.log(this.selectionList);
if (this.selectionList.length == 0) {
this.$message.error({ message: '请先选择包件' });
return;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
}
let checkcode = [];
this.selectionList.map(item => {
checkcode.push(item.id);
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
// checkcode.push(item.orderPackageCode)
});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
// return
let qr = {
ids: checkcode.join(','),
// qrCodes: checkcode.join(','),
};
this.html = '';
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
console.log(res.data);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
});
this.dialogVisible = true;
},
handleQRCode(row) {
// this.title = '查看'
// this.view = true;
// this.box = true;
this.materialQRCode = row;
console.log('11213 :>> ', 11213);
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
let qr = {
ids: row.id,
};
this.html = '';
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
showOrderPackgeCode(qr).then(res => {
// this.orderPackageCode = res.data
// console.log(res.data);
console.log('res :>> ', res);
this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
this.dialogVisible = true;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
});
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleTrajectory(row) {
console.log('>>>>', row);
this.$router.push({
path: '/distribution/signdetail/packageNodeSearch',
query: {
orderPackageCode:row.orderPackageCode,
}
});
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
handleDelete() {
if (this.selectionList.length === 0) {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.$message.warning('请选择至少一条数据');
return;
}
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.selectionClear();
this.onLoad(this.page);
this.$message({
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type: 'success',
message: '操作成功!',
});
});
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
type: 'success',
message: '操作成功!',
});
});
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
beforeClose(done) {
done();
this.form = {};
this.view = false;
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
selectionChange(list) {
// console.log("添加阿斯顿发生",list);
this.selectionList = list;
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
selectionClear() {
this.selectionList = [];
// this.$refs.table.clearSelection();
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
currentChange(currentPage) {
this.page.currentPage = currentPage;
this.onLoadOwn(this.page);
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
sizeChange(pageSize) {
this.page.pageSize = pageSize;
this.onLoadOwn(this.page);
},
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
onLoad(page, params = {}) {
this.loading = true;
console.log('执行了查询零零零零');
this.query.id = this.$route.query.id;
getDetail(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(
res => {
console.log('返回的数据》》》》', res.data.data);
const data = res.data.data;
// this.page.total = data.total;
this.data[0] = data;
this.loading = false;
this.selectionClear();
}
);
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
},
onLoadOwn(page, params = {}) {
// this.loading = true;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
this.dataMaterial = false;
params = {
stockArticleIds: this.$route.query.id,
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
};
getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then(
res => {
console.log('包件明细》》》》》', res.data.data);
const data = res.data.data;
this.page.total = data.total;
this.dataPare = data.records;
this.dataPare.some(i => {
if (i.conditions == '1') {
i.conditions = '定制品';
} else {
i.conditions = '库存品';
}
if (!i.materialId) {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
//有
this.dataMaterial = true;
}
});
this.loading = false;
this.selectionClear();
}
);
},
},
};
</script>
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
<style lang="scss" scoped>
.plck {
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
display: flex;
align-items: center;
justify-content: flex-end;
margin-bottom: 20px;
}
.el-button--text {
margin-right: 15px;
}
.el-select {
width: 300px;
}
.el-input {
width: 300px;
}
.dialog-footer button:first-child {
margin-right: 10px;
}
</style>