养殖场信息/种畜禽养殖场信息出栏入栏面积容积输入长度修改

data-ui/src/views/data/digitalagriculture/StillField/index.vue

@@ -2,7 +2,8 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="['2'].includes(routeParams.stillFieldType)?4:0" :xs="24" v-if="['2'].includes(routeParams.stillFieldType)">
+      <el-col :span="['2'].includes(routeParams.stillFieldType)?4:0" :xs="24"
+              v-if="['2'].includes(routeParams.stillFieldType)">
         <div class="head-container">
           <el-input
             v-model="deptName"
@@ -28,7 +29,8 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="['2'].includes(routeParams.stillFieldType)?20:24" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px" @submit.native.prevent>
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px"
+                 @submit.native.prevent>
           <el-form-item label="标题" prop="stillName">
             <el-input
               v-model="queryParams.stillName"
@@ -40,32 +42,32 @@
           </el-form-item>
 
           <!--<el-form-item label="还田人" prop="stillUserName" v-if="['3'].includes(routeParams.stillFieldType)">-->
-            <!--<el-input-->
-              <!--v-model="queryParams.stillUserName"-->
-              <!--placeholder="请输入还田人"-->
-              <!--clearable-->
-              <!--size="small"-->
-              <!--@keyup.enter.native="handleQuery"-->
-            <!--/>-->
+          <!--<el-input-->
+          <!--v-model="queryParams.stillUserName"-->
+          <!--placeholder="请输入还田人"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+          <!--/>-->
           <!--</el-form-item>-->
           <!--<el-form-item label="所属市" prop="city" v-if="['3'].includes(routeParams.stillFieldType)">-->
-            <!--<el-input-->
-              <!--v-model="queryParams.city"-->
-              <!--placeholder="请输入所属市"-->
-              <!--clearable-->
-              <!--size="small"-->
-              <!--@keyup.enter.native="handleQuery"-->
-            <!--/>-->
+          <!--<el-input-->
+          <!--v-model="queryParams.city"-->
+          <!--placeholder="请输入所属市"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+          <!--/>-->
           <!--</el-form-item>-->
-        <!--  <el-form-item label="所属乡(镇、街)" prop="village" v-if="['3'].includes(routeParams.stillFieldType)">
-            <el-input
-              v-model="queryParams.village"
-              placeholder="请输入所属乡(镇、街)"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>-->
+          <!--  <el-form-item label="所属乡(镇、街)" prop="village" v-if="['3'].includes(routeParams.stillFieldType)">
+              <el-input
+                v-model="queryParams.village"
+                placeholder="请输入所属乡(镇、街)"
+                clearable
+                size="small"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>-->
           <el-form-item label="联系电话" prop="stillPhone" v-if="['3'].includes(routeParams.stillFieldType)">
             <el-input
               v-model="queryParams.stillPhone"
@@ -76,30 +78,30 @@
             />
           </el-form-item>
           <!--<el-form-item label="还田面积(单位㎡)" prop="stillArea">-->
-            <!--<el-input-->
-              <!--v-model="queryParams.leaveArea"-->
-              <!--placeholder="请输入还田面积(单位㎡)"-->
-              <!--clearable-->
-              <!--size="small"-->
-              <!--@keyup.enter.native="handleQuery"-->
-            <!--/>-->
+          <!--<el-input-->
+          <!--v-model="queryParams.leaveArea"-->
+          <!--placeholder="请输入还田面积(单位㎡)"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+          <!--/>-->
           <!--</el-form-item>-->
           <!--<el-form-item label="还田量(单位kg)" prop="stillAmount">-->
-            <!--<el-input-->
-              <!--v-model="queryParams.leaveAmount"-->
-              <!--placeholder="请输入还田量(单位kg)"-->
-              <!--clearable-->
-              <!--size="small"-->
-              <!--@keyup.enter.native="handleQuery"-->
-            <!--/>-->
+          <!--<el-input-->
+          <!--v-model="queryParams.leaveAmount"-->
+          <!--placeholder="请输入还田量(单位kg)"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+          <!--/>-->
           <!--</el-form-item>-->
           <!--<el-form-item label="还田时间" prop="stillTime" v-if="['2','3'].includes(routeParams.stillFieldType)">-->
