diff --git a/src/views/resource/operation/index.vue b/src/views/resource/operation/index.vue
index 7d4667a..51f4a53 100644
--- a/src/views/resource/operation/index.vue
+++ b/src/views/resource/operation/index.vue
@@ -18,20 +18,43 @@
           <el-col>
 
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="地块代码" prop="dkbm">
-                <el-input v-model="queryParams.dkbm" placeholder="请输入地块代码" clearable @keyup.enter.native="handleQuery"/>
+              <el-form-item label="地块编码" prop="dkbm">
+                <el-input v-model="queryParams.dkbm" placeholder="请输入地块编码" clearable @keyup.enter.native="handleQuery"/>
               </el-form-item>
               <el-form-item label="地块名称" prop="dkmc">
                 <el-input v-model="queryParams.dkmc" placeholder="请输入地块名称" clearable @keyup.enter.native="handleQuery"/>
               </el-form-item>
+              <el-form-item label="经营方式" prop="jyfs">
+                <el-select v-model="queryParams.jyfs" placeholder="请选择经营方式" clearable>
+                  <el-option v-for="dict in dict.type.jyfs" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="经营对象" prop="jydxmc">
+                <el-input v-model="queryParams.jydxmc" placeholder="请输入经营对象名称" clearable @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="对象类型" prop="jydxlx">
+                <el-select v-model="queryParams.jydxlx" placeholder="请选择经营对象类型" clearable>
+                  <el-option v-for="dict in dict.type.jydxlx" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="证件类型" prop="jydxzjlx">
+                <el-select v-model="queryParams.jydxzjlx" placeholder="请选择经营对象证件类型" clearable>
+                  <el-option v-for="dict in dict.type.zjlx" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="证件号码" prop="jydxzjhm">
+                <el-input v-model="queryParams.jydxzjhm" placeholder="请输入经营对象证件号码" clearable @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="签订合同" prop="sfqdht">
+                <el-select v-model="queryParams.sfqdht" placeholder="请选择是否签订合同" clearable>
+                  <el-option v-for="dict in dict.type.is_common" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
+              </el-form-item>
               <el-form-item label="调查状态" prop="surveyStatus">
                 <el-select v-model="queryParams.surveyStatus" placeholder="请选择调查状态" clearable>
                   <el-option v-for="dict in dict.type.survey_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="级联代码" prop="importCode">
-                <el-input v-model="queryParams.importCode" placeholder="请输入部门级联代码" clearable @keyup.enter.native="handleQuery"/>
-              </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -65,25 +88,32 @@
               <!-- 数据列表  列属性 min-width="60" show-overflow-tooltip  @selection-change="handleSelectionChange" -->
             <el-table v-loading="loading" :data="operationList" border>
                 <!--<el-table-column type="selection" width="55" align="center" />-->
-              <el-table-column label="id" align="center" prop="id"  min-width="60"/>
-              <el-table-column label="地块代码" align="center" prop="dkbm" />
+              <el-table-column label="地块编码" align="center" prop="dkbm" />
               <el-table-column label="地块名称" align="center" prop="dkmc" />
               <el-table-column label="地块东至" align="center" prop="dkdz" />
               <el-table-column label="地块西至" align="center" prop="dkxz" />
               <el-table-column label="地块南至" align="center" prop="dknz" />
               <el-table-column label="地块北至" align="center" prop="dkbz" />
               <el-table-column label="经营面积(亩)" align="center" prop="jymj" />
-              <el-table-column label="经营方式" align="center" prop="jyfs" />
+              <el-table-column label="经营方式" align="center" prop="jyfs">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.jyfs" :value="scope.row.jyfs"/>
+                </template>
+              </el-table-column>
               <el-table-column label="经营对象名称" align="center" prop="jydxmc" />
