Merge branch 'master' into feature/merge_report

src/views/custom/custom/index.vue

@@ -362,6 +362,7 @@
                 <el-table-column label="出库数量" sortable prop="checkoutNumber" min-width="60px" align="center" />
                 <el-table-column label="单价" sortable prop="price" min-width="60px" align="center" />
                 <el-table-column label="总价" sortable prop="sumPrice" min-width="60px" align="center" />
+                <!-- <el-table-column label="冲销" sortable prop="sumPrice" min-width="60px" align="center" /> -->
               </el-table>
               <pagination v-show="total>0" :total="totalDelivery" :page.sync="getdataListParmDelivery.offset" :limit.sync="getdataListParmDelivery.pagecount" @pagination="getCardDelivery" />
             </el-tab-pane>

src/views/custom/outStock/index.vue

@@ -381,7 +381,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-if="No2" :span="8">
+            <el-col v-if="No2 && createTemp.useType == 5" :span="8">
               <el-form-item label="领用部门：" prop="departmentId">
                 <el-select v-model="createTemp.departmentId" placeholder="领用部门" class="filter-item" style="width:100%" @change="changeDepart">
                   <el-option
@@ -393,11 +393,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="No2 && createTemp.useType == 6" :span="8">
-              <el-form-item label="青贮单号：" prop="greenFodderNumber">
+            <el-col v-if="No2 && createTemp.useType == 6" :span="8">
+              <el-form-item label="订单号：" prop="greenFodderNumber">
                 <el-input ref="greenFodderNumber" v-model="createTemp.greenFodderNumber" maxlength="20" />
               </el-form-item>
-            </el-col> -->
+            </el-col>
             <el-col v-if="isReceiveTime2" :span="8">
               <el-form-item label="出库日期：" prop="receiveTime">
                 <el-date-picker