-            <!--<el-date-picker clearable size="small"-->
-                            <!--v-model="queryParams.stillTime"-->
-                            <!--type="year"-->
-                            <!--value-format="yyyy"-->
-                            <!--placeholder="选择还田时间">-->
-            <!--</el-date-picker>-->
+          <!--<el-date-picker clearable size="small"-->
+          <!--v-model="queryParams.stillTime"-->
+          <!--type="year"-->
+          <!--value-format="yyyy"-->
+          <!--placeholder="选择还田时间">-->
+          <!--</el-date-picker>-->
           <!--</el-form-item>-->
           <el-form-item label="所属县(市丶区)" prop="district" v-if="['3'].includes(routeParams.stillFieldType)">
             <el-input
@@ -111,15 +113,16 @@
             />
           </el-form-item>
           <!--<el-form-item label="地块编号" prop="landInfoId" v-if="['3'].includes(routeParams.stillFieldType)">-->
-            <!--<el-input-->
-              <!--v-model="queryParams.landInfoId"-->
-              <!--placeholder="请输入地块编号"-->
-              <!--clearable-->
-              <!--size="small"-->
-              <!--@keyup.enter.native="handleQuery"-->
-            <!--/>-->
+          <!--<el-input-->
+          <!--v-model="queryParams.landInfoId"-->
+          <!--placeholder="请输入地块编号"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+          <!--/>-->
           <!--</el-form-item>-->
-          <el-form-item label="还田开始时间" prop="startStillTime" v-if="['2','3'].includes(routeParams.stillFieldType)"label-width="120px">
+          <el-form-item label="还田开始时间" prop="startStillTime" v-if="['2','3'].includes(routeParams.stillFieldType)"
+                        label-width="120px">
             <el-date-picker clearable
                             @change="startStillTimeChange"
                             v-model="queryParams.startStillTime"
@@ -130,7 +133,8 @@
                             placeholder="请选择还田开始时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="还田结束时间" prop="endStillTime" v-if="['2','3'].includes(routeParams.stillFieldType)" label-width="120px">
+          <el-form-item label="还田结束时间" prop="endStillTime" v-if="['2','3'].includes(routeParams.stillFieldType)"
+                        label-width="120px">
             <el-date-picker clearable
                             @change="endStillTimeChange"
                             v-model="queryParams.endStillTime"
@@ -142,21 +146,22 @@
             </el-date-picker>
           </el-form-item>
           <!--<el-form-item label="补助金额" prop="subsidyMoney" v-if="['3'].includes(routeParams.stillFieldType)">-->
-            <!--<el-input-->
-              <!--v-model="queryParams.subsidyMoney"-->
-              <!--placeholder="请输入补助金额"-->
-              <!--clearable-->
-              <!--size="small"-->
-              <!--@keyup.enter.native="handleQuery"-->
-            <!--/>-->
+          <!--<el-input-->
+          <!--v-model="queryParams.subsidyMoney"-->
+          <!--placeholder="请输入补助金额"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+          <!--/>-->
           <!--</el-form-item>-->
-          <el-form-item prop="deptId" v-if="['3','1'].includes(routeParams.stillFieldType)"label-width="120px">
+          <el-form-item prop="deptId" v-if="['3','1'].includes(routeParams.stillFieldType)" label-width="120px">
             <template slot="label">
               <span @click="changeQueryType" v-if="queryParams.deptName === 0">本级及下级</span>
               <span @click="changeQueryType" v-if="queryParams.deptName === 1">只查询本级</span>
             </template>
             <treeselect v-model="queryParams.deptId" :options="deptOptions" multiple:false :show-count="true"
-                        placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'" style="width: 240px"/>
+                        placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"
+                        style="width: 240px"/>
             <el-input v-model="queryParams.deptName" v-if="false"/>
           </el-form-item>
           <el-form-item>
@@ -174,7 +179,8 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['StillField:StillField:add']"
-            >新增</el-button>
+            >新增
+            </el-button>
           </el-col>
           <el-col :span="1.5" v-if="['1'].includes(routeParams.stillFieldType)">
             <el-button
@@ -185,7 +191,8 @@
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['StillField:StillField:edit']"
-            >修改</el-button>
+            >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5" v-if="['1'].includes(routeParams.stillFieldType)">
             <el-button
@@ -196,18 +203,19 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['StillField:StillField:remove']"
-            >删除</el-button>
+            >删除
+            </el-button>
           </el-col>
           <!--<el-col :span="1.5">-->
