Merge branch 'feature/Feature-home' into develop

src/views/basic_data/stock/stock_fee_list.vue

@@ -117,7 +117,7 @@
               </el-col>
 
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="状态" prop="saleExamineStatus">
+                <el-form-item label="出库状态" prop="saleExamineStatus">
                   <el-select v-model="screenForm.saleExamineStatus" clearable filterable>
                     <el-option
                       v-for="(item, index) in statusList"

src/views/supply/pickup/components/pickup_form.vue

@@ -284,8 +284,8 @@ export default {
         pickupWay: [{ required: true, message: '请选择提货方式', trigger: 'change' }],
         pickupMan: [{ required: true, message: '请选择提货人', trigger: 'change' }],
         receivingName: [{ required: true, message: '请填写收货客户', trigger: 'change' }],
-        phone: [{ required: true, message: '请填写电话', trigger: 'change' }],
-        address: [{ required: true, message: '请填写收货地址', trigger: 'change' }]
+        phone: [{ required: true, message: '请填写电话', trigger: 'change' }]
+        // address: [{ required: true, message: '请填写收货地址', trigger: 'change' }]
       },
       formLoading: false,
       tableSelection: [],