wupengfei преди 2 години
родител
ревизия
140d752699
променени са 3 файла, в които са добавени 6 реда и са изтрити 3 реда
  1. 2 1
      .idea/workspace.xml
  2. 3 1
      application/common/model/Supplier.php
  3. 1 1
      application/operate/controller/SupplierGoods.php

+ 2 - 1
.idea/workspace.xml

@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/model/Supplier.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/Supplier.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -291,7 +292,7 @@
       <workItem from="1681348081818" duration="22448000" />
       <workItem from="1681434523223" duration="19578000" />
       <workItem from="1681463431612" duration="3188000" />
-      <workItem from="1681692707179" duration="15431000" />
+      <workItem from="1681692707179" duration="15481000" />
     </task>
     <servers />
   </component>

+ 3 - 1
application/common/model/Supplier.php

@@ -14,6 +14,8 @@ class Supplier extends Model
     // 获取供应商名称
     public static function getSupplierName($is_all = 0)
     {
-        return self::when($is_all,function ($query)use ($is_all){if(!$is_all)return $query->where('status',1)->where('is_deleted',0);})->column('id,title,is_deleted,status','id');
+        return self::when($is_all,function ($query)use ($is_all){
+            if(!$is_all) return $query->where('status',1)->where('is_deleted',0);
+        })->column('id,title,is_deleted,status','id');
     }
 }

+ 1 - 1
application/operate/controller/SupplierGoods.php

@@ -168,7 +168,7 @@ class SupplierGoods extends Controller
             ->where(['is_deleted'=>0])->order('id desc')
             ->select()->toArray();
         $data['create_at'] = date('Y-m-d H:i:s');
-        $this->supplier_list = \app\common\model\Supplier::getSupplierName();
+        $this->supplier_list = \app\common\model\Supplier::getSupplierName(0);
        // $this->company_list = \app\common\model\Company::getCompanyName();
         $this->assign('waitSecond','1');
         $this->assign("jumpUrl",$_SERVER["HTTP_REFERER"]);