-            <!--<el-button-->
-              <!--type="info"-->
-              <!--plain-->
-              <!--icon="el-icon-upload2"-->
-              <!--size="mini"-->
-              <!--@click="handleImport"-->
-              <!--v-hasPermi="['StillField:StillField:import']"-->
-            <!--&gt;导入-->
-            <!--</el-button>-->
+          <!--<el-button-->
+          <!--type="info"-->
+          <!--plain-->
+          <!--icon="el-icon-upload2"-->
+          <!--size="mini"-->
+          <!--@click="handleImport"-->
+          <!--v-hasPermi="['StillField:StillField:import']"-->
+          <!--&gt;导入-->
+          <!--</el-button>-->
           <!--</el-col>-->
           <el-col :span="1.5" v-if="['1', '2', '3'].includes(routeParams.stillFieldType)">
             <el-button
@@ -217,55 +225,59 @@
               size="mini"
               @click="handleExport"
               v-hasPermi="['StillField:StillField:export']"
-            >导出</el-button>
+            >导出
+            </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="StillFieldList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column type="selection" width="55" align="center"/>
           <!--<el-table-column label="${comment}" align="center" prop="id" />-->
-          <el-table-column label="标题" align="center" prop="stillName" />
-          <el-table-column label="还田面积(单位㎡)" align="center" prop="stillArea" />
-          <el-table-column label="还田类型" align="center" prop="stillType" >
+          <el-table-column label="标题" align="center" prop="stillName"/>
+          <el-table-column label="还田面积(单位㎡)" align="center" prop="stillArea"/>
+          <el-table-column label="还田类型" align="center" prop="stillType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.farm_returning_type" :value="scope.row.stillType"/>
             </template>
           </el-table-column>
-          <el-table-column label="联系电话" align="center" prop="stillPhone" />
+          <el-table-column label="联系电话" align="center" prop="stillPhone"/>
           <el-table-column label="还田时间" align="center" prop="stillTime" width="180">
             <template slot-scope="scope">
               <span>{{ scope.row.stillTime }}年</span>
             </template>
           </el-table-column>
-          <el-table-column label="所属部门" align="center" prop="deptName" />
-          <el-table-column label="创建人" align="center" prop="createName" />
-          <el-table-column label="创建时间" align="center" prop="createTime" />
-          <el-table-column label="修改人" align="center" prop="updateName" />
-          <el-table-column label="修改时间" align="center" prop="updateTime" />
+          <el-table-column label="所属部门" align="center" prop="deptName"/>
+          <el-table-column label="创建人" align="center" prop="createName"/>
+          <el-table-column label="创建时间" align="center" prop="createTime"/>
+          <el-table-column label="修改人" align="center" prop="updateName"/>
+          <el-table-column label="修改时间" align="center" prop="updateTime"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button v-if="['2', '3'].includes(routeParams.stillFieldType)"
-                size="mini"
-                type="text"
-                icon="el-icon-view"
-                @click="handleDetail(scope.row)"
-                v-hasPermi="['StillField:StillField:edit']"
-              >详情</el-button>
+                         size="mini"
+                         type="text"
+                         icon="el-icon-view"
+                         @click="handleDetail(scope.row)"
+                         v-hasPermi="['StillField:StillField:edit']"
+              >详情
+              </el-button>
               <el-button v-if="['1'].includes(routeParams.stillFieldType)"
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['StillField:StillField:edit']"
-              >修改</el-button>
+                         size="mini"
+                         type="text"
+                         icon="el-icon-edit"
+                         @click="handleUpdate(scope.row)"
+                         v-hasPermi="['StillField:StillField:edit']"
+              >修改
+              </el-button>
               <el-button v-if="['1'].includes(routeParams.stillFieldType)"
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['StillField:StillField:remove']"
-              >删除</el-button>
+                         size="mini"
+                         type="text"
+                         icon="el-icon-delete"
+                         @click="handleDelete(scope.row)"
+                         v-hasPermi="['StillField:StillField:remove']"
+              >删除
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -285,18 +297,18 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
         <el-row :gutter="20">
           <el-col :span="12">
