TASK 45932 资产管理模块下增加“产业信息”功能

src/components/Map/MapGisLine.vue

@@ -9,7 +9,7 @@
             <!--<el-button :id=this.drawingPolygonMap style="background-color:#D0EEFF;color:#1E88C7" type="primary">重置图层</el-button>-->
             <input :id="locationMap" type="button" class="ant-btn ant-btn-red" value="定位"/>&nbsp;&nbsp;
             <input :id="this.drawingPolygonMap" class="ant-btn ant-btn-red" type="button" value="画图"/>&nbsp;&nbsp;
-            <input :id="this.drawingResetMap" type="button" class="ant-btn ant-btn-red" value="重置图层"/>
+            <input :id="this.drawingResetMap" type="button" class="ant-btn ant-btn-red" value="重置"/>&nbsp;&nbsp;
         </div>
 
         <div v-if="hasSelectLocationMode" class="location-mode-chooser-btn"><input type="button" class="ant-btn ant-btn-red" value="选择定位方式" @click="selectLocationMode"/></div>

src/views/sunVillage_info/industryAdd.vue

@@ -82,7 +82,7 @@
                @cancel="showOccupyLand = false"
              />
            </van-popup>
-           <van-field v-model="form.occupyLandArea" label="占地面积" placeholder="占地面积" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.occupyLandArea" label="占地面积（亩）" placeholder="占地面积（亩）" type="number" input-align="right" :border="false" :maxlength="15"/>
            <van-field
              readonly
              clickable
@@ -125,10 +125,10 @@
              />
            </van-popup>
            <van-field v-model="form.landSourceOther" label="其他来源" placeholder="其他来源" input-align="right" :border="false" :maxlength="100"/>
-           <van-field v-model="form.investmentAmount" label="产业投资金额" placeholder="产业投资金额" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.industryValuation" label="产业估值" placeholder="产业估值" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.yearSaleAmount" label="年销售额" placeholder="年销售额" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.yearProfitAmount" label="年利润" placeholder="年利润" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.investmentAmount" label="产业投资金额(万)" placeholder="产业投资金额(万)" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15" label-width="120px"/>
+           <van-field v-model="form.industryValuation" label="产业估值(万)" placeholder="产业估值(万)" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.yearSaleAmount" label="年销售额(万)" placeholder="年销售额(万)" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.yearProfitAmount" label="年利润(万)" placeholder="年利润(万)" type="number" input-align="right" :border="false" :maxlength="15"/>
             <van-field
              readonly
              clickable
@@ -149,7 +149,7 @@
                @cancel="showIsLoan = false"
              />
            </van-popup>
-           <van-field v-model="form.loanAmount" label="计划贷款金额" placeholder="计划贷款金额" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.loanAmount" label="计划贷款金额(万)" placeholder="计划贷款金额(万)" type="number" input-align="right" :border="false" :maxlength="15" label-width="120px"/>
            <van-field v-model="form.industryBz" label="备注" placeholder="备注" input-align="right" :border="false" :maxlength="500"/>
 
          </div>

src/views/sunVillage_info/industryDetail.vue

@@ -13,7 +13,7 @@
            <van-field required :rules="[{ required: true }]" v-model="form.industryCode" label="产业编码" placeholder="产业编码" input-align="right" :border="false" :maxlength="20"/>
            <van-field required :rules="[{ required: true }]" v-model="form.industryName" label="产业名称" placeholder="产业名称" input-align="right" :border="false" :maxlength="100"/>
 
-           <van-field
+           <!-- <van-field
              readonly
              clickable
              label="产业权属"
@@ -34,9 +34,10 @@
                @confirm="onConfirmIndustryRights"
                @cancel="showIndustryRights = false"
              />
-           </van-popup>
+           </van-popup> -->
+           <van-field required :rules="[{ required: true }]" v-model="industryRights" label="产业权属" placeholder="产业权属" input-align="right" :border="false" :maxlength="100"/>
            <van-field v-model="form.industryRightsOther" label="其他权属" placeholder="其他权属" input-align="right" :border="false" :maxlength="100"/>
-           <van-field
+           <!-- <van-field
              readonly
              clickable
              label="产业类型"
@@ -57,10 +58,11 @@
                @confirm="onConfirmIndustryType"
                @cancel="showIndustryType = false"
              />
