Merge branch 'main' of http://git.njrzwl.cn:3000/yangsai/jiuhaoshenghuo

app/controller/store/product/StoreProduct.php

@@ -92,7 +92,8 @@ class StoreProduct extends AuthController
             ['pid', ''],
 			['data', '', '', 'time'],
 			['store_label_id', ''],
-			['brand_id', '']
+			['brand_id', ''],
+			['printset', '']
         ]);
 		$cateId = $where['cate_id'];
 		if ($cateId) {

app/dao/product/product/StoreProductDao.php

@@ -43,6 +43,12 @@ class StoreProductDao extends BaseDao
                 $query->where('product_type', 0)->where('is_presale_product', 0)->where('system_form_id', 0);
             })->when(isset($where['is_integral']) && $where['is_integral'], function ($query) use ($where) {
                 $query->where('product_type', 'in', [0, 1, 2, 3]);
+            })->when(isset($where['printset']) && $where['printset'], function ($query) use ($where) {
+                if($where['printset']=='no'){
+                    $query->whereRaw("printset is null");
+                }else{
+                    $query->whereRaw("FIND_IN_SET({$where['printset']},printset)");
+                }
             })
             ->when(isset($where['store_name']) && $where['store_name'] && is_string($where['store_name']), function ($query) use ($where) {
                 if (isset($where['field_key']) && $where['field_key'] && in_array($where['field_key'], ['product_id', 'bar_code'])) {

app/services/order/StoreOrderServices.php

@@ -1707,6 +1707,7 @@ HTML;
 						}
 					}
                     $newproduct = $product;
+                    // print_r($newproduct);
                     foreach ($newproduct as $pkey => $item) {
                         
                         $printset = !empty($item['printset'])?explode(',', $item['printset']):'';

app/services/product/product/StoreProductServices.php

@@ -53,6 +53,7 @@ use crmeb\services\FormBuilder as Form;
 use crmeb\services\SystemConfigService;
 use crmeb\traits\ServicesTrait;
 use crmeb\traits\OptionTrait;
+use app\services\message\SystemPrinterServices;
 use think\exception\ValidateException;
 use think\facade\Config;
 use think\facade\Route as Url;
@@ -205,7 +206,10 @@ class StoreProductServices extends BaseServices
                         $item['cate_name'] = is_array($cate_name) ? implode(',', $cate_name) : '';
                     }
                 }
