Merge branch 'feature/pyh_批量弹窗页面优化' into develop

src/views/auxiliaryFittings/auxiliaryDataManagement/auxiliaryMaterialClass/index.vue

@@ -38,7 +38,7 @@
 				  </zj-form-module>
 				</zj-form-container>
 				<div slot="footer" class="dialog-footer">
-				  <el-button size="mini" @click="formCancel;data.removeTab">取 消</el-button>
+				  <el-button size="mini" @click="formCancel;data.removeTab()">取 消</el-button>
 				  <el-button size="mini" @click="formConfirm(data.removeTab)" type="primary">确 定</el-button>
 				</div>
 			</div>
@@ -196,7 +196,7 @@ export default {
 					}else if(type == 'edit1'){
 						Object.assign(this.formData, row)
 						this.formDialogType = 1
-					}else if(type == 'edit1'){
+					}else if(type == 'edit2'){
 						Object.assign(this.formData, row)
 						this.formDialogType = 1
 					}

src/views/mallManagement/order/order_list/index.vue

@@ -305,7 +305,7 @@
 			</div>
 			<!-- 发货弹窗 -->
 			<div v-if="activeKey == 'deliverGoods' || activeKey == 'editExpressage'" class="app-container">
-				<el-form :model="logisticsForm" ref="logisticsForm" label-width="80px" label-position="left">
+				<el-form :model="logisticsForm" ref="logisticsForm" label-width="100px" label-position="left">
 					<el-row :gutter="20">
 						<el-col :span="6">
 							<el-form-item label="快递单号" prop="logisticsNo" :rules="[{ required: true, message: '快递单号不能为空', trigger: 'blur' }]">