From b308c8182e2086a4630cd14a7534d7b205c14ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 4 Jun 2023 18:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/material/MaterialList.vue          | 2 +-
 jshERP-web/src/views/material/modules/MaterialModal.vue | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 14a979d6..a2a2b561 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -387,7 +387,7 @@
         this.$refs.modalForm.title = "编辑";
         this.$refs.modalForm.disableSubmit = false;
         if(this.btnEnableList.indexOf(1)===-1) {
-          this.$refs.modalForm.isReadOnly = true
+          this.$refs.modalForm.showOkFlag = false
         }
       },
       getImgUrl(imgName) {
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 37046d73..7d299796 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -7,15 +7,12 @@
     v-bind:prefixNo="prefixNo"
     switchHelp
     switchFullscreen
-    @ok="handleOk"
     @cancel="handleCancel"
-    cancelText="关闭"
     :id="prefixNo"
     :style="modalStyle">
     <template slot="footer">
-      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
-        关闭
-      </a-button>
+      <a-button key="back" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" v-if="showOkFlag" :loading="confirmLoading" @click="handleOk">确定</a-button>
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
@@ -321,7 +318,7 @@
         skuTwoList: [],
         manySkuSelected: 0,
         model: {},
-        isReadOnly: false,
+        showOkFlag: true,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 8 },