-
+                /** @var SystemPrinterServices $SystemPrinterServices */
+                $SystemPrinterServices = app()->make(SystemPrinterServices::class);
+                $printlist = $SystemPrinterServices->getColumn([['id', 'in', $item['printset']]],  'name');
+                $item['print_name'] = implode(',',$printlist);
                 $item['stock_attr'] = $item['stock'] > 0;//库存
                 $item['plate_name'] = '平台';
                 switch ($item['type']) {

crmeb/services/printer/storage/FeiEYun.php

@@ -61,12 +61,17 @@ class FeiEYun extends BasePrinter
         $name = $config['name'];
         /** @var TableQrcodeServices $qrcodeService */
         $qrcodeService = app()->make(TableQrcodeServices::class);
-        $Info = $qrcodeService->getQrcodeyInfo((int)$tableInfo['qrcode_id'], ['category']);
+        $Info = [];
+        if(!empty($tableInfo)){
+            $Info = $qrcodeService->getQrcodeyInfo((int)$tableInfo['qrcode_id'], ['category']);
+        }
         $this->printerContent = '<CB>**' . $config['name'] . '**</CB><BR>';
         $this->printerContent .= '--------------------------------<BR>';
-        $this->printerContent .= '桌码流水：' . $tableInfo['serial_number']??'' . '<BR>';
-        $this->printerContent .= '桌码分类: ' . $Info['category']['name']??'' . '<BR>';
-        $this->printerContent .= '桌码编号: ' . $Info['table_number']??'' . '<BR>';
+        if(!empty($Info)){
+            $this->printerContent .= '桌码流水：' . $tableInfo['serial_number'] . '<BR>';
+            $this->printerContent .= '桌码分类: ' . $Info['category']['name']. '<BR>';
+            $this->printerContent .= '桌码编号: ' . $Info['table_number'] . '<BR>';
+        }
         $this->printerContent .= '订单编号：' . $orderInfo['order_id'] . '<BR>';
         $this->printerContent .= '打印时间: ' . $printTime . '<BR>';
         $this->printerContent .= '付款时间: ' . $orderTime . '<BR>';

crmeb/services/printer/storage/YiLianYun.php

@@ -103,9 +103,11 @@ class YiLianYun extends BasePrinter
         $name = $config['name'];
         /** @var TableQrcodeServices $qrcodeService */
         $qrcodeService = app()->make(TableQrcodeServices::class);
-        $Info = $qrcodeService->getQrcodeyInfo((int)$tableInfo['qrcode_id'], ['category']);
+        
         $discountPrice = (float)bcsub((string)bcadd((string)$orderInfo['total_price'], $orderInfo['pay_postage'], 2), (string)bcadd((string)$orderInfo['deduction_price'], $orderInfo['pay_price'], 2), 2);
-        $this->printerContent = <<<CONTENT
+        if(!empty($tableInfo)){
+            $Info = $qrcodeService->getQrcodeyInfo((int)$tableInfo['qrcode_id'], ['category']);
+            $this->printerContent = <<<CONTENT
 <MN>{$this->accessToken->times}</MN>
 <FB><center> ** {$name} **</center></FB>
 <FH2><FW2>----------------</FW2></FH2>
@@ -130,6 +132,31 @@ class YiLianYun extends BasePrinter
 </FH>
 <FS><center> ** 完 **</center></FS>
 CONTENT;
+        }else{
+            $this->printerContent = <<<CONTENT
+<MN>{$this->accessToken->times}</MN>
+<FB><center> ** {$name} **</center></FB>
+<FH2><FW2>----------------</FW2></FH2>
+订单编号：{$orderInfo['order_id']}\r
+日    期: {$timeYmd} \r
+时    间: {$timeHis}\r
+姓    名: {$orderInfo['real_name']}\r
+电    话: {$orderInfo['user_phone']}\r
+地    址: {$orderInfo['user_address']}\r
+赠送积分: {$orderInfo['gain_integral']}\r
+订单备注：{$orderInfo['mark']}\r
+*************商品***************\r
+{$goodsStr}
+********************************\r
+<FH>
+<LR>合计：￥{$orderInfo['total_price']},优惠: ￥{$discountPrice}</LR>
+<LR>邮费：￥{$orderInfo['pay_postage']},抵扣：￥{$orderInfo['deduction_price']}</LR>
+<right>实际支付：￥{$orderInfo['pay_price']}</right>           
+</FH>
+<FS><center> ** 完 **</center></FS>
+CONTENT;
+        }
+        
         return $this;
     }
 

view/store/node_modules/.cache/vue-loader/01d4587d55b991f44312ea3549b28e66.json

