1

core/CoreApp/controllers/Fullorderexcel.php

@@ -660,14 +660,18 @@ class Fullorderexcel extends Start_Controller {
 			{
 				$order_str = "id desc";
 			}
+
+
+			$order_status_list = $this->typeclass->find_all("classid = 29");
+
+			$order_status_list = array_column($order_status_list,'title','id');
+
 			// if($_GET['fexcel'] == '157'){
 			// 	$this->logic_ding->sendToDing("excel导出的【".$where.$wid.' and '.$excelshop);
 			// 	$this->logic_ding->sendToDing("excel导出的【".'id,'.$feq);
 			// 	$this->logic_ding->sendToDing("excel导出的【".$order_str);
 			// 	$this->logic_ding->sendToDing("excel导出的SJ【".$sj);
 			// }
-
-
             //取得信息列表
             $info_list = $this->$sj->find_all($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str);
 			 //格式化数据
@@ -834,6 +838,9 @@ class Fullorderexcel extends Start_Controller {
 
 
 
+				}
+				if(isset($value['state'])){
+					$info_list[$key]['state'] = isset($order_status_list[$value['state']]) ? $order_status_list[$value['state']] : '';
 				}
 				if(isset($value['lpdl'])){
 					$tmp_lpdl_str  ="";
@@ -1975,6 +1982,8 @@ class Fullorderexcel extends Start_Controller {
 			// 	$this->logic_ding->sendToDing("excel导出的【".$order_str);
 			// 	$this->logic_ding->sendToDing("excel导出的SJ【".$sj);
 			// }
+			$order_status_list = $this->typeclass->find_all("classid = 29");
+			$order_status_list = array_column($order_status_list,'title','id');
 			$extra = [
 				'usp'=>$usp,
 				'sku9610'=>$sku9610,
@@ -1983,6 +1992,7 @@ class Fullorderexcel extends Start_Controller {
 				'goods_sku_list'=>$goods_sku_list,
 				'typeclass'=>$typeclass,
 				'shopqz_list'=>$shopqz_list,
+				'order_status_list'=>$order_status_list,
 			];
 			$dlz_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullorder',$extra);
 			$tt_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullordertt',$extra);
@@ -2015,6 +2025,7 @@ class Fullorderexcel extends Start_Controller {
 		 $goods_sku_list = $extra['goods_sku_list'] ;
 		 $typeclass = $extra['typeclass'];
 		 $shopqz_list = $extra['shopqz_list'];
+		 $order_status_list = $extra['order_status_list'];
 		 //检查$field中的字段是否在表中存在，不存在的字段设置为空值
 		 $table = $this->$sj->table;
 		 $table_fields = $this->db->list_fields($table);
@@ -2113,6 +2124,9 @@ class Fullorderexcel extends Start_Controller {
 					$info_list[$key]['sku'] = $value['sku'];
 				}
 			}
+			if(isset($value['state'])){
+				$info_list[$key]['state'] = isset($order_status_list[$value['state']]) ? $order_status_list[$value['state']] : '';
+			}
 			if(isset($value['issku']))
 			{
 				$value['issku'] = str_replace(array('&lt;','&gt;'),array('<','>'),$value['issku']);

template/erp/fullorderexcel_add.html

@@ -298,12 +298,15 @@
 				<li id="ttcatetwo">
 					<font>TT订单分类2</font><i class="fa fa-plus"></i>
 				</li>
-				<li id="kong">
-					<font>空内容</font><i class="fa fa-plus"></i>
-				</li>
 				<li id="shopqz">
 					<font>订单编号前缀</font><i class="fa fa-plus"></i>
 				</li>
+				<li id="state">
+					<font>订单状态</font><i class="fa fa-plus"></i>
+				</li>
+				<li id="kong">
+					<font>空内容</font><i class="fa fa-plus"></i>
+				</li>
 			</ul>
 			<ul id="c2" class="fuexcel" style="width:320px;float:right">
 			</ul>

template/erp/fullorderexcel_edit.html

@@ -300,13 +300,15 @@
 				<li id="ttcatetwo">
 					<font>TT订单分类2</font><i class="fa fa-plus"></i>
 				</li>
-
-				<li id="kong">
-					<font>空内容</font><i class="fa fa-plus"></i>
-				</li>
 				<li id="shopqz">
 					<font>订单编号前缀</font><i class="fa fa-plus"></i>
 				</li>
+				<li id="state">
+					<font>订单状态</font><i class="fa fa-plus"></i>
+				</li>
+				<li id="kong">
+					<font>空内容</font><i class="fa fa-plus"></i>
+				</li>
 			</ul>
 			<ul id="c2" class="fuexcel" style="width:320px;float:right">
 			</ul>