Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Purch.php

@@ -599,8 +599,12 @@ class Purch extends Base
         $idinf['order_type']=$dn['order_type'];
 
         //取出销售的工差单信息
-        $idinf['diff_info'] = Db::name('sale_diff')->where('cgd_diffid',$id)->find();
-        
+        $diff = Db::name('sale_diff')->field('id,customer_remark,is_act,remark')->where('cgd_diffid',$id)->find();
+
+        $idinf['diff_customer_remark']=$diff['customer_remark'];
+        $idinf['diff_is_act']=$diff['is_act'];
+        $idinf['diff_remark']=$diff['remark'];
+
        return  app_show(0,"获取成功",$idinf);
 
     }