@@ -1 +1 @@
-{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\components\\batchSet.vue","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\components\\batchSet.vue","mtime":1730104101667},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./batchSet.vue?vue&type=template&id=6b03b52d&scoped=true&\"\nimport script from \"./batchSet.vue?vue&type=script&lang=js&\"\nexport * from \"./batchSet.vue?vue&type=script&lang=js&\"\nimport style0 from \"./batchSet.vue?vue&type=style&index=0&id=6b03b52d&scoped=true&lang=stylus&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  \"6b03b52d\",\n  null\n  \n)\n\n/* hot reload */\nif (module.hot) {\n  var api = require(\"D:\\\\project\\\\admin.jiuhaosh.cn\\\\view\\\\store\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n  api.install(require('vue'))\n  if (api.compatible) {\n    module.hot.accept()\n    if (!api.isRecorded('6b03b52d')) {\n      api.createRecord('6b03b52d', component.options)\n    } else {\n      api.reload('6b03b52d', component.options)\n    }\n    module.hot.accept(\"./batchSet.vue?vue&type=template&id=6b03b52d&scoped=true&\", function () {\n      api.rerender('6b03b52d', {\n        render: render,\n        staticRenderFns: staticRenderFns\n      })\n    })\n  }\n}\ncomponent.options.__file = \"src/pages/product/components/batchSet.vue\"\nexport default component.exports"]}
+{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\components\\batchSet.vue","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\components\\batchSet.vue","mtime":1730105392137},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./batchSet.vue?vue&type=template&id=6b03b52d&scoped=true&\"\nimport script from \"./batchSet.vue?vue&type=script&lang=js&\"\nexport * from \"./batchSet.vue?vue&type=script&lang=js&\"\nimport style0 from \"./batchSet.vue?vue&type=style&index=0&id=6b03b52d&scoped=true&lang=stylus&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  \"6b03b52d\",\n  null\n  \n)\n\n/* hot reload */\nif (module.hot) {\n  var api = require(\"D:\\\\project\\\\admin.jiuhaosh.cn\\\\view\\\\store\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n  api.install(require('vue'))\n  if (api.compatible) {\n    module.hot.accept()\n    if (!api.isRecorded('6b03b52d')) {\n      api.createRecord('6b03b52d', component.options)\n    } else {\n      api.reload('6b03b52d', component.options)\n    }\n    module.hot.accept(\"./batchSet.vue?vue&type=template&id=6b03b52d&scoped=true&\", function () {\n      api.rerender('6b03b52d', {\n        render: render,\n        staticRenderFns: staticRenderFns\n      })\n    })\n  }\n}\ncomponent.options.__file = \"src/pages/product/components/batchSet.vue\"\nexport default component.exports"]}

view/store/node_modules/.cache/vue-loader/374f79850e7d5234df35e809af5e2f94.json

@@ -1 +1 @@
-{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","mtime":1717396015000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./index.vue?vue&type=template&id=b77c4908&scoped=true&\"\nimport script from \"./index.vue?vue&type=script&lang=js&\"\nexport * from \"./index.vue?vue&type=script&lang=js&\"\nimport style0 from \"./index.vue?vue&type=style&index=0&id=b77c4908&scoped=true&lang=less&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  \"b77c4908\",\n  null\n  \n)\n\n/* hot reload */\nif (module.hot) {\n  var api = require(\"D:\\\\project\\\\admin.jiuhaosh.cn\\\\view\\\\store\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n  api.install(require('vue'))\n  if (api.compatible) {\n    module.hot.accept()\n    if (!api.isRecorded('b77c4908')) {\n      api.createRecord('b77c4908', component.options)\n    } else {\n      api.reload('b77c4908', component.options)\n    }\n    module.hot.accept(\"./index.vue?vue&type=template&id=b77c4908&scoped=true&\", function () {\n      api.rerender('b77c4908', {\n        render: render,\n        staticRenderFns: staticRenderFns\n      })\n    })\n  }\n}\ncomponent.options.__file = \"src/pages/product/productList/index.vue\"\nexport default component.exports"]}
+{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js??ref--13-0!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","mtime":1730267592589},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\eslint-loader\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["import { render, staticRenderFns } from \"./index.vue?vue&type=template&id=b77c4908&scoped=true&\"\nimport script from \"./index.vue?vue&type=script&lang=js&\"\nexport * from \"./index.vue?vue&type=script&lang=js&\"\nimport style0 from \"./index.vue?vue&type=style&index=0&id=b77c4908&scoped=true&lang=less&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  \"b77c4908\",\n  null\n  \n)\n\n/* hot reload */\nif (module.hot) {\n  var api = require(\"D:\\\\project\\\\admin.jiuhaosh.cn\\\\view\\\\store\\\\node_modules\\\\vue-hot-reload-api\\\\dist\\\\index.js\")\n  api.install(require('vue'))\n  if (api.compatible) {\n    module.hot.accept()\n    if (!api.isRecorded('b77c4908')) {\n      api.createRecord('b77c4908', component.options)\n    } else {\n      api.reload('b77c4908', component.options)\n    }\n    module.hot.accept(\"./index.vue?vue&type=template&id=b77c4908&scoped=true&\", function () {\n      api.rerender('b77c4908', {\n        render: render,\n        staticRenderFns: staticRenderFns\n      })\n    })\n  }\n}\ncomponent.options.__file = \"src/pages/product/productList/index.vue\"\nexport default component.exports"]}

