Merge branch 'dev' into pre-production

src/App.vue

@@ -5,12 +5,6 @@
 <script lang="ts" setup>
 import watermark from '@/utils/watermark.js';
 watermark.set('货无忧');
-import { useStore } from 'vuex';
-
-const $store = useStore();
-
-console.log('$store :>> ', $store);
-$store.commit('GET_PRINT_LIST');
 </script>
 
 <style lang="scss">

src/components/MyPrint/MyPrint.vue

@@ -55,6 +55,35 @@
           打 印
         </el-button>
 
+        <el-button
+          type="primary"
+          @click="handleShowEdit"
+          icon="Edit"
+          :disabled="details.printLoading"
+          :loading="details.printLoading"
+        >
+          编辑打印机
+        </el-button>
+
+        <!-- <el-select
+          v-model="activeIndex"
+          placeholder="打印机"
+          style="width: 200px; margin-left: 10px"
+        >
+          <el-option
+            v-for="item in $store.state.print.printList"
+            :label="item.label"
+            :value="item.value"
+            :key="item.label"
+          />
+        </el-select> -->
+      </div>
+    </el-dialog>
+
+    <!-- 确认打印机 -->
+    <el-dialog v-model="isShow" title="确认打印机" align-center width="fit-content">
+      <div style="margin-bottom: 40px" class="flex-c-c">
+        <div class="flex-none">编辑打印机：</div>
         <el-select
           v-model="activeIndex"
           placeholder="打印机"
@@ -141,6 +170,8 @@ const visible = computed({
   },
 });
 
