wupengfei 2 years ago
parent
commit
050c2c2f40
2 changed files with 7 additions and 6 deletions
  1. 2 2
      .idea/workspace.xml
  2. 5 4
      application/operate/view/supplier_goods/form.html

+ 2 - 2
.idea/workspace.xml

@@ -3,7 +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/operate/view/company/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/company/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -289,7 +289,7 @@
       <workItem from="1681174490906" duration="23334000" />
       <workItem from="1681260946292" duration="27381000" />
       <workItem from="1681348081818" duration="22448000" />
-      <workItem from="1681434523223" duration="17452000" />
+      <workItem from="1681434523223" duration="18257000" />
     </task>
     <servers />
   </component>

+ 5 - 4
application/operate/view/supplier_goods/form.html

@@ -41,7 +41,7 @@
                     </div>
 
 
-                    <div class="layui-form-item layui-row layui-col-space15" {if $Think.get.source == 1}style="display:none"{/if}>
+                    <div class="layui-form-item layui-row layui-col-space15" >
                         <label class="layui-col-xs9 relative">
                             <span class="color-green">供应商</span>
                         </label>
@@ -57,7 +57,7 @@
                         </div>
                     </div>
 
-                    <div class="layui-form-item layui-row layui-col-space15"  {if $Think.get.source == 2}style="display:none"{/if}>
+                    <div class="layui-form-item layui-row layui-col-space15"}>
                         <label class="layui-col-xs9 relative">
                             <span class="color-green">公司</span>
                         </label>
@@ -66,7 +66,7 @@
                                 <select name="company_id" lay-filter ="company_id">
                                     <option value="0">请选择</option>
                                     {foreach $company_list as $dk=>$dv}
-                                    <option  {if isset($vo.company_id) && $vo.company_id == $dv['id'] }selected{/if} value="{$dv['id']}">{$dv['title']}</option>
+                                        <option  {if isset($vo.company_id) && $vo.company_id == $dv['id'] }selected{/if} value="{$dv['id']}">{$dv['title']}</option>
                                     {/foreach}
                                 </select>
                             </div>
@@ -209,7 +209,8 @@
 
                     <div class="layui-form-item text-center">
                         {notempty name='vo.id'}<input type="hidden" name="id" value="{$vo.id}">{/notempty}
-                        <input type='hidden' value='{$supplier_id|default="0"}' name='supplier_id'>
+                      <!--  <input type='hidden' value='{$supplier_id|default="0"}' name='supplier_id'>
+                        <input type='hidden' value='{$company_id|default="0"}' name='company_id'>-->
                         <button class="layui-btn" type="submit">保存</button>
                         <button class="layui-btn layui-btn-danger" type='button' onclick="history.go(-1)" data-close>返回</button>
                     </div>