-        <el-form-item label="标题" prop="stillName">
-          <el-input v-model="form.stillName" placeholder="请输入标题" maxlength="20"/>
-        </el-form-item>
-        <el-form-item label="还田面积(单位㎡)" prop="stillArea">
-          <el-input v-model="form.stillArea" placeholder="请输入还田面积(单位㎡)" maxlength="20"/>
-        </el-form-item>
-        <el-form-item label="还田量(单位kg)" prop="stillAmount">
-          <el-input v-model="form.stillAmount" placeholder="请输入还田量(单位kg)" maxlength="20"/>
-        </el-form-item>
-        <el-form-item label="联系电话" prop="stillPhone">
-          <el-input v-model="form.stillPhone" placeholder="请输入联系电话" maxlength="13"/>
-        </el-form-item>
+            <el-form-item label="标题" prop="stillName">
+              <el-input v-model="form.stillName" placeholder="请输入标题" maxlength="20"/>
+            </el-form-item>
+            <el-form-item label="还田面积(单位㎡)" prop="stillArea">
+              <el-input v-model="form.stillArea" placeholder="请输入还田面积(单位㎡)" maxlength="20"/>
+            </el-form-item>
+            <el-form-item label="还田量(单位kg)" prop="stillAmount">
+              <el-input v-model="form.stillAmount" placeholder="请输入还田量(单位kg)" maxlength="20"/>
+            </el-form-item>
+            <el-form-item label="联系电话" prop="stillPhone">
+              <el-input v-model="form.stillPhone" placeholder="请输入联系电话" maxlength="13"/>
+            </el-form-item>
             <el-form-item label="还田类型" prop="stillType">
               <el-select v-model="form.stillType" placeholder="请选择还田类型">
                 <el-option
@@ -309,43 +321,44 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item label="还田时间" prop="stillTime">
-          <el-date-picker clearable size="small"
-            v-model="form.stillTime"
-            type="year"
-            value-format="yyyy"
-            placeholder="选择还田时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="所属县（市）区" prop="district">
-          <el-input v-model="form.district" placeholder="请输入所属县（市）区" maxlength="20"/>
-        </el-form-item>
-        <el-form-item label="所属乡镇（街）" prop="village">
-          <el-input v-model="form.village" placeholder="请输入所属乡镇（街）" maxlength="20"/>
-        </el-form-item>
+            <el-form-item label="还田时间" prop="stillTime">
+              <el-date-picker clearable size="small"
+                              v-model="form.stillTime"
+                              type="year"
+                              value-format="yyyy"
+                              placeholder="选择还田时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="所属县（市）区" prop="district">
+              <el-input v-model="form.district" placeholder="请输入所属县（市）区" maxlength="20"/>
+            </el-form-item>
+            <el-form-item label="所属乡镇（街）" prop="village">
+              <el-input v-model="form.village" placeholder="请输入所属乡镇（街）" maxlength="20"/>
+            </el-form-item>
             <el-form-item label="所属部门" prop="deptId" :label-width="labelWidth">
-<!--              <treeselect-->
-<!--                v-if="!disable"-->
-<!--                :flat="false"-->
-<!--                :allowSelectingDisabledDescendants="true"-->
-<!--                v-model="form.deptId" :options="deptOptions" :show-count="true"-->
-<!--                placeholder="请选择所属部门"/>-->
-<!--              <el-select v-model="form.deptName" placeholder="请选择所属部门" :style="inputStyle" v-if="disable" :disabled="disable">-->
-<!--                <el-option-->
-<!--                  v-for="dept in deptOptions"-->
-<!--                  :key="dept.deptId"-->
-<!--                  :label="dept.deptName"-->
-<!--                  :value="dept"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--              <deptselector :setValue=setDataDeptId :dataDeptId="form.deptId"-->
-<!--                            v-model="form.deptId"></deptselector>-->
-              <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true" :noResultsText="'空'" :noOptionsText="'空'"
+              <!--              <treeselect-->
+              <!--                v-if="!disable"-->
+              <!--                :flat="false"-->
+              <!--                :allowSelectingDisabledDescendants="true"-->
+              <!--                v-model="form.deptId" :options="deptOptions" :show-count="true"-->
+              <!--                placeholder="请选择所属部门"/>-->
+              <!--              <el-select v-model="form.deptName" placeholder="请选择所属部门" :style="inputStyle" v-if="disable" :disabled="disable">-->
+              <!--                <el-option-->
+              <!--                  v-for="dept in deptOptions"-->
+              <!--                  :key="dept.deptId"-->
+              <!--                  :label="dept.deptName"-->
+              <!--                  :value="dept"-->
+              <!--                />-->
+              <!--              </el-select>-->
+              <!--              <deptselector :setValue=setDataDeptId :dataDeptId="form.deptId"-->
+              <!--                            v-model="form.deptId"></deptselector>-->
+              <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true"
+                          :noResultsText="'空'" :noOptionsText="'空'"
                           placeholder="请选择部门" @select="hx"/>
             </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" maxlength="30"/>
