增加按钮权限，修复归属人，归属组织高度

src/components/CardShow/index.vue

@@ -8,7 +8,15 @@
     <div class="mobile">
         <iframe
         v-if="showStatus"
-        :src="cardShowUrl + 'credentialNo=' + datas.credentialNo + '&customerName=' + datas.customerName + '&carbonAmount=' + datas.carbonAmount + '&orderAmount=' + datas.orderAmount + '&buyDate=' + datas.buyDate + '&year=' + datas.year +  '&farmerName=' + datas.farmerName + '&nickName=' + datas.nickName + '&companyName=' + datas.companyName + '&isH5=0'"
+        :src="cardShowUrl
+        + 'credentialNo=' + datas.credentialNo
+        + '&certName=' + datas.certName
+        + '&carbonAmount=' + datas.carbonAmount
+        + '&orderAmount=' + datas.orderAmount
+        + '&buyDate=' + datas.buyDate
+        + '&year=' + datas.year
+        + '&farmerName=' + datas.farmerName
+        + '&isH5=false'"
         frameborder="0"
         width="100%"
         height="500px"></iframe>
@@ -78,6 +86,7 @@ export default {
       cardshowInfo(params).then(res => {
           if(res.retHead.errCode == 0){
             this.datas = res.retBody
+            this.datas.certName = this.datas.certType == 1 ? this.datas.customerName : this.datas.companyName //1普通用户 2企业用户
             this.showStatus = true
           }
         }

src/main.js

@@ -35,7 +35,8 @@ Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.imgRequest = "http://fqn.hongweisoft.com/";
-Vue.prototype.cardShowUrl = "http://172.16.90.6:8080?"
+// Vue.prototype.cardShowUrl = "http://172.16.90.6:8080?" //dev
+Vue.prototype.cardShowUrl = "http://cqthht.hongweisoft.com/cert?" //dev
 
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });

src/views/bankCheck/bank/index.vue

@@ -61,11 +61,13 @@
               type="primary"
               icon="el-icon-view"
               @click="handleView(scope.row)"
+              v-hasPermi="['bankCheck:bank:view']"
             >查看</el-button>
             <el-button
               size="mini"
               v-if="scope.row.transferStatus == 0"
               type="warning"
+              v-hasPermi="['bankCheck:bank:create']"
               @click="handleSubmit(scope.row)"
             >发送申请</el-button>
           </template>

src/views/bankCheck/farmer/index.vue

@@ -31,6 +31,7 @@
           <el-button
             type="primary"
             size="mini"
+            v-hasPermi="['bankCheck:farmer:create']"
             @click="createOrder"
           >生成需打款名单</el-button>
         </el-col>

src/views/baseManage/companyType/index.vue

@@ -23,6 +23,7 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
+            v-hasPermi="['baseManage:companyType:add']"
           >新增企业类型</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -48,17 +49,20 @@
               type="primary"
               icon="el-icon-view"
               @click="handleView(scope.row)"
+              v-hasPermi="['baseManage:companyType:view']"
             >查看</el-button>
             <el-button
               size="mini"
               type="success"
               icon="el-icon-edit"
               @click="handleEdit(scope.row)"
+              v-hasPermi="['baseManage:companyType:edit']"
             >编辑</el-button>
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.row)"
+              v-hasPermi="['baseManage:companyType:del']"
               icon="el-icon-delete"
             >删除</el-button>
           </template>

src/views/baseManage/productType/index.vue

@@ -23,7 +23,8 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
-          >新增方案</el-button>
+            v-hasPermi="['baseManage:productType:add']"
+          >新增类别</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
@@ -48,17 +49,20 @@
               type="primary"
               icon="el-icon-view"
               @click="handleView(scope.row)"
+              v-hasPermi="['baseManage:productType:view']"
             >查看</el-button>
             <el-button
               size="mini"
               type="success"
               icon="el-icon-edit"
+              v-hasPermi="['baseManage:productType:edit']"
               @click="handleEdit(scope.row)"
             >编辑</el-button>
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.row)"
+              v-hasPermi="['baseManage:productType:del']"
               icon="el-icon-delete"
             >删除</el-button>
           </template>

src/views/belongToSubject/area/index.vue

@@ -22,6 +22,7 @@
             type="primary"
             icon="el-icon-plus"
             size="mini"
+            v-hasPermi="['belongToSubject:area:add']"
             @click="handleAdd"
           >新增</el-button>
         </el-col>
@@ -43,6 +44,7 @@
               size="mini"
               type="primary"
               icon="el-icon-view"
+              v-hasPermi="['belongToSubject:area:view']"
               @click="handleView(scope.row)"
             >查看</el-button>
             <el-button
