Merge branch 'hurx'

src/layout/components/Navbar.vue

@@ -6,7 +6,7 @@
 
     <div class="right-menu flex align-center">
       <template v-if="appStore.device !== 'mobile'">
-        <el-select
+        <!-- <el-select
           v-if="userId === 1 && tenantEnabled"
           v-model="companyName"
           class="min-w-244px"
@@ -26,9 +26,9 @@
           <div class="right-menu-item hover-effect" @click="openSearchMenu">
             <svg-icon class-name="search-icon" icon-class="search" />
           </div>
-        </el-tooltip>
+        </el-tooltip> -->
         <!-- 消息 -->
-        <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
+        <!-- <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
           <div>
             <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
               <template #reference>
@@ -48,7 +48,7 @@
 
         <el-tooltip :content="proxy.$t('navbar.document')" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
         <el-tooltip :content="proxy.$t('navbar.full')" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />

src/views/login.vue

@@ -5,12 +5,12 @@
         <h3 class="title">{{ title }}</h3>
         <lang-select />
       </div>
-<!--      <el-form-item v-if="tenantEnabled" prop="tenantId">-->
-<!--        <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">-->
-<!--          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>-->
-<!--          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <!-- <el-form-item v-if="tenantEnabled" prop="tenantId">
+        <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" style="width: 100%">
+          <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
+          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
+        </el-select>
+      </el-form-item> -->
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('login.username')">
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
@@ -44,7 +44,7 @@
         </div>
       </el-form-item>
       <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">{{ proxy.$t('login.rememberPassword') }}</el-checkbox>
-      <el-form-item style="float: right">
+      <!-- <el-form-item style="float: right">
         <el-button circle :title="proxy.$t('login.social.wechat')" @click="doSocialLogin('wechat')">
           <svg-icon icon-class="wechat" />
         </el-button>
@@ -60,7 +60,7 @@
         <el-button circle :title="proxy.$t('login.social.github')" @click="doSocialLogin('github')">
           <svg-icon icon-class="github" />
         </el-button>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item style="width: 100%">
         <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
           <span v-if="!loading">{{ proxy.$t('login.login') }}</span>

src/views/order/orderAssignment/splitAssignDialog.vue

@@ -147,7 +147,7 @@
               <span class="required-mark">*</span>
               <span class="label">分配对象类型：</span>
               <el-select v-model="assignForm.targetType" placeholder="请选择分配对象类型" clearable style="flex: 1" @change="handleTargetTypeChange">
-                <el-option label="自营客户" value="zy" />
+                <el-option label="自营客户发货" value="zy" />
                 <el-option label="供应商" value="srm" />
               </el-select>
             </div>

src/views/order/orderDeliver/index.vue

@@ -18,17 +18,16 @@
                 <el-option v-for="dict in order_source" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
+            <el-form-item label="发货状态" prop="orderStatus">
+              <el-select v-model="queryParams.orderStatus" placeholder="请选择发货状态" clearable>
+                <el-option v-for="dict in deliverOrderStatus" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
             <!-- <el-form-item label="订单状态" prop="orderStatus">
               <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
                 <el-option v-for="dict in order_status" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item> -->
-            <el-form-item label="业务员" prop="">
-              <el-select v-model="queryParams.orderStatus" placeholder="请选择业务员" clearable> </el-select>
-            </el-form-item>
-            <el-form-item label="部门" prop="">
-              <el-select v-model="queryParams.orderStatus" placeholder="请选择部门" clearable> </el-select>
-            </el-form-item>
             <el-form-item label="提交时间" prop="createTime">
               <el-date-picker
                 v-model="dateRange"
@@ -122,6 +121,7 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { order_status, fee_type, pay_method, order_source, deliver_method } = toRefs<any>(
   proxy?.useDict('order_status', 'fee_type', 'pay_method', 'order_source', 'deliver_method')
 );