-        </el-form-item>
+            <el-form-item label="备注" prop="remarks">
+              <el-input v-model="form.remarks" placeholder="请输入备注" maxlength="30"/>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -370,13 +383,14 @@
               <label>{{ form.stillAmount }}</label>
             </el-form-item>
             <!--<el-form-item label="还田人：" prop="stillUserName">-->
-              <!--<label>{{ form.stillUserName }}</label>-->
+            <!--<label>{{ form.stillUserName }}</label>-->
             <!--</el-form-item>-->
             <el-form-item label="联系电话：" prop="stillPhone">
               <label>{{ form.stillPhone }}</label>
             </el-form-item>
             <el-form-item label="还田类型：" prop="stillType">
-              <label v-for="(dict, index) in dict.type.farm_returning_type" v-if="form.stillType == dict.value" >{{dict.label}}</label>
+              <label v-for="(dict, index) in dict.type.farm_returning_type"
+                     v-if="form.stillType == dict.value">{{ dict.label }}</label>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -389,7 +403,7 @@
             <el-form-item label="所属乡(镇、街)：" prop="village">
               <label>{{ form.village }}</label>
             </el-form-item>
-            <el-form-item label="所属部门：" prop="deptId" >
+            <el-form-item label="所属部门：" prop="deptId">
               <label>{{ form.deptName }}</label>
             </el-form-item>
             <el-form-item label="备注：" prop="remarks">
@@ -440,18 +454,24 @@
 </template>
 
 <script>
-import { listStillField, getStillField, delStillField, addStillField, updateStillField } from "@/api/data/digitalagriculture/StillField/StillField";
+import {
+  listStillField,
+  getStillField,
+  delStillField,
+  addStillField,
+  updateStillField
+} from "@/api/data/digitalagriculture/StillField/StillField";
 import {checkPositiveDecimal, checkNonnegativeInteger, validPhoneMobile} from "@/api/rules/rules";
 import deptselector from '@/views/components/deptselector'
