Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/components/CoilSelector/index.vue

@@ -80,6 +80,7 @@
           <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
           <el-checkbox v-if="orderBy" style="margin-left: 10px;" v-model="showCoilMap" size="small">显示钢卷地图</el-checkbox>
+          <el-checkbox v-if="orderBy && orderId" style="margin-left: 10px;" v-model="showOrderInfo" size="small">显示订单详情</el-checkbox>
         </el-form-item>
       </el-form>
 
@@ -163,6 +164,12 @@
             :id="selectedNodeId" :canToggle="false" :canRelease="false" />
         </div>
       </DragResizeBox>
+
+      <DragResizeBox v-if="orderBy && orderId && showOrderInfo" storageKey="coil-order-info">
+        <div style="height: 100%; width: 100%; background-color: #fff;">
+          <order-detail v-if="orderBy && orderId && showOrderInfo" :orderId="orderId" :editable="false" />
+        </div>
+      </DragResizeBox>
     </el-dialog>
   </div>
 </template>
@@ -177,6 +184,7 @@ import { defaultColumns } from './data';
 import ActualWarehouseSelect from '@/components/KLPService/ActualWarehouseSelect/index.vue';
 import WarehouseBirdMini from '@/views/wms/warehouse/components/WarehouseBirdMini.vue';
 import DragResizeBox from '@/components/DragResizeBox/index.vue';
+import OrderDetail from '@/views/crm/components/OrderDetail.vue';
 
 export default {
   name: 'CoilSelector',
@@ -185,7 +193,8 @@ export default {
     MutiSelect,
     ActualWarehouseSelect,
     WarehouseBirdMini,
-    DragResizeBox
+    DragResizeBox,
+    OrderDetail
   },
   dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer', 'coil_quality_status'],
   props: {
@@ -254,6 +263,10 @@ export default {
       type: Boolean,
       default: false
     },
+    orderId: {
+      type: String,
+      default: null
+    }
   },
   data() {
     return {
@@ -287,6 +300,7 @@ export default {
       warehouseTree: [],
       treeProps: { label: "actualWarehouseName", children: "children" },
       treeLoading: false,
+      showOrderInfo: false,
     };
   },
   computed: {

klp-ui/src/views/crm/components/OrderDetail.vue

@@ -113,7 +113,7 @@
 </template>
 
 <script>
-import { listOrderItem, getOrderItem, delOrderItem, addOrderItem, updateOrderItem } from "@/api/crm/orderItem";
+import { listOrderItem, getOrderItem } from "@/api/crm/orderItem";
 import { actions, ORDER_ACTIONS } from "../js/actions";
 import { getOrder } from "@/api/crm/order";
 import OrderPrinter from "./OrderPrinter.vue";

klp-ui/src/views/wms/delivery/components/detailTable.vue

@@ -8,7 +8,7 @@
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
         </el-col>
         <el-col :span="1.5">
-          <coil-selector dialogWidth="1200px" :use-trigger="true" multiple @confirm="handleBatchAdd"
+          <coil-selector dialogWidth="1200px" :use-trigger="true" multiple @confirm="handleBatchAdd" :orderId="orderId"
             :filters="{ selectType: 'product', status: 0, excludeBound: true, orderBy: true }" :orderBy="true" :disableO="true">
             <el-button type="primary" plain icon="el-icon-plus" size="mini">批量新增</el-button>
           </coil-selector>
@@ -154,6 +154,10 @@ export default {
     coilList: {
       type: Array,
       default: () => []
+    },
+    orderId: {
+      type: String,
+      default: ''
     }
   },
   dicts: ['coil_itemname'],

klp-ui/src/views/wms/delivery/waybill/index.vue

@@ -131,7 +131,7 @@
               </template>
               <template slot="panelB">
                 <div style="height: 100%; overflow: auto;">
-                  <DeliveryWaybillDetail v-if="canEdit" ref="detailTable" :waybillId="waybillId" :coilList="coilList" />
+                  <DeliveryWaybillDetail v-if="canEdit" ref="detailTable" :waybillId="waybillId" :coilList="coilList" :orderId="orderId" />
                   <el-empty v-else description="已发货，不可修改，点击打印查看详情" />
                 </div>
               </template>
@@ -327,6 +327,7 @@ export default {
       orderDialogVisible: false,
       // 订单搜索关键词
       orderQuery: '',
+      orderId: '',
     };
   },
   created() {
@@ -354,7 +355,7 @@ export default {
     /** 加载订单列表 */
     loadOrderList() {
       this.orderLoading = true;
-      listOrder({ pageNum: 1, pageSize: 100, orderType: 1, keyword: this.orderQuery }).then(response => {
+      listOrder({ pageNum: 1, pageSize: 100, keyword: this.orderQuery }).then(response => {
         this.orderList = response.rows || [];
         this.orderLoading = false;
       }).catch(error => {
@@ -495,6 +496,7 @@ export default {
         // this.$modal.msgWarning("已发货的发货单不能操作");
         return;
       }
+      this.orderId = row.orderId;
       this.canEdit = true;
       this.waybillId = row.waybillId;
     },

klp-ui/src/views/wms/hrm/records/meal.vue

@@ -199,6 +199,7 @@ import { listMealReport, getMealReport, delMealReport, addMealReport, updateMeal
 import DictSelect from "@/components/DictSelect";
 import EmployeeSelector from "@/components/EmployeeSelector";
 import { listDept } from "@/api/wms/dept"
+import { getConfigKey } from '@/api/system/config'
 
 export default {
   name: "MealReport",
@@ -233,7 +234,7 @@ export default {
         deptName: undefined,
         reportUserName: undefined,
         status: undefined,
-        deadlineTime: '12:00:00' // 新增：截至时间默认12点
+        deadlineTime: '16:00:00' // 新增：截至时间默认12点
       },
       form: {
         reportId: undefined,
@@ -276,6 +277,7 @@ export default {
   created() {
     this.getList();
     this.getDeptList();
+    this.getDeadlineConfig();
   },
   watch: {
     'form.dineInPeople': {
@@ -297,6 +299,11 @@ export default {
         this.deptOptions = response.data
       })
     },
+    getDeadlineConfig() {
+      getConfigKey('hrm.meal.deadline').then(response => {
+        this.queryParams.deadlineTime = response.msg || '16:00:00'
+      })
+    },
     /** 查询部门报餐主列表 */
     getList() {
       this.loading = true;