Merge branch 'refs/heads/master' into dev_1.0.0

# Conflicts:
#	oms_web/oms_vue/src/utils/ruoyi.js

oms_web/oms_vue/src/assets/icons/svg/Dot.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1764836070482" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4880" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M480 480m-160 0a2.5 2.5 0 1 0 320 0 2.5 2.5 0 1 0-320 0Z" p-id="4881"></path></svg>

oms_web/oms_vue/src/layout/components/Sidebar/SidebarItem.vue

@@ -97,3 +97,9 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+::v-deep .el-submenu__title {
+  font-size: 17px;
+  font-weight: bold;
+}
+</style>

oms_web/oms_vue/src/utils/ruoyi.js

@@ -226,3 +226,4 @@ export function getNormalPath(p) {
 export function blobValidate(data) {
   return data.type !== 'application/json'
 }
+

oms_web/oms_vue/src/views/inventory/outer/components/OuterForm.vue

@@ -82,14 +82,14 @@
     <delivery-detail :delivery-id="deliveryId" :visible.sync="viewOpen" />
 
     <div slot="footer" class="dialog-footer">
-      <el-button v-if="showReturn" type="danger" @click="handleCancel">退 回</el-button>
+      <el-button v-if="showReturn" type="danger" @click="handleStatusChange(this.form, '4')">退 回</el-button>
       <el-button  @click="handleCancel">关 闭</el-button>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getOuter, queryInfo } from '@/api/inventory/outer';
+import {changeOuterStatus, getOuter, queryInfo} from '@/api/inventory/outer';
 import { removeDelivery, updateDeliveryStatus } from '@/api/inventory/delivery';
 import GenerateDeliveryForm from './GenerateDeliveryForm.vue';
 import DeliveryDetail from '@/views/inventory/delivery/Detail.vue';
@@ -181,6 +181,19 @@ export default {
     handleViewDelivery(deliveryId) {
       this.deliveryId = deliveryId;
       this.viewOpen = true;
+    },
+    handleStatusChange(row, status) {
+      const actionText = status === '3' ? '确认接收' : '退回';
+      this.$confirm(`确认要"${actionText}"该出库单吗？`, '系统提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        return changeOuterStatus(row.id, status, row.orderCode);
+      }).then(() => {
+        this.$message.success(`${actionText}成功`);
+        this.getList();
+      }).catch(() => {});
     }
   }
 };

oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue

@@ -401,9 +401,9 @@ export default {
     },
     /** 获取厂商列表 */
     getVendorList() {
-        return listAllVendor().then(res => {
+      return listAllVendor().then(res => {
-            this.vendorOptions = res.data;
+        this.vendorOptions = res.data;
-        })
+      })
     },
     /** 制造商选择变化 */
     handleVendorChange(vendorId) {
@@ -414,26 +414,26 @@ export default {
         this.form.payMethod=this.selectedVendor.payMethod;
       } else {
         this.selectedVendor = {};
-         this.form.warehouseId = null;
+        this.form.warehouseId = null;
-         this.currentVendorCode = null;
+        this.currentVendorCode = null;
-         this.form.payMethod = null;
+        this.form.payMethod = null;
       }
     },
     /** 处理采购员选择 */
     handlePurchaserSelect(user) {
 
       console.log(user)
-        this.$set(this.form, 'purchaserId', user.userId);
+      this.$set(this.form, 'purchaserId', user.userId);
-        this.$set(this.form, 'purchaserName', user.userName);
+      this.$set(this.form, 'purchaserName', user.userName);
-        this.$set(this.form, 'purchaserMobile', user.phonenumber);
+      this.$set(this.form, 'purchaserMobile', user.phonenumber);
-        this.$set(this.form, 'purchaserEmail', user.email);
+      this.$set(this.form, 'purchaserEmail', user.email);
-        this.purchaserSelectOpen = false;
+      this.purchaserSelectOpen = false;
     },
     /** 处理汇智负责人选择 */
     handleOwnerSelect(user) {
-        this.$set(this.form, 'ownerId', user.userId);
+      this.$set(this.form, 'ownerId', user.userId);
-        this.$set(this.form, 'ownerName', user.userName);
+      this.$set(this.form, 'ownerName', user.userName);
-        this.ownerSelectOpen = false;
+      this.ownerSelectOpen = false;
     },
     /** 提交按钮 */
     submitForm() {