view/store/node_modules/.cache/vue-loader/5673ad869a93ab8d8316d67eff86609b.json

@@ -1 +1 @@
-{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\components\\batchSet.vue?vue&type=style&index=0&id=6b03b52d&scoped=true&lang=stylus&","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\components\\batchSet.vue","mtime":1730104101667},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\css-loader\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\loaders\\stylePostLoader.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\stylus-loader\\index.js","mtime":1519606876000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000}],"contextDependencies":[],"result":["\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n.ivu-menu{\n\tmargin: 20px 0;\n}\n.customTab{\n  margin-top: 20px;\n  /deep/.ivu-table-header thead tr th{\n    padding: 0 10px !important\n    .ivu-table-cell{\n      padding: 5px 0 !important\n    }\n  }\n  /deep/.ivu-table td{\n    height: 30px !important;\n    padding: 0 10px !important;\n    .ivu-table-cell{\n      padding: 2px 0 !important;\n    }\n  }\n}\n",null]}
+{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\components\\batchSet.vue?vue&type=style&index=0&id=6b03b52d&scoped=true&lang=stylus&","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\components\\batchSet.vue","mtime":1730105392137},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\css-loader\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\loaders\\stylePostLoader.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\stylus-loader\\index.js","mtime":1519606876000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000}],"contextDependencies":[],"result":["\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n.ivu-menu{\n\tmargin: 20px 0;\n}\n.customTab{\n  margin-top: 20px;\n  /deep/.ivu-table-header thead tr th{\n    padding: 0 10px !important\n    .ivu-table-cell{\n      padding: 5px 0 !important\n    }\n  }\n  /deep/.ivu-table td{\n    height: 30px !important;\n    padding: 0 10px !important;\n    .ivu-table-cell{\n      padding: 2px 0 !important;\n    }\n  }\n}\n",null]}

view/store/node_modules/.cache/vue-loader/f9407b57a08564221d2a4a6c23cb6f36.json

