Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_mobile into rongxin_dev

src/views/sunVillage_info/resourceAdd.vue

@@ -66,6 +66,17 @@
            <van-field v-model="form.north" label="北至" placeholder="北至" input-align="right" :border="false" />
            <van-field v-model="form.totalArea" label="总面积(亩)" placeholder="总面积(亩)" required :rules="[{ required: true }]" input-align="right" :border="false" />
 
+           <field-select
+             v-model="form.operationType"
+             label="经营属性"
+             value-key="dictLabel"
+             data-key="dictValue"
+             placeholder="请选择"
+             :rulesx="[{ required: true }]"
+             requiredx
+             remote-url="/open/zdzh/list/operation_type"
+             :on-remote-response="'data'"/>
+
            <van-field
              readonly
              clickable
@@ -212,8 +223,10 @@
  </template>
  <script>
    import { addResource } from "@/api/sunVillage_info/fixedAssets";
+   import FieldSelect from "@/components/form/FieldSelect.vue";
    export default {
      name: "certificateList",
+     components: {FieldSelect},
      data() {
        return {
          // 资源分类字典
@@ -262,7 +275,6 @@
          showAssetType:false,
          resourceSortOptions:[],
          //经营属性
-         operationType:'经营性',
          showOperationType:false,
          operationTypeOptions:[],
          //增加方式

src/views/sunVillage_info/resourceDetail.vue

@@ -42,6 +42,15 @@
            <van-field readonly v-model="form.north" label="北至" placeholder="北至" input-align="right" :border="false" />
            <van-field readonly v-model="form.totalArea" label="总面积(亩)" placeholder="总面积(亩)" required :rules="[{ required: true }]" input-align="right" :border="false" />
 
+           <field-select
+             v-model="form.operationType"
+             label="经营属性"
+             value-key="dictLabel"
+             data-key="dictValue"
+             placeholder="请选择"
+             remote-url="/open/zdzh/list/operation_type"
+             :on-remote-response="'data'"/>
+
            <van-field
              readonly
              label="使用情况"
@@ -165,8 +174,10 @@
  </template>
  <script>
    import { updateResource,getResource } from "@/api/sunVillage_info/fixedAssets";
+   import FieldSelect from "@/components/form/FieldSelect.vue";
    export default {
      name: "certificateList",
+     components: {FieldSelect},
      data() {
        return {
          // 资源分类字典

src/views/sunVillage_info/resourceEdit.vue

@@ -66,6 +66,17 @@
            <van-field v-model="form.north" label="北至" placeholder="北至" input-align="right" :border="false" />
            <van-field v-model="form.totalArea" label="总面积(亩)" placeholder="总面积(亩)" required :rules="[{ required: true }]" input-align="right" :border="false" />
 
+           <field-select
+             v-model="form.operationType"
+             label="经营属性"
+             value-key="dictLabel"
+             data-key="dictValue"
+             placeholder="请选择"
+             :rulesx="[{ required: true }]"
+             requiredx
+             remote-url="/open/zdzh/list/operation_type"
+             :on-remote-response="'data'"/>
+
            <van-field
              readonly
              clickable
@@ -212,8 +223,10 @@
  </template>
  <script>
    import { updateResource,getResource } from "@/api/sunVillage_info/fixedAssets";
+   import FieldSelect from "@/components/form/FieldSelect.vue";
    export default {
      name: "certificateList",
+     components: {FieldSelect},
      data() {
        return {
          // 资源分类字典
@@ -235,7 +248,7 @@
          applicationListSecond:[],
          form:{
            assetType:'151001',
-           operationType:'1',
+           operationType: null,
            addType:'1',
            buildTime:this.format(new Date(),'yyyy-MM-dd'),
            useType:'1',