update

src/views/settings/config/receiptMachine.vue

@@ -14,7 +14,7 @@
       <div class="head-content">
         <span class="name">小票机名称：</span>
         <el-input
-          placeholder="请输入自提点名称"
+          placeholder="请输入小票机名称"
           suffix-icon="el-icon-search"
           v-model="brandName"
           size="medium"
@@ -176,6 +176,7 @@ export default {
       layout: 'total, sizes, prev, pager, next, jumper',
       total: 0,
       params: {
+        keyword: '',
         pageNum: 1,
         pageSize: 20,
       },
@@ -295,10 +296,8 @@ export default {
       })
     },
     handleSearch() {
-      this.params = {
-        keyword: this.brandName,
-        ...this.params,
-      }
+      this.params.keyword = this.brandName
+
       this.getReceiptMachineList()
     },
     handleClear() {

src/views/store/base/cloudPrint/editCloudPrint.vue

@@ -560,7 +560,7 @@
       </el-table>
     </div>
     <div class="footer">
-      <el-button class="btn" size="medium">取消</el-button>
+      <el-button class="btn" size="medium" @click="handerGoTo">取消</el-button>
       <el-button class="btn" size="medium" @click="handerTestPrint" disabled>
         测试打印
       </el-button>
@@ -869,6 +869,11 @@ export default {
     async handerTestPrint() {
       let res = testPrinter({ orderId: 'DD-20241112-1' })
     },
+    handerGoTo() {
+      this.$router.push({
+        path: '/plotterManager',
+      })
+    },
     async handerSubmit() {
       let params = {
         model_id: this.form.model_id,

src/views/store/base/cloudPrint/editTemplateManagement.vue

@@ -3165,7 +3165,7 @@
       </div>
     </div>
     <div class="footer">
-      <el-button class="btn" size="medium">取消</el-button>
+      <el-button class="btn" size="medium" @click="handerGoTo">取消</el-button>
       <el-button class="btn" size="medium" type="primary" @click="onSubmit">
         保存
       </el-button>
@@ -3260,6 +3260,11 @@ export default {
     //console.log(this.printData);
   },
   methods: {
+    handerGoTo() {
+      this.$router.push({
+        path: '/templateManagement',
+      })
+    },
     showItem(blockName, itemName) {
       if (!this.printData == null) return
       return this.printData[blockName][itemName] != 0 ? true : false

src/views/store/base/cloudPrint/plotterManager.vue

@@ -49,7 +49,7 @@
             删除
           </el-button>
           <el-button type="text" size="small" @click="handerDisabledPrint(row)">
-            {{ row.status == '禁用' ? '启用' : '禁用' }}
+            {{ row.status == '停用' ? '启用' : '禁用' }}
           </el-button>
         </template>
       </el-table-column>
@@ -83,6 +83,7 @@ export default {
         height: window.innerHeight - 220 - 150,
       },
       params: {
+        keyword: '',
         pageNum: 1,
         pageSize: 20,
       },
@@ -95,6 +96,18 @@ export default {
           prop: 'model_name',
           label: '设备品牌',
         },
+        {
+          prop: 'printer_sn',
+          label: '打印机编号',
+        },
+        {
+          prop: 'printer_key',
+          label: '打印机密钥',
+        },
+        {
+          prop: 'website_url',
+          label: '官网地址',
+        },
         {
           prop: 'region',
           label: '打印来源',
@@ -136,12 +149,12 @@ export default {
     async handerDisabledPrint(item) {
       let res = await updatePrnterStatus({
         printer_id: item.printer_id,
-        status: item.status == '禁用' ? 1 : 0,
+        status: item.status == '停用' ? 1 : 0,
       })
       if (res && res.status == 200) {
         this.$message({
           type: 'success',
-          message: item.status == '禁用' ? '启动成功' : '禁用成功',
+          message: item.status == '停用' ? '启动成功' : '停用成功',
         })
         this.getPrinterList()
       } else {
@@ -189,7 +202,7 @@ export default {
           if (item.status == 1) {
             item.status = '启用'
           } else {
-            item.status = '禁用'
+            item.status = '停用'
           }
         })
       } else {
@@ -218,19 +231,17 @@ export default {
     },
     handerColor({ row, column, rowIndex, columnIndex }) {
       if (row) {
-        if (row.status == '启用' && columnIndex == 5) {
+        if (row.status == '启用' && columnIndex == 8) {
           return 'status-on'
         }
-        if (row.status == '停用' && columnIndex == 5) {
+        if (row.status == '停用' && columnIndex == 8) {
           return 'status-off'
         }
       }
     },
     handleSearch() {
-      this.params = {
-        keyword: this.printerName,
-        ...this.params,
-      }
+      this.params.keyword = this.printerName
+
       this.getPrinterList()
     },
     handleSizeChange(pageSize) {

src/views/store/base/distributionSetup/editSelfPickUpSite.vue

@@ -155,7 +155,7 @@
       </el-form>
     </div>
     <div class="footer">
-      <el-button class="btn" size="medium">取消</el-button>
+      <el-button class="btn" size="medium" @click="handerGoTo">取消</el-button>
       <el-button class="btn" size="medium" type="primary" @click="handerSubmit">
         保存
       </el-button>
@@ -279,6 +279,11 @@ export default {
   },
   created() {},
   methods: {
+    handerGoTo() {
+      this.$router.push({
+        path: '/selfPickUpSite',
+      })
+    },
     validateMobile() {},
     getAddress(address) {
       this.form.pickAddress = address.value

src/views/store/base/distributionSetup/localDelivery.vue

@@ -2396,8 +2396,8 @@ export default {
         will-change: top, left;
         top: -174px;
         left: 29%;
-        // opacity: 0;
-        // visibility: hidden;
+        opacity: 0;
+        visibility: hidden;
         transition: opacity 0.5s ease-out;
         z-index: 1;