-            <el-table-column label="经营开始时间" align="center" prop="jykssj" />
-            <el-table-column label="经营结束时间" align="center" prop="jyjssj" />
+              <el-table-column label="经营对象证件号码" align="center" prop="jydxzjhm" />
+              <el-table-column label="是否签订合同" align="center" prop="sfqdht">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.is_common" :value="scope.row.sfqdht"/>
+                </template>
+              </el-table-column>
               <el-table-column label="承包金额(元)" align="center" prop="cbje" />
+              <el-table-column label="年收益" align="center" prop="nsy" />
               <el-table-column label="调查状态" align="center" prop="surveyStatus">
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.survey_status" :value="scope.row.surveyStatus"/>
                 </template>
               </el-table-column>
-              <el-table-column label="部门级联代码" align="center" prop="importCode" />
               <el-table-column label="区域位置名称" align="center" prop="deptName" />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="250">
                 <template slot-scope="scope">
@@ -182,32 +212,52 @@
         <el-form-item label="区域位置名称" prop="deptName">
           <el-input v-model="form.deptName" placeholder="请输入区域位置名称"  show-word-limit :maxlength="100" readOnly/>
         </el-form-item>
-        <el-form-item label="地块代码" prop="dkbm">
-            <el-input v-model="form.dkbm" placeholder="请输入地块代码，跟地块属性中的地块编码一致"  show-word-limit :maxlength="19" readOnly/>
+        <el-form-item label="地块编码" prop="dkbm">
+          <el-input v-model="form.dkbm" placeholder="请输入地块代码，跟地块属性中的地块编码一致"  show-word-limit :maxlength="19" readOnly/>
         </el-form-item>
         <el-form-item label="地块名称" prop="dkmc">
-            <el-input v-model="form.dkmc" placeholder="请输入地块名称"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dkmc" placeholder="请输入地块名称"  show-word-limit :maxlength="50" readOnly/>
         </el-form-item>
         <el-form-item label="地块东至" prop="dkdz">
-            <el-input v-model="form.dkdz" placeholder="请输入地块东至"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dkdz" placeholder="请输入地块东至"  show-word-limit :maxlength="50" readOnly/>
         </el-form-item>
         <el-form-item label="地块西至" prop="dkxz">
-            <el-input v-model="form.dkxz" placeholder="请输入地块西至"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dkxz" placeholder="请输入地块西至"  show-word-limit :maxlength="50" readOnly/>
         </el-form-item>
         <el-form-item label="地块南至" prop="dknz">
-            <el-input v-model="form.dknz" placeholder="请输入地块南至"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dknz" placeholder="请输入地块南至"  show-word-limit :maxlength="50" readOnly/>
         </el-form-item>
         <el-form-item label="地块北至" prop="dkbz">
-            <el-input v-model="form.dkbz" placeholder="请输入地块北至"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dkbz" placeholder="请输入地块北至"  show-word-limit :maxlength="50" readOnly/>
         </el-form-item>
         <el-form-item label="经营面积(亩)" prop="jymj">
-            <el-input-number v-model="form.jymj" placeholder="请输入经营面积(亩)" controls-position="right"   :precision="3"/>
+          <el-input-number v-model="form.jymj" placeholder="请输入经营面积(亩)" controls-position="right"   :precision="3"/>
         </el-form-item>
         <el-form-item label="经营方式" prop="jyfs">