+const isShow = ref(false);
+
 const activeIndex = computed({
   get() {
     return $store.state.print[props.type + 'ActiveIndex'];
@@ -276,6 +307,11 @@ const handleFullScrean = () => {
   details.isFullscreen = !details.isFullscreen;
 };
 
+const handleShowEdit = () => {
+  $store.commit('GET_PRINT_LIST');
+  isShow.value = true;
+};
+
 watch(
   () => props.modelValue,
   async () => {

src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue

@@ -11,13 +11,20 @@
           <el-button type="primary" v-if="props.isShowExport" @click="handleExport" icon="Download">
             导 出
           </el-button>
+
           <el-button type="primary" @click="() => printTemplate('notHaveTem')" icon="Printer">
             打 印
           </el-button>
+
           <el-button type="primary" @click="() => printTemplate('haveTem')" icon="Printer">
             打 印(自定义模板)
           </el-button>
 
+          <el-button type="primary" @click="handleShowEdit" icon="Printer"> 编辑打印机 </el-button>
+          <!-- <el-button type="primary" @click="() => printTemplate('haveTem')" icon="Printer">
+            打 印(自定义模板)
+          </el-button>
+
           <el-select
             v-model="activeIndex"
             placeholder="打印机"
@@ -29,13 +36,28 @@
               :value="item.value"
               :key="item.label"
             />
-          </el-select>
+          </el-select> -->
 
           <el-form-item label="是否显示运费" style="margin: 0px 0px 0px 10px">
             <el-checkbox v-model="isShowFreight" @change="handleShowFreight"></el-checkbox>
           </el-form-item>
         </div>
       </el-dialog>
+
+      <!-- 确认打印机 -->
+      <el-dialog v-model="isShow" title="编辑打印机" align-center width="fit-content">
+        <div style="margin-bottom: 40px" class="flex-c-c">
+          <div class="flex-none">请选择打印机：</div>
+          <el-select v-model="activeIndex" placeholder="打印机" style="width: 200px">
+            <el-option
+              v-for="item in $store.state.print.printList"
+              :label="item.label"
+              :value="item.value"
+              :key="item.label"
+            />
+          </el-select>
+        </div>
+      </el-dialog>
     </template>
   </div>
 </template>
@@ -79,8 +101,12 @@ const props = defineProps({
   },
 });
 
+/** 是否显示运费 */
 const isShowFreight = ref(false);
 
+/** 是否显示选择打印机弹窗 */
+const isShow = ref(false);
+
 const $emit = defineEmits(['update:modelValue']);
 const $store = useStore();
 
@@ -93,11 +119,11 @@ const visible = computed({
 
 const activeIndex = computed({
   get() {
-    return $store.state.print.titlePrintActiveIndex;
+    return $store.state.print.deliveryPrintActiveIndex;
   },
   set(activeIndex) {
     // 设置打印机
-    $store.commit('SET_PRINT_ACTIVE', { activeIndex, type: 'titlePrint' });
+    $store.commit('SET_PRINT_ACTIVE', { activeIndex, type: 'deliveryPrint' });
   },
 });
 
@@ -225,6 +251,9 @@ const printTemplate = (type: 'haveTem' | 'notHaveTem') => {
   }
 
   print(printNode);
+
+  isShow.value = false;
+  visible.value = false;
 };
 
 const handleShowFreight = value => {
@@ -238,6 +267,11 @@ const handleShowFreight = value => {
   }
 };
 
+const handleShowEdit = () => {
+  $store.commit('GET_PRINT_LIST');
+  isShow.value = true;
+};
+
 watch(
   () => props.modelValue,
   async () => {

src/page/login/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="login-container" ref="login" @keyup.enter="handleLogin">
+  <div class="login-container login-index" ref="login" @keyup.enter="handleLogin">
     <div class="login-weaper animated bounceInDown">
       <!-- 横幅顶部 -->
       <!-- <div class="top">
@@ -192,8 +192,8 @@ export default {
     margin-left: 10px;
   }
 }
-
-.left {
+.login-index{
+  .left {
   position: absolute;
   left: 0;
   width: 80px;
@@ -238,6 +238,8 @@ export default {
     height: 100%;
   }
 }
+}
+
 
 .login-left {
   /* 新增 */

src/store/modules/print.js

@@ -13,34 +13,31 @@ const print = {
   mutations: {
     /** 获取当前设备的打印机 */
     GET_PRINT_LIST(state) {
-      const timer = setTimeout(() => {
-        let LODOP = getLodop();
-        const _count = LODOP.GET_PRINTER_COUNT();
+      let LODOP = getLodop();
+      const _count = LODOP.GET_PRINTER_COUNT();
 
-        const _name = LODOP.GET_PRINTER_NAME(-1);
+      const _name = LODOP.GET_PRINTER_NAME(-1);
 
-        const _deliveryPrintActiveName = window.localStorage.getItem('deliveryPrintActiveName');
-        const _titlePrintActiveName = window.localStorage.getItem('titlePrintActiveName');
+      const _deliveryPrintActiveName = window.localStorage.getItem('deliveryPrintActiveName');
+      const _titlePrintActiveName = window.localStorage.getItem('titlePrintActiveName');
 
-        for (let index = 0; index < _count; index++) {
-          const name = LODOP.GET_PRINTER_NAME(index);
+      for (let index = 0; index < _count; index++) {
+        const name = LODOP.GET_PRINTER_NAME(index);
 
-          _deliveryPrintActiveName &&
-            _deliveryPrintActiveName === name &&
-            (state.deliveryPrintActiveIndex = index);
+        _deliveryPrintActiveName &&
+          _deliveryPrintActiveName === name &&
+          (state.deliveryPrintActiveIndex = index);
 
-          _titlePrintActiveName &&
-            _titlePrintActiveName === name &&
-            (state.titlePrintActiveIndex = index);
+        _titlePrintActiveName &&
+          _titlePrintActiveName === name &&
+          (state.titlePrintActiveIndex = index);
 
-          if (name === _name) {
-            !_deliveryPrintActiveName && (state.deliveryPrintActiveIndex = index);
-            !_titlePrintActiveName && (state.titlePrintActiveIndex = index);
-          }
-          state.printList.push({ label: name, value: index });
+        if (name === _name) {
+          !_deliveryPrintActiveName && (state.deliveryPrintActiveIndex = index);
+          !_titlePrintActiveName && (state.titlePrintActiveIndex = index);
         }
-        clearTimeout(timer);
-      }, 2000);
+        state.printList.push({ label: name, value: index });
+      }
     },
     /** 设置打印机 */
     SET_PRINT_ACTIVE(state, action) {

src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@@ -85,7 +85,7 @@
                   >
                   <el-text
                     v-if="accessControl.warehouseWarehouse_view"
-                    click="view(slotProps.scope)"
+                    @click="view(slotProps.scope)"
                     >查看</el-text
                   >
                   <el-text