-import { getToken } from '@/utils/auth'
-import { treeselect } from '@/api/system/dept'
+import {getToken} from '@/utils/auth'
+import {treeselect} from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import {format_date} from "@/views/data/common/dateExport";
 
 export default {
   name: "StillField",
-  dicts:['farm_returning_type'],
+  dicts: ['farm_returning_type'],
   components: {
     deptselector,
     Treeselect,
@@ -503,7 +523,7 @@ export default {
         // 是否更新已经存在的数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: 'Bearer ' + getToken() },
+        headers: {Authorization: 'Bearer ' + getToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + '/center-data/StillField/import/importData'
       },
@@ -572,11 +592,11 @@ export default {
           {required: true, message: "还田类型不能为空", trigger: "change"},
         ],
         stillName: [
-          { required: true, message: "标题不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '标题长度必须介于 2 和 20 之间', trigger: 'blur' }
+          {required: true, message: "标题不能为空", trigger: "blur"},
+          {min: 2, max: 20, message: '标题长度必须介于 2 和 20 之间', trigger: 'blur'}
         ],
         stillPhone: [
-          { required: true, message: "联系电话不能为空", trigger: "blur" },
+          {required: true, message: "联系电话不能为空", trigger: "blur"},
           {validator: validPhoneMobile, trigger: 'blur'}
         ],
       }
@@ -636,6 +656,9 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.stillFieldType = this.routeParams.stillFieldType;// 查询秸秆还田信息类型
+      if (this.queryParams.stillFieldType === 2) {
+        this.queryParams.deptId = null;
+      }
       listStillField(this.queryParams).then(response => {
         this.StillFieldList = response.rows;
         this.total = response.total;
@@ -689,7 +712,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -747,12 +770,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否删除选中的数据').then(function() {
+      this.$modal.confirm('是否删除选中的数据').then(function () {
         return delStillField(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -772,7 +796,7 @@ export default {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
-      this.$alert('<div style=\'overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;\'>' + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
+      this.$alert('<div style=\'overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;\'>' + response.msg + '</div>', '导入结果', {dangerouslyUseHTMLString: true})
       this.getList()
     },
     // 提交上传文件
@@ -781,11 +805,11 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      let str = this.$route.query.stillFieldType=='3' ? '秸秆还田统计':(this.$route.query.stillFieldType=='1'?'秸秆还田上报':'秸秆还田台账');
+      let str = this.$route.query.stillFieldType == '3' ? '秸秆还田统计' : (this.$route.query.stillFieldType == '1' ? '秸秆还田上报' : '秸秆还田台账');
 
       this.download('/center-data/StillField/export', {
         ...this.queryParams
-      }, str+`_${format_date(new Date())}.xlsx`)
+      }, str + `_${format_date(new Date())}.xlsx`)
     },
     /** 还田开始时间 */
     startStillTimeChange(value) {

data-ui/src/views/data/digitalagriculture/filingsLivestock/index.vue

@@ -208,36 +208,36 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="设计存栏数量" prop="designMaintainCount">
-              <el-input v-model="form.designMaintainCount" placeholder="请输入设计存栏数量"  maxlength="20"/>
+              <el-input v-model="form.designMaintainCount" placeholder="请输入设计存栏数量"  maxlength="10"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="设计出栏数量" prop="designOfftakeCount">
-              <el-input v-model="form.designOfftakeCount" placeholder="请输入设计出栏数量"  maxlength="20"/>
+              <el-input v-model="form.designOfftakeCount" placeholder="请输入设计出栏数量"  maxlength="10"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="实际存栏数量" prop="realityMaintainCount">
-              <el-input v-model="form.realityMaintainCount" placeholder="请输入实际存栏数量" maxlength="20"/>
+              <el-input v-model="form.realityMaintainCount" placeholder="请输入实际存栏数量" maxlength="10"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="实际出栏数量" prop="realityOfftakeCount">
-              <el-input v-model="form.realityOfftakeCount" placeholder="请输入实际出栏数量" maxlength="20"/>
+              <el-input v-model="form.realityOfftakeCount" placeholder="请输入实际出栏数量" maxlength="10"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="储尿池容积" prop="urineReservoirArea">
-              <el-input v-model="form.urineReservoirArea" placeholder="请输入储尿池容积" maxlength="20"/>
+              <el-input v-model="form.urineReservoirArea" placeholder="请输入储尿池容积" maxlength="10"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="堆粪场面积" prop="dumpArea">
-              <el-input v-model="form.dumpArea" placeholder="请输入堆粪场面积" maxlength="20"/>
+              <el-input v-model="form.dumpArea" placeholder="请输入堆粪场面积" maxlength="10"/>
             </el-form-item>
           </el-col>
         </el-row>

data-ui/src/views/data/digitalagriculture/livestock/index.vue

@@ -181,36 +181,36 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="设计存栏数量" prop="designMaintainCount">
-              <el-input v-model="form.designMaintainCount" placeholder="请输入设计存栏数量" maxlength="20"/>
+              <el-input v-model="form.designMaintainCount" placeholder="请输入设计存栏数量" maxlength="10"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="设计出栏数量" prop="designOfftakeCount">
-              <el-input v-model="form.designOfftakeCount" placeholder="请输入设计出栏数量" maxlength="20"/>
+              <el-input v-model="form.designOfftakeCount" placeholder="请输入设计出栏数量" maxlength="10"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="实际存栏数量" prop="realityMaintainCount">
-              <el-input v-model="form.realityMaintainCount" placeholder="请输入实际存栏数量" maxlength="20"/>
+              <el-input v-model="form.realityMaintainCount" placeholder="请输入实际存栏数量" maxlength="10"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="实际出栏数量" prop="realityOfftakeCount">
-              <el-input v-model="form.realityOfftakeCount" placeholder="请输入实际出栏数量" maxlength="20"/>
+              <el-input v-model="form.realityOfftakeCount" placeholder="请输入实际出栏数量" maxlength="10"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="储尿池容积" prop="urineReservoirArea">
-              <el-input v-model="form.urineReservoirArea" placeholder="请输入储尿池容积" maxlength="20"/>
+              <el-input v-model="form.urineReservoirArea" placeholder="请输入储尿池容积" maxlength="10"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="堆粪场面积" prop="dumpArea">
-              <el-input v-model="form.dumpArea" placeholder="请输入堆粪场面积" maxlength="20"/>
+              <el-input v-model="form.dumpArea" placeholder="请输入堆粪场面积" maxlength="10"/>
             </el-form-item>
           </el-col>
         </el-row>

src/main/resources/mapper/digitalagriculture/CenterdataTStrawStillFieldMapper.xml

@@ -94,7 +94,6 @@
             <if test="village != null  and village != ''">and a.village = #{village}</if>
             <if test="landInfoId != null  and landInfoId != ''">and a.land_info_id = #{landInfoId}</if>
             <if test="remarks != null  and remarks != ''">and a.remarks = #{remarks}</if>
-            <if test="deptName != null  and deptName != ''">and a.dept_name like concat('%', #{deptName}, '%')</if>
             ${params.dataScope}
         </where>
         order BY still_time DESC , create_time desc