解决冲突

# Conflicts:
#	src/views/secondOrder/components/categoryDialog.vue
#	src/views/secondOrder/components/outDialog.vue

src/views/firstOrder/components/consumableDialog.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog :close-on-click-modal="false" :title="demandDialogTitle" :visible.sync="consumableVisible"
-        :append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen>
+        :append-to-body="true" width="70%" @close="handleCancel" fullscreen>
         <basic-container class="dialog-content">
             <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
                 :page.sync="page" :permission="permissionList" @row-del="rowDel" @search-change="searchChange"

src/views/firstOrder/components/inDialog.vue

@@ -616,7 +616,6 @@ export default {
         ldOnePutStorageDetailVOList: [], //入库明细
       },
       inTableData: [],
-
       inBatchDialogVisible: false, //选择采购单的数据
       batchType: "", //批量选择类型
       materialsType: "",

src/views/firstOrder/components/outDialog.vue

@@ -428,7 +428,7 @@
       v-if="consumableVisible"
       :consumableVisible="consumableVisible"
       :demandDialogTitle="demandDialogTitle"
-      @handleCloseDetail="handleCloseDetail"
+      @handleCloseDetail="closeDialog"
       @confirm="confirm"
     >
     </consumableDialog>
@@ -693,9 +693,12 @@ export default {
     //关闭新增弹窗
     handleCloseDetail() {
       this.outDialogVisible = false;
-      this.consumableVisible = false;
+      
       this.$emit("handleCloseDetail");
     },
+    closeDialog() {
+      this.consumableVisible = false;
+    },
     // 获取批量需求单列表
     async getQuarterList() {
       try {
@@ -834,8 +837,8 @@ export default {
     getDepartmentName(departmentId) {
       const department = this.list.find(
         (item) => item.departmentId === departmentId
-      );
+      )
-      return department ? department.department : "";
+      return department ? department.department : ""
     },
     //获取单条选择的物资名称列表
     async getMaterialList() {

src/views/secondOrder/components/outDialog.vue

@@ -521,6 +521,15 @@ export default {
     },
     handleCloseDetail() {
       this.outDialogVisible = false;
+<<<<<<< HEAD
+      
+      this.$emit("handleCloseDetail");
+    },
+    //关闭新增弹窗
+    closeDialog() {
+      this.categoryVisible = false
+    },
+=======
       this.$emit("handleCloseDetail");
     },
 
@@ -528,6 +537,7 @@ export default {
       this.categoryVisible = false;
     },
 
+>>>>>>> 94e2170923f61585374217a741bc58b7f0790b1e
     inInit() {
       if (this.outDialogType != "add") {
         getDetails({ twoOutStorageId: this.rowData.id }).then((res) => {