Merge branch 'master' of http://git.longjoe.com/shuiping150/JLH

JLHWEB/src/components/LjVxeTable/components/ColSetting.vue

@@ -739,7 +739,7 @@ const handleSelFormItem = (item: any, index: number) => {
   let breakPoint = LjDrawerRef.value.breakPoint;
 
   if (["sm", "md"].includes(breakPoint)) {
-    LjDrawerAsideRef.value.show();
+    LjDrawerAsideRef.value && LjDrawerAsideRef.value.show();
   }
   activeColumn.value = item;
   currentIndex.value = index;

JLHWEB/src/components/LjVxeTable/index.vue

@@ -813,6 +813,7 @@ const emit = defineEmits([
   "footerCellDblclick",
   "footerCellMenu",
   "clearMerge",
+  "setMergeCells",
   "sortChange",
   "clearSort",
   "filterChange",
@@ -870,6 +871,7 @@ const propsEvents = computed(() => {
     footerCellDblclick: (data: any) => emit("footerCellDblclick", data),
     footerCellMenu: (data: any) => emit("footerCellMenu", data),
     clearMerge: (data: any) => emit("clearMerge", data),
+    setMergeCells: (data: any) => emit("setMergeCells", data),
     sortChange: (data: any) => {
       handleSortChange(data);
       emit("sortChange", data);
@@ -1781,6 +1783,8 @@ const settingConfirm = async (column: any, param: any = {}, updateLocal = true,
     colSetting = cloneDeep(column);
   }
   cb && cb();
+
+  emit("setMergeCells");
 };
 
 /**

JLHWEB/src/hooks/useDwLayout.tsx

@@ -413,6 +413,7 @@ export const useDwLayout = (
         } else if (item.datatype == "input") {
           item.editRender = { name: "$input", props: {} };
         }
+        item.editRender.autoFocus = true;
       }
     });
     return argColumns;

JLHWEB/src/views/erpapi/mattressInterface/detail.vue

@@ -63,6 +63,7 @@
             :table-props="tableProps_qd"
             :tool-button="['setting']"
             collapseButtons
+            @setMergeCells="resetMergeCellsQd"
             @row-dragend="autoRowDragend"
           >
           </LjVxeTable>

JLHWEB/src/views/erpapi/mattressInterface/hooks/index.tsx

@@ -1670,6 +1670,9 @@ export const useHooks = (t?: any) => {
     height: "auto",
     align: "left",
     // height: "",
+    sortConfig: {
+      trigger: "manual"
+    },
     editConfig: {
       trigger: "click",
       mode: "cell",
@@ -1715,6 +1718,9 @@ export const useHooks = (t?: any) => {
     height: "auto",
     align: "left",
     // height: "",
+    sortConfig: {
+      trigger: "manual"
+    },
     editConfig: {
       trigger: "click",
       mode: "cell",

JLHWEB/src/views/quote/mattressQuote/hooks/index.tsx

@@ -3455,6 +3455,10 @@ export const useHooks = (t?: any) => {
           );
         }
       }
+    },
+    {
+      field: "packtype",
+      enum: state.packtypeOptions
     }
   ];
 

JLHWEB/src/views/quote/mattressQuote/index.vue

@@ -41,6 +41,9 @@
           <el-option label="小柜" value="小柜" />
         </el-select>
       </el-form-item>
+      <el-form-item label="压包数量" v-if="formParam.packtype == 0">
+        <el-input-number v-model="formParam.packqty" :min="0" :max="1000" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
@@ -92,7 +95,9 @@ const deptEnum = ref([]);
 const formParam = ref({
   deptid: 0,
   area: "维持原状",
-  cabinet_type: "维持原状"
+  cabinet_type: "维持原状",
+  packtype: 0,
+  packqty: 0
 });
 
 const getData = (params: any) => {
@@ -497,6 +502,9 @@ const openDeptChoosen = async curRecords => {
 
     if (deptEnum.value.length > 0) {
       formParam.value.deptid = curRecords[0].deptid;
+      formParam.value.packtype = curRecords[0].packtype;
+      formParam.value.packqty = curRecords[0].packqty;
+
       dialogFormVisible.value = true;
     } else {
       console.error("获取部门列表为空");
@@ -520,7 +528,9 @@ const BatchCopyMattressAudited = () => {
       mattressid: Number(item.mattressid),
       deptid: formParam.value.deptid,
       area: formParam.value.area,
-      cabinet_type: formParam.value.cabinet_type
+      cabinet_type: formParam.value.cabinet_type,
+      packtype: formParam.value.packtype,
+      packqty: formParam.value.packqty
     };
   });
   ElMessageBox.confirm(`是否确定要批复制${curRecords.length}张床垫报价单吗?`, "询问", {