入库申请

src/views/modules/warehouse/stock-order-inbound.vue

@@ -44,13 +44,13 @@
                     :value="item.code">
                   </el-option>
                 </el-select>
-                <el-button v-show="item.buttonType && item.buttonType === '1'" @click="changeButtonType(item, 0)" type="danger">转为选择</el-button>
-                <el-button v-show="!item.buttonType || item.buttonType === '0'" @click="changeButtonType(item, 1)" type="danger">转为输入</el-button>
+                <el-button v-show="!display && item.buttonType && item.buttonType === '1'" @click="changeButtonType(item, 0)" type="danger">转为选择</el-button>
+                <el-button v-show="!display && (!item.buttonType || item.buttonType === '0')" @click="changeButtonType(item, 1)" type="danger">转为输入</el-button>
               </el-form-item>
             </el-col>
             <el-col :span="8" style="padding-left: 20px">
               <el-form-item label="类别" prop="materialTypeId" :rules="{required: false, message: '类别不能为空', trigger: 'blur'}">
-                <el-input v-if="!item.buttonType || item.buttonType === '0'" v-model="item.categoryName" :disabled="true" style="width: 200px"></el-input>
+                <el-input v-if="display || !item.buttonType || item.buttonType === '0'" v-model="item.categoryName" :disabled="true" style="width: 200px"></el-input>
                 <el-select v-else v-model="item.materialTypeId"
                            remote
                            filterable
@@ -131,7 +131,7 @@
           </el-row>
           <el-row>
             <el-form-item label="备注" prop="notes">
-              <el-input v-model="item.notes" :disabled="display" placeholder="备注"></el-input>
+              <el-input type="textarea" v-model="item.notes" :disabled="display" placeholder="备注"></el-input>
             </el-form-item>
           </el-row>
         </div>

src/views/modules/warehouse/stock-order-outbound.vue

@@ -62,11 +62,11 @@
                 <el-input v-model="item.specifications" :disabled="true" placeholder="规格"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="padding-left: 20px">
-              <el-form-item label="批次号" prop="batchNumber">
-                <el-input v-model="item.batchNumber" placeholder="请填写出库物品（零件）批次"></el-input>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="8" style="padding-left: 20px">-->
+<!--              <el-form-item label="批次号" prop="batchNumber">-->
+<!--                <el-input v-model="item.batchNumber" placeholder="请填写出库物品（零件）批次"></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <el-row class="my-row">
             <el-col :span="8">