From f85fac116f8d1d5f8be0c65287a32bda4145ebec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Thu, 5 Jan 2023 08:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scm/basicInformation/contractfile/Form.vue     |  3 ++-
 .../scm/basicInformation/contractfile/index.vue    | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/SC-web/src/views/scm/basicInformation/contractfile/Form.vue b/SC-web/src/views/scm/basicInformation/contractfile/Form.vue
index f1c152ea..a63d38e4 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/Form.vue
@@ -238,6 +238,7 @@
                 </el-input>
                 </el-form-item>
             </el-col>
+             -->
             <el-col :span="24" >
                 <el-form-item  label="集团审批"
  prop="approval" >
@@ -246,7 +247,7 @@
 
                 </el-switch>
                 </el-form-item>
-            </el-col>-->
+            </el-col>
             <el-col :span="24">
                 <el-tabs  v-model="activemdfrsi"  tab-position="top" class="mb-20">
                 <el-tab-pane  label="物料明细">
diff --git a/SC-web/src/views/scm/basicInformation/contractfile/index.vue b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
index c43c1355..ae927cec 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/index.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
@@ -4,6 +4,16 @@
         <div class="JNPF-common-layout-center">
             <el-row class="JNPF-common-search-box" :gutter="16">
                 <el-form @submit.native.prevent>
+                  <el-col :span="6">
+                    <el-form-item label="合同编码">
+                      <el-input v-model="query.contractCode" placeholder="请输入" clearable>  </el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="合同名称">
+                      <el-input v-model="query.contractName" placeholder="请输入" clearable>  </el-input>
+                    </el-form-item>
+                  </el-col>
                                         <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@@ -100,6 +110,8 @@ width="150" >
             return {
                 detailVisible: false,
                 query: {
+                  contractCode:undefined,
+                  contractName:undefined,
                 },
                 treeProps: {
                     children: 'children',
@@ -263,7 +275,7 @@ width="150" >
                         currentPage: 1,
                         pageSize: 20,
                     sort: "desc",
-                    sidx: "",
+                    sidx: "contractCode",
                 }
                 this.initData()
             },