Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/baseInfo/branchCompany/companyInfoModal.vue

@@ -17,31 +17,34 @@
                          :value="val.code"></el-option>
             </el-select>
           </el-form-item>
-
-          <el-form-item label="所属地区" prop="zoneId">
-            <el-select class="filter-item" v-model="form.zoneId" placeholder="请选择" @change="getProvinceRegionsForm">
-              <el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="省份" prop="addrProvince">
-            <el-select v-model.number="form.addrProvince" placeholder="请选择省份（直辖市）" @change="changeProvince">
-              <el-option v-for="item in provinceRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="城市" prop="addrCity">
-            <el-select v-model.number="form.addrCity" placeholder="请选择城市" @change="changeCity">
-              <el-option v-for="item in cityRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="镇（县）">
-            <el-select v-model.number="form.addrTown" placeholder="请选择镇（县）">
-              <el-option v-for="item in townRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
-
+        <el-form-item label="所属地区" prop="zoneId">
+          <el-select class="filter-item" v-model="form.zoneId" placeholder="请选择" @change="getProvinceRegionsForm">
+            <el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
+          </el-select>
+        </el-form-item>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="省份" prop="addrProvince">
+                <el-select v-model.number="form.addrProvince" placeholder="请选择省份（直辖市）" @change="changeProvince">
+                  <el-option v-for="item in provinceRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="城市" prop="addrCity">
+                <el-select v-model.number="form.addrCity" placeholder="请选择城市" @change="changeCity">
+                  <el-option v-for="item in cityRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="镇（县）">
+                <el-select v-model.number="form.addrTown" placeholder="请选择镇（县）">
+                  <el-option v-for="item in townRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="详细地址">
             <el-input v-model="form.addrDetail" placeholder="请输入详细地址"></el-input>
           </el-form-item>

src/views/baseInfo/branchCompany/index.vue

@@ -63,11 +63,11 @@
           <span>{{getStatusName(scope.row.status)}}</span>
         </template>
       </el-table-column>
-      <el-table-column width="180" align="center" label="股价">
-        <template scope="scope">
-          <span>{{scope.row.price?scope.row.price/10000:0}}{{scope.row.type == 1?'万/股':'港万/股'}}</span>
-        </template>
-      </el-table-column>
+      <!--<el-table-column width="180" align="center" label="股价">-->
+        <!--<template scope="scope">-->
+          <!--<span>{{scope.row.price?scope.row.price/10000:0}}{{scope.row.type == 1?'万/股':'港万/股'}}</span>-->
+        <!--</template>-->
+      <!--</el-table-column>-->
 
       <el-table-column width="180" align="center" label="负责人">
         <template scope="scope">
@@ -119,7 +119,7 @@
           <el-button size="small"  class="el-button el-button--text el-button--small"  @click="handleView(scope.row)">详情</el-button>
           <el-button size="small"  class="el-button el-button--text el-button--small"  @click="handleSetting(scope.row)">基础信息</el-button>
           <el-button v-if="branchCompany_btn_edit" size="small"  class="el-button el-button--text el-button--small"  @click="handleCompanyInfo(scope.row)">公司介绍</el-button>
-          <el-button size="small"  class="el-button el-button--text el-button--small"  @click="handleSettingStock(scope.row)" v-if="compnay_stock_update">设置股权</el-button>
+          <!--<el-button size="small"  class="el-button el-button&#45;&#45;text el-button&#45;&#45;small"  @click="handleSettingStock(scope.row)" v-if="compnay_stock_update">设置股权</el-button>-->
           <el-button v-if="branchCompany_btn_del" size="small"  class="el-button el-button--text el-button--small"  style="color: red;" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>

src/views/baseInfo/branchCompany/info.vue

@@ -18,15 +18,15 @@
       详细地址：{{form.addrDetail}}
     </el-row>
 
-    <el-row style="border-top: 1px dashed #dfe6ec;margin: 10px 0;">
-      <el-col :span="4"><label>股权信息</label></el-col>
-      <el-col :span="4"><label>状态：</label>{{form.stockState == 2?"募股中":"暂无"}}</el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="8">总份额：{{form.total?form.total:0}}</el-col>
-      <el-col :span="8">剩余份额：{{form.balance?form.balance:0}}</el-col>
-      <el-col :span="8">股权单价：{{form.price?form.price/10000:"0"}}{{form.type == 1?'万/股':'港万/股'}}</el-col>
-    </el-row>
+    <!--<el-row style="border-top: 1px dashed #dfe6ec;margin: 10px 0;">-->
+      <!--<el-col :span="4"><label>股权信息</label></el-col>-->
+      <!--<el-col :span="4"><label>状态：</label>{{form.stockState == 2?"募股中":"暂无"}}</el-col>-->
+    <!--</el-row>-->
+    <!--<el-row>-->
+      <!--<el-col :span="8">总份额：{{form.total?form.total:0}}</el-col>-->
+      <!--<el-col :span="8">剩余份额：{{form.balance?form.balance:0}}</el-col>-->
+      <!--<el-col :span="8">股权单价：{{form.price?form.price/10000:"0"}}{{form.type == 1?'万/股':'港万/股'}}</el-col>-->
+    <!--</el-row>-->
 
     <el-row style="border-top: 1px dashed #dfe6ec;margin: 10px 0;">
       <el-col :span="4"><label>公司信息</label></el-col>