Browse Source

提交配件商城、达沃特

caojunjie 2 years ago
parent
commit
5f79b5f4a1

+ 14 - 1
src/api/basicData/purchaseInquiry.js

@@ -65,6 +65,19 @@ export const getGoods = (current, size,goodsTypeId, params) => {
       }
       }
   })
   })
 }
 }
+//获取商品
+export const selectGoodsAll = (current, size,goodsTypeId, params) => {
+  return request({
+      url: '/api//blade-client/goodsdesc/selectGoodsAll',
+      method: 'get',
+      params: {
+        ...params,
+          current,
+          size,
+          goodsTypeId,
+      }
+  })
+}
 //树形
 //树形
 export const getDeptLazyTree = (parentId) => {
 export const getDeptLazyTree = (parentId) => {
   return request({
   return request({
@@ -97,4 +110,4 @@ export function gainUser(query) {
     method: 'get',
     method: 'get',
     params: query
     params: query
   })
   })
-}
+}

+ 21 - 0
src/api/paymentManagement/parameterConfiguration/index.js

@@ -0,0 +1,21 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/blade-client/parameters/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
+}
+//新增修改
+export function submit(data){
+    return request({
+        url:'/api/blade-client/parameters/submit',
+        method:'post',
+        data
+    })
+}

+ 13 - 0
src/api/paymentManagement/paymentRecord/index.js

@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/blade-pay/wechatmark/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
+}

+ 39 - 0
src/api/system/paramService.js

@@ -0,0 +1,39 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-system/paramservice/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/blade-system/paramservice/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/blade-system/paramservice/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-system/paramservice/submit',
+    method: 'post',
+    data: row
+  })
+}

+ 6 - 0
src/enums/column-name.js

@@ -1084,6 +1084,12 @@ const columnName = [{
 }, {
 }, {
   code: 258,
   code: 258,
   name: '预算分析'
   name: '预算分析'
+}, {
+  code: 259,
+  name: '支付记录'
+}, {
+  code: 260,
+  name: '参数配置'
 }]
 }]
 export const getColumnName = (key) => {
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {
   for (let index = 0; index < columnName.length; index++) {

+ 59 - 0
src/mock/paramService.js

@@ -0,0 +1,59 @@
+import Mock from 'mockjs'
+
+function getFakeList() {
+  const json = {code: 200, success: true, msg: '操作成功'};
+  const list = [];
+  list.push(
+    {
+      id: '1',
+      paramName: '是否开启注册功能--mock测试',
+      paramKey: 'account.registerUser',
+      paramValue: 'true',
+      remark: '描述',
+    },
+    {
+      id: '2',
+      paramName: '账号初始密码--mock测试',
+      paramKey: 'account.initPassword',
+      paramValue: '123456',
+      remark: '描述',
+    }
+  );
+  json.data = {
+    total: 10,
+    size: 10,
+    current: 1,
+    searchCount: true,
+    pages: 1,
+    records: list,
+  };
+  return json;
+}
+
+function getFakeDetail() {
+  const json = {code: 200, success: true, msg: '操作成功'};
+  json.data = {
+    id: '1',
+    paramName: '是否开启注册功能',
+    paramKey: 'account.registerUser',
+    paramValue: 'true',
+    remark: '描述',
+  };
+  return json;
+}
+
+function fakeSuccess() {
+  return {code: 200, success: true, msg: '操作成功'};
+}
+
+export default ({mock}) => {
+  if (!mock) return;
+  Mock.mock(/\/api\/blade-system\/param\/list/, 'get', getFakeList);
+
+  Mock.mock(/\/api\/blade-system\/param\/detail/, 'get', getFakeDetail);
+
+  Mock.mock(/\/api\/blade-system\/param\/submit/, 'post', fakeSuccess);
+
+  Mock.mock(/\/api\/blade-system\/param\/remove/, 'post', fakeSuccess);
+
+}

+ 48 - 0
src/option/system/paramService.js

@@ -0,0 +1,48 @@
+export default {
+  height: 'auto',
+  calcHeight: 30,
+  tip: false,
+  searchShow: true,
+  searchMenuSpan: 6,
+  border: true,
+  index: true,
+  selection: true,
+  viewBtn: true,
+  dialogClickModal: false,
+  column: [
+    {
+      label: "参数名称",
+      prop: "paramName",
+      search: true,
+      span: 24,
+      rules: [{
+        required: true,
+        message: "请输入参数名称",
+        trigger: "blur"
+      }]
+    },
+    {
+      label: "参数键名",
+      prop: "paramKey",
+      search: true,
+      span: 24,
+      rules: [{
+        required: true,
+        message: "请输入参数键名",
+        trigger: "blur"
+      }]
+    },
+    {
+      label: "参数键值",
+      prop: "paramValue",
+      type: "textarea",
+      span: 24,
+      minRows: 6,
+      rules: [{
+        required: true,
+        message: "请输入参数键值",
+        trigger: "blur"
+      }]
+    }
+  ]
+};

+ 13 - 0
src/router/views/index.js

@@ -2406,5 +2406,18 @@ export default [{
     },
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/annualBudget/index')
     component: () => import( /* webpackChunkName: "views" */ '@/views/annualBudget/index')
   }]
   }]
