shish 5 years ago
parent
commit
aa78185f35
2 changed files with 3 additions and 2 deletions
  1. 1 1
      biz-ghs/order/classes/OrderClass.php
  2. 2 1
      sql.sql

+ 1 - 1
biz-ghs/order/classes/OrderClass.php

@@ -153,7 +153,7 @@ class OrderClass extends BaseClass
 		//待配送订单显示打印、发货和自取
 		if ($order['status'] == OrderClass::ORDER_STATUS_UN_SEND) {
 			//没有花材的订单按钮全部置灰色不可点
-			$print = ['type' => 'print', 'show' => 1, 'disable' => 1];
+			$print = ['type' => 'print', 'show' => 0, 'disable' => 1];
 			$item = ['type' => 'item', 'show' => 1, 'disable' => 1];
 			$selfGet = ['type' => 'selfGet', 'show' => 1, 'disable' => 1];
 			$send = ['type' => 'send', 'show' => 1, 'disable' => 1];

+ 2 - 1
sql.sql

@@ -1419,4 +1419,5 @@ ALTER TABLE `xhAdmin` ADD `style` TINYINT NOT NULL DEFAULT 1 COMMENT '类型 1
 RENAME TABLE `xhStaff` TO `xhPtAdmin`;
 RENAME TABLE `xhWxBase` TO `xhWxGzh`;
 RENAME TABLE `xhWxMiniBase` TO `xhWxMini`;
-ALTER TABLE xhWxOpen DROP COLUMN `appIdCreated`;
+ALTER TABLE xhWxOpen DROP COLUMN `appIdCreated`;
+ALTER TABLE xhAdmin MODIFY `identity` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '用户身份 1客户 2员工';