123

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

@@ -662,6 +662,7 @@ export default {
     queryStatYear: "གཏོགས་ལོ།",
     queryStatMonth: "གཏོགས་ཟླ།",
     queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
     queryEnterpriseName: "ཁེ་ལས་མིང་།",
     phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
     phEnterpriseName: "ཁེ་ལས་མིང་འབྲི་རོགས།",
@@ -770,6 +771,7 @@ export default {
     queryStatYear: "གཏོགས་ལོ།",
     queryStatMonth: "གཏོགས་ཟླ།",
     queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
     queryEnterpriseName: "ཁེ་ལས་མིང་།",
     phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
     phEnterpriseName: "ཁེ་ལས་མིང་འབྲི་རོགས།",
@@ -878,6 +880,7 @@ export default {
     queryStatYear: "གཏོགས་ལོ།",
     queryStatMonth: "གཏོགས་ཟླ།",
     queryTown: "ཤང་གྲོང།",
+    queryVillage: "གྲོང་ཚོ།",
     phVillageSearch: "འདེམས་པའམ་འཚོལ་འཇུག་རོགས།",
     phRemark: "འདེམས་འབྲི，ཡིག་ཆ་500ལས་མི་ཆོག",
     colStatYear: "གཏོགས་ལོ།",

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

@@ -71,6 +71,7 @@ export default {
     queryResourceName: "མིང་།",
     queryResourceNamePh: "མིང་འཚོལ（མཐུན）",
     queryPublishStatus: "འགྲེམ་སྤེལ་རྣམ་པ།",
+    queryTown: "ཤང་གྲོང།",
     resourceType1: "སོ་བའི་མི།",
     resourceType2: "ཆེད་ལས་ཚོགས་པ།",
     resourceType3: "གསོ་བཅོས་ལས་ཁུངས།",
@@ -79,6 +80,7 @@ export default {
     colResourceName: "མིང་།",
     colIntro: "ངོ་སྤྲོད།",
     colContact: "འབྲེལ་གཏུག",
+    colTown: "ཤང་གྲོང།",
     colAffiliatedUnit: "ཁོངས་འབྲེལ།",
     colDetailAddress: "ཁ་བྱང་།",
     colOrgLevel: "ལས་ཁུངས་རིམ་པ།",

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

@@ -662,6 +662,7 @@ export default {
     queryStatYear: "所属年份",
     queryStatMonth: "所属月份",
     queryTown: "所属乡镇",
+    queryVillage: "所属村",
     queryEnterpriseName: "企业名称",
     phVillageSearch: "请选择或输入搜索",
     phEnterpriseName: "请输入企业名称",
@@ -770,6 +771,7 @@ export default {
     queryStatYear: "所属年份",
     queryStatMonth: "所属月份",
     queryTown: "所属乡镇",
+    queryVillage: "所属村",
     queryEnterpriseName: "企业名称",
     phVillageSearch: "请选择或输入搜索",
     phEnterpriseName: "请输入企业名称",
@@ -878,6 +880,7 @@ export default {
     queryStatYear: "所属年份",
     queryStatMonth: "所属月份",
     queryTown: "所属乡镇",
+    queryVillage: "所属村",
     phVillageSearch: "请选择或输入搜索",
     phRemark: "选填，不超过 500 字",
     colStatYear: "所属年份",

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

@@ -71,6 +71,7 @@ export default {
     queryResourceName: "资源名称",
     queryResourceNamePh: "名称模糊查询",
     queryPublishStatus: "发布状态",
+    queryTown: "所属乡镇",
     resourceType1: "兽医人员",
     resourceType2: "专家团队",
     resourceType3: "诊疗机构",
@@ -79,6 +80,7 @@ export default {
     colResourceName: "展示名称",
     colIntro: "介绍摘要",
     colContact: "联系方式",
+    colTown: "所属乡镇",
     colAffiliatedUnit: "隶属单位",
     colDetailAddress: "详细地址",
     colOrgLevel: "机构级别",

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

@@ -20,6 +20,23 @@
             <el-option v-for="item in townOptions" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="villageDeptId">
+          <template slot="label">{{ dmT("queryVillage") }}</template>
+          <el-select
+            v-model="queryParams.villageDeptId"
+            :placeholder="dmT('phVillageSearch')"
+            clearable
+            filterable
+            style="width: 220px"
+          >
+            <el-option
+              v-for="item in villageOptions"
+              :key="'q-v-' + item.deptId"
+              :label="item.label"
+              :value="item.deptId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item prop="enterpriseName">
           <template slot="label">{{ dmT("queryEnterpriseName") }}</template>
           <el-input
@@ -821,6 +838,7 @@ export default {
         statYear: undefined,
         statMonth: undefined,
         townDeptId: undefined,
+        villageDeptId: undefined,
         enterpriseName: undefined
       },
       form: createEmptyForm()
@@ -1040,6 +1058,9 @@ export default {
       if (this.queryParams.townDeptId != null) {
         q.townDeptId = this.queryParams.townDeptId
       }
+      if (this.queryParams.villageDeptId != null) {
+        q.villageDeptId = this.queryParams.villageDeptId
+      }
       const name = this.queryParams.enterpriseName != null ? String(this.queryParams.enterpriseName).trim() : ""
       if (name) {
         q.enterpriseName = name
@@ -1095,6 +1116,7 @@ export default {
       this.queryParams.statYear = undefined
       this.queryParams.statMonth = undefined
       this.queryParams.townDeptId = undefined
+      this.queryParams.villageDeptId = undefined
       this.queryParams.enterpriseName = undefined
       this.resetForm("queryForm")
       this.handleQuery()

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

@@ -20,6 +20,23 @@
             <el-option v-for="item in townOptions" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="villageDeptId">
+          <template slot="label">{{ dmT("queryVillage") }}</template>
+          <el-select
+            v-model="queryParams.villageDeptId"
+            :placeholder="dmT('phVillageSearch')"
+            clearable
+            filterable
+            style="width: 220px"
+          >
+            <el-option
+              v-for="item in villageOptions"
+              :key="'q-v-' + item.deptId"
+              :label="item.label"
+              :value="item.deptId"
+            />
+          </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>
@@ -555,7 +572,8 @@ export default {
         pageSize: 20,
         statYear: undefined,
         statMonth: undefined,
-        townDeptId: undefined
+        townDeptId: undefined,
+        villageDeptId: undefined
       },
       form: createEmptyForm()
     }
@@ -758,6 +776,9 @@ export default {
       if (this.queryParams.townDeptId != null) {
         q.townDeptId = this.queryParams.townDeptId
       }
+      if (this.queryParams.villageDeptId != null) {
+        q.villageDeptId = this.queryParams.villageDeptId
+      }
       return q
     },
     getList() {
@@ -781,7 +802,8 @@ export default {
         pageSize: 20,
         statYear: undefined,
         statMonth: undefined,
-        townDeptId: undefined
+        townDeptId: undefined,
+        villageDeptId: undefined
       }
       this.getList()
     },

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

@@ -20,6 +20,23 @@
             <el-option v-for="item in townOptions" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
           </el-select>
         </el-form-item>
+        <el-form-item prop="villageDeptId">
+          <template slot="label">{{ dmT("queryVillage") }}</template>
+          <el-select
+            v-model="queryParams.villageDeptId"
+            :placeholder="dmT('phVillageSearch')"
+            clearable
+            filterable
+            style="width: 220px"
+          >
+            <el-option
+              v-for="item in villageOptions"
+              :key="'q-v-' + item.deptId"
+              :label="item.label"
+              :value="item.deptId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item prop="enterpriseName">
           <template slot="label">{{ dmT("queryEnterpriseName") }}</template>
           <el-input
@@ -821,6 +838,7 @@ export default {
         statYear: undefined,
         statMonth: undefined,
         townDeptId: undefined,
+        villageDeptId: undefined,
         enterpriseName: undefined
       },
       form: createEmptyForm()
@@ -1040,6 +1058,9 @@ export default {
       if (this.queryParams.townDeptId != null) {
         q.townDeptId = this.queryParams.townDeptId
       }
+      if (this.queryParams.villageDeptId != null) {
+        q.villageDeptId = this.queryParams.villageDeptId
+      }
       const name = this.queryParams.enterpriseName != null ? String(this.queryParams.enterpriseName).trim() : ""
       if (name) {
         q.enterpriseName = name
@@ -1095,6 +1116,7 @@ export default {
       this.queryParams.statYear = undefined
       this.queryParams.statMonth = undefined
       this.queryParams.townDeptId = undefined
+      this.queryParams.villageDeptId = undefined
       this.queryParams.enterpriseName = undefined
       this.resetForm("queryForm")
       this.handleQuery()

ruoyi-ui/src/views/diseaseTreatment/medicalResource/index.vue

@@ -35,6 +35,23 @@
             <el-option :label="$t('diseaseTreatment.status.offline')" :value="2" />
           </el-select>
         </el-form-item>
+        <el-form-item v-if="activeTab === 'vet'" prop="townDeptId">
+          <template slot="label">{{ dtT("queryTown") }}</template>
+          <el-select
+            v-model="queryParams.townDeptId"
+            :placeholder="dtCommon('pleaseSelect')"
+            clearable
+            filterable
+            style="width: 180px"
+          >
+            <el-option
+              v-for="item in townOptions"
+              :key="'q-town-' + item.deptId"
+              :label="item.deptName"
+              :value="item.deptId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ dtCommon("search") }}</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ dtCommon("reset") }}</el-button>
@@ -85,6 +102,7 @@
         <el-table-column :label="dtT('colResourceName')" prop="resourceName" align="center" min-width="110" :show-overflow-tooltip="true" />
         <el-table-column :label="dtT('colIntro')" prop="introduction" align="center" min-width="140" :show-overflow-tooltip="true" />
         <el-table-column v-if="showColContact" :label="dtT('colContact')" prop="contactPhone" align="center" width="120" />
+        <el-table-column v-if="showColTown" :label="dtT('colTown')" prop="townName" align="center" min-width="110" :show-overflow-tooltip="true" />
         <el-table-column v-if="showColAffiliated" :label="dtT('colAffiliatedUnit')" prop="affiliatedUnit" align="center" min-width="110" :show-overflow-tooltip="true" />
         <el-table-column v-if="showColAddress" :label="dtT('colDetailAddress')" prop="detailAddress" align="center" min-width="120" :show-overflow-tooltip="true" />
         <el-table-column v-if="activeTab === 'org'" :label="dtT('colOrgLevel')" align="center" width="100">
@@ -528,7 +546,8 @@ export default {
         pageSize: 20,
         resourceType: RESOURCE_TYPE_CODE.VET,
         resourceName: undefined,
-        publishStatus: undefined
+        publishStatus: undefined,
+        townDeptId: undefined
       },
       form: {},
       imageFileExts: ["jpg", "jpeg", "png"],
@@ -551,6 +570,9 @@ export default {
     showColContact() {
       return this.activeTab !== "equipment"
     },
+    showColTown() {
+      return this.activeTab === "vet"
+    },
     showColAffiliated() {
       return this.activeTab === "vet" || this.activeTab === "team" || this.activeTab === "equipment"
     },
@@ -802,6 +824,9 @@ export default {
     handleTabClick() {
       this.queryParams.resourceType = TAB_TYPE_MAP[this.activeTab]
       this.queryParams.pageNum = 1
+      if (this.activeTab !== "vet") {
+        this.queryParams.townDeptId = undefined
+      }
       this.getList()
     },
     handleQueryTypeChange(val) {
@@ -810,6 +835,9 @@ export default {
       if (tab) {
         this.activeTab = tab
       }
+      if (key !== RESOURCE_TYPE_CODE.VET) {
+        this.queryParams.townDeptId = undefined
+      }
       this.handleQuery()
     },
     normalizeIntList(val) {
@@ -980,6 +1008,7 @@ export default {
     resetQuery() {
       this.queryParams.resourceName = undefined
       this.queryParams.publishStatus = undefined
+      this.queryParams.townDeptId = undefined
       this.queryParams.resourceType = TAB_TYPE_MAP[this.activeTab]
       this.resetForm("queryForm")
       this.handleQuery()