Merge remote-tracking branch 'origin/master'

src/api/system/dept/index.ts

@@ -63,3 +63,10 @@ export const delDept = (deptId: number | string) => {
     method: 'delete'
   });
 };
+// 查询客户部门
+export const listCustomerDept = (customerId: string | number): AxiosPromise<DeptVO[]> => {
+  return request({
+    url: `/system/dept/customerDeptList/${customerId}`, // 拼接 customerId 到路径
+    method: 'get'
+  });
+};

src/views/order/checkOrder/index.vue

@@ -25,7 +25,14 @@
             </el-form-item>
 
             <el-form-item label="提交时间" prop="orderTime">
-              <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+              <el-date-picker
+                v-model="dateRange"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                value-format="YYYY-MM-DD"
+              />
             </el-form-item>
 
             <el-form-item>

src/views/order/orderAssignment/splitAssignDialog.vue

@@ -362,7 +362,7 @@ const loadAssignRecords = async (orderId: string | number) => {
 
 /** 表单重置 */
 const reset = () => {
-  assignForm.targetType = '';
+  assignForm.targetType = 'srm';
   assignForm.targetId = '';
   assignForm.productList = [];
   selectedPendingProducts.value = [];

src/views/order/orderDeliver/index.vue

@@ -30,7 +30,14 @@
               <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" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+              <el-date-picker
+                v-model="dateRange"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                value-format="YYYY-MM-DD"
+              />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery()">搜索</el-button>

src/views/order/orderInquiry/index.vue

@@ -18,7 +18,13 @@
               </el-select>
             </el-form-item>
             <el-form-item label="提交时间" prop="orderTime">
-              <el-date-picker type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+              <el-date-picker
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                value-format="YYYY-MM-DD"
+              />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>

src/views/order/orderReturn/index.vue

@@ -15,7 +15,14 @@
               </el-select>
             </el-form-item>
             <el-form-item label="提交时间" prop="dateRange">
-              <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+              <el-date-picker
+                v-model="dateRange"
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                value-format="YYYY-MM-DD"
+              />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>