lvhao 1 týždeň pred
rodič
commit
585d7cfca8

+ 36 - 36
core/CoreApp/controllers/Fullorder.php

@@ -1499,24 +1499,24 @@ class Fullorder extends Start_Controller {
             }
 		}
 		$fpdata = $this->logic_order->checkOrderProduct($fpdata);
-		$tmp_features = array_column($fpdata,0);
-		$do_trans_pms = [];
-		foreach ($tmp_features as $k=>$v) {
-			if(strpos($v,",") === false){
-				$do_trans_pms[] = [
-					'features'=>$v
-				];
-			}else{
-				$tmp_arr = explode(",",$v);
-				$do_trans_pms[] = [
-					'features'=>$tmp_arr[1].$tmp_arr[0]."-"
-				];
-			}
-		}
-		$r = $this->logic_whlabel->dataTran($do_trans_pms,['pm']);
-		foreach ($fpdata as $k=>$v) {
-			$fpdata[$k]['pm'] = $r[$k]['pm'];
-		}
+		// $tmp_features = array_column($fpdata,0);
+		// $do_trans_pms = [];
+		// foreach ($tmp_features as $k=>$v) {
+		// 	if(strpos($v,",") === false){
+		// 		$do_trans_pms[] = [
+		// 			'features'=>$v
+		// 		];
+		// 	}else{
+		// 		$tmp_arr = explode(",",$v);
+		// 		$do_trans_pms[] = [
+		// 			'features'=>$tmp_arr[1].$tmp_arr[0]."-"
+		// 		];
+		// 	}
+		// }
+		// $r = $this->logic_whlabel->dataTran($do_trans_pms,['pm']);
+		// foreach ($fpdata as $k=>$v) {
+		// 	$fpdata[$k]['pm'] = $r[$k]['pm'];
+		// }
 		$this->data['fpdata'] = $fpdata;
 		$thfpdataxs = array();
 		if($fullorder['thfpdata'] != '')
@@ -2073,24 +2073,24 @@ class Fullorder extends Start_Controller {
             }
 		}
 		$this->data['fpdata'] = $fpdata;
-		$tmp_features = array_column($fpdata,0);
-		$do_trans_pms = [];
-		foreach ($tmp_features as $k=>$v) {
-			if(strpos($v,",") === false){
-				$do_trans_pms[] = [
-					'features'=>$v
-				];
-			}else{
-				$tmp_arr = explode(",",$v);
-				$do_trans_pms[] = [
-					'features'=>$tmp_arr[1].$tmp_arr[0]."-"
-				];
-			}
-		}
-		$r = $this->logic_whlabel->dataTran($do_trans_pms,['pm']);
-		foreach ($fpdata as $k=>$v) {
-			$fpdata[$k]['pm'] = $r[$k]['pm'];
-		}
+		// $tmp_features = array_column($fpdata,0);
+		// $do_trans_pms = [];
+		// foreach ($tmp_features as $k=>$v) {
+		// 	if(strpos($v,",") === false){
+		// 		$do_trans_pms[] = [
+		// 			'features'=>$v
+		// 		];
+		// 	}else{
+		// 		$tmp_arr = explode(",",$v);
+		// 		$do_trans_pms[] = [
+		// 			'features'=>$tmp_arr[1].$tmp_arr[0]."-"
+		// 		];
+		// 	}
+		// }
+		// $r = $this->logic_whlabel->dataTran($do_trans_pms,['pm']);
+		// foreach ($fpdata as $k=>$v) {
+		// 	$fpdata[$k]['pm'] = $r[$k]['pm'];
+		// }
 		$this->data['fpdata'] = $fpdata;
 		$thfpdataxs = array();
 		if($fullorder['thfpdata'] != '')

+ 40 - 40
template/erp/choice.html

@@ -16,7 +16,7 @@
 			<ul class="setting" style="min-width: 850px;">
 				<div class="datalist">
 					<li class="cike">
-						<em>类 目:</em>
+						<em>类 目:16</em>
 						<select name="category" class="select">
 							{loop typeclass(16) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -25,7 +25,7 @@
 					</li>
 
 					<li class="Gift Accessories synthetic">
-						<em>真人发类型:</em>
+						<em>真人发类型:22</em>
 						<select name="hairtype" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(22) as $val}
@@ -35,7 +35,7 @@
 					</li>
 
 					<li class="Gift synthetichair">
-						<em>等 级:</em>
+						<em>等 级:13</em>
 						<select name="grade" class="select">
 							{loop typeclass(13) as $val}
 							{if $val['id'] == 80}
