瀏覽代碼

【修改】调整

zhouhao 2 年之前
父節點
當前提交
df5c437a12

+ 3 - 2
src/mixin/print.js

@@ -1,4 +1,5 @@
 import { disAutoConnect, hiprint, defaultElementTypeProvider } from 'vue-plugin-hiprint'
+
 disAutoConnect()
 import panel from '@/utils/panel'
 import { addPrint, getDtailPrintDis } from '@/api/supply/pickup'
@@ -201,7 +202,7 @@ export default {
       return date.slice(0, 10)
     },
     // 添加次数
-    async addPrint(funcType = 'getDeliverDetail') {
+    addPrint(funcType = 'getDeliverDetail') {
       let ids = []
       for (let i = this.clonelData.length; i > 0; i--) {
         const tempData = this.clonelData[i - 1].invoicePickBeans
@@ -229,7 +230,7 @@ export default {
           funcType = addPrints
         }
 
-        await funcType(requestParams)
+        funcType(requestParams)
         // 清空当前克隆数据,避免重复添加次数
         this.clonelData = []
       } catch (error) {

+ 1 - 1
src/views/finance/rebate_list.vue

@@ -69,7 +69,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="备注1" prop="id">
+                  <el-form-item label="备注1" prop="remark1">
                     <el-input v-model="searchForm.remark1" placeholder="请输入备注1"></el-input>
                   </el-form-item>
                 </el-col>

+ 9 - 6
src/views/supply/deliver/components/design/preview.vue

@@ -19,7 +19,7 @@
       </div>
     </template>
     <template slot="footer">
-      <el-button key="close" type="info" @click="hideModal"> 关闭 </el-button>
+      <el-button key="close" type="info" @click="hideModal"> 关闭</el-button>
     </template>
   </el-dialog>
 </template>
@@ -28,6 +28,7 @@
 // import { downloadPDF } from '@/utils/pdf'
 import { addPrint } from './print-data'
 import { detailArr } from './print-data'
+
 export default {
   name: 'PrintPreview',
   props: {},
@@ -47,8 +48,10 @@ export default {
   },
   computed: {},
   watch: {},
-  created() {},
-  mounted() {},
+  created() {
+  },
+  mounted() {
+  },
   methods: {
     // handleExport() {
     //   downloadPDF(this.$refs.printDom);
@@ -76,10 +79,10 @@ export default {
         this.printData,
         {},
         {
-          callback: async () => {
+          callback: async() => {
             try {
               if (typeof this.$parent.addPrint === 'function') {
-                await this.$parent.addPrint('addPrints')
+                this.$parent.addPrint('addPrints')
               } else {
                 throw new Error('加载失败,刷新重试')
               }
@@ -118,6 +121,7 @@ export default {
 ::v-deep tr {
   height: 40px !important;
 }
+
 ::v-deep td {
   height: 40px !important;
   overflow: hidden;
@@ -153,7 +157,6 @@ export default {
   td {
     border: none !important;
   } */
-
   .drag_item_box {
     height: 100%;
     padding: 6px;

+ 7 - 6
src/views/supply/pickup/components/design/preview.vue

@@ -18,7 +18,7 @@
       </div>
     </template>
     <template slot="footer">
-      <el-button key="close" type="info" @click="hideModal"> 关闭 </el-button>
+      <el-button key="close" type="info" @click="hideModal"> 关闭</el-button>
     </template>
   </el-dialog>
 </template>
@@ -42,8 +42,10 @@ export default {
   },
   computed: {},
   watch: {},
-  created() {},
-  mounted() {},
+  created() {
+  },
+  mounted() {
+  },
   methods: {
     // handleExport() {
     //   downloadPDF(this.$refs.printDom);
@@ -70,10 +72,10 @@ export default {
         this.printData,
         {},
         {
-          callback: async () => {
+          callback: async() => {
             try {
               if (typeof this.$parent.addPrint === 'function') {
-                await this.$parent.addPrint('getDtailPrintDis')
+                this.$parent.addPrint('getDtailPrintDis')
               } else {
                 throw new Error('加载失败,刷新重试')
               }
@@ -133,7 +135,6 @@ export default {
   td {
     border: none !important;
   } */
-
   .drag_item_box {
     height: 100%;
     padding: 6px;