平台端服务订单打印

admin-ui/.env.development

@@ -5,10 +5,10 @@ VUE_APP_TITLE = 一七管理系统
 ENV = 'development'
 
 
-VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
-VUE_APP_BASE_API = 'http://127.0.0.1:9801'
-#VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-#VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+# VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
+# VUE_APP_BASE_API = 'http://127.0.0.1:9801'
+VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
 # VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
 

admin-ui/src/utils/index.js

@@ -920,7 +920,12 @@ export function goodsPrinter(LODOP, data, lodopName) {
   //这里3表示纵向打印且纸高“按内容的高度”；800表示纸宽80mm；45表示页底空白4.5mm
 
   // 设置打印内容
-  LODOP.ADD_PRINT_TEXT(30, 95, 150, 20, `一七生活 ${data.sysOrg.name}`);
+  if (data.sysOrg) {
+    LODOP.ADD_PRINT_TEXT(30, 95, 150, 20, `一七生活 ${data.sysOrg ? data.sysOrg.name : '---'}`);
+  } else {
+    LODOP.ADD_PRINT_TEXT(30, 135, 150, 20, `一七生活`);
+
+  }
   LODOP.ADD_PRINT_TEXT(55, 135, 100, 20, '商品订单');
 
   // 开始绘制虚线
@@ -994,15 +999,19 @@ export function goodsPrinter(LODOP, data, lodopName) {
   LODOP.ADD_PRINT_TEXT(height + 185, 10, 300, 20, `客户电话：${data.appUserInfoVO.phoneNumber}`);
   let address = `客户地址：${data.appUserInfoVO.province || ''}${ data.appUserInfoVO.city|| ''}${ data.appUserInfoVO.area|| ''}${ data.appUserInfoVO.address|| ''}${ data.appUserInfoVO.addressDetail|| ''}`
   LODOP.ADD_PRINT_TEXT(height + 205, 10, 300, 20, address);
-
-  LODOP.ADD_PRINT_TEXT(height + 240, 10, 300, 20, `本店地址：${data.sysOrg.address?data.sysOrg.address+data.sysOrg.addressDetail:''}`);
-  LODOP.ADD_PRINT_TEXT(height + 260, 10, 300, 20, `联系电话：${data.sysOrg.contactPhone}`);
-
-  LODOP.ADD_PRINT_TEXT(height + 280, 10, 300, 20, `营业时间：${data.sysOrg.time?data.sysOrg.time:''}`);
-  LODOP.ADD_PRINT_TEXT(height + 300, 10, 300, 20, `员工：${data.sysOrg.user?data.sysOrg.user:''}`);
-
-  LODOP.ADD_PRINT_LINE(height + 320, 10, height + 320, 295, 1, 1);
-  LODOP.ADD_PRINT_TEXT(height + 330, 10, 300, 50, `客户签名：`);
+  if (data.sysOrg) {
+    LODOP.ADD_PRINT_TEXT(height + 240, 10, 300, 20, `本店地址：${data.sysOrg.address?data.sysOrg.address+data.sysOrg.addressDetail:''}`);
+    LODOP.ADD_PRINT_TEXT(height + 260, 10, 300, 20, `联系电话：${data.sysOrg.contactPhone}`);
+  
+    LODOP.ADD_PRINT_TEXT(height + 280, 10, 300, 20, `营业时间：${data.sysOrg.time?data.sysOrg.time:''}`);
+    LODOP.ADD_PRINT_TEXT(height + 300, 10, 300, 20, `员工：${data.sysOrg.user?data.sysOrg.user:''}`);
+  
+    LODOP.ADD_PRINT_LINE(height + 320, 10, height + 320, 295, 1, 1);
+    LODOP.ADD_PRINT_TEXT(height + 330, 10, 300, 50, `客户签名：`);
+  } else {
+    LODOP.ADD_PRINT_TEXT(height + 240, 10, 300, 50, `客户签名：`);
+  }
+   
 
   if (this.LODOP.SET_PRINTER_INDEXA(lodopName))
   // this.LODOP.PREVIEW(); //打印预览

admin-ui/src/views/order/serviceOrder/carBeautyOrder.vue

@@ -36,8 +36,8 @@
         </el-row>
 
         <Page uri="/mapi/order/goods/list" :request-params="queryParams" ref="pagination">
-            <el-table-column label="订单编号" align="center" prop="orderNo" width="150px" />
-            <el-table-column label="客户信息" align="center" width="150">
+            <el-table-column label="订单编号" align="center" prop="orderNo" min-width="150px" />
+            <el-table-column label="客户信息" align="center" min-width="150">
                 <template slot-scope="scope">
                     <span>{{ scope.row.realName ? scope.row.realName : '--' }}</span>
                     <br />
@@ -77,7 +77,7 @@
                     <el-button type="text" icon="el-icon-chat-dot-square" @click="orderDetail(scope.row)">订单详情</el-button>
                     <el-button type="text" icon="el-icon-check" @click="btn_receiving(scope.row)" v-if="scope.row.orderStatus == '1'">接单</el-button>
                     <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '4'">确认完成</el-button>
-                    <el-button type="text" icon="el-icon-printer" v-if="userInfoVO.userType != '00'" @click="btn_lodop(scope.row)">打印 </el-button>
+                    <el-button type="text" icon="el-icon-printer" @click="btn_lodop(scope.row)">打印 </el-button>
                     <!-- <el-button
 
             type="text"

admin-ui/src/views/order/serviceOrder/lifeServicesOrder.vue

@@ -35,8 +35,8 @@
         </el-row>
 
         <Page uri="/mapi/order/goods/list" :request-params="queryParams" ref="pagination">
-            <el-table-column label="订单编号" align="center" prop="orderNo" width="150px" />
-            <el-table-column label="客户信息" align="center" width="150">
+            <el-table-column label="订单编号" align="center" prop="orderNo" min-width="150px" />
+            <el-table-column label="客户信息" align="center" min-width="150">
                 <template slot-scope="scope">
                     <span>{{ scope.row.realName ? scope.row.realName : '--' }}</span>
                     <br />
@@ -77,7 +77,7 @@
                     <el-button type="text" icon="el-icon-chat-dot-square" @click="orderDetail(scope.row)">订单详情</el-button>
                     <el-button type="text" icon="el-icon-check" @click="btn_receiving(scope.row)" v-if="scope.row.orderStatus == '1'">接单</el-button>
                     <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '4'">确认完成</el-button>
-                    <el-button type="text" icon="el-icon-printer" v-if="userInfoVO.userType != '00'" @click="btn_lodop(scope.row)">打印 </el-button>
+                    <el-button type="text" icon="el-icon-printer" @click="btn_lodop(scope.row)">打印 </el-button>
 
                 </template>
             </el-table-column>

admin-ui/src/views/system/printerSettings/index.vue

@@ -2,7 +2,7 @@
 	<div class="app-container">
     <div class="title">打印机设置</div>
     <!-- v-if="$store.getters.user.userType==='01'" -->
-    <div class="list_printer" v-if="userInfoVO.userType == '02'">
+    <div class="list_printer" v-if="userInfoVO.userType == '02' || userInfoVO.userType == '00'">
       <el-row :gutter="20">
         <el-col :span="8">
           <el-card class="box-card">
@@ -19,7 +19,7 @@
             </el-select>
           </el-card>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" v-if="userInfoVO.userType == '02'">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>条码打印机</span>
@@ -34,7 +34,7 @@
             </el-select>
           </el-card>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" v-if="userInfoVO.userType == '02'">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>标签打印机</span>
@@ -222,11 +222,11 @@
           this.$message.error(`请选择小票打印机`);
           state = true
         }
-        if( !this.printer.barCode ) {
+        if( !this.printer.barCode && this.userInfoVO.userType == '02') {
           this.$message.error(`请选择条码打印机`);
           state = true
         }
-        if( !this.printer.label ) {
+        if( !this.printer.label && this.userInfoVO.userType == '02' ) {
           this.$message.error(`请选择标签打印机`);
           state = true
         }