+}, {
+  path: '/paymentManagement/paymentRecord/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/paymentManagement/paymentRecord/index',
+    name: '支付记录',
+    meta: {
+      i18n: '/paymentManagement/paymentRecord/index',
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/paymentManagement/paymentRecord/index')
+  }]
 }
 }
 ]
 ]

+ 1 - 0
src/views/exportTrade/invoice/detailsPage.vue

@@ -211,6 +211,7 @@
       </trade-card>
       </trade-card>
       <fee-info
       <fee-info
         ref="feeInfo"
         ref="feeInfo"
+        :inCropId="true"
         :orderFeesList="orderFeesList"
         :orderFeesList="orderFeesList"
         :disabled="detailData.status == 1"
         :disabled="detailData.status == 1"
         feeUrl="/blade-deliver-goods/deliveryfees/update"
         feeUrl="/blade-deliver-goods/deliveryfees/update"

+ 1 - 0
src/views/exportTrade/purchaseContract/detailsPage.vue

@@ -222,6 +222,7 @@
 
 
       <fee-info
       <fee-info
         ref="feeInfo"
         ref="feeInfo"
+        activeName="second"
         :orderFeesList="orderFeesList"
         :orderFeesList="orderFeesList"
         :disabled="detailData.status == 1"
         :disabled="detailData.status == 1"
         feeUrl="/trade-purchase/purchase-order/removeByFees"
         feeUrl="/trade-purchase/purchase-order/removeByFees"

+ 16 - 12
src/views/exportTrade/purchaseInquiry/detailsPage.vue

@@ -148,6 +148,7 @@ import {
   delItem,
   delItem,
   getDeptLazyTree,
   getDeptLazyTree,
   getGoods,
   getGoods,
+  selectGoodsAll,
   getSpecification,
   getSpecification,
   submitMessage
   submitMessage
 } from "@/api/basicData/purchaseInquiry";
 } from "@/api/basicData/purchaseInquiry";
