123

ruoyi-ui/src/api/dataModel/pasture.js

@@ -17,28 +17,10 @@ export function getPasture(id) {
   })
 }
 
-/** 新增 */
-export function addPasture(data) {
+/** 从第三方同步 */
+export function syncPasture() {
   return request({
-    url: "/dataModel/pasture",
-    method: "post",
-    data
-  })
-}
-
-/** 修改 */
-export function updatePasture(data) {
-  return request({
-    url: "/dataModel/pasture",
-    method: "put",
-    data
-  })
-}
-
-/** 删除（逻辑删除） */
-export function delPasture(ids) {
-  return request({
-    url: "/dataModel/pasture/" + ids,
-    method: "delete"
+    url: "/dataModel/pasture/sync",
+    method: "post"
   })
 }

ruoyi-ui/src/lang/bo/dataModel.js

@@ -94,60 +94,38 @@ export default {
     viewUpdateTime: "རྩོམ་སྒྲིག་དུས་ཚོད།"
   },
   pasture: {
-    queryKeyword: "རྩྭ་ཁང་མིང་།",
+    queryKeyword: "ཞིང་ཁང་མིང་།",
     queryKeywordPh: "མིང་འཚོལ་རོགས།",
-    queryPastureNature: "རང་བཞིན།",
-    queryBizStatus: "གནས་བབ།",
-    colPastureName: "རྩྭ་ཁང་མིང་།",
-    colPastureNature: "རང་བཞིན།",
-    colIdCardNo: "ཐོབ་ཐང་།",
-    colRegion: "ས་ཁུལ།",
-    colDetailAddress: "ཁ་བྱང་།",
+    queryFarmType: "ཞིང་ཁང་རིགས།",
+    colPastureName: "ཞིང་ཁང་མིང་།",
+    colFarmType: "ཞིང་ཁང་རིགས།",
+    colCounty: "རྫོང་ཁག",
+    colTown: "ཤང་གྲོང་།",
     colPersonInCharge: "འགན་འཛིན།",
-    colContactPhone: "འབྲེལ་ཁ།",
-    colBizStatus: "གནས་བབ།",
-    formPastureName: "རྩྭ་ཁང་མིང་།",
-    formPastureNature: "རང་བཞིན།",
-    formIdCardNo: "ཐོབ་ཐང་།",
-    formRegion: "ས་ཁུལ།",
+    colContactPhone: "འབྲེལ་གཏུག",
+    formPastureName: "ཞིང་ཁང་མིང་།",
+    formFarmType: "ཞིང་ཁང་རིགས།",
+    formIntroduction: "ངོ་སྤྲོད།",
+    formLongitude: "གཞུང་ཚད།",
+    formLatitude: "འཕྲེད་ཚད།",
     formDetailAddress: "ཁ་བྱང་།",
     formPersonInCharge: "འགན་འཛིན།",
-    formContactPhone: "འབྲེལ་ཁ།",
-    formBizStatus: "གནས་བབ།",
-    formPhoto: "པར་རིས།",
+    formContactPhone: "འབྲེལ་གཏུག་ཁ་པར།",
+    formCounty: "རྫོང་ཁག",
+    formTown: "ཤང་གྲོང་།",
+    formFloorArea: "ས་ཁོངས་ཆེ་ཆུང་།",
+    formScaleBreeding: "འཕྲུལ་སྐྱོད་ཆེ་ཆུང་།",
+    formBreedSpecies: "འཕྲུལ་རིགས།",
+    formDataSource: "གཞི་གྲངས་ཁུངས།",
+    formLastSyncTime: "མཉམ་སྒྲིག་དུས་ཚོད།",
     formRemark: "ཟིན་བྲིས།",
-    phPastureName: "མིང་1-10",
-    phIdCardIndividual: "ཐོབ་ཐང་18",
-    phIdCardEnterprise: "ཚོགས་པ་ཨང་18",
-    phDetailAddress: "50ཡན་མི་ཆོག",
-    phPersonInCharge: "10ཡན་མི་ཆོག",
-    phContactPhone: "ཁ་པར་11",
-    phRemark: "འདེམས་ཆོག",
-    tipPhoto: "jpg/png 10MB",
-    nature1: "མི་སྒེར།",
-    nature2: "ཁེ་ལས།",
-    bizStatus1: "སྤྱིར་བཏང་།",
-    bizStatus2: "བཀག་སྡོད།",
-    bizStatus3: "ཐོབ་ཐོང་།",
-    ruleNameRequired: "མིང་འབྲི་རོགས།",
-    ruleNameLen: "མིང་1-10",
-    ruleNatureRequired: "རང་བཞིན་འདེམས་རོགས།",
-    ruleIdCardRequired: "ཨང་གྲངས་འབྲི་རོགས།",
-    ruleIdCardInvalid: "ཐོབ་ཐང་ཕྱི་མིན།",
-    ruleUsccInvalid: "ཚོགས་པ་ཨང་ཕྱི་མིན།",
-    ruleRegionRequired: "རྫོང་བར་འདེམས་རོགས།",
-    rulePhoneRequired: "ཁ་པར་འབྲི་རོགས།",
-    rulePhoneInvalid: "ཁ་པར་ཕྱི་མིན།",
-    ruleBizStatusRequired: "གནས་བབ་འདེམས་རོགས།",
-    ruleDetailLen: "ཁ་བྱང་50ལས་མི་ཆོག",
-    rulePersonLen: "འགན་འཛིན་10ལས་མི་ཆོག",
-    dialogAdd: "[གསར་སྣོན]རྩྭ་ཁང་།",
-    dialogEdit: "[རྩོམ་སྒྲིག]རྩྭ་ཁང་།",
-    confirmDelete: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
-    confirmDeleteBatch: "ཐོ་གཞུང་འདི་སུབ་རྒྱུ་གཏན་ཁེལ་ལམ？",
-    viewCreateBy: "གསར་སྣོན་མཁན།",
-    viewUpdateBy: "རྩོམ་སྒྲིག་མཁན།",
-    viewUpdateTime: "རྩོམ་སྒྲིག་དུས་ཚོད།"
+    farmType1: "མི་སྒེར།",
+    farmType2: "ཁེ་ལས།",
+    dataSourceThirdParty: "ཕྱི་རོལ་མཉམ་སྒྲིག",
+    btnSync: "མཉམ་སྒྲིག",
+    syncSummary: "མཉམ་སྒྲིག་ཟིན：གསར་{insert} རྩོམ་{update} ཕམ་{fail}",
+    syncTimeHint: "གཞི་གྲངས་མཇུག：{time}",
+    emptyList: "གཞི་གྲངས་མེད།"
   },
   grasslandUsage: {
     queryKeyword: "རྩྭ་ཁང་མིང་།",

ruoyi-ui/src/lang/zh/dataModel.js

@@ -94,60 +94,38 @@ export default {
     viewUpdateTime: "修改时间"
   },
   pasture: {
-    queryKeyword: "牧场名称",
-    queryKeywordPh: "请输入牧场名称关键字",
-    queryPastureNature: "牧场性质",
-    queryBizStatus: "经营状态",
-    colPastureName: "牧场名称",
-    colPastureNature: "牧场性质",
-    colIdCardNo: "身份证号",
-    colRegion: "所属区域",
-    colDetailAddress: "详细地址",
+    queryKeyword: "农场名称",
+    queryKeywordPh: "请输入农场名称关键字",
+    queryFarmType: "农场类型",
+    colPastureName: "农场名称",
+    colFarmType: "农场类型",
+    colCounty: "区县",
+    colTown: "乡镇",
     colPersonInCharge: "负责人",
     colContactPhone: "联系方式",
-    colBizStatus: "经营状态",
-    formPastureName: "牧场名称",
-    formPastureNature: "牧场性质",
-    formIdCardNo: "身份证号",
-    formRegion: "所属区域",
+    formPastureName: "农场名称",
+    formFarmType: "农场类型",
+    formIntroduction: "农场简介",
+    formLongitude: "经度",
+    formLatitude: "纬度",
     formDetailAddress: "详细地址",
     formPersonInCharge: "负责人",
-    formContactPhone: "联系方式",
-    formBizStatus: "经营状态",
-    formPhoto: "照片",
+    formContactPhone: "联系电话",
+    formCounty: "区县",
+    formTown: "乡镇",
+    formFloorArea: "占地面积",
+    formScaleBreeding: "养殖规模",
+    formBreedSpecies: "养殖品种",
+    formDataSource: "数据来源",
+    formLastSyncTime: "最近同步时间",
     formRemark: "备注",
-    phPastureName: "请输入牧场名称（1～10字）",
-    phIdCardIndividual: "请输入18位身份证号",
-    phIdCardEnterprise: "请输入18位主体识别号",
-    phDetailAddress: "选填，不超过50字",
-    phPersonInCharge: "选填，不超过10字",
-    phContactPhone: "请输入11位手机号",
-    phRemark: "选填",
-    tipPhoto: "支持 jpg/jpeg/png，单张不超过 10MB",
-    nature1: "个体",
-    nature2: "企业",
-    bizStatus1: "正常",
-    bizStatus2: "停业",
-    bizStatus3: "注销",
-    ruleNameRequired: "请输入牧场名称",
-    ruleNameLen: "牧场名称长度为 1～10 个字符",
-    ruleNatureRequired: "请选择牧场性质",
-    ruleIdCardRequired: "请输入证件号码",
-    ruleIdCardInvalid: "身份证号格式不正确",
-    ruleUsccInvalid: "主体识别号格式不正确",
-    ruleRegionRequired: "请选择至县级所属区域",
-    rulePhoneRequired: "请输入联系方式",
-    rulePhoneInvalid: "手机号格式不正确",
-    ruleBizStatusRequired: "请选择经营状态",
-    ruleDetailLen: "详细地址不能超过 50 个字符",
-    rulePersonLen: "负责人不能超过 10 个字符",
-    dialogAdd: "[新增]牧场",
-    dialogEdit: "[编辑]牧场",
-    confirmDelete: "是否确认删除这条数据？",
-    confirmDeleteBatch: "是否确认删除这条数据？",
-    viewCreateBy: "创建人",
-    viewUpdateBy: "修改人",
-    viewUpdateTime: "修改时间"
+    farmType1: "个体",
+    farmType2: "企业",
+    dataSourceThirdParty: "第三方同步",
+    btnSync: "同步",
+    syncSummary: "同步完成：新增 {insert} 条，更新 {update} 条，失败 {fail} 条",
+    syncTimeHint: "数据截至：{time}",
+    emptyList: "暂无牧场数据"
   },
   grasslandUsage: {
     queryKeyword: "草场名称",

ruoyi-ui/src/views/dataModel/pasture/index.vue

@@ -12,95 +12,62 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item prop="pastureNature">
-          <template slot="label">{{ dmT("queryPastureNature") }}</template>
-          <el-select v-model="queryParams.pastureNature" :placeholder="dmCommon('pleaseSelect')" clearable style="width: 120px">
-            <el-option v-for="item in pastureNatureOptions" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="bizStatus">
-          <template slot="label">{{ dmT("queryBizStatus") }}</template>
-          <el-select v-model="queryParams.bizStatus" :placeholder="dmCommon('pleaseSelect')" clearable style="width: 120px">
-            <el-option v-for="item in bizStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
+        <el-form-item prop="farmType">
+          <template slot="label">{{ dmT("queryFarmType") }}</template>
+          <el-select v-model="queryParams.farmType" :placeholder="dmCommon('pleaseSelect')" clearable style="width: 120px">
+            <el-option v-for="item in farmTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ dmCommon("search") }}</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ dmCommon("reset") }}</el-button>
           <el-button
-            v-hasPermi="['dataModel:pasture:add']"
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-          >{{ dmCommon("add") }}</el-button>
-          <el-button
-            v-hasPermi="['dataModel:pasture:remove']"
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="!ids.length"
-            @click="handleDeleteBatch"
-          >{{ dmCommon("delete") }}</el-button>
-          <!-- 导出功能暂未开放
-          <el-button
-            v-hasPermi="['dataModel:pasture:export']"
+            v-hasPermi="['dataModel:pasture:sync']"
             type="warning"
             plain
-            icon="el-icon-download"
+            icon="el-icon-refresh"
             size="mini"
-            @click="handleExport"
-          >{{ dmCommon("export") }}</el-button>
-          -->
+            :loading="syncing"
+            @click="handleSync"
+          >{{ dmT("btnSync") }}</el-button>
         </el-form-item>
       </el-form>
+      <div v-if="lastSyncHint" class="pasture-sync-hint">{{ lastSyncHint }}</div>
     </el-card>
 
     <br />
 
     <el-card shadow="never">
-      <el-table v-loading="loading" :data="tableList" border @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="50" align="center" fixed="left" />
-        <el-table-column :label="dmT('colPastureName')" prop="pastureName" align="center" min-width="100" fixed="left" :show-overflow-tooltip="true" />
-        <el-table-column :label="dmT('colPastureNature')" align="center" width="80">
+      <el-table v-loading="loading" :data="tableList" border>
+        <template slot="empty">
+          <span>{{ dmT("emptyList") }}</span>
+        </template>
+        <el-table-column :label="dmT('colPastureName')" prop="pastureName" align="center" min-width="120" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colFarmType')" align="center" width="90">
           <template slot-scope="scope">
-            <span>{{ pastureNatureLabel(scope.row.pastureNature) }}</span>
+            <span>{{ farmTypeLabel(scope.row.farmType) }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="dmT('colIdCardNo')" align="center" min-width="140" :show-overflow-tooltip="true">
+        <el-table-column :label="dmT('colCounty')" prop="county" align="center" min-width="100" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colTown')" prop="town" align="center" min-width="100" :show-overflow-tooltip="true" />
+        <el-table-column :label="dmT('colPersonInCharge')" align="center" width="90" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span>{{ maskIdCard(scope.row.idCardNo) }}</span>
+            <span>{{ maskPerson(scope.row.personInCharge) }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="dmT('colRegion')" align="center" min-width="160" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <span>{{ formatRegion(scope.row) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="dmT('colDetailAddress')" prop="detailAddress" align="center" min-width="120" :show-overflow-tooltip="true" />
-        <el-table-column :label="dmT('colPersonInCharge')" prop="personInCharge" align="center" width="90" :show-overflow-tooltip="true" />
         <el-table-column :label="dmT('colContactPhone')" align="center" width="120">
           <template slot-scope="scope">
             <span>{{ maskPhone(scope.row.contactPhone) }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="dmT('colBizStatus')" align="center" width="80">
-          <template slot-scope="scope">
-            <span>{{ bizStatusLabel(scope.row.bizStatus) }}</span>
-          </template>
-        </el-table-column>
         <el-table-column :label="dmCommon('colCreate')" align="center" width="160">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? parseTime(scope.row.createTime) : $t("dataModel.status.dash") }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="dmCommon('colOp')" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
+        <el-table-column :label="dmCommon('colOp')" align="center" class-name="small-padding fixed-width" width="80" fixed="right">
           <template slot-scope="scope">
             <el-button v-hasPermi="['dataModel:pasture:query']" type="text" size="mini" @click="handleView(scope.row)">{{ dmCommon("view") }}</el-button>
-            <el-button v-hasPermi="['dataModel:pasture:edit']" type="text" size="mini" @click="handleEdit(scope.row)">{{ dmCommon("edit") }}</el-button>
-            <el-button v-hasPermi="['dataModel:pasture:remove']" type="text" size="mini" @click="handleDelete(scope.row)">{{ dmCommon("delete") }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -113,182 +80,92 @@
       />
     </el-card>
 
-    <el-dialog :title="dialogTitle" :visible.sync="open" width="900px" append-to-body @close="cancel">
-      <el-form :key="formKey" ref="form" :model="form" label-width="130px">
+    <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="900px" append-to-body>
+      <el-form label-width="130px" size="small">
         <el-row :gutter="16">
           <el-col :span="12">
-            <el-form-item prop="pastureName" :rules="formRules.pastureName">
-              <template slot="label">{{ dmT("formPastureName") }}</template>
-              <el-input v-model="form.pastureName" :placeholder="dmT('phPastureName')" maxlength="10" show-word-limit />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="pastureNature" :rules="formRules.pastureNature">
-              <template slot="label">{{ dmT("formPastureNature") }}</template>
-              <el-select v-model="form.pastureNature" :placeholder="dmCommon('pleaseSelect')" style="width: 100%" @change="handleNatureChange">
-                <el-option v-for="item in pastureNatureOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="idCardNo" :rules="formRules.idCardNo">
-              <template slot="label">{{ dmT("formIdCardNo") }}</template>
-              <el-input v-model="form.idCardNo" :placeholder="idCardPlaceholder" maxlength="18" />
+            <el-form-item :label="dmT('formPastureName')">
+              <span>{{ viewRow.pastureName || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="regionCodes" :rules="formRules.regionCodes">
-              <template slot="label">{{ dmT("formRegion") }}</template>
-              <region-cascader
-                :province-code.sync="form.provinceCode"
-                :province-name.sync="form.provinceName"
-                :city-code.sync="form.cityCode"
-                :city-name.sync="form.cityName"
-                :county-code.sync="form.countyCode"
-                :county-name.sync="form.countyName"
-                :placeholder="dmCommon('pleaseSelect')"
-                @change="handleRegionChange"
-              />
+            <el-form-item :label="dmT('formFarmType')">
+              <span>{{ farmTypeLabel(viewRow.farmType) }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item prop="detailAddress" :rules="formRules.detailAddress">
-              <template slot="label">{{ dmT("formDetailAddress") }}</template>
-              <el-input v-model="form.detailAddress" :placeholder="dmT('phDetailAddress')" maxlength="50" show-word-limit />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item prop="personInCharge" :rules="formRules.personInCharge">
-              <template slot="label">{{ dmT("formPersonInCharge") }}</template>
-              <el-input v-model="form.personInCharge" :placeholder="dmT('phPersonInCharge')" maxlength="10" show-word-limit />
+            <el-form-item :label="dmT('formIntroduction')">
+              <span class="pasture-view-text">{{ viewRow.introduction || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="contactPhone" :rules="formRules.contactPhone">
-              <template slot="label">{{ dmT("formContactPhone") }}</template>
-              <el-input v-model="form.contactPhone" :placeholder="dmT('phContactPhone')" maxlength="11" />
+            <el-form-item :label="dmT('formLongitude')">
+              <span>{{ formatCoord(viewRow.longitude) }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="bizStatus" :rules="formRules.bizStatus">
-              <template slot="label">{{ dmT("formBizStatus") }}</template>
-              <el-select v-model="form.bizStatus" :placeholder="dmCommon('pleaseSelect')" style="width: 100%">
-                <el-option v-for="item in bizStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item prop="photoFilePath">
-              <template slot="label">{{ dmT("formPhoto") }}</template>
-              <el-upload
-                list-type="picture-card"
-                :class="{ hide: hidePhotoUpload }"
-                :action="uploadAction"
-                :headers="uploadHeaders"
-                :before-upload="beforePhotoUpload"
-                :on-success="handlePhotoUploadSuccess"
-                :on-error="handleUploadError"
-                :on-remove="handlePhotoRemove"
-                :limit="1"
-                :file-list="photoFileList"
-              >
-                <i class="el-icon-plus" />
-              </el-upload>
-              <div class="el-upload__tip">{{ dmT("tipPhoto") }}</div>
+            <el-form-item :label="dmT('formLatitude')">
+              <span>{{ formatCoord(viewRow.latitude) }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item prop="remark" :rules="formRules.remark">
-              <template slot="label">{{ dmT("formRemark") }}</template>
-              <el-input v-model="form.remark" type="textarea" :rows="2" :placeholder="dmT('phRemark')" maxlength="100" show-word-limit />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{ dmCommon("ok") }}</el-button>
-        <el-button @click="cancel">{{ dmCommon("cancel") }}</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :title="dmCommon('viewTitle')" :visible.sync="viewOpen" width="900px" append-to-body>
-      <el-form label-width="130px" size="small">
-        <el-row :gutter="16">
-          <el-col :span="12">
-            <el-form-item :label="dmT('formPastureName')">
-              <span>{{ viewRow.pastureName || $t("dataModel.status.dash") }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="dmT('formPastureNature')">
-              <span>{{ pastureNatureLabel(viewRow.pastureNature) }}</span>
+            <el-form-item :label="dmT('formDetailAddress')">
+              <span>{{ viewRow.detailAddress || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmT('formIdCardNo')">
-              <span>{{ viewRow.idCardNo || $t("dataModel.status.dash") }}</span>
+            <el-form-item :label="dmT('formPersonInCharge')">
+              <span>{{ viewRow.personInCharge || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmT('formRegion')">
-              <span>{{ formatRegion(viewRow) }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item :label="dmT('formDetailAddress')">
-              <span>{{ viewRow.detailAddress || $t("dataModel.status.dash") }}</span>
+            <el-form-item :label="dmT('formContactPhone')">
+              <span>{{ viewRow.contactPhone || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmT('formPersonInCharge')">
-              <span>{{ viewRow.personInCharge || $t("dataModel.status.dash") }}</span>
+            <el-form-item :label="dmT('formCounty')">
+              <span>{{ viewRow.county || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmT('formContactPhone')">
-              <span>{{ viewRow.contactPhone || $t("dataModel.status.dash") }}</span>
+            <el-form-item :label="dmT('formTown')">
+              <span>{{ viewRow.town || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmT('formBizStatus')">
-              <span>{{ bizStatusLabel(viewRow.bizStatus) }}</span>
+            <el-form-item :label="dmT('formFloorArea')">
+              <span>{{ viewRow.floorArea || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmT('formPhoto')">
-              <el-image
-                v-if="viewRow.photoFileUrl"
-                :src="viewPhotoUrl"
-                style="width: 80px; height: 80px"
-                fit="cover"
-                :preview-src-list="[viewPhotoUrl]"
-              />
-              <span v-else>{{ $t("dataModel.status.dash") }}</span>
+            <el-form-item :label="dmT('formScaleBreeding')">
+              <span>{{ viewRow.scaleBreeding || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="dmT('formRemark')">
-              <span>{{ viewRow.remark || $t("dataModel.status.dash") }}</span>
+            <el-form-item :label="dmT('formBreedSpecies')">
+              <span>{{ viewRow.breedSpecies || dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmT('viewCreateBy')">
-              <span>{{ viewRow.createBy || $t("dataModel.status.dash") }}</span>
+            <el-form-item :label="dmCommon('colCreate')">
+              <span>{{ viewRow.createTime ? parseTime(viewRow.createTime) : dash }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmCommon('colCreate')">
-              <span>{{ viewRow.createTime ? parseTime(viewRow.createTime) : $t("dataModel.status.dash") }}</span>
+            <el-form-item :label="dmT('formDataSource')">
+              <span>{{ dataSourceLabel(viewRow.dataSource) }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="dmT('viewUpdateBy')">
-              <span>{{ viewRow.updateBy || $t("dataModel.status.dash") }}</span>
+            <el-form-item :label="dmT('formLastSyncTime')">
+              <span>{{ viewRow.lastSyncTime ? parseTime(viewRow.lastSyncTime) : dash }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="dmT('viewUpdateTime')">
-              <span>{{ viewRow.updateTime ? parseTime(viewRow.updateTime) : $t("dataModel.status.dash") }}</span>
+          <el-col :span="24">
+            <el-form-item :label="dmT('formRemark')">
+              <span class="pasture-view-text">{{ viewRow.remark || dash }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -301,249 +178,91 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth"
 import dataModelLocaleMixin from "@/mixins/dataModelLocaleMixin"
-import RegionCascader from "@/components/RegionCascader/index.vue"
-import {
-  listPasture,
-  getPasture,
-  addPasture,
-  updatePasture,
-  delPasture
-} from "@/api/dataModel/pasture"
-
-const ID_CARD_REG = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/
-const USCC_REG = /^[0-9A-Z]{18}$/
-const PHONE_REG = /^1[3-9]\d{9}$/
+import { listPasture, getPasture, syncPasture } from "@/api/dataModel/pasture"
 
 export default {
   name: "Pasture",
-  components: { RegionCascader },
   mixins: [dataModelLocaleMixin],
   data() {
     return {
       dmNs: "pasture",
       loading: false,
-      open: false,
+      syncing: false,
       viewOpen: false,
       viewRow: {},
-      dialogEdit: false,
-      formKey: 0,
+      lastSyncHint: "",
       total: 0,
       tableList: [],
-      ids: [],
       queryParams: {
         pageNum: 1,
         pageSize: 20,
         keyword: undefined,
-        pastureNature: undefined,
-        bizStatus: undefined
-      },
-      form: {}
+        farmType: undefined
+      }
     }
   },
   computed: {
-    dialogTitle() {
-      return this.dialogEdit ? this.dmT("dialogEdit") : this.dmT("dialogAdd")
-    },
-    pastureNatureOptions() {
-      return [1, 2].map((v) => ({ value: v, label: this.dmT("nature" + v) }))
-    },
-    bizStatusOptions() {
-      return [1, 2, 3].map((v) => ({ value: v, label: this.dmT("bizStatus" + v) }))
-    },
-    idCardPlaceholder() {
-      return this.form.pastureNature === 2 ? this.dmT("phIdCardEnterprise") : this.dmT("phIdCardIndividual")
-    },
-    uploadAction() {
-      return process.env.VUE_APP_BASE_API + "/common/upload"
-    },
-    uploadHeaders() {
-      return { Authorization: "Bearer " + getToken() }
-    },
-    photoFileList() {
-      if (!this.form.photoFileUrl && !this.form.photoFilePath) {
-        return []
-      }
-      const url = this.resolvePhotoUrl(this.form.photoFileUrl, this.form.photoFilePath)
-      return [{ name: this.form.photoFilePath || "photo", url: url }]
-    },
-    hidePhotoUpload() {
-      return !!(this.form.photoFilePath || this.form.photoFileUrl)
-    },
-    viewPhotoUrl() {
-      return this.resolvePhotoUrl(this.viewRow.photoFileUrl, this.viewRow.photoFilePath)
-    },
-    formRules() {
-      return {
-        pastureName: [
-          { required: true, message: this.dmT("ruleNameRequired"), trigger: "blur" },
-          { min: 1, max: 10, message: this.dmT("ruleNameLen"), trigger: "blur" }
-        ],
-        pastureNature: [{ required: true, message: this.dmT("ruleNatureRequired"), trigger: "change" }],
-        idCardNo: [
-          { required: true, message: this.dmT("ruleIdCardRequired"), trigger: "blur" },
-          { validator: this.validateIdCardNo, trigger: "blur" }
-        ],
-        regionCodes: [
-          { required: true, message: this.dmT("ruleRegionRequired"), trigger: "change" },
-          { validator: this.validateRegion, trigger: "change" }
-        ],
-        detailAddress: [{ max: 50, message: this.dmT("ruleDetailLen"), trigger: "blur" }],
-        personInCharge: [{ max: 10, message: this.dmT("rulePersonLen"), trigger: "blur" }],
-        contactPhone: [
-          { required: true, message: this.dmT("rulePhoneRequired"), trigger: "blur" },
-          { validator: this.validatePhone, trigger: "blur" }
-        ],
-        bizStatus: [{ required: true, message: this.dmT("ruleBizStatusRequired"), trigger: "change" }],
-        remark: [{ max: 100, message: this.dmCommon("ruleLen100"), trigger: "blur" }]
-      }
+    dash() {
+      return this.$t("dataModel.status.dash")
+    },
+    farmTypeOptions() {
+      return [
+        { value: "1", label: this.dmT("farmType1") },
+        { value: "2", label: this.dmT("farmType2") }
+      ]
     }
   },
   created() {
     this.getList()
   },
   methods: {
-    pastureNatureLabel(v) {
+    farmTypeLabel(v) {
       if (v == null || v === "") {
-        return this.$t("dataModel.status.dash")
+        return this.dash
       }
-      return this.dmT("nature" + v) || v
-    },
-    bizStatusLabel(v) {
-      if (v == null || v === "") {
-        return this.$t("dataModel.status.dash")
+      const key = String(v)
+      if (key === "1") {
+        return this.dmT("farmType1")
       }
-      return this.dmT("bizStatus" + v) || v
-    },
-    formatRegion(row) {
-      if (!row) {
-        return this.$t("dataModel.status.dash")
+      if (key === "2") {
+        return this.dmT("farmType2")
       }
-      const parts = [row.provinceName, row.cityName, row.countyName].filter(Boolean)
-      return parts.length ? parts.join("") : this.$t("dataModel.status.dash")
+      return key
     },
-    maskIdCard(val) {
-      if (!val || val.length < 8) {
-        return val || this.$t("dataModel.status.dash")
+    dataSourceLabel(v) {
+      if (!v) {
+        return this.dash
       }
-      return val.slice(0, 4) + "**********" + val.slice(-4)
-    },
-    maskPhone(val) {
-      if (!val || val.length < 7) {
-        return val || this.$t("dataModel.status.dash")
+      if (v === "third_party") {
+        return this.dmT("dataSourceThirdParty")
       }
-      return val.slice(0, 3) + "****" + val.slice(-4)
+      return v
     },
-    resolvePhotoUrl(url, path) {
-      if (url) {
-        if (url.indexOf("http") === 0) {
-          return url
-        }
-        return process.env.VUE_APP_BASE_API + url
-      }
-      if (path) {
-        return process.env.VUE_APP_BASE_API + path
+    formatCoord(val) {
+      if (val == null || val === "") {
+        return this.dash
       }
-      return ""
+      return String(val)
     },
-    validateIdCardNo(rule, value, callback) {
-      if (!value) {
-        callback()
-        return
+    maskPerson(val) {
+      if (!val) {
+        return this.dash
       }
-      const v = String(value).trim().toUpperCase()
-      const nature = this.form.pastureNature
-      if (nature === 2) {
-        if (!USCC_REG.test(v)) {
-          callback(new Error(this.dmT("ruleUsccInvalid")))
-          return
-        }
-      } else if (!ID_CARD_REG.test(v)) {
-        callback(new Error(this.dmT("ruleIdCardInvalid")))
-        return
+      const s = String(val)
+      if (s.length <= 1) {
+        return s
       }
-      callback()
-    },
-    validatePhone(rule, value, callback) {
-      if (!value) {
-        callback()
-        return
-      }
-      if (!PHONE_REG.test(value)) {
-        callback(new Error(this.dmT("rulePhoneInvalid")))
-        return
-      }
-      callback()
-    },
-    syncRegionCodes() {
-      const { provinceCode, cityCode, countyCode } = this.form
-      this.form.regionCodes =
-        provinceCode && cityCode && countyCode ? [provinceCode, cityCode, countyCode] : []
-    },
-    handleRegionChange() {
-      this.syncRegionCodes()
-      this.$nextTick(() => {
-        if (this.$refs.form) {
-          this.$refs.form.validateField("regionCodes")
-        }
-      })
-    },
-    validateRegion(rule, value, callback) {
-      this.syncRegionCodes()
-      if (!this.form.provinceCode || !this.form.cityCode || !this.form.countyCode) {
-        callback(new Error(this.dmT("ruleRegionRequired")))
-        return
-      }
-      callback()
-    },
-    handleNatureChange() {
-      this.form.idCardNo = undefined
-      this.$nextTick(() => {
-        if (this.$refs.form) {
-          this.$refs.form.clearValidate("idCardNo")
-        }
-      })
-    },
-    extOf(fileName) {
-      if (!fileName || fileName.lastIndexOf(".") < 0) {
-        return ""
+      if (s.length === 2) {
+        return `${s[0]}*`
       }
-      return fileName.slice(fileName.lastIndexOf(".") + 1).toLowerCase()
+      return `${s[0]}*${s.slice(-1)}`
     },
-    beforePhotoUpload(file) {
-      const ext = this.extOf(file.name)
-      if (!["jpg", "jpeg", "png"].includes(ext)) {
-        this.$modal.msgError(this.dmT("tipPhoto"))
-        return false
-      }
-      if (file.name.includes(",")) {
-        this.$modal.msgError("文件名不能包含英文逗号")
-        return false
-      }
-      if (file.size / 1024 / 1024 >= 10) {
-        this.$modal.msgError(this.dmT("tipPhoto"))
-        return false
-      }
-      this.$modal.loading("正在上传图片，请稍候...")
-      return true
-    },
-    handlePhotoUploadSuccess(res) {
-      this.$modal.closeLoading()
-      if (res.code === 200) {
-        this.form.photoFileUrl = res.url
-        this.form.photoFilePath = res.fileName
-      } else {
-        this.$modal.msgError(res.msg || "上传失败")
+    maskPhone(val) {
+      if (!val || val.length < 7) {
+        return val || this.dash
       }
-    },
-    handleUploadError() {
-      this.$modal.closeLoading()
-      this.$modal.msgError("上传失败，请重试")
-    },
-    handlePhotoRemove() {
-      this.form.photoFileUrl = undefined
-      this.form.photoFilePath = undefined
+      return val.slice(0, 3) + "****" + val.slice(-4)
     },
     getList() {
       this.loading = true
@@ -562,168 +281,56 @@ export default {
     },
     resetQuery() {
       this.queryParams.keyword = undefined
-      this.queryParams.pastureNature = undefined
-      this.queryParams.bizStatus = undefined
+      this.queryParams.farmType = undefined
       this.resetForm("queryForm")
       this.handleQuery()
     },
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id)
-    },
-    resetFormModel() {
-      this.form = {
-        id: undefined,
-        pastureName: undefined,
-        pastureNature: undefined,
-        idCardNo: undefined,
-        provinceCode: undefined,
-        provinceName: undefined,
-        cityCode: undefined,
-        cityName: undefined,
-        countyCode: undefined,
-        countyName: undefined,
-        regionCodes: [],
-        detailAddress: undefined,
-        personInCharge: undefined,
-        contactPhone: undefined,
-        bizStatus: 1,
-        photoFileUrl: undefined,
-        photoFilePath: undefined,
-        remark: undefined
-      }
-    },
-    handleAdd() {
-      this.formKey += 1
-      this.resetFormModel()
-      this.dialogEdit = false
-      this.open = true
-      this.$nextTick(() => this.resetForm("form"))
-    },
-    handleEdit(row) {
-      getPasture(row.id).then((res) => {
-        const data = res.data || {}
-        this.formKey += 1
-        this.dialogEdit = true
-        this.form = {
-          id: data.id,
-          pastureName: data.pastureName,
-          pastureNature: data.pastureNature,
-          idCardNo: data.idCardNo,
-          provinceCode: data.provinceCode,
-          provinceName: data.provinceName,
-          cityCode: data.cityCode,
-          cityName: data.cityName,
-          countyCode: data.countyCode,
-          countyName: data.countyName,
-          regionCodes:
-            data.provinceCode && data.cityCode && data.countyCode
-              ? [data.provinceCode, data.cityCode, data.countyCode]
-              : [],
-          detailAddress: data.detailAddress,
-          personInCharge: data.personInCharge,
-          contactPhone: data.contactPhone,
-          bizStatus: data.bizStatus != null ? data.bizStatus : 1,
-          photoFileUrl: data.photoFileUrl,
-          photoFilePath: data.photoFilePath,
-          remark: data.remark
-        }
-        this.open = true
-        this.$nextTick(() => {
-          if (this.$refs.form) {
-            this.$refs.form.clearValidate()
-          }
-        })
-      })
-    },
     handleView(row) {
       getPasture(row.id).then((res) => {
         this.viewRow = res.data || {}
         this.viewOpen = true
       })
     },
-    handleDelete(row) {
-      this.$modal
-        .confirm(this.$t("dataModel.pasture.confirmDelete", { id: row.id }))
-        .then(() => delPasture(row.id))
-        .then(() => {
-          this.$modal.msgSuccess(this.dmCommon("msgDelOk"))
-          this.getList()
-        })
-        .catch(() => {})
-    },
-    handleDeleteBatch() {
-      if (!this.ids.length) {
+    handleSync() {
+      if (this.syncing) {
         return
       }
-      this.$modal
-        .confirm(this.dmT("confirmDeleteBatch"))
-        .then(() => delPasture(this.ids.join(",")))
-        .then(() => {
-          this.$modal.msgSuccess(this.dmCommon("msgDelOk"))
+      this.syncing = true
+      syncPasture()
+        .then((res) => {
+          const data = res.data || {}
+          this.$modal.msgSuccess(
+            this.dmT("syncSummary", {
+              insert: data.insertCount != null ? data.insertCount : 0,
+              update: data.updateCount != null ? data.updateCount : 0,
+              fail: data.failCount != null ? data.failCount : 0
+            })
+          )
+          if (data.failCount > 0 && data.failMessages && data.failMessages.length) {
+            this.$modal.msgWarning(data.failMessages.join("；"))
+          }
+          if (data.syncTime) {
+            this.lastSyncHint = this.dmT("syncTimeHint", { time: this.parseTime(data.syncTime) })
+          }
           this.getList()
         })
-        .catch(() => {})
-    },
-    handleExport() {
-      this.download(
-        "dataModel/pasture/export",
-        { ...this.queryParams },
-        `pasture_${new Date().getTime()}.xlsx`
-      )
-    },
-    buildPayload() {
-      return {
-        pastureName: this.form.pastureName,
-        pastureNature: this.form.pastureNature,
-        idCardNo: this.form.idCardNo ? String(this.form.idCardNo).trim().toUpperCase() : undefined,
-        provinceCode: this.form.provinceCode,
-        provinceName: this.form.provinceName,
-        cityCode: this.form.cityCode,
-        cityName: this.form.cityName,
-        countyCode: this.form.countyCode,
-        countyName: this.form.countyName,
-        detailAddress: this.form.detailAddress || undefined,
-        personInCharge: this.form.personInCharge || undefined,
-        contactPhone: this.form.contactPhone,
-        bizStatus: this.form.bizStatus,
-        photoFileUrl: this.form.photoFileUrl || undefined,
-        photoFilePath: this.form.photoFilePath || undefined,
-        remark: this.form.remark || undefined
-      }
-    },
-    submitForm() {
-      this.syncRegionCodes()
-      this.$refs.form.validate((valid) => {
-        if (!valid) {
-          return
-        }
-        const payload = this.buildPayload()
-        if (this.dialogEdit) {
-          payload.id = this.form.id
-          updatePasture(payload).then(() => {
-            this.$modal.msgSuccess(this.dmCommon("msgModOk"))
-            this.open = false
-            this.getList()
-          })
-        } else {
-          addPasture(payload).then(() => {
-            this.$modal.msgSuccess(this.dmCommon("msgAddOk"))
-            this.open = false
-            this.getList()
-          })
-        }
-      })
-    },
-    cancel() {
-      this.open = false
-      this.resetFormModel()
+        .finally(() => {
+          this.syncing = false
+        })
     }
   }
 }
 </script>
 
 <style scoped>
-::v-deep.hide .el-upload--picture-card {
-  display: none;
+.pasture-sync-hint {
+  margin-top: 8px;
+  font-size: 12px;
+  color: #909399;
+}
+
+.pasture-view-text {
+  white-space: pre-wrap;
+  word-break: break-word;
 }
 </style>