-           </van-popup>
+           </van-popup> -->
+           <van-field required :rules="[{ required: true }]" v-model="industryType" label="产业类型" placeholder="产业类型" input-align="right" :border="false" :maxlength="100"/>
            <van-field v-model="form.industryTypeOther" label="其他产业" placeholder="其他产业" input-align="right" :border="false" :maxlength="100"/>
-           <van-field v-model="form.productName" label="主要产品" placeholder="主要产品" required :rules="[{ required: true }]" input-align="right" :border="false" :maxlength="100"/>
-           <van-field
+           <van-field v-model="form.productName" label="主要产品" placeholder="主要产品" required :rules="[{ required: true }]" input-align="right" :border="false" :maxlength="100" type="textarea" autosize/>
+           <!-- <van-field
              readonly
              clickable
              label="占用土地"
@@ -81,9 +83,10 @@
                @confirm="onConfirmOccupyLand"
                @cancel="showOccupyLand = false"
              />
-           </van-popup>
-           <van-field v-model="form.occupyLandArea" label="占地面积" placeholder="占地面积" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field
+           </van-popup> -->
+           <van-field required :rules="[{ required: true }]" v-model="occupyLand" label="占用土地" placeholder="占用土地" input-align="right" :border="false" :maxlength="100"/>
+           <van-field v-model="form.occupyLandArea" label="占地面积（亩）" placeholder="占地面积（亩）" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <!-- <van-field
              readonly
              clickable
              label="占用类型"
@@ -102,9 +105,10 @@
                @confirm="onConfirmOccupyLandType"
                @cancel="showOccupyLandType = false"
              />
-           </van-popup>
+           </van-popup> -->
+           <van-field v-model="occupyLandType" label="占用类型" placeholder="占用类型" input-align="right" :border="false" :maxlength="100"/>
            <van-field v-model="form.occupyLandTypeOther" label="其他占用" placeholder="其他占用" input-align="right" :border="false"  :maxlength="100"/>
-           <van-field
+           <!-- <van-field
              readonly
              clickable
              label="土地来源"
@@ -123,13 +127,14 @@
                @confirm="onConfirmLandSource"
                @cancel="showLandSource = false"
              />
-           </van-popup>
+           </van-popup> -->
+           <van-field v-model="landSource" label="土地来源" placeholder="土地来源" input-align="right" :border="false" :maxlength="100"/>
            <van-field v-model="form.landSourceOther" label="其他来源" placeholder="其他来源" input-align="right" :border="false" :maxlength="100"/>
-           <van-field v-model="form.investmentAmount" label="产业投资金额" placeholder="产业投资金额" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.industryValuation" label="产业估值" placeholder="产业估值" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.yearSaleAmount" label="年销售额" placeholder="年销售额" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.yearProfitAmount" label="年利润" placeholder="年利润" type="number" input-align="right" :border="false" :maxlength="15"/>
-            <van-field
+           <van-field v-model="form.investmentAmount" label="产业投资金额(万)" placeholder="产业投资金额(万)" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15" label-width="120px"/>
+           <van-field v-model="form.industryValuation" label="产业估值(万)" placeholder="产业估值(万)" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.yearSaleAmount" label="年销售额(万)" placeholder="年销售额(万)" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.yearProfitAmount" label="年利润(万)" placeholder="年利润(万)" type="number" input-align="right" :border="false" :maxlength="15"/>
+            <!-- <van-field
              readonly
              clickable
              label="有贷款需求"
@@ -148,9 +153,10 @@
                @confirm="onConfirmIsLoan"
                @cancel="showIsLoan = false"
              />
-           </van-popup>
-           <van-field v-model="form.loanAmount" label="计划贷款金额" placeholder="计划贷款金额" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.industryBz" label="备注" placeholder="备注" input-align="right" :border="false" :maxlength="500"/>
+           </van-popup> -->
+           <van-field v-model="isLoan" label="有贷款需求" placeholder="有贷款需求" input-align="right" :border="false" :maxlength="100"/>
+           <van-field v-model="form.loanAmount" label="计划贷款金额(万)" placeholder="计划贷款金额(万)" type="number" input-align="right" :border="false" :maxlength="15" label-width="120px"/>
+           <van-field v-model="form.industryBz" label="备注" placeholder="备注" input-align="right" :border="false" :maxlength="500" type="textarea" autosize/>
 
          </div>
        </van-form>