@@ -50,11 +52,13 @@
               type="success"
               icon="el-icon-edit"
               @click="handleEdit(scope.row)"
+              v-hasPermi="['belongToSubject:area:edit']"
             >编辑</el-button>
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.row)"
+              v-hasPermi="['belongToSubject:area:del']"
               icon="el-icon-delete"
             >删除</el-button>
           </template>

src/views/belongToSubject/org/index.vue

@@ -46,6 +46,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"
+                    v-hasPermi="['belongToSubject:org:add']"
                   >新增</el-button>
                 </el-col>
                 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -70,18 +71,21 @@
                       type="primary"
                       icon="el-icon-view"
                       @click="handleView(scope.row)"
+                      v-hasPermi="['belongToSubject:org:view']"
                     >查看</el-button>
                     <el-button
                       size="mini"
                       type="success"
                       icon="el-icon-edit"
                       @click="handleEdit(scope.row)"
+                      v-hasPermi="['belongToSubject:org:edit']"
                     >编辑</el-button>
                     <el-button
                       size="mini"
                       type="danger"
                       @click="handleDelete(scope.row)"
                       icon="el-icon-delete"
+                      v-hasPermi="['belongToSubject:org:del']"
                     >删除</el-button>
                   </template>
                 </el-table-column>
@@ -280,7 +284,7 @@ export default {
 <style scoped lang="scss">
   .people {
     width: 100%;
-    height: 100%;
+    height:calc(100vh - 84px);
     margin: 10px 10px 0 0;
     padding: 0 10px 0 0;
     &-container {

src/views/belongToSubject/people/index.vue

@@ -56,6 +56,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"
+                    v-hasPermi="['belongToSubject:people:add']"
                   >新增</el-button>
                 </el-col>
                 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -86,17 +87,20 @@
                       type="primary"
                       icon="el-icon-view"
                       @click="handleView(scope.row)"
+                      v-hasPermi="['belongToSubject:people:view']"
                     >查看</el-button>
                     <el-button
                       size="mini"
                       type="success"
                       icon="el-icon-edit"
                       @click="handleEdit(scope.row)"
+                      v-hasPermi="['belongToSubject:people:edit']"
                     >编辑</el-button>
                     <el-button
                       size="mini"
                       type="danger"
                       @click="handleDelete(scope.row)"
+                      v-hasPermi="['belongToSubject:people:del']"
                       icon="el-icon-delete"
                     >删除</el-button>
                   </template>
@@ -296,7 +300,7 @@ export default {
 <style scoped lang="scss">
   .people {
     width: 100%;
-    height: 100%;
+    height:calc(100vh - 84px);
     margin: 10px 10px 0 0;
     padding: 0 10px 0 0;
     &-container {

src/views/customerManage/company/index.vue

@@ -53,6 +53,7 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
+            v-hasPermi="['customerManage:company:create']"
           >新增企业</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -78,18 +79,21 @@
               type="primary"
               icon="el-icon-view"
               @click="handleView(scope.row)"
+              v-hasPermi="['customerManage:company:view']"
             >查看</el-button>
             <el-button
               size="mini"
               type="success"
               icon="el-icon-edit"
               @click="handleEdit(scope.row)"
+              v-hasPermi="['customerManage:company:edit']"
             >编辑</el-button>
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.row)"
               icon="el-icon-delete"
+              v-hasPermi="['customerManage:company:del']"
             >删除</el-button>
           </template>
         </el-table-column>

src/views/customerManage/customer/index.vue

@@ -71,6 +71,7 @@
                 @change="handelUserStatus($event,scope.row)"
                 :active-value="1"
                 :inactive-value="0"
+                v-hasPermi="['customerManage:customers:uStatus']"
                 active-text="未启用"
                 inactive-text="已启用">
               </el-switch>
@@ -89,18 +90,21 @@
               type="success"
               icon="el-icon-view"
               @click="resetPw(scope.row)"
+              v-hasPermi="['customerManage:customers:resetpwd']"
             >重置密码</el-button>
             <el-button
               size="mini"
               type="primary"
               icon="el-icon-view"
               @click="handleView(scope.row)"
+              v-hasPermi="['customerManage:customers:view']"
             >查看</el-button>
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.row)"
               icon="el-icon-delete"
+              v-hasPermi="['customerManage:customers:del']"
             >删除</el-button>
           </template>
         </el-table-column>

src/views/order/baseOrder/index.vue

@@ -96,11 +96,13 @@
               type="warning"
               v-if="scope.row.statusNum == 2"
               @click="handleCertificate(scope.row)"
+              v-hasPermi="['order:baseOrder:certView']"
             >证书查看</el-button>
             <el-button
               size="mini"
               type="success"
               @click="handleView(scope.row)"
+              v-hasPermi="['order:baseOrder:orderView']"
             >查看详情</el-button>
           </template>
         </el-table-column>

src/views/order/inlineOrder/index.vue

@@ -58,6 +58,7 @@
             type="primary"
             size="mini"
             @click="handleCreate"
+            v-hasPermi="['order:inlineOrder:create']"
           >新增订单</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -88,16 +89,19 @@
               type="primary"
               v-if="scope.row.status == 1"
               @click="handlePay(scope.row)"
+              v-hasPermi="['order:inlineOrder:realpay']"
             >确认收款</el-button>
             <el-button
               size="mini"
               type="warning"
               v-if="scope.row.status == 2"
+              v-hasPermi="['order:inlineOrder:certView']"
               @click="handleCertificate(scope.row)"
             >证书查看</el-button>
             <el-button
               size="mini"
               type="success"
+              v-hasPermi="['order:inlineOrder:orderView']"
               @click="handleView(scope.row)"
             >查看详情</el-button>
           </template>

src/views/order/subscription/index.vue

@@ -64,12 +64,14 @@
               icon="el-icon-view"
               v-if="scope.row.applyStatus != 1"
               @click="handleCreate(scope.row)"
+              v-hasPermi="['order:subscription:create']"
             >生成订单</el-button>
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.row)"
               icon="el-icon-delete"
+              v-hasPermi="['order:subscription:del']"
             >删除</el-button>
           </template>
         </el-table-column>

src/views/productManage/commodity/index.vue

@@ -47,12 +47,14 @@
             icon="el-icon-plus"
             size="mini"
             @click="handelProductAction(1)"
+            v-hasPermi="['productManage:commodity:online']"
           >上架</el-button>
           <el-button
             type="primary"
             icon="el-icon-plus"
             size="mini"
             @click="handelProductAction(0)"
+            v-hasPermi="['productManage:commodity:inline']"
           >下架</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -103,12 +105,14 @@
               type="primary"
               @click="handleView(scope.row)"
               icon="el-icon-delete"
+              v-hasPermi="['productManage:commodity:view']"
             >详情</el-button>
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.row)"
               icon="el-icon-delete"
+              v-hasPermi="['productManage:commodity:del']"
             >删除</el-button>
           </template>
         </el-table-column>

src/views/productManage/priceManage/index.vue

@@ -38,6 +38,7 @@
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
+            v-hasPermi="['productManage:priceManage:add']"
           >新增定价</el-button>
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -67,6 +68,7 @@
               type="warning"
               v-if="scope.row.checkState == 0"
               @click="handleCheck(scope.row)"
+              v-hasPermi="['productManage:priceManage:check']"
             >审核</el-button>
             <!-- <el-button
               size="mini"
@@ -79,6 +81,7 @@
               type="danger"
               @click="handleDelete(scope.row)"
               icon="el-icon-delete"
+              v-hasPermi="['productManage:priceManage:del']"
             >删除</el-button>
           </template>
         </el-table-column>

src/views/productManage/productInfo/index.vue

@@ -47,6 +47,7 @@
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"
+                    v-hasPermi="['productManage:productInfo:add']"
                   >新增</el-button>
                 </el-col>
                 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -80,17 +81,20 @@
                       type="warning"
                       icon="el-icon-s-check"
                       @click="handleExportPd(scope.row)"
+                      v-hasPermi="['productManage:productInfo:create']"
                     >生成商品</el-button>
                     <el-button
                       size="mini"
                       v-if="scope.row.isEnable === 2"
                       icon="el-icon-s-check"
                       type="info"
+                      v-hasPermi="['productManage:productInfo:create']"
                     >商品已生成</el-button>
                     <el-button
                       size="mini"
                       type="primary"
                       icon="el-icon-view"
+                      v-hasPermi="['productManage:productInfo:view']"
                       @click="handleView(scope.row)"
                     >查看</el-button>
                     <el-button
@@ -98,6 +102,7 @@
                       type="success"
                       icon="el-icon-edit"
                       @click="handleEdit(scope.row)"
+                      v-hasPermi="['productManage:productInfo:edit']"
                     >编辑</el-button>
                   </template>
                 </el-table-column>

vue.config.js

@@ -36,8 +36,8 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.90.94:21998`,
         // target: `http://bobo.hw.hongweisoft.com/lymcq`,
-        // target: `http://172.16.90.64:21998`,
-        target: `http://172.16.90.102:21998`, //qiubo
+        target: `http://172.16.90.94:21998`,
+        // target: `http://172.16.90.102:21998`, //qiubo
         // target: `http://172.16.90.110:21998`, //lql
         // target: `http://172.16.90.8:21998`, //zdd
         // target: `http://47.108.214.98:21998`, //online