浏览代码

Merge branch 'master' of http://139.196.39.194:9021/yuansh/global-web

yuansh 5 月之前
父节点
当前提交
6a672af263
共有 2 个文件被更改,包括 0 次插入515 次删除
  1. 0 403
      src/mixins/JeecgListMixin.js
  2. 0 112
      src/views/BasicData/productCassification.vue

+ 0 - 403
src/mixins/JeecgListMixin.js

@@ -1,403 +0,0 @@
-/**
- * 新增修改完成调用 modalFormOk方法 编辑弹框组件ref定义为modalForm
- * 高级查询按钮调用 superQuery方法  高级查询组件ref定义为superQueryModal
- * data中url定义 list为查询列表  delete为删除单条记录  deleteBatch为批量删除
- */
-import { filterObj } from '@/utils/util';
-import { deleteAction, getAction,downFile,getFileAccessHttpUrl } from '@/api/manage'
-import Vue from 'vue'
-import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
-import store from '@/store'
-
-export const JeecgListMixin = {
-  data(){
-    return {
-      /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
-      queryParam: {},
-      /* 数据源 */
-      dataSource:[],
-      /* 分页参数 */
-      ipagination:{
-        current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['10', '20', '30'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 共" + total + "条"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      /* 排序参数 */
-      isorter:{
-        column: 'createTime',
-        order: 'desc',
-      },
-      /* 筛选参数 */
-      filters: {},
-      /* table加载状态 */
-      loading:false,
-      /* table选中keys*/
-      selectedRowKeys: [],
-      /* table选中records*/
-      selectionRows: [],
-      /* 查询折叠 */
-      toggleSearchStatus:false,
-      /* 高级查询条件生效状态 */
-      superQueryFlag:false,
-      /* 高级查询条件 */
-      superQueryParams: '',
-      /** 高级查询拼接方式 */
-      superQueryMatchType: 'and',
-    }
-  },
-  created() {
-      if(!this.disableMixinCreated){
-        console.log(' -- mixin created -- ')
-        this.loadData();
-        //初始化字典配置 在自己页面定义
-        this.initDictConfig();
-      }
-  },
-  computed: {
-    //token header
-    tokenHeader(){
-      let head = {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)}
-      let tenantid = Vue.ls.get(TENANT_ID)
-      if(tenantid){
-        head['X-Tenant-Id'] = tenantid
-      }
-      return head;
-    }
-  },
-  methods:{
-    loadData(arg) {
-      if(!this.url.list){
-        this.$message.error("请设置url.list属性!")
-        return
-      }
-      //加载数据 若传入参数1则加载第一页的内容
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      var params = this.getQueryParams();//查询条件
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          //update-begin---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
-          this.dataSource = res.result.records||res.result;
-          if(res.result.total)
-          {
-            this.ipagination.total = res.result.total;
-          }else{
-            this.ipagination.total = 0;
-          }
-          //update-end---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
-        }else{
-          this.$message.warning(res.message)
-        }
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    initDictConfig(){
-      console.log("--这是一个假的方法!")
-    },
-    handleSuperQuery(params, matchType) {
-      //高级查询方法
-      if(!params){
-        this.superQueryParams=''
-        this.superQueryFlag = false
-      }else{
-        this.superQueryFlag = true
-        this.superQueryParams=JSON.stringify(params)
-        this.superQueryMatchType = matchType
-      }
-      this.loadData(1)
-    },
-    getQueryParams() {
-      //获取查询条件
-      let sqp = {}
-      if(this.superQueryParams){
-        sqp['superQueryParams']=encodeURI(this.superQueryParams)
-        sqp['superQueryMatchType'] = this.superQueryMatchType
-      }
-      var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
-      param.field = this.getQueryField();
-      param.pageNo = this.ipagination.current;
-      param.pageSize = this.ipagination.pageSize;
-      return filterObj(param);
-    },
-    getQueryField() {
-      //TODO 字段权限控制
-      var str = "id,";
-      this.columns.forEach(function (value) {
-        str += "," + value.dataIndex;
-      });
-      return str;
-    },
-
-    onSelectChange(selectedRowKeys, selectionRows) {
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-    },
-    searchQuery() {
-      this.loadData(1);
-      // 点击查询清空列表选中行
-      // https://gitee.com/jeecg/jeecg-boot/issues/I4KTU1
-      this.selectedRowKeys = []
-      this.selectionRows = []
-    },
-    superQuery() {
-      this.$refs.superQueryModal.show();
-    },
-    searchReset() {
-      this.queryParam = {}
-      this.loadData(1);
-    },
-    batchDel: function () {
-      if(!this.url.deleteBatch){
-        this.$message.error("请设置url.deleteBatch属性!")
-        return
-      }
-      if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录!');
-        return;
-      } else {
-        var ids = "";
-        for (var a = 0; a < this.selectedRowKeys.length; a++) {
-          ids += this.selectedRowKeys[a] + ",";
-        }
-        var that = this;
-        this.$confirm({
-          title: "确认删除",
-          content: "是否删除选中数据?",
-          onOk: function () {
-            that.loading = true;
-            deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
-              if (res.success) {
-                //重新计算分页问题
-                that.reCalculatePage(that.selectedRowKeys.length)
-                that.$message.success(res.message);
-                that.loadData();
-                that.onClearSelected();
-              } else {
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.loading = false;
-            });
-          }
-        });
-      }
-    },
-    handleDelete: function (id) {
-      if(!this.url.delete){
-        this.$message.error("请设置url.delete属性!")
-        return
-      }
-      var that = this;
-      deleteAction(that.url.delete, {id: id}).then((res) => {
-        if (res.success) {
-          //重新计算分页问题
-          that.reCalculatePage(1)
-          that.$message.success(res.message);
-          that.loadData();
-        } else {
-          that.$message.warning(res.message);
-        }
-      });
-    },
-    reCalculatePage(count){
-      //总数量-count
-      let total=this.ipagination.total-count;
-      //获取删除后的分页数
-      let currentIndex=Math.ceil(total/this.ipagination.pageSize);
-      //删除后的分页数<所在当前页
-      if(currentIndex<this.ipagination.current){
-        this.ipagination.current=currentIndex;
-      }
-      console.log('currentIndex',currentIndex)
-    },
-    handleEdit: function (record) {
-      this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.title = "编辑";
-      this.$refs.modalForm.disableSubmit = false;
-    },
-    handleAdd: function () {
-      this.$refs.modalForm.add();
-      this.$refs.modalForm.title = "新增";
-      this.$refs.modalForm.disableSubmit = false;
-    },
-    handleTableChange(pagination, filters, sorter) {
-      //分页、排序、筛选变化时触发
-      //TODO 筛选
-      console.log(pagination)
-      if (Object.keys(sorter).length > 0) {
-        this.isorter.column = sorter.field;
-        this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
-      }
-      this.ipagination = pagination;
-      this.loadData();
-    },
-    handleToggleSearch(){
-      this.toggleSearchStatus = !this.toggleSearchStatus;
-    },
-    // 给popup查询使用(查询区域不支持回填多个字段,限制只返回一个字段)
-    getPopupField(fields){
-      return fields.split(',')[0]
-    },
-    modalFormOk() {
-      // 新增/修改 成功时,重载列表
-      this.loadData();
-      //清空列表选中
-      this.onClearSelected()
-    },
-    handleDetail:function(record){
-      this.$refs.modalForm.edit(record);
-      this.$refs.modalForm.title="详情";
-      this.$refs.modalForm.disableSubmit = true;
-    },
-    /* 导出 */
-    handleExportXls2(){
-      let paramsStr = encodeURI(JSON.stringify(this.getQueryParams()));
-      let url = `${window._CONFIG['domianURL']}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`;
-      window.location.href = url;
-    },
-    handleExportXls(fileName){
-      if(!fileName || typeof fileName != "string"){
-        fileName = "导出文件"
-      }
-      let param = this.getQueryParams();
-      if(this.selectedRowKeys && this.selectedRowKeys.length>0){
-        param['selections'] = this.selectedRowKeys.join(",")
-      }
-      console.log("导出参数",param)
-      downFile(this.url.exportXlsUrl,param).then((data)=>{
-        if (!data) {
-          this.$message.warning("文件下载失败")
-          return
-        }
-        if (typeof window.navigator.msSaveBlob !== 'undefined') {
-          window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xls')
-        }else{
-          let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'}))
-          let link = document.createElement('a')
-          link.style.display = 'none'
-          link.href = url
-          link.setAttribute('download', fileName+'.xls')
-          document.body.appendChild(link)
-          link.click()
-          document.body.removeChild(link); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
-        }
-      })
-    },
-    handleExportXlsWithUrl(fileName, url){
-      if(!fileName || typeof fileName != "string"){
-        fileName = "导出文件"
-      }
-      let param = this.getQueryParams();
-      if(this.selectedRowKeys && this.selectedRowKeys.length>0){
-        param['selections'] = this.selectedRowKeys.join(",")
-      }
-      console.log("导出参数",param)
-      downFile(url,param).then((data)=>{
-        if (!data) {
-          this.$message.warning("文件下载失败")
-          return
-        }
-        if (typeof window.navigator.msSaveBlob !== 'undefined') {
-          window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xls')
-        }else{
-          let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'}))
-          let link = document.createElement('a')
-          link.style.display = 'none'
-          link.href = url
-          link.setAttribute('download', fileName+'.xls')
-          document.body.appendChild(link)
-          link.click()
-          document.body.removeChild(link); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
-        }
-      })
-    },
-    /* 导入 */
-    handleImportExcel(info){
-      this.loading = true;
-      if (info.file.status !== 'uploading') {
-        console.log(info.file, info.fileList);
-      }
-      if (info.file.status === 'done') {
-        this.loading = false;
-        if (info.file.response.success) {
-          // this.$message.success(`${info.file.name} 文件上传成功`);
-          if (info.file.response.code === 201) {
-            let { message, result: { msg, fileUrl, fileName } } = info.file.response
-            let href = window._CONFIG['domianURL'] + fileUrl
-            this.$warning({
-              title: message,
-              content: (<div>
-                  <span>{msg}</span><br/>
-                  <span>具体详情请 <a href={href} target="_blank" download={fileName}>点击下载</a> </span>
-                </div>
-              )
-            })
-          } else {
-            this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
-          }
-          this.loadData()
-        } else {
-          this.$message.error(`${info.file.name} ${info.file.response.message}.`);
-        }
-      } else if (info.file.status === 'error') {
-        this.loading = false;
-        if (info.file.response.status === 500) {
-          let data = info.file.response
-          const token = Vue.ls.get(ACCESS_TOKEN)
-          if (token && data.message.includes("Token失效")) {
-            this.$error({
-              title: '登录已过期',
-              content: '很抱歉,登录已过期,请重新登录',
-              okText: '重新登录',
-              mask: false,
-              onOk: () => {
-                store.dispatch('Logout').then(() => {
-                  Vue.ls.remove(ACCESS_TOKEN)
-                  window.location.reload();
-                })
-              }
-            })
-          }
-        } else {
-          this.$message.error(`文件上传失败: ${info.file.msg} `);
-        }
-      }
-    },
-    /* 图片预览 */
-    getImgView(text){
-      if(text && text.indexOf(",")>0){
-        text = text.substring(0,text.indexOf(","))
-      }
-      return getFileAccessHttpUrl(text)
-    },
-    /* 文件下载 */
-    // update--autor:lvdandan-----date:20200630------for:修改下载文件方法名uploadFile改为downloadFile------
-    downloadFile(text){
-      if(!text){
-        this.$message.warning("未知的文件")
-        return;
-      }
-      if(text.indexOf(",")>0){
-        text = text.substring(0,text.indexOf(","))
-      }
-      let url = getFileAccessHttpUrl(text)
-      window.open(url);
-    },
-  }
-
-}