@@ -234,33 +240,33 @@
      created() {
        this.houseGetDicts("sys_yes_no").then((response) => {
          this.sysYesNoSelect = response.data;
-         for(var i = 0 ; i < response.data.length ; i++){
-           this.sysYesNoOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
-         }
+        //  for(var i = 0 ; i < response.data.length ; i++){
+        //    this.sysYesNoOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+        //  }
        });
        this.houseGetDicts("industry_rights_type").then((response) => {
          this.industryRightsSelect = response.data;
-         for(var i = 0 ; i < response.data.length ; i++){
-           this.industryRightsOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
-         }
+        //  for(var i = 0 ; i < response.data.length ; i++){
+        //    this.industryRightsOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+        //  }
        });
        this.houseGetDicts("occupy_land_type").then((response) => {
          this.occupyLandTypeSelect = response.data;
-         for(var i = 0 ; i < response.data.length ; i++){
-           this.occupyLandTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
-         }
+        //  for(var i = 0 ; i < response.data.length ; i++){
+        //    this.occupyLandTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+        //  }
        });
        this.houseGetDicts("land_source").then((response) => {
          this.landSourceSelect = response.data;
-         for(var i = 0 ; i < response.data.length ; i++){
-           this.landSourceOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
-         }
+        //  for(var i = 0 ; i < response.data.length ; i++){
+        //    this.landSourceOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+        //  }
        });
         this.houseGetDicts("purpose_type").then((response) => {
          this.industryTypeSelect = response.data;
-          for(var i = 0 ; i < response.data.length ; i++){
-            this.industryTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
-          }
+          // for(var i = 0 ; i < response.data.length ; i++){
+          //   this.industryTypeOptions.push({text:response.data[i].dictLabel,value:response.data[i].dictValue});
+          // }
         });
        this.getDetail();
      },

src/views/sunVillage_info/industryEdit.vue

@@ -82,7 +82,7 @@
                @cancel="showOccupyLand = false"
              />
            </van-popup>
-           <van-field v-model="form.occupyLandArea" label="占地面积" placeholder="占地面积" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.occupyLandArea" label="占地面积（亩）" placeholder="占地面积（亩）" type="number" input-align="right" :border="false" :maxlength="15"/>
            <van-field
              readonly
              clickable
@@ -125,10 +125,10 @@
              />
            </van-popup>
            <van-field v-model="form.landSourceOther" label="其他来源" placeholder="其他来源" input-align="right" :border="false" :maxlength="100"/>
-           <van-field v-model="form.investmentAmount" label="产业投资金额" placeholder="产业投资金额" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.industryValuation" label="产业估值" placeholder="产业估值" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.yearSaleAmount" label="年销售额" placeholder="年销售额" type="number" input-align="right" :border="false" :maxlength="15"/>
-           <van-field v-model="form.yearProfitAmount" label="年利润" placeholder="年利润" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.investmentAmount" label="产业投资金额(万)" placeholder="产业投资金额(万)" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15" label-width="120px"/>
+           <van-field v-model="form.industryValuation" label="产业估值(万)" placeholder="产业估值(万)" required :rules="[{ required: true }]" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.yearSaleAmount" label="年销售额(万)" placeholder="年销售额(万)" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.yearProfitAmount" label="年利润(万)" placeholder="年利润(万)" type="number" input-align="right" :border="false" :maxlength="15"/>
             <van-field
              readonly
              clickable
@@ -149,7 +149,7 @@
                @cancel="showIsLoan = false"
              />
            </van-popup>
-           <van-field v-model="form.loanAmount" label="计划贷款金额" placeholder="计划贷款金额" type="number" input-align="right" :border="false" :maxlength="15"/>
+           <van-field v-model="form.loanAmount" label="计划贷款金额(万)" placeholder="计划贷款金额(万)" type="number" input-align="right" :border="false" :maxlength="15" label-width="120px"/>
            <van-field v-model="form.industryBz" label="备注" placeholder="备注" input-align="right" :border="false" :maxlength="500"/>
 
          </div>
@@ -315,7 +315,7 @@
        onSubmit(){
          updateIndustry(this.form).then(response => {
            if (response.code == 200){
-             this.$notify({ type: 'success', message: '新增成功' });
+             this.$notify({ type: 'success', message: '修改成功' });
              setTimeout(function(){
                history.back(-1);
              },2000)