@@ -52,7 +52,7 @@
 
 
 					<li class="Gift synthetic Accessories ycwigs Extension">
-						<em>头发颜色:</em>
+						<em>头发颜色:8</em>
 						<select name="color" style="width: 60%;" class="select select_two" id="color_one">
 							{loop typeclassyc(8) as $val}
 							{if $val['id'] == 57}
@@ -70,7 +70,7 @@
 					</li>
 
 					<li class="Gift synthetic Accessories ycwigs Extension">
-						<em>曲 度:</em>
+						<em>曲 度:15</em>
 						<select name="lowe" style="width: 60%;" class="select select_two">
 							{loop typeclassyc(15) as $val} <!-- 这个是不显示部分曲度 -->
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -85,7 +85,7 @@
 					</select>
 
 					<li class="1 none cikeb">
-						<em>类 型:</em>
+						<em>类 型:27</em>
 						<select name="type" class="select">
 							{loop typeclass(27) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -94,7 +94,7 @@
 					</li>
 
 					<li class="1 none">
-						<em>头路设计:</em>
+						<em>头路设计:12</em>
 						<select name="headroad" class="select">
 							{loop typeclass(12) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -103,7 +103,7 @@
 					</li>
 
 					<li class="1 none">
-						<em>密 度:</em>
+						<em>密 度:10</em>
 						<select name="density" class="select">
 							{loop typeclass(10) as $val}
 							{if $val['id']==72}
@@ -121,7 +121,7 @@
 					</li>
 
 					<li class="1 a1 none">
-						<em>蕾丝尺寸:</em>
+						<em>蕾丝尺寸:25</em>
 						<select name="lacesize" class="select">
 							{loop typeclassyc(25) as $val} <!-- 这个是不显示部分尺寸 -->
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -130,7 +130,7 @@
 					</li>
 
 					<li class="a2 none">
-						<em>蕾丝尺寸:</em>
+						<em>蕾丝尺寸:26</em>
 						<select name="lacesize" class="select">
 							{loop typeclassyc(26) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -139,21 +139,21 @@
 					</li>
 
 					<li class="a3 none">
-						<em>蕾丝尺寸:</em>
+						<em>蕾丝尺寸:26</em>
 						<select name="lacesize" class="select">
 							<option value="191">13" x 4"</option>
 						</select>
 					</li>
 
 					<li class="a4 none">
-						<em>蕾丝尺寸:</em>
+						<em>蕾丝尺寸:异常</em>
 						<select name="lacesize" class="select">
 							<option value="186">4" x 4"</option>
 						</select>
 					</li>
 
 					<li class="1 none">
-						<em>蕾丝颜色:</em>
+						<em>蕾丝颜色:9</em>
 						<select name="lacecolor" class="select">
 							<option value="">未选择</option>
 							{loop typeclassyc(9) as $val}
@@ -163,7 +163,7 @@
 					</li>
 
 					<li class="1 none">
-						<em>蕾丝类型:</em>
+						<em>蕾丝类型:44</em>
 						<select name="lacetypes" class="select">
 							<option value="">未选择</option>
 							{loop typeclassyc(44) as $val}
@@ -173,7 +173,7 @@
 					</li>
 
 					<li class="4 none">
-						<em>Gift类型:</em>
+						<em>Gift类型:34</em>
 						<select name="gifttype" class="select">
 							{loop typeclass(34) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -182,7 +182,7 @@
 					</li>
 
 					<li class="4 none">
-						<em>Gift其它:</em>
+						<em>Gift其它:49</em>
 						<select name="giftother" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(49) as $val}
@@ -192,7 +192,7 @@
 					</li>
 
 					<li class="2 none">
-						<em>人发头套编号:</em>
+						<em>人发头套编号:43</em>
 						<select name="hairnumber" style="width:60%" class="select select_two">
 							<option value="">未选择</option>
 							{loop typeclass(43) as $val}
@@ -203,7 +203,7 @@
 
 
 					<li class="3 none">
-						<em>Extension类型:</em>
+						<em>Extension类型:33</em>
 						<select name="extension" class="select">
 							{loop typeclass(33) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -212,7 +212,7 @@
 					</li>
 
 					<li class="6 none">
-						<em>化纤头套编号:</em>
+						<em>化纤头套编号:40</em>
 						<select name="sywignumber" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(40) as $val}
@@ -222,7 +222,7 @@
 					</li>
 
 					<li class="5 none">
-						<em>配件类型:</em>
+						<em>配件类型:35</em>
 						<select name="fittype" class="select">
 							{loop typeclass(35) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -231,7 +231,7 @@
 					</li>
 
 					<li class="5 none">
-						<em>配件其他:</em>
+						<em>配件其他:45</em>
 						<select name="acother" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(45) as $val}
@@ -241,7 +241,7 @@
 					</li>
 
 					<li class="7 none">
-						<em>化纤发编号:</em>
+						<em>化纤发编号:47</em>
 						<select name="syhairnumber" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(47) as $val}
@@ -251,7 +251,7 @@
 					</li>
 
 					<li class="7 none">
-						<em>化纤其它分类:</em>
+						<em>化纤其它分类:46</em>
 						<select name="syother" class="select">
 							{loop typeclass(46) as $val}
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -260,7 +260,7 @@
 					</li>
 
 					<li class="2 3 5 6 7 none">
-						<em>头发颜色:</em>
+						<em>头发颜色:8</em>
 						<select name="color" style="width: 60%;"  class="select select_two" id="color_two">
 							{loop typeclassyc(8) as $val}
 							{if $val['id'] == 57}
@@ -278,7 +278,7 @@
 					</li>
 
 					<li class="2 3 5 6 7 none">
-						<em>曲 度:</em>
+						<em>曲 度:15</em>
 						<select name="lowe" style="width: 60%;" class="select select_two">
 							{loop typeclassyc(15) as $val} <!-- 这个是不显示部分曲度 -->
 							<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>
@@ -287,7 +287,7 @@
 					</li>
 
 					<li class="2 none">
-						<em>头套种类:</em>
+						<em>头套种类:18</em>
 						<select name="lacetype" style="width: 60%;" class="select select_two">
 							{loop typeclassyc(18) as $val}
 							{if $val['id']==146}
@@ -303,7 +303,7 @@
 					</li>
 
 					<li class="2 none">
-						<em>发帽大小:</em>
+						<em>发帽大小:6</em>
 						<select name="haircap" class="select">
 							<option value="30">Medium - 中号</option>
 							{loop typeclass(6) as $val}
@@ -315,7 +315,7 @@
 					</li>
 
 					<li class="2 none">
-						<em>密 度:</em>
+						<em>密 度:10</em>
 						<select name="density" class="select">
 							{loop typeclass(10) as $val}
 							{if $val['id']==72}
@@ -331,7 +331,7 @@
 					</li>
 
 					<li class="2 none">
-						<em>蕾丝颜色:</em>
+						<em>蕾丝颜色:9</em>
 						<select name="lacecolor" class="select">
 							<option value="">未选择</option>
 							{loop typeclassyc(9) as $val}
@@ -343,7 +343,7 @@
 					</li>
 
 					<li class="2 none">
-						<em>蕾丝类型:</em>
+						<em>蕾丝类型:44</em>
 						<select name="lacetypes" class="select">
 							<option value="">未选择</option>
 							{loop typeclassyc(44) as $val}
@@ -353,7 +353,7 @@
 					</li>
 
 					<li class="2 none">
-						<em>分缝及刘海:</em>
+						<em>分缝及刘海:39</em>
 						<select name="wigother" class="select">
 							<option value="">未选择</option>
 							{loop typeclassyc(39) as $val}
@@ -363,7 +363,7 @@
 					</li>
 
 					<li class="2 none">
-						<em>头套其它1:</em>
+						<em>头套其它1:50</em>
 						<select name="wigother1" class="select">
 							<option value="">未选择</option>
 							{loop typeclassyc(50) as $val}
@@ -372,7 +372,7 @@
 						</select>
 					</li>
 					<li class="2 none">
-						<em>头套其它2:</em>
+						<em>头套其它2:51</em>
 						<select name="wigother2" class="select">
 							<option value="">未选择</option>
 							{loop typeclassyc(51) as $val}
@@ -382,7 +382,7 @@
 					</li>
 
 					<li class="6 none">
-						<em>头套类型:</em>
+						<em>头套类型:41</em>
 						<select name="synthetictype" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(41) as $val}
@@ -392,7 +392,7 @@
 					</li>
 
 					<li class="6 none">
-						<em>化纤头套其它:</em>
+						<em>化纤头套其它:42</em>
 						<select name="sywigother" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(42) as $val}