-            <el-input v-model="form.jyfs" placeholder="请输入经营方式"  show-word-limit :maxlength="1"/>
+          <el-select v-model="form.jyfs" placeholder="请选择经营方式">
+            <el-option v-for="dict in dict.type.jyfs" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="经营对象类型" prop="jydxlx">
+          <el-select v-model="form.jydxlx" placeholder="请选择经营对象类型">
+            <el-option v-for="dict in dict.type.jydxlx" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="经营对象名称" prop="jydxmc">
-            <el-input v-model="form.jydxmc" placeholder="请输入经营对象名称"  show-word-limit :maxlength="200"/>
+          <el-input v-model="form.jydxmc" placeholder="请输入经营对象名称"  show-word-limit :maxlength="100"/>
+        </el-form-item>
+        <el-form-item label="经营对象证件类型" prop="jydxzjlx">
+          <el-select v-model="form.jydxzjlx" placeholder="请选择经营对象证件类型">
+            <el-option v-for="dict in dict.type.zjlx" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="经营对象证件号码" prop="jydxzjhm">
+          <el-input v-model="form.jydxzjhm" placeholder="请输入经营对象证件号码"  show-word-limit :maxlength="30"/>
+        </el-form-item>
+        <el-form-item label="是否签订合同" prop="sfqdht">
+          <el-radio-group v-model="form.sfqdht">
+            <el-radio v-for="dict in dict.type.is_common" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="经营开始时间" prop="jykssj">
           <el-date-picker clearable v-model="form.jykssj" type="date" value-format="yyyy-MM-dd" placeholder="请选择经营开始时间"></el-date-picker>
@@ -216,10 +266,19 @@
           <el-date-picker clearable v-model="form.jyjssj" type="date" value-format="yyyy-MM-dd" placeholder="请选择经营结束时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="承包金额(元)" prop="cbje">
-            <el-input-number v-model="form.cbje" placeholder="请输入承包金额(元)" controls-position="right"   :precision="2"/>
+          <el-input-number v-model="form.cbje" placeholder="请输入承包金额(元)" controls-position="right"   :precision="2"/>
         </el-form-item>
-        <el-form-item label="备注" prop="bz">
-            <el-input v-model="form.bz" placeholder="请输入备注"  show-word-limit :maxlength="255"/>
+        <el-form-item label="兑现金额" prop="dxje">
+          <el-input-number v-model="form.dxje" placeholder="请输入兑现金额" controls-position="right"   :precision="2"/>
+        </el-form-item>
+        <el-form-item label="尚欠金额" prop="sqje">
+          <el-input-number v-model="form.sqje" placeholder="请输入尚欠金额" controls-position="right"   :precision="2"/>
+        </el-form-item>
+        <el-form-item label="年收益" prop="nsy">
+          <el-input-number v-model="form.nsy" placeholder="请输入年收益" controls-position="right"   :precision="2"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="bzxx">
+          <el-input v-model="form.bzxx" placeholder="请输入备注"  show-word-limit :maxlength="255"/>
         </el-form-item>
         <el-form-item label="实物图" prop="dkImg">
           <image-upload v-model="form.dkImg"/>
@@ -229,6 +288,7 @@
             <el-radio v-for="dict in dict.type.survey_status" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -249,7 +309,7 @@ import { deptTreeSelect } from "@/api/system/user"
 
 export default {
   name: "Operation",
-  dicts: ['survey_status'],
+  dicts: ['zjlx', 'survey_status', 'is_common', 'jydxlx', 'jyfs'],
   components: { Treeselect, Splitpanes, Pane },
   data() {
     return {
@@ -304,6 +364,12 @@ export default {
        //toTranslateDict: "1",
         dkbm: null,
         dkmc: null,
+        jyfs: null,
+        jydxlx: null,
+        jydxmc: null,
+        jydxzjlx: null,
+        jydxzjhm: null,
+        sfqdht: null,
         surveyStatus: null,
         importCode: null,
       },
@@ -395,13 +461,20 @@ export default {
         dkbz: null,
         jymj: null,
         jyfs: null,
+        jydxlx: null,
         jydxmc: null,
+        jydxzjlx: null,
+        jydxzjhm: null,
+        sfqdht: null,
         jykssj: null,
         jyjssj: null,
         cbje: null,
-        bz: null,
+        dxje: null,
+        sqje: null,
+        nsy: null,
+        bzxx: null,
         dkImg: null,
-        surveyStatus: '2',
+        surveyStatus: null,
         importCode: null,
         deptName: null,
       }