From 26da97fecf922012e75d62658fbeb269875ad79e Mon Sep 17 00:00:00 2001
From: zzx <zzxjava@163.com>
Date: Tue, 20 Jun 2023 11:51:14 +0800
Subject: [PATCH 1/2] fix issues/I7EV3H

---
 src/views/system/autocode/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/autocode/index.vue b/src/views/system/autocode/index.vue
index 29ca332..0ce21e0 100644
--- a/src/views/system/autocode/index.vue
+++ b/src/views/system/autocode/index.vue
@@ -3,7 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="规则名称" prop="ruleName">
         <el-input
-          v-model="queryParams.dictName"
+          v-model="queryParams.ruleName"
           placeholder="请输入规则名称"
           clearable
           style="width: 240px"
@@ -332,4 +332,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>

From 82b9a71e72847ce85500236d1fd5e31c36e67051 Mon Sep 17 00:00:00 2001
From: zzx <zzxjava@163.com>
Date: Wed, 21 Jun 2023 17:42:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95=E6=97=B6=20=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/pro/feedback/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index 053fe2d..99a7852 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -284,7 +284,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
         <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">保 存</el-button>
-        <el-button type="primary" @click="handleSubmit" v-if="form.status =='PREPARE' && optType !='view' ">提交审批</el-button>
+        <el-button type="primary" @click="handleSubmit" v-if="form.status =='PREPARE' && (optType == 'view' || optType == 'edit') ">提交审批</el-button>
         <el-button type="success" @click="handleExecute" v-if="form.status =='APPROVING'  && form.recordId !=null">审批通过</el-button>
         <el-button type="danger" @click="handleReject" v-if="form.status =='APPROVING'  && form.recordId !=null">审批不通过</el-button>
         <el-button @click="cancel">取 消</el-button>