@@ -402,7 +402,7 @@
 					</li>
 
 					<li class="3 5 7 none">
-						<em>单包片数:</em>
+						<em>单包片数:38</em>
 						<select name="items" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(38) as $val}
@@ -412,7 +412,7 @@
 					</li>
 
 					<li class="3 5 none">
-						<em>重 量:</em>
+						<em>重 量:7</em>
 						<select name="weight" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(7) as $val}
@@ -422,7 +422,7 @@
 					</li>
 
 					<li class="7 none">
-						<em>化纤发其它:</em>
+						<em>化纤发其它:48</em>
 						<select name="syhairther" class="select">
 							<option value="">未选择</option>
 							{loop typeclass(48) as $val}
@@ -433,7 +433,7 @@
 				</div>
 				<div class="datalist">
 					<li class="length none4">
-						<em>长 度:</em>
+						<em>长 度:14</em>
 						<div class="checkbox">
 							{loop typeclass(14) as $val}
 							<span class="ckrows"><label><input class="{$val['id']}" name="size" type="radio"
@@ -566,6 +566,6 @@
 		**/
 
 	</script>
-	<script src="{$theme}js/fullorder-addeditv1.js?v=202511100924"></script>
+	<script src="{$theme}js/fullorder-addedit.js?v=202511100924"></script>
 	<script src="{$theme}js/goodsrules.js?v=202511100924"></script>
 	{Template footer}

