供外问题

applications/dee-mes/src/privateComponents/components/OutStorageOfferDetail/components/addOutStorageOfferDetailDialog.vue

@@ -20,7 +20,7 @@
       <el-form-item class="foot-btn-box">
         <el-button type="primary" @click="submitEvent(true)">添加</el-button>
         <el-button type="primary" @click="submitEvent(false)">确认</el-button>
-        <el-button @click.native="cancelEvent">取消</el-button>
+        <el-button @click="diaCancel">取消</el-button>
       </el-form-item>
     </el-form>
 
@@ -91,7 +91,7 @@ export default {
         }
       })
     },
-    cancelEvent() {
+    diaCancel() {
       this.$emit('cancel')
     }
   }

applications/dee-mes/src/privateComponents/components/OutStorageOfferDetail/index.vue

@@ -15,8 +15,8 @@
     >
       <dee-tools slot="header" :tools="tools" mode="normal" :collapse="false" />
     </dee-table>
-    <dee-dialog width="70%" title="添加供外出库申请明细" :visible.sync="dialogVisible" @on-cancel="cancel">
-      <addOutStorageOfferDetailDialog ref="addOffer" :basic-data="form" @submitEvent="addData" />
+    <dee-dialog width="70%" title="添加供外出库申请明细" :visible.sync="dialogVisible" @on-cancel="addCancel">
+      <addOutStorageOfferDetailDialog ref="addOffer" :basic-data="form" @submitEvent="addData" @cancel="addCancel" />
     </dee-dialog>
     <dee-dialog width="70%" title="调整占用" :visible.sync="aoDialogVisible" @on-cancel="aoCancel">
       <OutStorageOfferAdjustOccupy ref="adjustOffer" :select-datas="selectTableData" :form="form" @submitEvent="addData" @refreshResponses="refreshResponses" />
@@ -121,7 +121,7 @@ export default {
         }
       },
       {
-        name: '保存占用',
+        name: '占用',
         icon: '/icons/c-creatBook.png',
         handler: {
           click: () => {
@@ -205,7 +205,7 @@ export default {
     handleSelectionChange(v) {
       this.selectTableData = v
     },
-    cancel() {
+    addCancel() {
       this.dialogVisible = false
     },
     aoCancel() {