+ 0 - 112
src/views/BasicData/productCassification.vue

@@ -1,112 +0,0 @@
-<!-- 产品分类 -->
-<!-- 订单(供应商端) -->
-<template>
-    <a-card :bordered="false">
-      <!-- 查询区域 -->
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="searchQuery">
-          <a-row :gutter="24">
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="供应商">
-                <a-input placeholder="请输入" v-model="queryParam.supplierName"></a-input>
-              </a-form-item>
-            </a-col>
-            <template v-if="toggleSearchStatus">
-            </template>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-                <a @click="handleToggleSearch" style="margin-left: 8px">
-                  {{ toggleSearchStatus ? '收起' : '展开' }}
-                  <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                </a>
-              </span>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <!-- 查询区域-END -->
-  
-      <!-- 操作按钮区域 -->
-      <div class="table-operator">
-        <a-button  type="primary" icon="plus">新增</a-button>
-      </div>
-  
-      <!-- table区域-begin -->
-      <div>
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-        </div>
-  
-        <a-table
-          ref="table"
-          size="middle"
-          bordered
-          rowKey="id"
-          :columns="columns"
-          :dataSource="dataSource"
-          :pagination="ipagination"
-          :scroll="{ x: 2500 }"
-          :loading="loading"
-          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-          @change="handleTableChange"
-          class="j-table-force-nowrap"
-          >
-        </a-table>
-      </div>
-    </a-card>
-  </template>
-  
-  <script>
-  
-    import '@/assets/less/TableExpand.less'
-    import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-    import { putAction,getAction,postAction,deleteAction } from '@/api/manage'
-    export default {
-      name: 'productCassification',
-      mixins:[JeecgListMixin],
-      components: {},
-      data () {
-        return {
-          description: '产品分类',
-          selectedRowKeys:[],
-          dataSource:[],
-          // 表头
-          columns: [
-            {
-              title: '#',
-              dataIndex: '',
-              key:'rowIndex',
-              width:60,
-              align:"center",
-              customRender:function (t,r,index) {
-                return parseInt(index)+1;
-              }
-            },
-            {
-              title:'组织',
-              align:"center",
-              ellipsis: true,
-              dataIndex: 'sourceSystem_dictText'
-            },
-          ],
-          url: {
-            // list: "/purchase/ompoOrder/listBySupplier",
-            
-          },
-        }
-      },
-      created() {
-      },
-      computed: {
-      },
-      methods: {
-
-      }
-    }
-  </script>
-  <style scoped>
-    @import '~@assets/less/common.less';
-  </style>