+ 4 - 4
template/erp/fullorder_edit.html

@@ -58,9 +58,9 @@
 <tr data-list="{$val['0']}" {if isset($val['err_sku'])&&($val['err_sku'] == 1) } style="background-color: #FF3;"  {/if}>
 <td>
 	<div class="en_title">{$val['1']}</div>
-	<div>
+	<!-- <div>
 		{$val['pm']}<i style="margin-left: 4px;" class="fa fa-file-o" title="点击复制" data-t="{$val['pm']}" onclick="copytext(this)"></i>
-	</div>
+	</div> -->
 	
 </td>
 <td>{$val['2']}</td>
@@ -79,7 +79,7 @@
 	{else}
 	<font class="yxzd">允许占单</font>
 	{/if} 
-	<font style="padding: 2px 10px; margin: 0 6px;color: #fff;border: 1px solid #f51;color: #f51;border-radius: 5px;cursor: pointer;" onclick="fuzhishangpin(this)">复制商品</font> 
+	<!-- <font style="padding: 2px 10px; margin: 0 6px;color: #fff;border: 1px solid #f51;color: #f51;border-radius: 5px;cursor: pointer;" onclick="fuzhishangpin(this)">复制商品</font>  -->
 </td>
 </tr>
 {/loop}
@@ -1293,6 +1293,6 @@ $("#is_jiaji_id").on('change',function(){
 });
 
 </script>
-<script src="{$theme}js/fullorder-addeditv1.js?v=202511100932"></script>
+<script src="{$theme}js/fullorder-addedit.js?v=202511100932"></script>
 <script type="text/javascript" src="{$theme}js/time.js"></script>
 {Template footer}

+ 4 - 4
template/erp/fullorder_readonly.html

@@ -47,9 +47,9 @@
 <td>
 
 <div class="en_title">{$val['1']}</div>
-<div>
+<!-- <div>
 	{$val['pm']}<i style="margin-left: 4px;" class="fa fa-file-o" title="点击复制" data-t="{$val['pm']}" onclick="copytext(this)"></i>
-</div>
+</div> -->
 
 
 </td>
@@ -64,7 +64,7 @@
 <td class="none val9">{if isset($val['9'])}{$val['9']}{else}0{/if}</td>
 <td {if isset($val['zd']) && $fullorder['type'] == 13}style="color:#f00"{/if}>{if isset($val['zd'])}{$val['zd']}{/if}</td>
 <td class="czzd">{if $val['9'] != 'DNOTO'}<font class="jzzd">禁止占单</font>{else}<font class="yxzd">允许占单</font>{/if}
-	<font style="padding: 2px 10px; margin: 0 6px;color: #fff;border: 1px solid #f51;color: #f51;border-radius: 5px;cursor: pointer;" onclick="fuzhishangpin(this)">复制商品</font>
+	<!-- <font style="padding: 2px 10px; margin: 0 6px;color: #fff;border: 1px solid #f51;color: #f51;border-radius: 5px;cursor: pointer;" onclick="fuzhishangpin(this)">复制商品</font> -->
 </td>
 </tr>
 {/loop}
@@ -834,6 +834,6 @@ function addShouhu(that){
 }
 </script>
 <script type="text/javascript">var addedit="/fullorder/readonly/";var fh="/fullorder";</script>
-<script src="{$theme}js/fullorder-addeditv1.js?v=202511100933"></script>
+<script src="{$theme}js/fullorder-addedit.js?v=202511100933"></script>
 <script type="text/javascript" src="{$theme}js/time.js"></script>
 {Template footer}