+const deliverOrderStatus = computed(() => order_status.value.filter((d: any) => ['2', '3', '4'].includes(d.value)));
 
 const orderMainList = ref<OrderMainVO[]>([]);
 const buttonLoading = ref(false);
@@ -339,8 +339,6 @@ const reset = () => {
 const handleQuery = (orderStatus?: string) => {
   if (orderStatus) {
     queryParams.value.orderStatus = orderStatus;
-  } else {
-    queryParams.value.orderStatus = undefined;
   }
   queryParams.value.pageNum = 1;
   getList();

src/views/order/orderDeliver/indexProject.vue

@@ -18,17 +18,11 @@
                 <el-option v-for="dict in order_source" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <!-- <el-form-item label="订单状态" prop="orderStatus">
-              <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
-                <el-option v-for="dict in order_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-form-item label="发货状态" prop="orderStatus">
+              <el-select v-model="queryParams.orderStatus" placeholder="请选择发货状态" clearable>
+                <el-option v-for="dict in deliverOrderStatus" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item label="业务员" prop="">
-              <el-select v-model="queryParams.orderStatus" placeholder="请选择业务员" clearable> </el-select>
             </el-form-item>
-            <el-form-item label="部门" prop="">
-              <el-select v-model="queryParams.orderStatus" placeholder="请选择部门" clearable> </el-select>
-            </el-form-item> -->
             <el-form-item label="提交时间" prop="createTime">
               <el-date-picker
                 v-model="dateRange"
@@ -127,7 +121,7 @@ import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
 import { OrderMainVO, OrderMainQuery, OrderMainForm } from '@/api/order/orderMain/types';
 import DeliverDialog from '../saleOrder/deliverDialog.vue';
 import LogisticsDetail from '../saleOrder/logisticsDetail.vue';
-
+const deliverOrderStatus = computed(() => order_status.value.filter((d: any) => ['2', '3', '4'].includes(d.value)));
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { order_status, fee_type, pay_method, order_source, deliver_method } = toRefs<any>(
   proxy?.useDict('order_status', 'fee_type', 'pay_method', 'order_source', 'deliver_method')
@@ -344,8 +338,6 @@ const reset = () => {
 const handleQuery = (orderStatus?: string) => {
   if (orderStatus) {
     queryParams.value.orderStatus = orderStatus;
-  } else {
-    queryParams.value.orderStatus = undefined;
   }
   queryParams.value.pageNum = 1;
   getList();

src/views/order/saleOrder/addOrderStatusLogDrawer.vue

@@ -23,7 +23,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="发货人" prop="shipper">
+        <el-form-item label="送货人" prop="shipper">
           <el-input v-model="form.shipper" disabled />
         </el-form-item>
 
@@ -92,7 +92,20 @@ const statusOptions = [
   { label: '已签收', value: '已签收' }
 ];
 const rules = {
-  statusName: [{ required: true, message: '请选择状态名称', trigger: 'change' }]
+  statusName: [{ required: true, message: '请选择状态名称', trigger: 'change' }],
+  images: [
+    {
+      validator: (_rule: any, _value: any, callback: any) => {
+        if (form.statusName === '已签收' && !form.images) {
+          ElMessage.warning('已签收状态必须上传签收图片');
+          callback(new Error('已签收状态必须上传签收图片'));
+        } else {
+          callback();
+        }
+      },
+      trigger: 'change'
+    }
+  ]
 };
 
 // 打开抽屉

src/views/order/saleOrder/editDeliverDialog.vue

@@ -22,14 +22,7 @@
         </el-col>
         <el-col :span="12" v-if="form.deliverMethod === '1'">
           <el-form-item label="物流公司名称" prop="logisticsCompanyId">
-            <el-select
-              v-model="form.logisticsCompanyId"
-              placeholder="请选择"
-              style="width: 100%"
-              filterable
-              @change="handleLogisticsCompanyChange"
-              disabled
-            >
+            <el-select v-model="form.logisticsCompanyId" placeholder="请选择" style="width: 100%" filterable @change="handleLogisticsCompanyChange">
               <el-option v-for="company in logisticsCompanyList" :key="company.id" :label="company.logisticsName" :value="company.id" />
             </el-select>
           </el-form-item>
@@ -38,7 +31,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item v-if="form.deliverMethod === '1'" label="物流单号" prop="logisticNo">
-            <el-input v-model="form.logisticNo" placeholder="请输入物流单号" disabled />
+            <el-input v-model="form.logisticNo" placeholder="请输入物流单号" />
           </el-form-item>
         </el-col>
         <el-col :span="12">

src/views/order/saleOrder/index.vue

@@ -366,8 +366,6 @@ const handleQuery = (orderStatus?: string) => {
   if (orderStatus) {
     queryParams.value.orderStatus = orderStatus;
     confirmStatus.value = undefined;
-  } else {
-    queryParams.value.orderStatus = undefined;
   }
   queryParams.value.pageNum = 1;
   getList();
@@ -605,12 +603,12 @@ const getButtonsByStatus = (orderStatus: string, checkStatus: string): ActionBut
   // 待支付状态：显示查看按钮
   if (orderStatus === OrderStatus.PENDING_PAYMENT) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
   // 待确认状态：显示确认订单按钮
   if (orderStatus === OrderStatus.PENDING_CONFIRM) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
 
   // 待审核：显示审核按钮

src/views/order/saleOrder/indexProject.vue

@@ -60,7 +60,7 @@
           <span style="font-size: 16px; font-weight: 500">销售订单信息列表</span>
 
           <div style="display: flex; flex-wrap: nowrap; gap: 10px">
-            <el-button type="primary" @click="handleBatchConfirm()" :disabled="!ids.length" plain>批量确认订单</el-button>
+            <!-- <el-button type="primary" @click="handleBatchConfirm()" :disabled="!ids.length" plain>批量确认订单</el-button> -->
             <el-button type="primary" @click="handleCloseOrder()" :disabled="!ids.length" plain>关闭订单</el-button>
             <el-button type="primary" @click="handleDelete()" :disabled="!ids.length" plain>删除订单</el-button>
             <el-button type="primary" :disabled="!ids.length" plain>导出订单</el-button>
@@ -569,12 +569,12 @@ const getButtonsByStatus = (orderStatus: string, checkStatus: string): ActionBut
   // 待支付状态：显示查看按钮
   if (orderStatus === OrderStatus.PENDING_PAYMENT) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
   // 待确认状态：显示确认订单按钮
   if (orderStatus === OrderStatus.PENDING_CONFIRM) {
     buttons.push({ label: '查看', handler: handleReview });
-    buttons.push({ label: '确认订单', handler: handleAffirm });
+    // buttons.push({ label: '确认订单', handler: handleAffirm });
   }
 
   // 待审核：显示审核按钮

src/views/order/saleOrder/sendDetail.vue

@@ -214,7 +214,7 @@
                 <span>发货单号:{{ (deliver as any).deliverCode || '--' }}</span>
                 <span>发货时间:{{ (deliver as any).createTime || '--' }}</span>
                 <span>发货方式:{{ getDictLabel(deliver_method, deliver.deliverMethod || '--') }}</span>
-                <span v-if="deliver.deliverMethod == '0'">收货人:{{ deliver.deliverMan || '--' }}</span>
+                <span v-if="deliver.deliverMethod == '0'">送货人:{{ deliver.deliverMan || '--' }}</span>
                 <span>手机:{{ deliver.phone || deliver.consigneePhone }}</span>
                 <span style="margin-left: 30px" v-if="deliver.deliverMethod == '1'">物流单号:{{ deliver.logisticNo || '--' }}</span>
                 <span style="margin-left: 20px">发货备注:{{ deliver.deliverRemark || '--' }}</span>