diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue
index 97349bd8..47b75047 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue
@@ -32,7 +32,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="收款金额" prop="amountCollected">
-              <el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+              <el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}' >
 
               </el-input>
             </el-form-item>
diff --git a/SC-web/src/views/scm/basicInformation/contractfile/index.vue b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
index d75c4217..8086c599 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/index.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/index.vue
@@ -14,10 +14,32 @@
               <el-input v-model="query.contractName" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
+          <template v-if="showAll">
+          <el-col :span="6">
+            <el-form-item label="供应商/客户名">
+              <el-input v-model="query.name" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="合同类型">
+              <el-select v-model="query.contractType" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                <el-option v-for="(item, index) in contractTypeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          </template>
+
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+                展开
+              </el-button>
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
+                收起
+              </el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -137,10 +159,13 @@
     },
     data() {
       return {
+        showAll: false,
         detailVisible: false,
         query: {
           contractCode: undefined,
-          contractName: undefined
+          contractName: undefined,
+          name: undefined,
+          contractType: undefined
         },
         treeProps: {
           children: 'children',