Merge tag 'Hotfix-zh-317' into develop

Finish Hotfix-zh-317

# Conflicts:
#	src/views/supply/apply/components/apply_return_form.vue

src/views/supply/apply/components/apply_return_form.vue

@@ -512,7 +512,7 @@ export default {
         this.mainForm.createMan = data.createBy
         this.mainForm.remark = data.remark
         this.mainForm.warehouse = data.correspondId
-         data.salesOrderPictures.forEach(k => {
+        data.salesOrderPictures.forEach(k => {
           k.name = k.fileName
           k.url = k.fileUrl
         })

src/views/supply/deliver/components/design/preview.vue

@@ -75,35 +75,38 @@ export default {
       }, 500)
     },
     print() {
-      this.hiprintTemplate.print(
-        this.printData,
-        {},
-        {
-          callback: async() => {
-            try {
-              if (typeof this.$parent.addPrint === 'function') {
-                this.$parent.addPrint('addPrints').then(() => {
+
+      try {
+        if (typeof this.$parent.addPrint === 'function') {
+          this.$parent.addPrint('addPrints').then(() => {
+            this.hiprintTemplate.print(
+              this.printData,
+              {},
+              {
+                callback: async() => {
+                  this.hiprintTemplate = {}
+                  this.$parent.tableSelection = []
+                  // setTimeout(() => {
+                  //   console.error('更新发货汇总列表')
+                  //   // this.$successMsg('更新成功')
+                  // }, 1000)
                   setTimeout(() => {
                     console.error('更新发货汇总列表')
                     this.$parent.getList()
                   }, 1000)
-                })
-              } else {
-                throw new Error('加载失败,刷新重试')
+                }
               }
-            } catch (e) {
-              this.$errorMsg(e)
-              // '调用打印次数接口失败'
-            }
-            this.hiprintTemplate = {}
-            this.$parent.tableSelection = []
-            // setTimeout(() => {
-            //   console.error('更新发货汇总列表')
-            //   // this.$successMsg('更新成功')
-            // }, 1000)
-          }
+            )
+
+          })
+        } else {
+          throw new Error('加载失败,刷新重试')
         }
-      )
+      } catch (e) {
+        this.$errorMsg(e)
+        // '调用打印次数接口失败'
+      }
+
       setTimeout(() => {
         this.hideModal()
       }, 2000)

src/views/supply/implement/implement_total_list.vue

@@ -375,6 +375,13 @@
               </template>
             </el-table-column>
             <el-table-column
+              align="right"
+              label="格力折扣"
+              prop="totalDiscAmount"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
               align="left"
               label="表头业务员"
               prop="serviceName"

src/views/supply/pickup/components/design/preview.vue

@@ -68,33 +68,33 @@ export default {
       }, 500)
     },
     print() {
-      this.hiprintTemplate.print(
-        this.printData,
-        {},
-        {
-          callback: async() => {
-            try {
-              if (typeof this.$parent.addPrint === 'function') {
-                this.$parent.addPrint('getDtailPrintDis').then(() => {
+      try {
+        if (typeof this.$parent.addPrint === 'function') {
+          this.$parent.addPrint('getDtailPrintDis').then(() => {
+            this.hiprintTemplate.print(
+              this.printData,
+              {},
+              {
+                callback: async() => {
+                  this.hiprintTemplate = {}
+                  this.$parent.tableSelection = []
+
                   setTimeout(() => {
                     console.error('更新发货汇总列表')
                     this.$parent.getList()
-
                   }, 2000)
-                })
-              } else {
-                throw new Error('加载失败,刷新重试')
+                }
               }
-            } catch (e) {
-              this.$errorMsg(e)
-              // '调用打印次数接口失败'
-            }
-            this.hiprintTemplate = {}
-            this.$parent.tableSelection = []
-
-          }
+            )
+
+          })
+        } else {
+          throw new Error('加载失败,刷新重试')
         }
-      )
+      } catch (e) {
+        this.$errorMsg(e)
+        // '调用打印次数接口失败'
+      }
       setTimeout(() => {
         this.hideModal()
       }, 2000)