优化

ghs/src/views/order/components/order-detail.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="order-detail">
-		<el-drawer :visible.sync="showOrderDetail" size="1000px" :before-close="closeFn" custom-class="order-draw-wrap" direction="ltr" @close="closeTrigger">
+		<el-drawer :visible.sync="showOrderDetail" size="1100px" :before-close="closeFn" custom-class="order-draw-wrap" direction="ltr" @close="closeTrigger">
 			<div class="order-manage-wrap" v-if="!$util.isEmpty(data)">
 				<div class="card-wrap" style="margin-top:0px;">
 					<div class="card-tit">备注</div>

ghs/src/views/order/list.vue

@@ -143,11 +143,13 @@
         <el-button @click.stop="allDown(scope.row)" size="small" type="primary" v-if="scope.row.status!=5 && scope.row.status!=1 && scope.row.sameTimeIdsNum>1">全下载</el-button>
         <el-button size="small" v-else>全下载</el-button>
 
+        <el-button v-if="scope.row.status != 1 && scope.row.status != 5" @click.stop="printPin(scope.row)" size="small" type="primary">打多联</el-button>
+        <el-button v-else size="small">打多联</el-button>
+
         <el-dropdown @command="doMore($event,scope.row)" style="margin-left:10px;">
           <el-button type="primary" size="small" v-if="scope.row.status!=5 && scope.row.status!=1">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
           <el-button size="small" v-else>更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="printPin">打多联</el-dropdown-item>
             <el-dropdown-item command="refundShowRecord">售后记录</el-dropdown-item>
             <el-dropdown-item command="downExcel">下载excel</el-dropdown-item>
             <el-dropdown-item command="cancelCurrentOrder">取消</el-dropdown-item>
@@ -431,24 +433,6 @@ export default {
       this.$refs.selectStaffRef.init()
     },
     doMore(cmd,info){
-      if(cmd == 'printPin'){
-        if(info.payStatus != 1){
-          this.$message.error('没有付款')
-          return false
-        }
-        this.$service.order.info({ id: info.id,printType:1 }).then(res => {
-        let printData = res.printData ? res.printData : ''
-        let str = res.template ? res.template:''
-        let template = JSON.parse(str)
-        var hiprintTemplate = new hiprint.PrintTemplate({template:template});
-        hiprintTemplate.print(printData)
-        //增加打印次数
-        this.$service.order.addPrintNum({id:info.id}).then(data => {
-          this.app.refresh({ status: this.tabIndex,book:this.book,clearSign:this.clearSign,name:this.name })
-        })
-			});
-
-      }
       if(cmd == 'cancelCurrentOrder'){
         if(info.book == 1 && info.status == 2){
           this.$confirm('确认取消？', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
@@ -639,6 +623,23 @@ export default {
         this.printBilling(item)
       }
     },
+    printPin(info){
+        if(info.payStatus != 1){
+          this.$message.error('没有付款')
+          return false
+        }
+        this.$service.order.info({ id: info.id,printType:1 }).then(res => {
+          let printData = res.printData ? res.printData : ''
+          let str = res.template ? res.template:''
+          let template = JSON.parse(str)
+          var hiprintTemplate = new hiprint.PrintTemplate({template:template});
+          hiprintTemplate.print(printData)
+          //增加打印次数
+          this.$service.order.addPrintNum({id:info.id}).then(data => {
+            this.app.refresh({ status: this.tabIndex,book:this.book,clearSign:this.clearSign,name:this.name })
+          })
+			  })
+    },
     printBilling(item){
       this.$service.order.cloudPrintOrder({id:item.id}).then(data => {
           if(data.hasNoPrint && data.hasNoPrint == 1){
@@ -852,6 +853,19 @@ export default {
                 align: 'center',
                 width: 70
               },
+              {
+                prop: 'prePrice',
+                label: '总价',
+                align: 'center',
+                width: '90'
+              },
+              {
+                prop: 'actPrice',
+                label: '实际',
+                align: 'center',
+                emptyText: '无',
+                width: '90'
+              },
               {
                 prop: 'reCheck',
                 label: '复核',
@@ -876,19 +890,6 @@ export default {
                 align: 'center',
                 width: '75'
               },
-              {
-                prop: 'prePrice',
-                label: '总价',
-                align: 'center',
-                width: '90'
-              },
-              {
-                prop: 'actPrice',
-                label: '实际',
-                align: 'center',
-                emptyText: '无',
-                width: '90'
-              },
               {
                 prop: 'discountAmount',
                 label: '已优惠',
@@ -943,7 +944,7 @@ export default {
             op: {
               visible: true,
               props: {
-                width: 630,
+                width: 710,
                 align: 'center',
                 fixed: 'right',
                 label: '操作'

hdApp/src/pagesPurchase/contact.vue

@@ -2,7 +2,7 @@
   <view class="app-content">
     <!-- 图片说明区域 -->
     <view class="section-card">
-      <view class="section-desc">质量、价格和售后问题，请在下图位置找商家</view>
+      <view class="section-desc">花材的质量、价格和售后问题，请在下图位置找商家</view>
       <view class="image-box">
         <image class="logo" :src="`${constant.imgUrl}/shop/contact_shop.png`" mode="widthFix"></image>
       </view>