@@ -1 +1 @@
-{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue?vue&type=style&index=0&id=b77c4908&scoped=true&lang=less&","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","mtime":1717396015000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\css-loader\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\loaders\\stylePostLoader.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\less-loader\\dist\\cjs.js","mtime":1728455681676},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000}],"contextDependencies":[],"result":["\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/deep/.el-cascader {\n\t.el-input__inner {\n\t  font-size: 12px;\n\t  min-height: 32px !important;\n\t}\n\t.el-input{\n\t\t.el-icon-arrow-down{\n\t\t\tfont-size: 12px;\n\t\t\tcolor: #000;\n\t\t}\n\t}\n\t.el-cascader__search-input{\n\t\tmargin-left: 7px !important;\n\t}\n}\n/deep/.ivu-page-header,\n/deep/.ivu-tabs-bar {\n  margin-bottom: 0px !important;\n  border-bottom: 1px solid #E9E9E9;\n}\n\n/deep/.ivu-card-body {\n  padding: 14px 20px 0 20px !important;\n}\n\n\n/deep/.ivu-tabs-nav {\n  height: 45px;\n}\n\n.bg {\n  z-index: 100;\n  position: fixed;\n  left: 0;\n  top: 0;\n  width: 100%;\n  height: 100%;\n  background: rgba(0, 0, 0, 0.5);\n}\n\n.tabbox {\n  padding: 0px 20px 0px;\n  // border-bottom: 1px solid #DCDFE6;\n}\n\n.box {\n  padding: 20px;\n  padding-bottom: 0px;\n}\n\n.tablebox {\n  margin-top: 15px;\n}\n\n.btnbox {\n  padding: 20px 0px 0px 30px;\n\n  .btns {\n    width: 99px;\n    height: 32px;\n    background: #1890ff;\n    border-radius: 4px;\n    text-align: center;\n    line-height: 32px;\n    color: #ffffff;\n    cursor: pointer;\n  }\n}\n\n.table {\n  padding: 0px 30px 15px 30px;\n}\n.ivu-table {\n  background-color: #182328;\n  color: #fff;\n}\n.tabBox_img {\n  width: 36px;\n  height: 36px;\n  border-radius: 4px;\n  cursor: pointer;\n\n  img {\n    width: 100%;\n    height: 100%;\n  }\n}\n\n.search {\n  width: 86px;\n  height: 32px;\n  background: #1890ff;\n  border-radius: 4px;\n  text-align: center;\n  line-height: 32px;\n  font-size: 13px;\n  font-family: PingFangSC-Regular, PingFang SC;\n  font-weight: 400;\n  color: #ffffff;\n  cursor: pointer;\n}\n\n.reset {\n  width: 86px;\n  height: 32px;\n  border-radius: 4px;\n  border: 1px solid rgba(151, 151, 151, 0.36);\n  text-align: center;\n  line-height: 32px;\n  font-size: 13px;\n  font-family: PingFangSC-Regular, PingFang SC;\n  font-weight: 400;\n  font-weight: 500;\n  color: #515a6e;\n  // background: #2D8CF0;\n\n  cursor: pointer;\n}\n",null]}
+{"remainingRequest":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js??ref--0-2!D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue?vue&type=style&index=0&id=b77c4908&scoped=true&lang=less&","dependencies":[{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\src\\pages\\product\\productList\\index.vue","mtime":1730267592589},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\css-loader\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\loaders\\stylePostLoader.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\less-loader\\dist\\cjs.js","mtime":1728455681676},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000},{"path":"D:\\project\\admin.jiuhaosh.cn\\view\\store\\node_modules\\iview-loader\\index.js","mtime":1570440814000}],"contextDependencies":[],"result":["\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/deep/.el-cascader {\n\t.el-input__inner {\n\t  font-size: 12px;\n\t  min-height: 32px !important;\n\t}\n\t.el-input{\n\t\t.el-icon-arrow-down{\n\t\t\tfont-size: 12px;\n\t\t\tcolor: #000;\n\t\t}\n\t}\n\t.el-cascader__search-input{\n\t\tmargin-left: 7px !important;\n\t}\n}\n/deep/.ivu-page-header,\n/deep/.ivu-tabs-bar {\n  margin-bottom: 0px !important;\n  border-bottom: 1px solid #E9E9E9;\n}\n\n/deep/.ivu-card-body {\n  padding: 14px 20px 0 20px !important;\n}\n\n\n/deep/.ivu-tabs-nav {\n  height: 45px;\n}\n\n.bg {\n  z-index: 100;\n  position: fixed;\n  left: 0;\n  top: 0;\n  width: 100%;\n  height: 100%;\n  background: rgba(0, 0, 0, 0.5);\n}\n\n.tabbox {\n  padding: 0px 20px 0px;\n  // border-bottom: 1px solid #DCDFE6;\n}\n\n.box {\n  padding: 20px;\n  padding-bottom: 0px;\n}\n\n.tablebox {\n  margin-top: 15px;\n}\n\n.btnbox {\n  padding: 20px 0px 0px 30px;\n\n  .btns {\n    width: 99px;\n    height: 32px;\n    background: #1890ff;\n    border-radius: 4px;\n    text-align: center;\n    line-height: 32px;\n    color: #ffffff;\n    cursor: pointer;\n  }\n}\n\n.table {\n  padding: 0px 30px 15px 30px;\n}\n.ivu-table {\n  background-color: #182328;\n  color: #fff;\n}\n.tabBox_img {\n  width: 36px;\n  height: 36px;\n  border-radius: 4px;\n  cursor: pointer;\n\n  img {\n    width: 100%;\n    height: 100%;\n  }\n}\n\n.search {\n  width: 86px;\n  height: 32px;\n  background: #1890ff;\n  border-radius: 4px;\n  text-align: center;\n  line-height: 32px;\n  font-size: 13px;\n  font-family: PingFangSC-Regular, PingFang SC;\n  font-weight: 400;\n  color: #ffffff;\n  cursor: pointer;\n}\n\n.reset {\n  width: 86px;\n  height: 32px;\n  border-radius: 4px;\n  border: 1px solid rgba(151, 151, 151, 0.36);\n  text-align: center;\n  line-height: 32px;\n  font-size: 13px;\n  font-family: PingFangSC-Regular, PingFang SC;\n  font-weight: 400;\n  font-weight: 500;\n  color: #515a6e;\n  // background: #2D8CF0;\n\n  cursor: pointer;\n}\n",null]}

view/store/src/pages/product/productList/index.vue

@@ -28,6 +28,15 @@
 				</Select>
 		    </FormItem>
 		  </Col>
+		  <Col>
+		    <FormItem label="打印机：" :labelWidth="80" label-for="show_type">
+		  				<Select v-model="formValidate.printset" style="width:250px" placeholder="请选择" clearable @on-change="search">
+		  				  <Option value="0" >全部</Option>
+		  				  <Option value="no" >未设置</Option>
+		  				  <Option :value="item.id" v-for="(item, index) in printlist">{{item.name}}</Option>
+		  				</Select>
+		    </FormItem>
+		  </Col>
           <Col>
             <FormItem label="商品搜索：" :labelWidth="80" label-for="store_name">
               <Input enter-button style="width:250px"  placeholder="请输入商品名称,关键字,ID" v-model="formValidate.store_name" />
@@ -139,6 +148,7 @@
               </Tooltip>
             </template>
           </vxe-column>
+		  <vxe-column field="print_name" title="打印机" min-width="70"></vxe-column>
           <vxe-column field="price" title="商品售价" min-width="90"></vxe-column>
           <vxe-column field="branch_sales" title="销量" min-width="90"></vxe-column>
           <vxe-column field="branch_stock" title="库存" min-width="80"></vxe-column>
@@ -183,6 +193,7 @@
 </template>
 
 <script>
+
 import Setting from "@/setting";
 import { mapState } from "vuex";
 import goodsDetail from "../components/goods_detail.vue";
@@ -199,6 +210,7 @@ import {
   productUnshowApi
 } from "@/api/product.js";
 import { erpConfig } from "@/api/erp";
+import { getPrinterList} from '@/api/setting'
 export default {
   name: "index",
   components: {
@@ -209,6 +221,7 @@ export default {
   },
   data() {
     return {
+		printlist:[],
       routePre:Setting.routePre,
 	  props: { emitPath: false, multiple: true, checkStrictly: true },
       openErp:false,
@@ -257,6 +270,7 @@ export default {
     this.goodsCategory();
     this.getHeader();
     this.getErpConfig();
+	this.printerList();
   },
   methods: {
     //批量设置
@@ -294,6 +308,20 @@ export default {
         this.isCheckBox = false;
       }
     },
+	// 列表
+	printerList() {
+	  this.loading = true;
+	  getPrinterList({
+	    page: 1,
+	    limit: 100,
+	  }).then((res) => {
+	    let { list, count } = res.data;
+	    this.printlist = list;
+	    this.loading = false;
+	  }).catch(err => {
+	    this.$Message.error(err.msg);
+	  });
+	},
     allPages(e){
       this.isAll = e;
       if(e==0){