wenningning 6 月之前
父节点
当前提交
497a11dd1a

+ 1 - 1
manager-admin/src/views/goods/goodsEdit.vue

@@ -129,7 +129,7 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" v-if="authStatus===0 || authStatus===3" @click="handleSave" class="save">保存</el-button>
+          <el-button type="primary" v-if="authStatus===0 || authStatus===3 || boolFounder" @click="handleSave" class="save">保存</el-button>
           <template v-if="goodsForm.enabled && goodsId">
             <el-button type="warning" v-if="authStatus===0 || authStatus===3" @click="handleAuthReq" class="save">提交审核</el-button>
             <el-button type="warning" v-if="authStatus===1" @click="handleAuth2Default" class="save">撤销提交</el-button>

+ 7 - 0
manager-admin/src/views/pjOrder/Items.vue

@@ -22,6 +22,13 @@
             <div style="float: left">
               <el-input v-model="params.keyword" placeholder="输入产品名搜索" size="" clearable />
             </div>
+            <div style="float: left">
+              <el-select v-model="params.good_type" clearable filterable allow-create
+                         placeholder="选择产品类型">
+                <el-option value="外购"></el-option>
+                <el-option value="自产"></el-option>
+              </el-select>
+            </div>
             <el-button @click="sousuo">搜索</el-button>
             <!--              <el-input v-model="params.keyword" placeholder="输入项目搜索" size="mini" clearable />-->
           </div>

+ 2 - 1
manager-admin/src/views/pjOrder/OrderItems.vue

@@ -24,7 +24,7 @@
                   <div class="info">
                     <div>生产型号:{{ item.code }}</div>
                     <div>产品编码:{{ item.no }}</div>
-                    <div>类型:{{ item.good_type }}</div>
+                    <div>产品类型:{{ item.good_type }}</div>
                     <div>生产周期:{{ item.produce_day }}天</div>
                     <div>数量:{{item.qty}}</div>
                     <div>价格:{{item.price}}</div>
@@ -182,6 +182,7 @@
                   <div class="info">
                     <div>生产型号:{{ item.code }}</div>
                     <div>产品编码:{{ item.no }}</div>
+                    <div>产品类型:{{ item.good_type }}</div>
                     <div>生产周期:{{ item.produce_day }}天</div>
                     <div>数量:{{item.qty}}</div>
                     <div>价格:{{item.price}}</div>