@@ -367,18 +368,21 @@ export default {
     this.getWorkDicts("currency").then(res => {
     this.getWorkDicts("currency").then(res => {
       this.currencyList = res.data.data;
       this.currencyList = res.data.data;
     });
     });
-    getGoods(1, 10).then(res => {
-      if (res.data.data.total > 0) {
-        this.goodsoptions = res.data.data.records;
-        if (Math.ceil(res.data.data.total / 10) > 1) {
-          for (let i = 2; i <= Math.ceil(res.data.data.total / 10); i++) {
-            getGoods(i, 10).then(e => {
-              this.goodsoptions = this.goodsoptions.concat(e.data.data.records);
-            });
-          }
-        }
-      }
-    });
+    selectGoodsAll().then(res => {
+      this.goodsoptions = res.data.data;
+    })
+    // getGoods(1, 10).then(res => {
+    //   if (res.data.data.total > 0) {
+    //     this.goodsoptions = res.data.data.records;
+    //     if (Math.ceil(res.data.data.total / 10) > 1) {
+    //       for (let i = 2; i <= Math.ceil(res.data.data.total / 10); i++) {
+    //         getGoods(i, 10).then(e => {
+    //           this.goodsoptions = this.goodsoptions.concat(e.data.data.records);
+    //         });
+    //       }
+    //     }
+    //   }
+    // });
     this.pickerOptions = {
     this.pickerOptions = {
       disabledDate: time => {
       disabledDate: time => {
         var today = new Date();
         var today = new Date();

+ 1 - 0
src/views/exportTrade/receipt/detailsPage.vue

@@ -179,6 +179,7 @@
         ref="feeInfo"
         ref="feeInfo"
         :orderFeesList="orderFeesList"
         :orderFeesList="orderFeesList"
         :disabled="detailData.status == 1"
         :disabled="detailData.status == 1"
+        :inCropId="true"
         feeUrl="/blade-deliver-goods/deliveryfees/update"
         feeUrl="/blade-deliver-goods/deliveryfees/update"
       />
       />
       <containerTitle title="合同附件"></containerTitle>
       <containerTitle title="合同附件"></containerTitle>

+ 303 - 0
src/views/paymentManagement/parameterConfiguration/index.vue

@@ -0,0 +1,303 @@
+<template>
+  <div>
+    <basic-container class="page-crad">
+      <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
+                 :cell-style="cellStyle" @search-change="searchChange" @current-change="currentChange"
+                 @size-change="sizeChange"
+                 @row-save="handleRowSave"
+                 @row-update="handleRowUpdate"
+                 @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
+                 @resetColumn="resetColumn" @search-criteria-switch="searchCriteriaSwitch">
+                <template slot="menuLeft">
+                  <el-button icon="el-icon-plus" size="small" type="primary" v-if="dataList.length === 0" @click.stop="$refs.crud.rowAdd">新 增
+                  </el-button>
+        <!--          <el-button type="info" size="small" @click="outExport">导出-->
+        <!--          </el-button>-->
+                </template>
+      </avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import {getToken} from "@/util/auth";
+import {getList,submit} from "@/api/paymentManagement/parameterConfiguration"
+
+export default {
+  name: "index",
+  data() {
+    return {
+      UConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        disabled: false,
+        searchShow: true,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
+      form: {},
+      search: {},
+      dataList: [],
+      loading: false,
+      detailData: {},
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      option: {},
+      optionBack: {
+        align: 'center',
+        searchShow: true,
+        searchMenuPosition: "right",
+        searchSpan: 8,
+        searchMenuSpan: 8,
+        border: true,
+        index: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: true,
+        delBtn: false,
+        searchIcon: true,
+        menu: true,
+        menuWidth: 80,
+        dialogWidth: "90%",
+        summaryText: "合计",
+        showSummary: true,
+        span: 8,
+        sumColumnList: [{
+          name: "amount",
+          type: "sum",
+          decimals: 2
+        }],
+        column: [{
+          label: "集团/代理商商户号",
+          prop: "orgid",
+          width: 140,
+          labelWidth: 140,
+          overHidden: true
+        }, {
+          label: "商户号",
+          prop: "cusId",
+          width: 80,
+          overHidden: true
+        }, {
+          label: "平台分配的APPID",
+          prop: "appId",
+          width: 140,
+          labelWidth: 140,
+          overHidden: true
+        }, {
+          label: "商户号",
+          prop: "mchId",
+          width: 80,
+          overHidden: true
+        }, {
+          label: "通联支付appid",
+          prop: "sybAppId",
+          labelWidth: 120,
+          width: 120,
+          overHidden: true
+        }, {
+          label: "交易类型",
+          prop: "payType",
+          width: 100,
+          overHidden: true
+        }, {
+          label: "支付签名key",
+          prop: "paySignKey",
+          width: 100,
+          overHidden: true
+        }, {
+          label: "有效时间",
+          prop: "validtime",
+          width: 100,
+          overHidden: true
+        }, {
+          label: "支付回调地址",
+          prop: "notifyUrl",
+          width: 100,
+          overHidden: true
+        }, {
+          label: "微信子appid",
+          prop: "subAppid",
+          width: 100,
+          labelWidth: 110,
+          overHidden: true,
+          rules: [
+            {
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }
+          ]
+        }, {
+          label: "小程序appSecret",
+          prop: "appSecret",
+          width: 120,
+          labelWidth: 120,
+          overHidden: true
+        }, {
+          label: "渠道门店编号",
+          prop: "chnlstoreId",
+          width: 120,
+          labelWidth: 120,
+          overHidden: true
+        }, {
+          label: "门店号",
+          prop: "subbranch",
+          width: 80,
+          overHidden: true
+        }, {
+          label: "支付完成跳转",
+          prop: "frontUrl",
+          width: 100,
+          overHidden: true
+        }, {
+          label: "终端ip",
+          prop: "cusIp",
+          width: 90,
+          overHidden: true
+        }, {
+          label: "备注",
+          prop: "remarks",
+          width: 200,
+          span: 24,
+          type: 'textarea',
+          overHidden: true,
+          minRows: 3
+        }]
+      }
+    };
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(260), this.optionBack);
+  },
+  methods: {
+    handleRowSave(row, done, loading) {
+      //新增
+      done(row)
+      this.addModify(row)
+    },
+    handleRowUpdate(row, index, done, loading) {
+      //编辑
+      done(row)
+      this.addModify(row)
+    },
+    addModify(row){
+      submit(row).then(res=>{
+        if (row.id){
+          this.$message.success("修改成功")
+        }else {
+          this.$message.success("新增成功")
+        }
+        this.onLoad(this.page);
+      })
+    },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    onLoad(page, params = {}) {
+      let data = this.deepClone(Object.assign({}, params, this.search));
+      this.loading = true;
+      getList(
+          page.currentPage,
+          page.pageSize,
+          Object.assign(data)
+      ).then(res => {
+        this.dataList = res.data.data.records ? res.data.data.records : [];
+        this.page.total = res.data.data.total;
+        if (this.page.total) {
+          this.option.height = window.innerHeight - 210;
+        }
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    //列保存触发
+    async saveColumn() {
+      const inSave = await this.saveColumnData(this.getColumnName(260), this.option);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      this.option = this.optionBack;
+      const inSave = await this.delColumnData(this.getColumnName(260), this.optionBack);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    editOpen(row) {
+    },
+    outExport() {
+      let config = {params: {...this.search}}
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
+              }
+              delete config.params[propName]
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: '/api/blade-box-tube/annualItem/annualBudgetProfitExcel',      //跳转目标窗口的地址
+        query: {
+          ...config.params    //括号内是要传递给新窗口的参数
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    }
+  }
+}
+;
+</script>
+
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 0px;
+}
+
+.itemTable ::v-deep .el-table {
+  width: 100%;
+}
+</style>

+ 234 - 0
src/views/paymentManagement/paymentRecord/index.vue

@@ -0,0 +1,234 @@
+<template>
+  <div>
+    <basic-container class="page-crad">
+      <avue-crud ref="crud" :option="option" :data="dataList" :page.sync="page" :search.sync="search"
+                 :cell-style="cellStyle" @search-change="searchChange" @current-change="currentChange"
+                 @size-change="sizeChange"
+                 @refresh-change="refreshChange" @on-load="onLoad" :table-loading="loading" @saveColumn="saveColumn"
+                 @resetColumn="resetColumn" @search-criteria-switch="searchCriteriaSwitch">
+<!--        <template slot="menuLeft">-->
+<!--          <el-button type="info" size="small" @click="outExport">导出-->
+<!--          </el-button>-->
+<!--        </template>-->
+      </avue-crud>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+import {getToken} from "@/util/auth";
+import {getList} from "@/api/paymentManagement/paymentRecord"
+
+export default {
+  name: "index",
+  data() {
+    return {
+      UConfiguration: {
+        multipleChoices: false,
+        multiple: false,
+        disabled: false,
+        searchShow: true,
+        collapseTags: false,
+        placeholder: '请点击右边按钮选择',
+        dicData: []
+      },
+      form: {},
+      search: {},
+      dataList: [],
+      loading: false,
+      detailData: {},
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [20, 30, 40, 50, 100, 200, 300, 400, 500]
+      },
+      option: {},
+      optionBack: {
+        align: 'center',
+        searchShow: true,
+        searchMenuPosition: "right",
+        searchSpan: 8,
+        searchMenuSpan: 8,
+        border: true,
+        index: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        searchIcon: true,
+        menu: false,
+        summaryText: "合计",
+        showSummary: true,
+        sumColumnList: [{
+          name: "amount",
+          type: "sum",
+          decimals: 2
+        }],
+        column: [
+          {
+            label: "流水号",
+            prop: "serialNumber",
+            search:true,
+            overHidden: true
+          }, {
+            label: "业务单号",
+            prop: "srcBillNo",
+            search:true,
+            overHidden: true
+          }, {
+            label: "金额",
+            prop: "amount",
+            overHidden: true
+          }, {
+            label: "类型",
+            prop: "type",
+            overHidden: true,
+            type: 'select',
+            search:true,
+            dicData:[{
+              label:'支付',
+              value:'支付'
+            },{
+              label:'退款',
+              value:'退款'
+            }]
+          }, {
+            label: '状态',
+            prop: 'status',
+            width: 140,
+            search:true,
+            overHidden: true,
+            filterable: true,
+            type: 'select',
+            dataType: 'number',
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=pay_status",
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            }
+          }, {
+            label: "创建日期",
+            prop: "createTime",
+            searchProp: "createTimeList",
+            type: "date",
+            overHidden: true,
+            width: 200,
+            search:true,
+            searchRange: true,
+            searchDefaultTime: ["00:00:00", "23:59:59"],
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          }
+        ]
+      }
+    };
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(259), this.optionBack);
+  },
+  methods: {
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
+    searchCriteriaSwitch(type) {
+      if (type) {
+        this.option.height = this.option.height - 46;
+      } else {
+        this.option.height = this.option.height + 46;
+      }
+      this.$refs.crud.getTableHeight();
+    },
+    //点击搜索按钮触发
+    searchChange(params, done) {
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.search);
+    },
+    currentChange(val) {
+      this.page.currentPage = val;
+    },
+    sizeChange(val) {
+      this.page.currentPage = 1;
+      this.page.pageSize = val;
+    },
+    onLoad(page, params = {}) {
+      let data = this.deepClone(Object.assign({}, params, this.search));
+      this.loading = true;
+      getList(
+          page.currentPage,
+          page.pageSize,
+          Object.assign(data)
+      ).then(res => {
+        this.dataList = res.data.data.records ? res.data.data.records : [];
+        this.page.total = res.data.data.total;
+        if (this.page.total) {
+          this.option.height = window.innerHeight - 210;
+        }
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    //列保存触发
+    async saveColumn() {
+      const inSave = await this.saveColumnData(this.getColumnName(259), this.option);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    async resetColumn() {
+      this.option = this.optionBack;
+      const inSave = await this.delColumnData(this.getColumnName(259), this.optionBack);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+      }
+    },
+    editOpen(row) {
+    },
+    outExport() {
+      let config = {params: {...this.search}}
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
+              }
+              delete config.params[propName]
+            }
+          }
+        }
+      }
+      const routeData = this.$router.resolve({
+        path: '/api/blade-box-tube/annualItem/annualBudgetProfitExcel',      //跳转目标窗口的地址
+        query: {
+          ...config.params    //括号内是要传递给新窗口的参数
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    }
+  }
+};
+</script>
+
+<style scoped>
+.page-crad ::v-deep .basic-container__card {
+  height: 94.2vh;
+}
+
+::v-deep .el-table__expanded-cell[class*="cell"] {
+  padding: 0px;
+}
+
+.itemTable ::v-deep .el-table {
+  width: 100%;
+}
+</style>

+ 90 - 0
src/views/system/paramService.vue

@@ -0,0 +1,90 @@
+<template>
+  <basic-container>
+    <avue-crud v-bind="bindVal"
+               v-on="onEvent"
+               v-model="form"
+               :permission="permissionList"
+               :page.sync="page">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   v-if="permission.param_delete"
+                   plain
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+      <template slot="paramValueForm">
+        <el-input placeholder="请输入内容" v-model="form.paramValue" class="input-with-select">
+          <el-button slot="append" icon="el-icon-upload" @click="excelBox = true"></el-button>
+        </el-input>
+      </template>
+    </avue-crud>
+    <el-dialog
+        title="附件上传"
+        append-to-body
+        :visible.sync="excelBox"
+        width="555px"
+        :close-on-click-modal="false"
+        v-dialog-drag
+    >
+      <el-upload
+          class="upload-demo"
+          drag
+          style="text-align: center"
+          ref="upload"
+          :action="action"
+          :headers="headers"
+          :on-success="onSuccess"
+          :show-file-list="false"
+          multiple
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+        <div class="el-upload__tip" slot="tip">
+          如上传文件过大,请耐心等待上传成功
+        </div>
+      </el-upload>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+
+import {getToken} from "@/util/auth";
+
+export default window.$crudCommon({
+  data() {
+    return {
+      excelBox:false,
+      action: "/api/blade-resource/oss/endpoint/put-file",
+      headers: { "Blade-Auth": "Bearer " + getToken() },
+    }
+  },
+  computed: {
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.param_add, false),
+        viewBtn: this.vaildData(this.permission.param_view, false),
+        delBtn: this.vaildData(this.permission.param_delete, false),
+        editBtn: this.vaildData(this.permission.param_edit, false)
+      };
+    },
+  },
+  methods: {
+    //修改上传成功
+    onSuccess(response) {
+      console.log(response)
+      this.form.paramValue = response.data.link;
+      this.excelBox = false;
+      this.$message.success("上传成功!");
+    }
+  }
+}, {
+  //模块路径
+  name: 'system/paramService',
+})
+</script>
+
+<style>
+</style>

+ 17 - 1
src/views/system/tenant.vue

@@ -82,6 +82,7 @@ export default {
         total: 0
         total: 0
       },
       },
       option: {
       option: {
+        align: 'center',
         height: 'auto',
         height: 'auto',
         calcHeight: 30,
         calcHeight: 30,
         tip: false,
         tip: false,
@@ -163,7 +164,9 @@ export default {
           {
           {
             label: "绑定域名",
             label: "绑定域名",
             prop: "domain",
             prop: "domain",
+            width: 160,
             span: 24,
             span: 24,
+            overHidden: true,
           },{
           },{
             label: "公司类型",
             label: "公司类型",
             type: "select",
             type: "select",
@@ -173,9 +176,10 @@ export default {
               value: "dictKey"
               value: "dictKey"
             },
             },
             dataType: "number",
             dataType: "number",
-            width: 120,
+            width: 80,
             prop: "billType",
             prop: "billType",
             slot: true,
             slot: true,
+            overHidden: true,
             rules: [{
             rules: [{
               required: true,
               required: true,
               message: "请输入机构类型",
               message: "请输入机构类型",
@@ -185,12 +189,24 @@ export default {
           {
           {
             label: "平台客户编码",
             label: "平台客户编码",
             prop: "corpCode",
             prop: "corpCode",
+            width: 120,
             span: 12,
             span: 12,
+            overHidden: true,
           },
           },
           {
           {
             label: "对应平台(租户id)",
             label: "对应平台(租户id)",
             prop: "terrace",
             prop: "terrace",
+            labelWidth: 140,
+            width: 140,
+            span: 12,
+            overHidden: true,
+          },
+          {
+            label: "微信AppId",
+            prop: "appId",
+            width: 100,
             span: 12,
             span: 12,
+            overHidden: true
           },
           },
           {
           {
             label: "系统背景",
             label: "系统背景",